From 057754cfd31cf552d2617769667109a7441761ca Mon Sep 17 00:00:00 2001
From: aj-r <aj.ric.ar+git@gmail.com>
Date: Sat, 23 Dec 2017 12:34:07 -0500
Subject: [PATCH 001/575] lodash: _.get should with numeric keys, too. Also
 added some better tests.

---
 types/lodash/index.d.ts      | 51 ++++++++++++++++++++++++++++++++++++
 types/lodash/lodash-tests.ts | 20 ++++++++++++--
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/types/lodash/index.d.ts b/types/lodash/index.d.ts
index caa92006b8..cc90e15559 100644
--- a/types/lodash/index.d.ts
+++ b/types/lodash/index.d.ts
@@ -13372,6 +13372,23 @@ declare namespace _ {
             defaultValue: TDefault
         ): TObject[TKey] | TDefault;
 
+        /**
+         * @see _.get
+         */
+        get<T>(
+            object: NumericDictionary<T> | null | undefined,
+            path: number
+        ): T | undefined;
+
+        /**
+         * @see _.get
+         */
+        get<T, TDefault>(
+            object: NumericDictionary<T> | null | undefined,
+            path: number,
+            defaultValue: TDefault
+        ): T | TDefault;
+
         /**
          * @see _.get
          */
@@ -13424,6 +13441,23 @@ declare namespace _ {
             defaultValue: TDefault
         ): TObject[TKey] | TDefault;
 
+        /**
+         * @see _.get
+         */
+        get<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            path: number
+        ): T | undefined;
+
+        /**
+         * @see _.get
+         */
+        get<T, TDefault>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            path: number,
+            defaultValue: TDefault
+        ): T | TDefault;
+
         /**
          * @see _.get
          */
@@ -13475,6 +13509,23 @@ declare namespace _ {
             defaultValue: TDefault
         ): LoDashExplicitWrapper<TObject[TKey] | TDefault>;
 
+        /**
+         * @see _.get
+         */
+        get<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            path: number
+        ): LoDashExplicitWrapper<T | undefined>;
+
+        /**
+         * @see _.get
+         */
+        get<T, TDefault>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            path: number,
+            defaultValue: TDefault
+        ): LoDashExplicitWrapper<T | undefined>;
+
         /**
          * @see _.get
          */
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 774e58ef9f..fe1f1eb9ca 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -11266,6 +11266,22 @@ namespace TestGet {
     _.get([], Symbol.iterator);
     _.get([], [Symbol.iterator]);
 
+    _.get('abc', 4); // $ExpectType string | undefined
+    _('abc').get(4); // $ExpectType string | undefined
+    _.chain('abc').get(4); // $ExpectType LoDashExplicitWrapper<string | undefined>
+
+    _.get({ a: { b: true } }, "a"); // $ExpectType { b: boolean; }
+    _({ a: { b: true } }).get("a"); // $ExpectType { b: boolean; }
+    _.chain({ a: { b: true } }).get("a"); // $ExpectType LoDashExplicitWrapper<{ b: boolean; }>
+
+    _.get({ a: { b: true } }, ["a"]); // $ExpectType { b: boolean; }
+    _({ a: { b: true } }).get(["a"]); // $ExpectType { b: boolean; }
+    _.chain({ a: { b: true } }).get(["a"]); // $ExpectType LoDashExplicitWrapper<{ b: boolean; }>
+
+    _.get({ a: { b: true } }, ["a", "b"]); // $ExpectType any
+    _({ a: { b: true } }).get(["a", "b"]); // $ExpectType any
+    _.chain({ a: { b: true } }).get(["a", "b"]); // $ExpectType LoDashExplicitWrapper<any>
+
     {
         let result: string;
 
@@ -11322,7 +11338,7 @@ namespace TestGet {
         result = _({a: true}).get<boolean>(['a']);
         result = _({a: true}).get<boolean>(['a'], false);
     }
-
+/*
     {
         let result: _.LoDashExplicitWrapper<string>;
 
@@ -11348,7 +11364,7 @@ namespace TestGet {
         result = _({a: true}).chain().get('a', false);
         result = _({a: true}).chain().get(['a']);
         result = _({a: true}).chain().get(['a'], false);
-    }
+    }*/
 }
 
 // _.has

From 6e0532c130119f75734ccb934baf22974b889749 Mon Sep 17 00:00:00 2001
From: AJ Richardson <aj.ric.ar+git@gmail.com>
Date: Tue, 2 Jan 2018 09:06:13 -0500
Subject: [PATCH 002/575] lodash: add one more NumericDictionary overload for
 _.get

---
 types/lodash/index.d.ts      | 24 ++++++++++++++++++++++++
 types/lodash/lodash-tests.ts | 10 +++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/types/lodash/index.d.ts b/types/lodash/index.d.ts
index cc90e15559..00a1cd63b2 100644
--- a/types/lodash/index.d.ts
+++ b/types/lodash/index.d.ts
@@ -13372,6 +13372,14 @@ declare namespace _ {
             defaultValue: TDefault
         ): TObject[TKey] | TDefault;
 
+        /**
+         * @see _.get
+         */
+        get<T>(
+            object: NumericDictionary<T>,
+            path: number
+        ): T;
+
         /**
          * @see _.get
          */
@@ -13441,6 +13449,14 @@ declare namespace _ {
             defaultValue: TDefault
         ): TObject[TKey] | TDefault;
 
+        /**
+         * @see _.get
+         */
+        get<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T>>,
+            path: number
+        ): T;
+
         /**
          * @see _.get
          */
@@ -13509,6 +13525,14 @@ declare namespace _ {
             defaultValue: TDefault
         ): LoDashExplicitWrapper<TObject[TKey] | TDefault>;
 
+        /**
+         * @see _.get
+         */
+        get<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T>>,
+            path: number
+        ): LoDashExplicitWrapper<T>;
+
         /**
          * @see _.get
          */
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index fe1f1eb9ca..d3886537a1 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -11266,9 +11266,9 @@ namespace TestGet {
     _.get([], Symbol.iterator);
     _.get([], [Symbol.iterator]);
 
-    _.get('abc', 4); // $ExpectType string | undefined
-    _('abc').get(4); // $ExpectType string | undefined
-    _.chain('abc').get(4); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    _.get('abc', 4); // $ExpectType string
+    _('abc').get(4); // $ExpectType string
+    _.chain('abc').get(4); // $ExpectType LoDashExplicitWrapper<string>
 
     _.get({ a: { b: true } }, "a"); // $ExpectType { b: boolean; }
     _({ a: { b: true } }).get("a"); // $ExpectType { b: boolean; }
@@ -11338,7 +11338,7 @@ namespace TestGet {
         result = _({a: true}).get<boolean>(['a']);
         result = _({a: true}).get<boolean>(['a'], false);
     }
-/*
+
     {
         let result: _.LoDashExplicitWrapper<string>;
 
@@ -11364,7 +11364,7 @@ namespace TestGet {
         result = _({a: true}).chain().get('a', false);
         result = _({a: true}).chain().get(['a']);
         result = _({a: true}).chain().get(['a'], false);
-    }*/
+    }
 }
 
 // _.has

From 5b606cac973d358d6c5141fea915a03b124b16d3 Mon Sep 17 00:00:00 2001
From: AJ Richardson <aj.ric.ar+git@gmail.com>
Date: Wed, 3 Jan 2018 18:46:29 -0500
Subject: [PATCH 003/575] lodash: more reasonable index for _.get tests

---
 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 d3886537a1..69fe88b341 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -11266,9 +11266,9 @@ namespace TestGet {
     _.get([], Symbol.iterator);
     _.get([], [Symbol.iterator]);
 
-    _.get('abc', 4); // $ExpectType string
-    _('abc').get(4); // $ExpectType string
-    _.chain('abc').get(4); // $ExpectType LoDashExplicitWrapper<string>
+    _.get('abc', 1); // $ExpectType string
+    _('abc').get(1); // $ExpectType string
+    _.chain('abc').get(1); // $ExpectType LoDashExplicitWrapper<string>
 
     _.get({ a: { b: true } }, "a"); // $ExpectType { b: boolean; }
     _({ a: { b: true } }).get("a"); // $ExpectType { b: boolean; }

From 04b8281f8760bd2e416806115053dc35db972f43 Mon Sep 17 00:00:00 2001
From: leanazulyoro <leanazulyoro@gmail.com>
Date: Mon, 16 Apr 2018 10:28:18 -0300
Subject: [PATCH 004/575] Add definitions for restify's conditionalHandler
 plugin

---
 types/restify/index.d.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/types/restify/index.d.ts b/types/restify/index.d.ts
index b5f6dd6fe5..30a5220022 100644
--- a/types/restify/index.d.ts
+++ b/types/restify/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for restify 5.0
 // Project: https://github.com/restify/node-restify
-// Definitions by: Bret Little <https://github.com/blittle>, Steve Hipwell <https://github.com/stevehipwell>
+// Definitions by: Bret Little <https://github.com/blittle>, Steve Hipwell <https://github.com/stevehipwell>, Leandro Almeida <https://github.com/leanazulyoro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -946,6 +946,17 @@ export namespace plugins {
      */
     function authorizationParser(options?: any): RequestHandler;
 
+    interface HandlerCandidate {
+        handler: RequestHandler | RequestHandler[];
+        version?: string | string[];
+        contentType?: string | string[];
+    }
+
+    /**
+     * Runs first handler that matches to the condition
+     */
+    function conditionalHandler(candidates: HandlerCandidate | HandlerCandidate[]): RequestHandler[];
+
     /**
      * Conditional headers (If-*)
      */

From b130408774ba0622125682402446ede98f514a08 Mon Sep 17 00:00:00 2001
From: leanazulyoro <leanazulyoro@gmail.com>
Date: Mon, 16 Apr 2018 10:36:38 -0300
Subject: [PATCH 005/575] Changed: restify's version in header of definitions

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

diff --git a/types/restify/index.d.ts b/types/restify/index.d.ts
index 30a5220022..8a07519121 100644
--- a/types/restify/index.d.ts
+++ b/types/restify/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for restify 5.0
+// Type definitions for restify 7.1.1
 // Project: https://github.com/restify/node-restify
 // Definitions by: Bret Little <https://github.com/blittle>, Steve Hipwell <https://github.com/stevehipwell>, Leandro Almeida <https://github.com/leanazulyoro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 74a624759ba410b6f941f01d47c9156f49199c62 Mon Sep 17 00:00:00 2001
From: leanazulyoro <leanazulyoro@gmail.com>
Date: Mon, 16 Apr 2018 16:46:00 -0300
Subject: [PATCH 006/575] reverted version

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

diff --git a/types/restify/index.d.ts b/types/restify/index.d.ts
index 8a07519121..30a5220022 100644
--- a/types/restify/index.d.ts
+++ b/types/restify/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for restify 7.1.1
+// Type definitions for restify 5.0
 // Project: https://github.com/restify/node-restify
 // Definitions by: Bret Little <https://github.com/blittle>, Steve Hipwell <https://github.com/stevehipwell>, Leandro Almeida <https://github.com/leanazulyoro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 2421842822c0f83801d2af4b825bb4b3f3690584 Mon Sep 17 00:00:00 2001
From: Unknown <michael.dodge@vivint.com>
Date: Fri, 20 Apr 2018 17:27:18 -0600
Subject: [PATCH 007/575] Add definitions for ace-diff

---
 types/ace-diff/ace-diff-tests.ts | 18 ++++++++++++
 types/ace-diff/index.d.ts        | 47 ++++++++++++++++++++++++++++++++
 types/ace-diff/tsconfig.json     | 24 ++++++++++++++++
 types/ace-diff/tslint.json       |  1 +
 4 files changed, 90 insertions(+)
 create mode 100644 types/ace-diff/ace-diff-tests.ts
 create mode 100644 types/ace-diff/index.d.ts
 create mode 100644 types/ace-diff/tsconfig.json
 create mode 100644 types/ace-diff/tslint.json

diff --git a/types/ace-diff/ace-diff-tests.ts b/types/ace-diff/ace-diff-tests.ts
new file mode 100644
index 0000000000..9c9eb4cfb9
--- /dev/null
+++ b/types/ace-diff/ace-diff-tests.ts
@@ -0,0 +1,18 @@
+import AceDiff = require('ace-diff');
+
+new AceDiff(); // $ExpectError
+
+const aceDiffOpts = {
+    element: '.acediff',
+    left: { content: 'left content' },
+    right: { content: 'left content' },
+};
+new AceDiff(aceDiffOpts); // $ExpectType AceDiff
+
+const differ = new AceDiff(aceDiffOpts);
+
+differ.getEditors(); // $ExpectType { left: any; right: any; }
+differ.setOptions(); // $ExpectType void
+differ.getNumDiffs(); // $ExpectType number
+differ.diff(); // $ExpectType void
+differ.destroy(); // $ExpectType void
diff --git a/types/ace-diff/index.d.ts b/types/ace-diff/index.d.ts
new file mode 100644
index 0000000000..f381aedfed
--- /dev/null
+++ b/types/ace-diff/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for ace-diff 2.1
+// Project: https://ace-diff.github.io/ace-diff/
+// Definitions by: Mike Dodge <https://github.com/innovation-team>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace AceDiff;
+
+export = AceDiff;
+
+declare class AceDiff {
+    constructor(opts: AceDiff.AceDiffOpts);
+    getEditors(): {
+        left: any;
+        right: any;
+    };
+    setOptions(): void;
+    getNumDiffs(): number;
+    diff(): void;
+    destroy(): void;
+}
+declare namespace AceDiff {
+    interface AceDiffLROpts {
+        content?: string | null;
+        mode?: string;
+        theme?: string;
+        editable?: boolean;
+        copyLinkEnabled?: boolean;
+    }
+
+    interface AceDiffOpts {
+        element: string | HTMLElement;
+        mode?: string;
+        theme?: string;
+        diffGranularity?: 'specific' | 'broad';
+        showDiffs?: boolean;
+        showConnectors?: boolean;
+        maxDiffs?: number;
+        left: AceDiffLROpts;
+        right: AceDiffLROpts;
+        classes?: {
+            diff: string;
+            connector: string;
+            newCodeConnectorLinkContent: string;
+            deletedCodeConnectorLinkContent: string;
+        };
+    }
+}
diff --git a/types/ace-diff/tsconfig.json b/types/ace-diff/tsconfig.json
new file mode 100644
index 0000000000..00fb70bbcd
--- /dev/null
+++ b/types/ace-diff/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",
+        "ace-diff-tests.ts"
+    ]
+}
diff --git a/types/ace-diff/tslint.json b/types/ace-diff/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ace-diff/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 689c9abdb257bc88346a572880fc62df879866d6 Mon Sep 17 00:00:00 2001
From: Wouter van Heeswijk <wouter.vanheeswijk@tomtom.com>
Date: Wed, 25 Apr 2018 11:40:14 +0200
Subject: [PATCH 008/575] .tz() can also return undefined as per the docs

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

diff --git a/types/moment-timezone/index.d.ts b/types/moment-timezone/index.d.ts
index c3927415c6..727c91cad4 100644
--- a/types/moment-timezone/index.d.ts
+++ b/types/moment-timezone/index.d.ts
@@ -57,7 +57,7 @@ declare module "moment" {
     }
 
     interface Moment {
-        tz(): string;
+        tz(): string | undefined;
         tz(timezone: string): Moment;
         zoneAbbr(): string;
         zoneName(): string;

From 7f22b29fc516ad5e4828ab413a979cc574d93c16 Mon Sep 17 00:00:00 2001
From: Wouter van Heeswijk <woutervh@gmail.com>
Date: Fri, 27 Apr 2018 20:28:44 +0200
Subject: [PATCH 009/575] Added a test that type checks the .tz() function

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

diff --git a/types/moment-timezone/moment-timezone-tests.ts b/types/moment-timezone/moment-timezone-tests.ts
index 66bb7403ea..44b00abf10 100644
--- a/types/moment-timezone/moment-timezone-tests.ts
+++ b/types/moment-timezone/moment-timezone-tests.ts
@@ -83,3 +83,5 @@ moment.tz.guess(true);
 const zoneAbbr: string = moment.tz('America/Los_Angeles').zoneAbbr();
 
 const zoneName: string = moment.tz('America/Los_Angeles').zoneName();
+
+const zoneType: string | undefined = moment.tz('2013-11-18 11:55').tz();

From c326abb53bce78217cd74fe9f400ffdedcaa2d9b Mon Sep 17 00:00:00 2001
From: Michael Dodge <michael.dodge@vivint.com>
Date: Wed, 2 May 2018 17:05:37 -0600
Subject: [PATCH 010/575] Fix missing setOptions arg

---
 types/ace-diff/ace-diff-tests.ts | 14 +++++++++-----
 types/ace-diff/index.d.ts        | 15 ++++++++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/types/ace-diff/ace-diff-tests.ts b/types/ace-diff/ace-diff-tests.ts
index 9c9eb4cfb9..52e64589a3 100644
--- a/types/ace-diff/ace-diff-tests.ts
+++ b/types/ace-diff/ace-diff-tests.ts
@@ -2,17 +2,21 @@ import AceDiff = require('ace-diff');
 
 new AceDiff(); // $ExpectError
 
-const aceDiffOpts = {
+const aceDiffConstructorOpts = {
     element: '.acediff',
     left: { content: 'left content' },
-    right: { content: 'left content' },
+    right: { content: 'right content' },
 };
-new AceDiff(aceDiffOpts); // $ExpectType AceDiff
+new AceDiff(aceDiffConstructorOpts); // $ExpectType AceDiff
 
-const differ = new AceDiff(aceDiffOpts);
+const differ = new AceDiff(aceDiffConstructorOpts);
 
 differ.getEditors(); // $ExpectType { left: any; right: any; }
-differ.setOptions(); // $ExpectType void
+differ.setOptions(); // $ExpectError
+const aceDiffOpts = {
+    diffGranularity: 'broad' as 'broad', // workaround: cast to avoid https://github.com/Microsoft/TypeScript/issues/11465#issuecomment-252453037
+};
+differ.setOptions(aceDiffOpts); // $ExpectType void
 differ.getNumDiffs(); // $ExpectType number
 differ.diff(); // $ExpectType void
 differ.destroy(); // $ExpectType void
diff --git a/types/ace-diff/index.d.ts b/types/ace-diff/index.d.ts
index f381aedfed..b59b3d25e2 100644
--- a/types/ace-diff/index.d.ts
+++ b/types/ace-diff/index.d.ts
@@ -8,12 +8,12 @@ export as namespace AceDiff;
 export = AceDiff;
 
 declare class AceDiff {
-    constructor(opts: AceDiff.AceDiffOpts);
+    constructor(opts: AceDiff.AceDiffConstructorOpts);
     getEditors(): {
         left: any;
         right: any;
     };
-    setOptions(): void;
+    setOptions(options: AceDiff.AceDiffOpts): void;
     getNumDiffs(): number;
     diff(): void;
     destroy(): void;
@@ -27,16 +27,21 @@ declare namespace AceDiff {
         copyLinkEnabled?: boolean;
     }
 
-    interface AceDiffOpts {
+    interface AceDiffConstructorOpts extends AceDiffOpts {
         element: string | HTMLElement;
+        left: AceDiffLROpts;
+        right: AceDiffLROpts;
+    }
+
+    interface AceDiffOpts {
         mode?: string;
         theme?: string;
         diffGranularity?: 'specific' | 'broad';
         showDiffs?: boolean;
         showConnectors?: boolean;
         maxDiffs?: number;
-        left: AceDiffLROpts;
-        right: AceDiffLROpts;
+        left?: AceDiffLROpts;
+        right?: AceDiffLROpts;
         classes?: {
             diff: string;
             connector: string;

From 1e7f4242377340083bb988f6cbc58869b603d44a Mon Sep 17 00:00:00 2001
From: AJ Richardson <aj.ric.ar+git@gmail.com>
Date: Thu, 3 May 2018 21:22:50 -0400
Subject: [PATCH 011/575] lodash: improve omit/unset/mergeAll
 (#25361,#25365,#25382), fix partial

---
 types/lodash/common/common.d.ts     |   3 +
 types/lodash/common/object.d.ts     |  36 ++-
 types/lodash/fp.d.ts                | 329 +++++++++++++++++++++++++---
 types/lodash/lodash-tests.ts        |  36 +--
 types/lodash/scripts/generate-fp.ts |  35 ++-
 types/lowdb/_lodash.d.ts            |  20 +-
 6 files changed, 392 insertions(+), 67 deletions(-)

diff --git a/types/lodash/common/common.d.ts b/types/lodash/common/common.d.ts
index 28c4437073..b5da2a8080 100644
--- a/types/lodash/common/common.d.ts
+++ b/types/lodash/common/common.d.ts
@@ -217,6 +217,9 @@ declare module "../index" {
     type PropertyName = string | number | symbol;
     type PropertyPath = Many<PropertyName>;
 
+    type Diff<T extends string, U extends string> = ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];
+    type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
+
     /** Common interface between Arrays and jQuery objects */
     type List<T> = ArrayLike<T>;
 
diff --git a/types/lodash/common/object.d.ts b/types/lodash/common/object.d.ts
index e0b1f3ebf1..5e2d539c23 100644
--- a/types/lodash/common/object.d.ts
+++ b/types/lodash/common/object.d.ts
@@ -2860,15 +2860,23 @@ declare module "../index" {
          */
         omit<T extends AnyKindOfDictionary>(
             object: T | null | undefined,
-            ...paths: PropertyPath[]
+            ...paths: Array<Many<PropertyName>>
         ): T;
 
+        /**
+         * @see _.omit
+         */
+        omit<T extends object, K extends keyof T>(
+            object: T | null | undefined,
+            ...paths: Array<Many<K>>
+        ): Omit<T, K>;
+
         /**
          * @see _.omit
          */
         omit<T extends object>(
             object: T | null | undefined,
-            ...paths: PropertyPath[]
+            ...paths: Array<Many<PropertyName>>
         ): PartialObject<T>;
     }
 
@@ -2878,15 +2886,23 @@ declare module "../index" {
          */
         omit<T extends AnyKindOfDictionary>(
             this: LoDashImplicitWrapper<T | null | undefined>,
-            ...paths: PropertyPath[]
+            ...paths: Array<Many<PropertyName>>
         ): LoDashImplicitWrapper<T>;
 
+        /**
+         * @see _.omit
+         */
+        omit<T extends object, K extends keyof T>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            ...paths: Array<Many<K>>
+        ): LoDashImplicitWrapper<Omit<T, K>>;
+
         /**
          * @see _.omit
          */
         omit<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
-            ...paths: PropertyPath[]
+            ...paths: Array<Many<PropertyName>>
         ): LoDashImplicitWrapper<PartialObject<T>>;
     }
 
@@ -2896,15 +2912,23 @@ declare module "../index" {
          */
         omit<T extends AnyKindOfDictionary>(
             this: LoDashExplicitWrapper<T | null | undefined>,
-            ...paths: PropertyPath[]
+            ...paths: Array<Many<PropertyName>>
         ): LoDashExplicitWrapper<T>;
 
+        /**
+         * @see _.omit
+         */
+        omit<T extends object, K extends keyof T>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            ...paths: Array<Many<K>>
+        ): LoDashExplicitWrapper<Omit<T, K>>;
+
         /**
          * @see _.omit
          */
         omit<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
-            ...paths: PropertyPath[]
+            ...paths: Array<Many<PropertyName>>
         ): LoDashExplicitWrapper<PartialObject<T>>;
     }
 
diff --git a/types/lodash/fp.d.ts b/types/lodash/fp.d.ts
index d577414aa4..da68ea250e 100644
--- a/types/lodash/fp.d.ts
+++ b/types/lodash/fp.d.ts
@@ -1,6 +1,6 @@
 // AUTO-GENERATED: do not modify this file directly.
 // If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
+// npm install && npm run generate
 
 import lodash = require("./index");
 
@@ -60,7 +60,14 @@ declare namespace _ {
     }
     type LodashAssign1x1<TObject> = <TSource>(source: TSource) => TObject & TSource;
     type LodashAssign1x2<TSource> = <TObject>(object: TObject) => TObject & TSource;
-    type LodashAssignAll = (object: ReadonlyArray<any>) => any;
+    interface LodashAssignAll {
+        <TObject, TSource>(object: [TObject, TSource]): TObject & TSource;
+        <TObject, TSource1, TSource2>(object: [TObject, TSource1, TSource2]): TObject & TSource1 & TSource2;
+        <TObject, TSource1, TSource2, TSource3>(object: [TObject, TSource1, TSource2, TSource3]): TObject & TSource1 & TSource2 & TSource3;
+        <TObject, TSource1, TSource2, TSource3, TSource4>(object: [TObject, TSource1, TSource2, TSource3, TSource4]): TObject & TSource1 & TSource2 & TSource3 & TSource4;
+        <TObject>(object: [TObject]): TObject;
+        (object: ReadonlyArray<any>): any;
+    }
     interface LodashAssignAllWith {
         (customizer: lodash.AssignCustomizer): LodashAssignAllWith1x1;
         (customizer: lodash.__, args: ReadonlyArray<any>): LodashAssignAllWith1x2;
@@ -75,7 +82,14 @@ declare namespace _ {
     }
     type LodashAssignIn1x1<TObject> = <TSource>(source: TSource) => TObject & TSource;
     type LodashAssignIn1x2<TSource> = <TObject>(object: TObject) => TObject & TSource;
-    type LodashAssignInAll = <TResult>(object: ReadonlyArray<any>) => TResult;
+    interface LodashAssignInAll {
+        <TObject, TSource>(object: [TObject, TSource]): TObject & TSource;
+        <TObject, TSource1, TSource2>(object: [TObject, TSource1, TSource2]): TObject & TSource1 & TSource2;
+        <TObject, TSource1, TSource2, TSource3>(object: [TObject, TSource1, TSource2, TSource3]): TObject & TSource1 & TSource2 & TSource3;
+        <TObject, TSource1, TSource2, TSource3, TSource4>(object: [TObject, TSource1, TSource2, TSource3, TSource4]): TObject & TSource1 & TSource2 & TSource3 & TSource4;
+        <TObject>(object: [TObject]): TObject;
+        <TResult>(object: ReadonlyArray<any>): TResult;
+    }
     interface LodashAssignInAllWith {
         (customizer: lodash.AssignCustomizer): LodashAssignInAllWith1x1;
         (customizer: lodash.__, args: ReadonlyArray<any>): LodashAssignInAllWith1x2;
@@ -453,7 +467,14 @@ declare namespace _ {
     }
     type LodashDefaults1x1<TSource> = <TObject>(object: TObject) => TSource & TObject;
     type LodashDefaults1x2<TObject> = <TSource>(source: TSource) => TSource & TObject;
-    type LodashDefaultsAll = (object: ReadonlyArray<any>) => any;
+    interface LodashDefaultsAll {
+        <TObject, TSource>(object: [TObject, TSource]): TSource & TObject;
+        <TObject, TSource1, TSource2>(object: [TObject, TSource1, TSource2]): TSource2 & TSource1 & TObject;
+        <TObject, TSource1, TSource2, TSource3>(object: [TObject, TSource1, TSource2, TSource3]): TSource3 & TSource2 & TSource1 & TObject;
+        <TObject, TSource1, TSource2, TSource3, TSource4>(object: [TObject, TSource1, TSource2, TSource3, TSource4]): TSource4 & TSource3 & TSource2 & TSource1 & TObject;
+        <TObject>(object: [TObject]): TObject;
+        (object: ReadonlyArray<any>): any;
+    }
     interface LodashDefaultsDeep {
         (sources: any): LodashDefaultsDeep1x1;
         (sources: lodash.__, object: any): LodashDefaultsDeep1x2;
@@ -546,11 +567,11 @@ declare namespace _ {
     type LodashDifferenceWith1x6<T1, T2> = (comparator: lodash.Comparator2<T1, T2>) => T1[];
     interface LodashUnset {
         (path: lodash.PropertyPath): LodashUnset1x1;
-        (path: lodash.__, object: any): LodashUnset1x2;
-        (path: lodash.PropertyPath, object: any): boolean;
+        <T>(path: lodash.__, object: T): LodashUnset1x2<T>;
+        <T>(path: lodash.PropertyPath, object: T): T;
     }
-    type LodashUnset1x1 = (object: any) => boolean;
-    type LodashUnset1x2 = (path: lodash.PropertyPath) => boolean;
+    type LodashUnset1x1 = <T>(object: T) => T;
+    type LodashUnset1x2<T> = (path: lodash.PropertyPath) => T;
     interface LodashDivide {
         (dividend: number): LodashDivide1x1;
         (dividend: lodash.__, divisor: number): LodashDivide1x2;
@@ -704,7 +725,14 @@ declare namespace _ {
     }
     type LodashExtend1x1<TObject> = <TSource>(source: TSource) => TObject & TSource;
     type LodashExtend1x2<TSource> = <TObject>(object: TObject) => TObject & TSource;
-    type LodashExtendAll = <TResult>(object: ReadonlyArray<any>) => TResult;
+    interface LodashExtendAll {
+        <TObject, TSource>(object: [TObject, TSource]): TObject & TSource;
+        <TObject, TSource1, TSource2>(object: [TObject, TSource1, TSource2]): TObject & TSource1 & TSource2;
+        <TObject, TSource1, TSource2, TSource3>(object: [TObject, TSource1, TSource2, TSource3]): TObject & TSource1 & TSource2 & TSource3;
+        <TObject, TSource1, TSource2, TSource3, TSource4>(object: [TObject, TSource1, TSource2, TSource3, TSource4]): TObject & TSource1 & TSource2 & TSource3 & TSource4;
+        <TObject>(object: [TObject]): TObject;
+        <TResult>(object: ReadonlyArray<any>): TResult;
+    }
     interface LodashExtendAllWith {
         (customizer: lodash.AssignCustomizer): LodashExtendAllWith1x1;
         (customizer: lodash.__, args: ReadonlyArray<any>): LodashExtendAllWith1x2;
@@ -2171,7 +2199,13 @@ declare namespace _ {
     }
     type LodashMerge1x1<TObject> = <TSource>(source: TSource) => TObject & TSource;
     type LodashMerge1x2<TSource> = <TObject>(object: TObject) => TObject & TSource;
-    type LodashMergeAll = (object: ReadonlyArray<any>) => any;
+    interface LodashMergeAll {
+        <TObject, TSource>(object: [TObject, TSource]): TObject & TSource;
+        <TObject, TSource1, TSource2>(object: [TObject, TSource1, TSource2]): TObject & TSource1 & TSource2;
+        <TObject, TSource1, TSource2, TSource3>(object: [TObject, TSource1, TSource2, TSource3]): TObject & TSource1 & TSource2 & TSource3;
+        <TObject, TSource1, TSource2, TSource3, TSource4>(object: [TObject, TSource1, TSource2, TSource3, TSource4]): TObject & TSource1 & TSource2 & TSource3 & TSource4;
+        (object: ReadonlyArray<any>): any;
+    }
     interface LodashMergeAllWith {
         (customizer: lodash.MergeWithCustomizer): LodashMergeAllWith1x1;
         (customizer: lodash.__, args: ReadonlyArray<any>): LodashMergeAllWith1x2;
@@ -2235,18 +2269,24 @@ declare namespace _ {
     type LodashNth1x2<T> = (n: number) => T | undefined;
     type LodashNthArg = (n: number) => (...args: any[]) => any;
     interface LodashOmit {
-        (paths: lodash.PropertyPath): LodashOmit1x1;
+        (paths: lodash.Many<lodash.PropertyName>): LodashOmit1x1;
         <T extends lodash.AnyKindOfDictionary>(paths: lodash.__, object: T | null | undefined): LodashOmit1x2<T>;
-        <T extends lodash.AnyKindOfDictionary>(paths: lodash.PropertyPath, object: T | null | undefined): T;
+        <T extends lodash.AnyKindOfDictionary>(paths: lodash.Many<lodash.PropertyName>, object: T | null | undefined): T;
+        <T extends object, K extends keyof T>(paths: lodash.Many<K>): LodashOmit2x1<T, K>;
         <T extends object>(paths: lodash.__, object: T | null | undefined): LodashOmit2x2<T>;
-        <T extends object>(paths: lodash.PropertyPath, object: T | null | undefined): lodash.PartialObject<T>;
+        <T extends object, K extends keyof T>(paths: lodash.Many<K>, object: T | null | undefined): lodash.Omit<T, K>;
+        <T extends object>(paths: lodash.Many<lodash.PropertyName>, object: T | null | undefined): lodash.PartialObject<T>;
     }
     interface LodashOmit1x1 {
         <T extends lodash.AnyKindOfDictionary>(object: T | null | undefined): T;
         <T extends object>(object: T | null | undefined): lodash.PartialObject<T>;
     }
-    type LodashOmit1x2<T> = (paths: lodash.PropertyPath) => T;
-    type LodashOmit2x2<T> = (paths: lodash.PropertyPath) => lodash.PartialObject<T>;
+    type LodashOmit1x2<T> = (paths: lodash.Many<lodash.PropertyName>) => T;
+    type LodashOmit2x1<T, K extends keyof T> = (object: T | null | undefined) => lodash.Omit<T, K>;
+    interface LodashOmit2x2<T> {
+        <K extends keyof T>(paths: lodash.Many<K>): lodash.Omit<T, K>;
+        (paths: lodash.Many<lodash.PropertyName>): lodash.PartialObject<T>;
+    }
     interface LodashOmitBy {
         <T>(predicate: lodash.ValueKeyIteratee<T>): LodashOmitBy1x1<T>;
         <T extends object>(predicate: lodash.__, object: T | null | undefined): LodashOmitBy1x2<T>;
@@ -2435,21 +2475,252 @@ declare namespace _ {
     type LodashParseInt1x1 = (string: string) => number;
     type LodashParseInt1x2 = (radix: number) => number;
     interface LodashPartial {
-        (args: ReadonlyArray<any>): LodashPartial1x1;
-        (args: lodash.__, func: (...args: any[]) => any): LodashPartial1x2;
-        (args: ReadonlyArray<any>, func: (...args: any[]) => any): (...args: any[]) => any;
+        <T1, R>(func: lodash.Function1<T1, R>): LodashPartial1x1<T1, R>;
+        <T1>(func: lodash.__, arg1: [T1]): LodashPartial1x2<T1>;
+        <T1, R>(func: lodash.Function1<T1, R>, arg1: [T1]): lodash.Function0<R>;
+        <T1, T2, R>(func: lodash.Function2<T1, T2, R>): LodashPartial2x1<T1, T2, R>;
+        <T1, T2, R>(func: lodash.Function2<T1, T2, R>, arg1: [T1]): lodash.Function1<    T2, R>;
+        <T2>(func: lodash.__, plc1: [lodash.__, T2]): LodashPartial3x2<T2>;
+        <T1, T2, R>(func: lodash.Function2<T1, T2, R>, plc1: [lodash.__, T2]): lodash.Function1<T1,     R>;
+        <T1, T2>(func: lodash.__, arg1: [T1, T2]): LodashPartial4x2<T1, T2>;
+        <T1, T2, R>(func: lodash.Function2<T1, T2, R>, arg1: [T1, T2]): lodash.Function0<        R>;
+        <T1, T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>): LodashPartial5x1<T1, T2, T3, R>;
+        <T1, T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>, arg1: [T1]): lodash.Function2<    T2, T3, R>;
+        <T1, T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>, plc1: [lodash.__, T2]): lodash.Function2<T1,     T3, R>;
+        <T1, T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>, arg1: [T1, T2]): lodash.Function1<        T3, R>;
+        <T3>(func: lodash.__, plc1: [lodash.__, lodash.__, T3]): LodashPartial8x2<T3>;
+        <T1, T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>, plc1: [lodash.__, lodash.__, T3]): lodash.Function2<T1, T2,     R>;
+        <T1, T3>(func: lodash.__, arg1: [T1, lodash.__, T3]): LodashPartial9x2<T1, T3>;
+        <T1, T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>, arg1: [T1, lodash.__, T3]): lodash.Function1<    T2,     R>;
+        <T2, T3>(func: lodash.__, plc1: [lodash.__, T2, T3]): LodashPartial10x2<T2, T3>;
+        <T1, T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>, plc1: [lodash.__, T2, T3]): lodash.Function1<T1,         R>;
+        <T1, T2, T3>(func: lodash.__, arg1: [T1, T2, T3]): LodashPartial11x2<T1, T2, T3>;
+        <T1, T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>, arg1: [T1, T2, T3]): lodash.Function0<            R>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>): LodashPartial12x1<T1, T2, T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg1: [T1]): lodash.Function3<    T2, T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, plc1: [lodash.__, T2]): lodash.Function3<T1,     T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg1: [T1, T2]): lodash.Function2<        T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, plc1: [lodash.__, lodash.__, T3]): lodash.Function3<T1, T2,     T4, R>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg1: [T1, lodash.__, T3]): lodash.Function2<    T2,     T4, R>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, plc1: [lodash.__, T2, T3]): lodash.Function2<T1,         T4, R>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg1: [T1, T2, T3]): lodash.Function1<            T4, R>;
+        <T4>(func: lodash.__, plc1: [lodash.__, lodash.__, lodash.__, T4]): LodashPartial19x2<T4>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, plc1: [lodash.__, lodash.__, lodash.__, T4]): lodash.Function3<T1, T2, T3,     R>;
+        <T1, T4>(func: lodash.__, arg1: [T1, lodash.__, lodash.__, T4]): LodashPartial20x2<T1, T4>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg1: [T1, lodash.__, lodash.__, T4]): lodash.Function2<    T2, T3,     R>;
+        <T2, T4>(func: lodash.__, plc1: [lodash.__, T2, lodash.__, T4]): LodashPartial21x2<T2, T4>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, plc1: [lodash.__, T2, lodash.__, T4]): lodash.Function2<T1,     T3,     R>;
+        <T1, T2, T4>(func: lodash.__, arg1: [T1, T2, lodash.__, T4]): LodashPartial22x2<T1, T2, T4>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg1: [T1, T2, lodash.__, T4]): lodash.Function1<        T3,     R>;
+        <T3, T4>(func: lodash.__, plc1: [lodash.__, lodash.__, T3, T4]): LodashPartial23x2<T3, T4>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, plc1: [lodash.__, lodash.__, T3, T4]): lodash.Function2<T1, T2,         R>;
+        <T1, T3, T4>(func: lodash.__, arg1: [T1, lodash.__, T3, T4]): LodashPartial24x2<T1, T3, T4>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg1: [T1, lodash.__, T3, T4]): lodash.Function1<    T2,         R>;
+        <T2, T3, T4>(func: lodash.__, plc1: [lodash.__, T2, T3, T4]): LodashPartial25x2<T2, T3, T4>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, plc1: [lodash.__, T2, T3, T4]): lodash.Function1<T1,             R>;
+        <T1, T2, T3, T4>(func: lodash.__, arg1: [T1, T2, T3, T4]): LodashPartial26x2<T1, T2, T3, T4>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg1: [T1, T2, T3, T4]): lodash.Function0<                R>;
+        (func: (...args: any[]) => any): LodashPartial27x1;
+        (func: lodash.__, args: ReadonlyArray<any>): LodashPartial27x2;
+        (func: (...args: any[]) => any, args: ReadonlyArray<any>): (...args: any[]) => any;
         placeholder: lodash.__;
     }
-    type LodashPartial1x1 = (func: (...args: any[]) => any) => (...args: any[]) => any;
-    type LodashPartial1x2 = (args: ReadonlyArray<any>) => (...args: any[]) => any;
+    type LodashPartial1x1<T1, R> = (arg1: [T1]) => lodash.Function0<R>;
+    interface LodashPartial1x2<T1> {
+        <R>(func: lodash.Function1<T1, R>): lodash.Function0<R>;
+        <T2, R>(func: lodash.Function2<T1, T2, R>): lodash.Function1<    T2, R>;
+        <T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>): lodash.Function2<    T2, T3, R>;
+        <T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>): lodash.Function3<    T2, T3, T4, R>;
+    }
+    interface LodashPartial2x1<T1, T2, R> {
+        (arg1: [T1]): lodash.Function1<    T2, R>;
+        (plc1: [lodash.__, T2]): lodash.Function1<T1,     R>;
+        (arg1: [T1, T2]): lodash.Function0<        R>;
+    }
+    interface LodashPartial3x2<T2> {
+        <T1, R>(func: lodash.Function2<T1, T2, R>): lodash.Function1<T1,     R>;
+        <T1, T3, R>(func: lodash.Function3<T1, T2, T3, R>): lodash.Function2<T1,     T3, R>;
+        <T1, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>): lodash.Function3<T1,     T3, T4, R>;
+    }
+    interface LodashPartial4x2<T1, T2> {
+        <R>(func: lodash.Function2<T1, T2, R>): lodash.Function0<        R>;
+        <T3, R>(func: lodash.Function3<T1, T2, T3, R>): lodash.Function1<        T3, R>;
+        <T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>): lodash.Function2<        T3, T4, R>;
+    }
+    interface LodashPartial5x1<T1, T2, T3, R> {
+        (arg1: [T1]): lodash.Function2<    T2, T3, R>;
+        (plc1: [lodash.__, T2]): lodash.Function2<T1,     T3, R>;
+        (arg1: [T1, T2]): lodash.Function1<        T3, R>;
+        (plc1: [lodash.__, lodash.__, T3]): lodash.Function2<T1, T2,     R>;
+        (arg1: [T1, lodash.__, T3]): lodash.Function1<    T2,     R>;
+        (plc1: [lodash.__, T2, T3]): lodash.Function1<T1,         R>;
+        (arg1: [T1, T2, T3]): lodash.Function0<            R>;
+    }
+    interface LodashPartial8x2<T3> {
+        <T1, T2, R>(func: lodash.Function3<T1, T2, T3, R>): lodash.Function2<T1, T2,     R>;
+        <T1, T2, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>): lodash.Function3<T1, T2,     T4, R>;
+    }
+    interface LodashPartial9x2<T1, T3> {
+        <T2, R>(func: lodash.Function3<T1, T2, T3, R>): lodash.Function1<    T2,     R>;
+        <T2, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>): lodash.Function2<    T2,     T4, R>;
+    }
+    interface LodashPartial10x2<T2, T3> {
+        <T1, R>(func: lodash.Function3<T1, T2, T3, R>): lodash.Function1<T1,         R>;
+        <T1, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>): lodash.Function2<T1,         T4, R>;
+    }
+    interface LodashPartial11x2<T1, T2, T3> {
+        <R>(func: lodash.Function3<T1, T2, T3, R>): lodash.Function0<            R>;
+        <T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>): lodash.Function1<            T4, R>;
+    }
+    interface LodashPartial12x1<T1, T2, T3, T4, R> {
+        (arg1: [T1]): lodash.Function3<    T2, T3, T4, R>;
+        (plc1: [lodash.__, T2]): lodash.Function3<T1,     T3, T4, R>;
+        (arg1: [T1, T2]): lodash.Function2<        T3, T4, R>;
+        (plc1: [lodash.__, lodash.__, T3]): lodash.Function3<T1, T2,     T4, R>;
+        (arg1: [T1, lodash.__, T3]): lodash.Function2<    T2,     T4, R>;
+        (plc1: [lodash.__, T2, T3]): lodash.Function2<T1,         T4, R>;
+        (arg1: [T1, T2, T3]): lodash.Function1<            T4, R>;
+        (plc1: [lodash.__, lodash.__, lodash.__, T4]): lodash.Function3<T1, T2, T3,     R>;
+        (arg1: [T1, lodash.__, lodash.__, T4]): lodash.Function2<    T2, T3,     R>;
+        (plc1: [lodash.__, T2, lodash.__, T4]): lodash.Function2<T1,     T3,     R>;
+        (arg1: [T1, T2, lodash.__, T4]): lodash.Function1<        T3,     R>;
+        (plc1: [lodash.__, lodash.__, T3, T4]): lodash.Function2<T1, T2,         R>;
+        (arg1: [T1, lodash.__, T3, T4]): lodash.Function1<    T2,         R>;
+        (plc1: [lodash.__, T2, T3, T4]): lodash.Function1<T1,             R>;
+        (arg1: [T1, T2, T3, T4]): lodash.Function0<                R>;
+    }
+    type LodashPartial19x2<T4> = <T1, T2, T3, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function3<T1, T2, T3,     R>;
+    type LodashPartial20x2<T1, T4> = <T2, T3, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function2<    T2, T3,     R>;
+    type LodashPartial21x2<T2, T4> = <T1, T3, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function2<T1,     T3,     R>;
+    type LodashPartial22x2<T1, T2, T4> = <T3, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function1<        T3,     R>;
+    type LodashPartial23x2<T3, T4> = <T1, T2, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function2<T1, T2,         R>;
+    type LodashPartial24x2<T1, T3, T4> = <T2, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function1<    T2,         R>;
+    type LodashPartial25x2<T2, T3, T4> = <T1, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function1<T1,             R>;
+    type LodashPartial26x2<T1, T2, T3, T4> = <R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function0<                R>;
+    type LodashPartial27x1 = (args: ReadonlyArray<any>) => (...args: any[]) => any;
+    type LodashPartial27x2 = (func: (...args: any[]) => any) => (...args: any[]) => any;
     interface LodashPartialRight {
-        (args: ReadonlyArray<any>): LodashPartialRight1x1;
-        (args: lodash.__, func: (...args: any[]) => any): LodashPartialRight1x2;
-        (args: ReadonlyArray<any>, func: (...args: any[]) => any): (...args: any[]) => any;
+        <T1, R>(func: lodash.Function1<T1, R>): LodashPartialRight1x1<T1, R>;
+        <T1>(func: lodash.__, arg1: [T1]): LodashPartialRight1x2<T1>;
+        <T1, R>(func: lodash.Function1<T1, R>, arg1: [T1]): lodash.Function0<R>;
+        <T1, T2, R>(func: lodash.Function2<T1, T2, R>): LodashPartialRight2x1<T1, T2, R>;
+        <T1>(func: lodash.__, arg1: [T1, lodash.__]): LodashPartialRight2x2<T1>;
+        <T1, T2, R>(func: lodash.Function2<T1, T2, R>, arg1: [T1, lodash.__]): lodash.Function1<    T2, R>;
+        <T2>(func: lodash.__, arg2: [T2]): LodashPartialRight3x2<T2>;
+        <T1, T2, R>(func: lodash.Function2<T1, T2, R>, arg2: [T2]): lodash.Function1<T1,     R>;
+        <T1, T2>(func: lodash.__, arg1: [T1, T2]): LodashPartialRight4x2<T1, T2>;
+        <T1, T2, R>(func: lodash.Function2<T1, T2, R>, arg1: [T1, T2]): lodash.Function0<        R>;
+        <T1, T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>): LodashPartialRight5x1<T1, T2, T3, R>;
+        <T1>(func: lodash.__, arg1: [T1, lodash.__, lodash.__]): LodashPartialRight5x2<T1>;
+        <T1, T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>, arg1: [T1, lodash.__, lodash.__]): lodash.Function2<    T2, T3, R>;
+        <T2>(func: lodash.__, arg2: [T2, lodash.__]): LodashPartialRight6x2<T2>;
+        <T1, T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>, arg2: [T2, lodash.__]): lodash.Function2<T1,     T3, R>;
+        <T1, T2>(func: lodash.__, arg1: [T1, T2, lodash.__]): LodashPartialRight7x2<T1, T2>;
+        <T1, T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>, arg1: [T1, T2, lodash.__]): lodash.Function1<        T3, R>;
+        <T3>(func: lodash.__, arg3: [T3]): LodashPartialRight8x2<T3>;
+        <T1, T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>, arg3: [T3]): lodash.Function2<T1, T2,     R>;
+        <T1, T3>(func: lodash.__, arg1: [T1, lodash.__, T3]): LodashPartialRight9x2<T1, T3>;
+        <T1, T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>, arg1: [T1, lodash.__, T3]): lodash.Function1<    T2,     R>;
+        <T2, T3>(func: lodash.__, arg2: [T2, T3]): LodashPartialRight10x2<T2, T3>;
+        <T1, T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>, arg2: [T2, T3]): lodash.Function1<T1,         R>;
+        <T1, T2, T3>(func: lodash.__, arg1: [T1, T2, T3]): LodashPartialRight11x2<T1, T2, T3>;
+        <T1, T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>, arg1: [T1, T2, T3]): lodash.Function0<            R>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>): LodashPartialRight12x1<T1, T2, T3, T4, R>;
+        <T1>(func: lodash.__, arg1: [T1, lodash.__, lodash.__, lodash.__]): LodashPartialRight12x2<T1>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg1: [T1, lodash.__, lodash.__, lodash.__]): lodash.Function3<    T2, T3, T4, R>;
+        <T2>(func: lodash.__, arg2: [T2, lodash.__, lodash.__]): LodashPartialRight13x2<T2>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg2: [T2, lodash.__, lodash.__]): lodash.Function3<T1,     T3, T4, R>;
+        <T1, T2>(func: lodash.__, arg1: [T1, T2, lodash.__, lodash.__]): LodashPartialRight14x2<T1, T2>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg1: [T1, T2, lodash.__, lodash.__]): lodash.Function2<        T3, T4, R>;
+        <T3>(func: lodash.__, arg3: [T3, lodash.__]): LodashPartialRight15x2<T3>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg3: [T3, lodash.__]): lodash.Function3<T1, T2,     T4, R>;
+        <T1, T3>(func: lodash.__, arg1: [T1, lodash.__, T3, lodash.__]): LodashPartialRight16x2<T1, T3>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg1: [T1, lodash.__, T3, lodash.__]): lodash.Function2<    T2,     T4, R>;
+        <T2, T3>(func: lodash.__, arg2: [T2, T3, lodash.__]): LodashPartialRight17x2<T2, T3>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg2: [T2, T3, lodash.__]): lodash.Function2<T1,         T4, R>;
+        <T1, T2, T3>(func: lodash.__, arg1: [T1, T2, T3, lodash.__]): LodashPartialRight18x2<T1, T2, T3>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg1: [T1, T2, T3, lodash.__]): lodash.Function1<            T4, R>;
+        <T4>(func: lodash.__, arg4: [T4]): LodashPartialRight19x2<T4>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg4: [T4]): lodash.Function3<T1, T2, T3,     R>;
+        <T1, T4>(func: lodash.__, arg1: [T1, lodash.__, lodash.__, T4]): LodashPartialRight20x2<T1, T4>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg1: [T1, lodash.__, lodash.__, T4]): lodash.Function2<    T2, T3,     R>;
+        <T2, T4>(func: lodash.__, arg2: [T2, lodash.__, T4]): LodashPartialRight21x2<T2, T4>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg2: [T2, lodash.__, T4]): lodash.Function2<T1,     T3,     R>;
+        <T1, T2, T4>(func: lodash.__, arg1: [T1, T2, lodash.__, T4]): LodashPartialRight22x2<T1, T2, T4>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg1: [T1, T2, lodash.__, T4]): lodash.Function1<        T3,     R>;
+        <T3, T4>(func: lodash.__, arg3: [T3, T4]): LodashPartialRight23x2<T3, T4>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg3: [T3, T4]): lodash.Function2<T1, T2,         R>;
+        <T1, T3, T4>(func: lodash.__, arg1: [T1, lodash.__, T3, T4]): LodashPartialRight24x2<T1, T3, T4>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg1: [T1, lodash.__, T3, T4]): lodash.Function1<    T2,         R>;
+        <T2, T3, T4>(func: lodash.__, arg2: [T2, T3, T4]): LodashPartialRight25x2<T2, T3, T4>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg2: [T2, T3, T4]): lodash.Function1<T1,             R>;
+        <T1, T2, T3, T4>(func: lodash.__, arg1: [T1, T2, T3, T4]): LodashPartialRight26x2<T1, T2, T3, T4>;
+        <T1, T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>, arg1: [T1, T2, T3, T4]): lodash.Function0<                R>;
+        (func: (...args: any[]) => any): LodashPartialRight27x1;
+        (func: lodash.__, args: ReadonlyArray<any>): LodashPartialRight27x2;
+        (func: (...args: any[]) => any, args: ReadonlyArray<any>): (...args: any[]) => any;
         placeholder: lodash.__;
     }
-    type LodashPartialRight1x1 = (func: (...args: any[]) => any) => (...args: any[]) => any;
-    type LodashPartialRight1x2 = (args: ReadonlyArray<any>) => (...args: any[]) => any;
+    type LodashPartialRight1x1<T1, R> = (arg1: [T1]) => lodash.Function0<R>;
+    type LodashPartialRight1x2<T1> = <R>(func: lodash.Function1<T1, R>) => lodash.Function0<R>;
+    interface LodashPartialRight2x1<T1, T2, R> {
+        (arg1: [T1, lodash.__]): lodash.Function1<    T2, R>;
+        (arg2: [T2]): lodash.Function1<T1,     R>;
+        (arg1: [T1, T2]): lodash.Function0<        R>;
+    }
+    type LodashPartialRight2x2<T1> = <T2, R>(func: lodash.Function2<T1, T2, R>) => lodash.Function1<    T2, R>;
+    type LodashPartialRight3x2<T2> = <T1, R>(func: lodash.Function2<T1, T2, R>) => lodash.Function1<T1,     R>;
+    type LodashPartialRight4x2<T1, T2> = <R>(func: lodash.Function2<T1, T2, R>) => lodash.Function0<        R>;
+    interface LodashPartialRight5x1<T1, T2, T3, R> {
+        (arg1: [T1, lodash.__, lodash.__]): lodash.Function2<    T2, T3, R>;
+        (arg2: [T2, lodash.__]): lodash.Function2<T1,     T3, R>;
+        (arg1: [T1, T2, lodash.__]): lodash.Function1<        T3, R>;
+        (arg3: [T3]): lodash.Function2<T1, T2,     R>;
+        (arg1: [T1, lodash.__, T3]): lodash.Function1<    T2,     R>;
+        (arg2: [T2, T3]): lodash.Function1<T1,         R>;
+        (arg1: [T1, T2, T3]): lodash.Function0<            R>;
+    }
+    type LodashPartialRight5x2<T1> = <T2, T3, R>(func: lodash.Function3<T1, T2, T3, R>) => lodash.Function2<    T2, T3, R>;
+    type LodashPartialRight6x2<T2> = <T1, T3, R>(func: lodash.Function3<T1, T2, T3, R>) => lodash.Function2<T1,     T3, R>;
+    type LodashPartialRight7x2<T1, T2> = <T3, R>(func: lodash.Function3<T1, T2, T3, R>) => lodash.Function1<        T3, R>;
+    type LodashPartialRight8x2<T3> = <T1, T2, R>(func: lodash.Function3<T1, T2, T3, R>) => lodash.Function2<T1, T2,     R>;
+    type LodashPartialRight9x2<T1, T3> = <T2, R>(func: lodash.Function3<T1, T2, T3, R>) => lodash.Function1<    T2,     R>;
+    type LodashPartialRight10x2<T2, T3> = <T1, R>(func: lodash.Function3<T1, T2, T3, R>) => lodash.Function1<T1,         R>;
+    type LodashPartialRight11x2<T1, T2, T3> = <R>(func: lodash.Function3<T1, T2, T3, R>) => lodash.Function0<            R>;
+    interface LodashPartialRight12x1<T1, T2, T3, T4, R> {
+        (arg1: [T1, lodash.__, lodash.__, lodash.__]): lodash.Function3<    T2, T3, T4, R>;
+        (arg2: [T2, lodash.__, lodash.__]): lodash.Function3<T1,     T3, T4, R>;
+        (arg1: [T1, T2, lodash.__, lodash.__]): lodash.Function2<        T3, T4, R>;
+        (arg3: [T3, lodash.__]): lodash.Function3<T1, T2,     T4, R>;
+        (arg1: [T1, lodash.__, T3, lodash.__]): lodash.Function2<    T2,     T4, R>;
+        (arg2: [T2, T3, lodash.__]): lodash.Function2<T1,         T4, R>;
+        (arg1: [T1, T2, T3, lodash.__]): lodash.Function1<            T4, R>;
+        (arg4: [T4]): lodash.Function3<T1, T2, T3,     R>;
+        (arg1: [T1, lodash.__, lodash.__, T4]): lodash.Function2<    T2, T3,     R>;
+        (arg2: [T2, lodash.__, T4]): lodash.Function2<T1,     T3,     R>;
+        (arg1: [T1, T2, lodash.__, T4]): lodash.Function1<        T3,     R>;
+        (arg3: [T3, T4]): lodash.Function2<T1, T2,         R>;
+        (arg1: [T1, lodash.__, T3, T4]): lodash.Function1<    T2,         R>;
+        (arg2: [T2, T3, T4]): lodash.Function1<T1,             R>;
+        (arg1: [T1, T2, T3, T4]): lodash.Function0<                R>;
+    }
+    type LodashPartialRight12x2<T1> = <T2, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function3<    T2, T3, T4, R>;
+    type LodashPartialRight13x2<T2> = <T1, T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function3<T1,     T3, T4, R>;
+    type LodashPartialRight14x2<T1, T2> = <T3, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function2<        T3, T4, R>;
+    type LodashPartialRight15x2<T3> = <T1, T2, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function3<T1, T2,     T4, R>;
+    type LodashPartialRight16x2<T1, T3> = <T2, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function2<    T2,     T4, R>;
+    type LodashPartialRight17x2<T2, T3> = <T1, T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function2<T1,         T4, R>;
+    type LodashPartialRight18x2<T1, T2, T3> = <T4, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function1<            T4, R>;
+    type LodashPartialRight19x2<T4> = <T1, T2, T3, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function3<T1, T2, T3,     R>;
+    type LodashPartialRight20x2<T1, T4> = <T2, T3, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function2<    T2, T3,     R>;
+    type LodashPartialRight21x2<T2, T4> = <T1, T3, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function2<T1,     T3,     R>;
+    type LodashPartialRight22x2<T1, T2, T4> = <T3, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function1<        T3,     R>;
+    type LodashPartialRight23x2<T3, T4> = <T1, T2, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function2<T1, T2,         R>;
+    type LodashPartialRight24x2<T1, T3, T4> = <T2, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function1<    T2,         R>;
+    type LodashPartialRight25x2<T2, T3, T4> = <T1, R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function1<T1,             R>;
+    type LodashPartialRight26x2<T1, T2, T3, T4> = <R>(func: lodash.Function4<T1, T2, T3, T4, R>) => lodash.Function0<                R>;
+    type LodashPartialRight27x1 = (args: ReadonlyArray<any>) => (...args: any[]) => any;
+    type LodashPartialRight27x2 = (func: (...args: any[]) => any) => (...args: any[]) => any;
     interface LodashPartition {
         <T>(callback: lodash.ValueIteratee<T>): LodashPartition1x1<T>;
         <T>(callback: lodash.__, collection: lodash.List<T> | null | undefined): LodashPartition1x2<T>;
@@ -4055,7 +4326,13 @@ declare namespace _ {
     }
     type LodashZip1x1<T1> = <T2>(arrays2: lodash.List<T2>) => Array<[T1 | undefined, T2 | undefined]>;
     type LodashZip1x2<T2> = <T1>(arrays1: lodash.List<T1>) => Array<[T1 | undefined, T2 | undefined]>;
-    type LodashZipAll = <T>(arrays: ReadonlyArray<lodash.List<T> | null | undefined>) => Array<Array<T | undefined>>;
+    interface LodashZipAll {
+        <T1, T2>(arrays1: [lodash.List<T1>, lodash.List<T2>]): Array<[T1 | undefined, T2 | undefined]>;
+        <T1, T2, T3>(arrays1: [lodash.List<T1>, lodash.List<T2>, lodash.List<T3>]): Array<[T1 | undefined, T2 | undefined, T3 | undefined]>;
+        <T1, T2, T3, T4>(arrays1: [lodash.List<T1>, lodash.List<T2>, lodash.List<T3>, lodash.List<T4>]): Array<[T1 | undefined, T2 | undefined, T3 | undefined, T4 | undefined]>;
+        <T1, T2, T3, T4, T5>(arrays1: [lodash.List<T1>, lodash.List<T2>, lodash.List<T3>, lodash.List<T4>, lodash.List<T5>]): Array<[T1 | undefined, T2 | undefined, T3 | undefined, T4 | undefined, T5 | undefined]>;
+        <T>(arrays: ReadonlyArray<lodash.List<T> | null | undefined>): Array<Array<T | undefined>>;
+    }
     interface LodashZipObject {
         (props: lodash.List<lodash.PropertyName>): LodashZipObject1x1;
         <T>(props: lodash.__, values: lodash.List<T>): LodashZipObject1x2<T>;
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index fbb164c4c5..08dcd31639 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -5788,24 +5788,24 @@ fp.now(); // $ExpectType number
     const dictionary: _.Dictionary<AbcObject> = anything;
     const numericDictionary: _.NumericDictionary<AbcObject> = anything;
 
-    _.omit(obj, "a"); // $ExpectType Partial<AbcObject>
+    _.omit(obj, "a"); // ExpectType Pick<AbcObject, "b" | "c">   // NOTE: ExpectType disabled because it fails in TS2.4
     _.omit(obj, ["b", 1], 0, "a"); // $ExpectType Partial<AbcObject>
     _.omit(dictionary, "a"); // $ExpectType Dictionary<AbcObject>
     _.omit(numericDictionary, "a");  // $ExpectType NumericDictionary<AbcObject>
 
-    _(obj).omit("a"); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    _(obj).omit<AbcObject, "a">("a"); // ExpectType LoDashImplicitWrapper<Pick<AbcObject, "b" | "c">>   // NOTE: ExpectType disabled because it fails in TS2.4
     _(obj).omit(["b", 1], 0, "a"); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
     _(dictionary).omit("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
     _(numericDictionary).omit("a"); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
 
-    _.chain(obj).omit("a"); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+    _.chain(obj).omit<AbcObject, "a">("a"); // ExpectType LoDashExplicitWrapper<Pick<AbcObject, "b" | "c">>   // NOTE: ExpectType disabled because it fails in TS2.4
     _.chain(obj).omit(["b", 1], 0, "a"); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     _.chain(dictionary).omit("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
     _.chain(numericDictionary).omit("a"); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
 
-    fp.omit("a", obj); // $ExpectType Partial<AbcObject>
-    fp.omit("a")(obj); // $ExpectType Partial<AbcObject>
-    fp.omit(["a", "b"])(obj); // $ExpectType Partial<AbcObject>
+    fp.omit("a", obj); // ExpectType Pick<AbcObject, "b" | "c">   // NOTE: ExpectType disabled because it fails in TS2.4
+    fp.omit<AbcObject, "a">("a")(obj); // ExpectType Pick<AbcObject, "b" | "c">   // NOTE: ExpectType disabled because it fails in TS2.3
+    fp.omit<AbcObject, "a" | "b">(["a", "b"])(obj); // ExpectType Pick<AbcObject, "c">   // NOTE: ExpectType disabled because it fails in TS2.3
 }
 
 // _.omitBy
@@ -5825,7 +5825,7 @@ fp.now(); // $ExpectType number
     const obj1: AbcObject | null | undefined = anything;
     const obj2: AbcObject = anything;
     const readonlyArray: string[] = ["a", "b"]; // TODO: Should be ReadonlyArray, but see comment on type Many<T>
-    const literalsArray = ["a" as "a", "b" as "b"];
+    const literalsArray: Array<"a" | "b"> = ["a", "b"];
     const roLiteralsArray: Array<"a" | "b"> = literalsArray; // TODO: Should be ReadonlyArray, but see comment on type Many<T>
 
     _.pick(obj1, "a"); // $ExpectType PartialDeep<AbcObject>
@@ -5857,7 +5857,7 @@ fp.now(); // $ExpectType number
 
     fp.pick<AbcObject, "a">("a", obj2); // $ExpectType Pick<AbcObject, "a">
     fp.pick<AbcObject, "a">("a")(obj2); // $ExpectType Pick<AbcObject, "a">
-    fp.pick<AbcObject, "a" | "b">(["a" as "a", "b" as "b"])(obj2); // $ExpectType Pick<AbcObject, "a" | "b">
+    fp.pick<AbcObject, "a" | "b">(literalsArray)(obj2); // $ExpectType Pick<AbcObject, "a" | "b">
 }
 
 // _.pickBy
@@ -6060,9 +6060,10 @@ fp.now(); // $ExpectType number
     _(object).unset(["a", "b"]); // $ExpectType LoDashImplicitWrapper<boolean>
     _.chain(object).unset("a.b"); // $ExpectType LoDashExplicitWrapper<boolean>
     _.chain(object).unset(["a", "b"]); // $ExpectType LoDashExplicitWrapper<boolean>
-    fp.unset("a.b", object); // $ExpectType boolean
-    fp.unset("a.b")(object); // $ExpectType boolean
-    fp.unset(["a", "b"])(object); // $ExpectType boolean
+
+    fp.unset("a.b", object); // $ExpectType { a: { b: string; c: boolean; }; }
+    fp.unset("a.b")(object); // $ExpectType { a: { b: string; c: boolean; }; }
+    fp.unset(["a", "b"])(object); // $ExpectType { a: { b: string; c: boolean; }; }
 }
 
 // _.update
@@ -7251,11 +7252,10 @@ _.templateSettings; // $ExpectType TemplateSettings
     // with arity 3 function
     _.partialRight(func3, 42,     _, true);
 
-    fp.partial([], func0); // $ExpectType (...args: any[]) => any
-    fp.partial([])(func0); // $ExpectType (...args: any[]) => any
-    fp.partial([42])(func1); // $ExpectType (...args: any[]) => any
-    fp.partial([fp.partial.placeholder, "foo"])(func2);
-    fp.partialRight([])(func0); // $ExpectType (...args: any[]) => any
-    fp.partialRight([42])(func1); // $ExpectType (...args: any[]) => any
-    fp.partialRight([fp.partialRight.placeholder, "foo"])(func2);
+    fp.partial(func1, [42]); // $ExpectType Function0<number>
+    fp.partial(func1)([42]); // $ExpectType Function0<number>
+    fp.partial(func2)([fp.partial.placeholder, "foo"]); // $ExpectType Function1<number, number>
+    fp.partialRight(func1, [42]); // $ExpectType Function0<number>
+    fp.partialRight(func1)([42]); // $ExpectType Function0<number>
+    fp.partialRight(func2)([42, fp.partialRight.placeholder]); // $ExpectType Function1<string, number>
 }
diff --git a/types/lodash/scripts/generate-fp.ts b/types/lodash/scripts/generate-fp.ts
index 77f11b46ac..9a03fef544 100644
--- a/types/lodash/scripts/generate-fp.ts
+++ b/types/lodash/scripts/generate-fp.ts
@@ -174,15 +174,14 @@ async function processDefinitions(filePaths: string[], commonTypes: string[]): P
                     } else if (args.length > 4 || definition.name === "flow" || definition.name === "flowRight") {
                         // Arity wasn't fixed by convert()
                         isFixed = false;
-                    } else {
-                        // For some reason, convert() doesn't seems to tell us which functions have unchanged argument order.
-                        // So we have to hard-code it.
-                        const unchangedOrders = ["add", "assign", "assignIn", "bind", "bindKey", "concat", "difference", "divide", "eq",
-                            "gt", "gte", "isEqual", "lt", "lte", "matchesProperty", "merge", "multiply", "overArgs", "partial", "partialRight",
-                            "propertyOf", "random", "range", "rangeRight", "subtract", "zip", "zipObject", "zipObjectDeep"];
-                        if (unchangedOrders.includes(definition.name))
-                            args = _.sortBy(args as number[][], (a: number[]) => a[0]);
                     }
+                    // For some reason, convert() doesn't seems to tell us which functions have unchanged argument order.
+                    // So we have to hard-code it.
+                    const unchangedOrders = ["add", "assign", "assignIn", "bind", "bindKey", "concat", "difference", "divide", "eq",
+                        "gt", "gte", "isEqual", "lt", "lte", "matchesProperty", "merge", "multiply", "overArgs", "partial", "partialRight",
+                        "propertyOf", "random", "range", "rangeRight", "subtract", "zip", "zipObject", "zipObjectDeep"];
+                    if (unchangedOrders.includes(definition.name))
+                        args = _.sortBy(args, a => typeof a === "number" ? a : a[0]);
 
                     return () => curryDefinition(definition, _.flatten(args), spreadIndex, isFixed);
                 };
@@ -324,6 +323,12 @@ function parseDefinitions(definitionString: string, startIndex: number, endIndex
                 .map(o => _.trim(o, ","))
                 .filter(o => !!o);
             overload.returnType = overloadString.substring(paramEndIndex + 2).trim();
+            // Special case for unset: the return type should be the input type, not bolean. See https://github.com/DefinitelyTyped/DefinitelyTyped/issues/25361
+            if (name === "unset") {
+                overload.typeParams = [{ name: "T" }];
+                overload.params[0] = overload.params[0].replace(/\bany\b/, "T");
+                overload.returnType = "T";
+            }
             currentDefinition.overloads.push(overload);
         } else {
             // This overload actually points to an interface. Try to find said interface and get the overloads from there.
@@ -433,25 +438,33 @@ function curryDefinition(definition: Definition, paramOrder: number[], spreadInd
         // Spread/rest parameters could be in any of the following formats:
         // 1. The rest parameter is at spreadIndex, and it is the last parameter.
         // 2. The rest parameter is immediately after spreadIndex, e.g. assign(object, ...sources[]). In this case, convert it to assignAll(...object[])
-        // 3. The rest parameter is not the last parameter, e.g. assignWith(object, ...sources[], customizer)
+        // 3. The overload defines no rest parameters, e.g. mergeAll(T1, T2, T3)
+        // 4. The rest parameter is not the last parameter, e.g. assignWith(object, ...sources[], customizer)
         if (spreadIndex === arity - 1) {
-            // cases 1-2
             for (let i = 0; i < overloads.length; ++i) {
                 const overload = overloads[i];
                 if (overload.params.length === arity && overload.params[spreadIndex] && overload.params[spreadIndex].startsWith("...")) {
+                    // case 1
                     overload.params[spreadIndex] = overload.params[spreadIndex].replace("...", "");
                 } else if (overload.params.length === arity + 1 && overload.params[spreadIndex + 1] && overload.params[spreadIndex + 1].startsWith("...")) {
+                    // case 2
                     overload.params.splice(spreadIndex + 1, 1);
                     const parts = overload.params[spreadIndex].split(":").map(_.trim);
                     parts[1] = `ReadonlyArray<${parts[1]}>`;
                     overload.params[spreadIndex] = `${parts[0]}: ${parts[1]}`;
+                } else if (overload.params.length >= arity && overload.params[spreadIndex] && !overload.params.some(p => p.startsWith("..."))) {
+                    // case 3
+                    const paramName = getParamName(overload.params[spreadIndex]);
+                    const spreadParamTypes = overload.params.slice(spreadIndex).map(getParamType);
+                    overload.params = overload.params.slice(0, spreadIndex);
+                    overload.params.push(`${paramName}: [${spreadParamTypes.join(", ")}]`);
                 } else {
                     _.pull(overloads, overload);
                     --i;
                 }
             }
         } else {
-            // case 3
+            // case 4
             const overload = overloads[0];
             overloads = [{
                 jsdoc: overload.jsdoc,
diff --git a/types/lowdb/_lodash.d.ts b/types/lowdb/_lodash.d.ts
index 78ff4901af..982826fe5b 100644
--- a/types/lowdb/_lodash.d.ts
+++ b/types/lowdb/_lodash.d.ts
@@ -127,7 +127,7 @@ declare module "./index" {
         first<T>(this: LoDashExplicitSyncWrapper<_.List<T> | null | undefined>): LoDashExplicitSyncWrapper<T | undefined>;
         flatten<T>(this: LoDashExplicitSyncWrapper<_.List<_.Many<T>> | null | undefined>): LoDashExplicitSyncWrapper<T[]>;
         flattenDeep<T>(this: LoDashExplicitSyncWrapper<_.ListOfRecursiveArraysOrValues<T> | null | undefined>): LoDashExplicitSyncWrapper<T[]>;
-        flattenDepth<T>(this: LoDashExplicitSyncWrapper<_.ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashExplicitSyncWrapper<T[]>;
+       flattenDepth<T>(this: LoDashExplicitSyncWrapper<_.ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashExplicitSyncWrapper<T[]>;
         fromPairs<T>(
           this: LoDashExplicitSyncWrapper<_.List<[_.PropertyName, T]> | null | undefined>
         ): LoDashExplicitSyncWrapper<_.Dictionary<T>>;
@@ -1263,11 +1263,15 @@ declare module "./index" {
         ): LoDashExplicitSyncWrapper<any>;
         omit<T extends _.AnyKindOfDictionary>(
             this: LoDashExplicitSyncWrapper<T | null | undefined>,
-            ...paths: _.PropertyPath[]
+            ...paths: Array<_.Many<_.PropertyName>>
         ): LoDashExplicitSyncWrapper<T>;
+        omit<T extends object, K extends keyof T>(
+            this: LoDashExplicitSyncWrapper<T | null | undefined>,
+            ...paths: Array<_.Many<K>>
+        ): LoDashExplicitSyncWrapper<_.Omit<T, K>>;
         omit<T extends object>(
             this: LoDashExplicitSyncWrapper<T | null | undefined>,
-            ...paths: _.PropertyPath[]
+            ...paths: Array<_.Many<_.PropertyName>>
         ): LoDashExplicitSyncWrapper<_.PartialObject<T>>;
         omitBy<T extends object>(
             this: LoDashExplicitSyncWrapper<T | null | undefined>,
@@ -1691,7 +1695,7 @@ declare module "./index" {
         first<T>(this: LoDashExplicitAsyncWrapper<_.List<T> | null | undefined>): LoDashExplicitAsyncWrapper<T | undefined>;
         flatten<T>(this: LoDashExplicitAsyncWrapper<_.List<_.Many<T>> | null | undefined>): LoDashExplicitAsyncWrapper<T[]>;
         flattenDeep<T>(this: LoDashExplicitAsyncWrapper<_.ListOfRecursiveArraysOrValues<T> | null | undefined>): LoDashExplicitAsyncWrapper<T[]>;
-        flattenDepth<T>(this: LoDashExplicitAsyncWrapper<_.ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashExplicitAsyncWrapper<T[]>;
+       flattenDepth<T>(this: LoDashExplicitAsyncWrapper<_.ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashExplicitAsyncWrapper<T[]>;
         fromPairs<T>(
           this: LoDashExplicitAsyncWrapper<_.List<[_.PropertyName, T]> | null | undefined>
         ): LoDashExplicitAsyncWrapper<_.Dictionary<T>>;
@@ -2827,11 +2831,15 @@ declare module "./index" {
         ): LoDashExplicitAsyncWrapper<any>;
         omit<T extends _.AnyKindOfDictionary>(
             this: LoDashExplicitAsyncWrapper<T | null | undefined>,
-            ...paths: _.PropertyPath[]
+            ...paths: Array<_.Many<_.PropertyName>>
         ): LoDashExplicitAsyncWrapper<T>;
+        omit<T extends object, K extends keyof T>(
+            this: LoDashExplicitAsyncWrapper<T | null | undefined>,
+            ...paths: Array<_.Many<K>>
+        ): LoDashExplicitAsyncWrapper<_.Omit<T, K>>;
         omit<T extends object>(
             this: LoDashExplicitAsyncWrapper<T | null | undefined>,
-            ...paths: _.PropertyPath[]
+            ...paths: Array<_.Many<_.PropertyName>>
         ): LoDashExplicitAsyncWrapper<_.PartialObject<T>>;
         omitBy<T extends object>(
             this: LoDashExplicitAsyncWrapper<T | null | undefined>,

From d45c6ed0629a47f49f412b7a3872fccafe5c6929 Mon Sep 17 00:00:00 2001
From: AJ Richardson <aj.ric.ar+git@gmail.com>
Date: Sat, 5 May 2018 17:01:11 -0400
Subject: [PATCH 012/575] lodash: fix test failures

---
 types/lodash/common/common.d.ts |  3 +--
 types/lodash/lodash-tests.ts    | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/types/lodash/common/common.d.ts b/types/lodash/common/common.d.ts
index b5da2a8080..d0856a006b 100644
--- a/types/lodash/common/common.d.ts
+++ b/types/lodash/common/common.d.ts
@@ -217,8 +217,7 @@ declare module "../index" {
     type PropertyName = string | number | symbol;
     type PropertyPath = Many<PropertyName>;
 
-    type Diff<T extends string, U extends string> = ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];
-    type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
+    type Omit<T, K extends keyof T> = Pick<T, ({ [P in keyof T]: P } & { [P in K]: never } & { [x: string]: never })[keyof T]>;
 
     /** Common interface between Arrays and jQuery objects */
     type List<T> = ArrayLike<T>;
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 08dcd31639..6f4fae8529 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -5396,7 +5396,7 @@ fp.now(); // $ExpectType number
 
     _.chain("abc").get(1); // $ExpectType LoDashExplicitWrapper<string>
     _.chain("abc").get(["0"], "_");
-    _.chain([42]).get(0, -1); // $ExpectType LoDashExplicitWrapper<number | undefined>
+    _.chain([42]).get(0, -1); // ExpectType LoDashExplicitWrapper<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>
@@ -6939,13 +6939,13 @@ fp.now(); // $ExpectType number
 {
     const object: AbcObject = anything;
 
-    _.methodOf(object); // $ExpectType (path: Many<PropertyName>) => any
-    _.methodOf(object, anything, anything, anything); // $ExpectType (path: Many<PropertyName>) => any
-    _(object).methodOf(); // $ExpectType LoDashImplicitWrapper<(path: Many<PropertyName>) => any>
-    _(object).methodOf(anything, anything, anything); // $ExpectType LoDashImplicitWrapper<(path: Many<PropertyName>) => any>
-    _.chain(object).methodOf(); // $ExpectType LoDashExplicitWrapper<(path: Many<PropertyName>) => any>
-    _.chain(object).methodOf(anything, anything, anything); // $ExpectType LoDashExplicitWrapper<(path: Many<PropertyName>) => any>
-    fp.methodOf(object); // $ExpectType (path: Many<PropertyName>) => any
+    _.methodOf(object) as (path: _.Many<_.PropertyName>) => any;
+    _.methodOf(object, anything, anything, anything) as (path: _.Many<_.PropertyName>) => any;
+    _(object).methodOf() as _.LoDashImplicitWrapper<(path: _.Many<_.PropertyName>) => any>;
+    _(object).methodOf(anything, anything, anything) as _.LoDashImplicitWrapper<(path: _.Many<_.PropertyName>) => any>;
+    _.chain(object).methodOf() as _.LoDashExplicitWrapper<(path: _.Many<_.PropertyName>) => any>;
+    _.chain(object).methodOf(anything, anything, anything) as _.LoDashExplicitWrapper<(path: _.Many<_.PropertyName>) => any>;
+    fp.methodOf(object) as (path: _.Many<_.PropertyName>) => any;
 }
 
 // _.mixin
@@ -7077,9 +7077,9 @@ fp.now(); // $ExpectType number
 
 // _.propertyOf
 {
-    _.propertyOf({}); // $ExpectType (path: Many<PropertyName>) => any
-    _({}).propertyOf(); // $ExpectType LoDashImplicitWrapper<(path: Many<PropertyName>) => any>
-    _.chain({}).propertyOf(); // $ExpectType LoDashExplicitWrapper<(path: Many<PropertyName>) => any>
+    _.propertyOf({}) as (path: _.Many<_.PropertyName>) => any;
+    _({}).propertyOf() as _.LoDashImplicitWrapper<(path: _.Many<_.PropertyName>) => any>;
+    _.chain({}).propertyOf() as _.LoDashExplicitWrapper<(path: _.Many<_.PropertyName>) => any>;
 
     fp.propertyOf(Symbol.iterator)([]); // $ExpectType any
     fp.propertyOf([Symbol.iterator], []); // $ExpectType any

From 22c541a2ba3a113a8bee23cd650325e754fa8775 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 7 May 2018 21:22:21 +0200
Subject: [PATCH 013/575] #25583 : update d3-color to 1.2.0 Added hex method

---
 types/d3-color/d3-color-tests.ts |  5 +++++
 types/d3-color/index.d.ts        | 37 ++++++++++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/types/d3-color/d3-color-tests.ts b/types/d3-color/d3-color-tests.ts
index 47f191073b..135456a005 100644
--- a/types/d3-color/d3-color-tests.ts
+++ b/types/d3-color/d3-color-tests.ts
@@ -36,6 +36,7 @@ cRGB = cRGB.darker(0.2);
 cRGB = cRGB.rgb();
 displayable = cRGB.displayable();
 cString = cRGB.toString();
+cString = cRGB.hex();
 console.log('Channels = (r : %d, g: %d, b: %d)', cRGB.r, cRGB.g, cRGB.b);
 console.log('Opacity = %d', cRGB.opacity);
 
@@ -51,6 +52,7 @@ cHSL = cHSL.darker(0.2);
 cRGB = cHSL.rgb();
 displayable = cHSL.displayable();
 cString = cHSL.toString();
+cString = cHSL.hex();
 console.log('Channels = (h : %d, s: %d, l: %d)', cHSL.h, cHSL.s, cHSL.l);
 console.log('Opacity = %d', cHSL.opacity);
 
@@ -70,6 +72,7 @@ cLab = cLab.darker(0.2);
 cRGB = cLab.rgb();
 displayable = cLab.displayable();
 cString = cLab.toString();
+cString = cLab.hex();
 console.log('Channels = (l : %d, a: %d, b: %d)', cLab.l, cLab.a, cLab.b);
 console.log('Opacity = %d', cLab.opacity);
 
@@ -89,6 +92,7 @@ cHcl = cHcl.darker(0.2);
 cRGB = cHcl.rgb();
 displayable = cHcl.displayable();
 cString = cHcl.toString();
+cString = cHcl.hex();
 console.log('Channels = (h : %d, c: %d, l: %d)', cHcl.h, cHcl.c, cHcl.l);
 console.log('Opacity = %d', cHcl.opacity);
 
@@ -108,6 +112,7 @@ cCubehelix = cCubehelix.darker(0.2);
 cRGB = cCubehelix.rgb();
 displayable = cCubehelix.displayable();
 cString = cCubehelix.toString();
+cString = cCubehelix.hex();
 console.log('Channels = (h : %d, s: %d, l: %d)', cCubehelix.h, cCubehelix.s, cCubehelix.l);
 console.log('Opacity = %d', cCubehelix.opacity);
 
diff --git a/types/d3-color/index.d.ts b/types/d3-color/index.d.ts
index 825b82d9c4..1682fe653f 100644
--- a/types/d3-color/index.d.ts
+++ b/types/d3-color/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for D3JS d3-color module 1.0
+// Type definitions for D3JS d3-color module 1.2
 // Project: https://github.com/d3/d3-color/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>
 //                 Alex Ford <https://github.com/gustavderdrache>
@@ -6,7 +6,7 @@
 //                 denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// Last module patch version validated against: 1.0.3
+// Last module patch version validated against: 1.2.0
 
 // ---------------------------------------------------------------------------
 // Shared Type Definitions and Interfaces
@@ -27,6 +27,11 @@ export interface ColorCommonInstance {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
+      /**
+     * Returns a hexadecimal string representing this color.
+     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+     */
+    hex(): string;
 }
 
 export interface Color {
@@ -47,7 +52,15 @@ export interface RGBColor extends Color {
     opacity: number;
     brighter(k?: number): this;
     darker(k?: number): this;
+    /**
+     * Returns the RGB equivalent of this color.
+     */
     rgb(): this;
+    /**
+     * Returns a hexadecimal string representing this color.
+     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+     */
+    hex(): string;
 }
 
 export interface RGBColorFactory extends Function {
@@ -65,6 +78,11 @@ export interface HSLColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
+      /**
+     * Returns a hexadecimal string representing this color.
+     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+     */
+    hex(): string;
 }
 
 export interface HSLColorFactory extends Function {
@@ -82,6 +100,11 @@ export interface LabColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
+      /**
+     * Returns a hexadecimal string representing this color.
+     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+     */
+    hex(): string;
 }
 
 export interface LabColorFactory extends Function {
@@ -99,6 +122,11 @@ export interface HCLColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
+      /**
+     * Returns a hexadecimal string representing this color.
+     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+     */
+    hex(): string;
 }
 
 export interface HCLColorFactory extends Function {
@@ -116,6 +144,11 @@ export interface CubehelixColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
+      /**
+     * Returns a hexadecimal string representing this color.
+     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+     */
+    hex(): string;
 }
 
 export interface CubehelixColorFactory extends Function {

From 415972a8af1e742b23894e706042f59f6276dcb6 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 7 May 2018 21:38:32 +0200
Subject: [PATCH 014/575] #25583 : added gray method

---
 types/d3-color/d3-color-tests.ts |  6 ++++
 types/d3-color/index.d.ts        | 60 +++++++++++++++++++-------------
 types/d3-geo/index.d.ts          |  2 +-
 3 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/types/d3-color/d3-color-tests.ts b/types/d3-color/d3-color-tests.ts
index 135456a005..d8ea79b637 100644
--- a/types/d3-color/d3-color-tests.ts
+++ b/types/d3-color/d3-color-tests.ts
@@ -76,6 +76,10 @@ cString = cLab.hex();
 console.log('Channels = (l : %d, a: %d, b: %d)', cLab.l, cLab.a, cLab.b);
 console.log('Opacity = %d', cLab.opacity);
 
+// Signature tests for Gray
+cLab = d3Color.gray(120);
+cLab = d3Color.gray(120, 0.5);
+
 // Signature tests for HCL
 
 let cHcl: d3Color.HCLColor;
@@ -126,6 +130,8 @@ if (color instanceof d3Color.rgb) {
     cHSL = color;
 } else if (color instanceof d3Color.lab) {
     cLab = color;
+} else if (color instanceof d3Color.gray) {
+    cLab = color;
 } else if (color instanceof d3Color.hcl) {
     cHcl = color;
 } else if (color instanceof d3Color.cubehelix) {
diff --git a/types/d3-color/index.d.ts b/types/d3-color/index.d.ts
index 1682fe653f..465618b5e8 100644
--- a/types/d3-color/index.d.ts
+++ b/types/d3-color/index.d.ts
@@ -1,9 +1,10 @@
 // Type definitions for D3JS d3-color module 1.2
 // Project: https://github.com/d3/d3-color/
-// Definitions by: Tom Wanzek <https://github.com/tomwanzek>
-//                 Alex Ford <https://github.com/gustavderdrache>
-//                 Boris Yankov <https://github.com/borisyankov>
-//                 denisname <https://github.com/denisname>
+// Definitions by: Tom Wanzek <https://github.com/tomwanzek>,
+//                 Alex Ford <https://github.com/gustavderdrache>,
+//                 Boris Yankov <https://github.com/borisyankov>,
+//                 denisname <https://github.com/denisname>,
+//                 Hugues Stefanski <https://github.com/ledragon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // Last module patch version validated against: 1.2.0
@@ -27,10 +28,10 @@ export interface ColorCommonInstance {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-      /**
-     * Returns a hexadecimal string representing this color.
-     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-     */
+    /**
+   * Returns a hexadecimal string representing this color.
+   * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+   */
     hex(): string;
 }
 
@@ -78,10 +79,10 @@ export interface HSLColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-      /**
-     * Returns a hexadecimal string representing this color.
-     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-     */
+    /**
+   * Returns a hexadecimal string representing this color.
+   * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+   */
     hex(): string;
 }
 
@@ -100,10 +101,10 @@ export interface LabColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-      /**
-     * Returns a hexadecimal string representing this color.
-     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-     */
+    /**
+    * Returns a hexadecimal string representing this color.
+    * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+    */
     hex(): string;
 }
 
@@ -114,6 +115,15 @@ export interface LabColorFactory extends Function {
     readonly prototype: LabColor;
 }
 
+/**
+ * Constructs a new Lab color with the specified l value and a = b = 0.
+ */
+export interface GrayColorFactory extends Function {
+    (l: number, opacity?: number): LabColor;
+    readonly prototype: LabColor;
+
+}
+
 export interface HCLColor extends Color {
     h: number;
     c: number;
@@ -122,10 +132,10 @@ export interface HCLColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-      /**
-     * Returns a hexadecimal string representing this color.
-     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-     */
+    /**
+   * Returns a hexadecimal string representing this color.
+   * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+   */
     hex(): string;
 }
 
@@ -144,10 +154,10 @@ export interface CubehelixColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-      /**
-     * Returns a hexadecimal string representing this color.
-     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-     */
+    /**
+   * Returns a hexadecimal string representing this color.
+   * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+   */
     hex(): string;
 }
 
@@ -170,6 +180,8 @@ export const hsl: HSLColorFactory;
 
 export const lab: LabColorFactory;
 
+export const gray: GrayColorFactory;
+
 export const hcl: HCLColorFactory;
 
 export const cubehelix: CubehelixColorFactory;
diff --git a/types/d3-geo/index.d.ts b/types/d3-geo/index.d.ts
index a41f67618a..5dd835026d 100644
--- a/types/d3-geo/index.d.ts
+++ b/types/d3-geo/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for D3JS d3-geo module 1.10
 // Project: https://github.com/d3/d3-geo/
-// Definitions by: Hugues Stefanski <https://github.com/Ledragon>, Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
+// Definitions by: Hugues Stefanski <https://github.com/ledragon>, Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From 3d87842d8b21a84ac0d71c0aa1c5701c1b107a46 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 7 May 2018 21:41:37 +0200
Subject: [PATCH 015/575] #25583 : added lch method

---
 types/d3-color/d3-color-tests.ts | 8 ++++++++
 types/d3-color/index.d.ts        | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/types/d3-color/d3-color-tests.ts b/types/d3-color/d3-color-tests.ts
index d8ea79b637..9be5a3d067 100644
--- a/types/d3-color/d3-color-tests.ts
+++ b/types/d3-color/d3-color-tests.ts
@@ -100,6 +100,12 @@ cString = cHcl.hex();
 console.log('Channels = (h : %d, c: %d, l: %d)', cHcl.h, cHcl.c, cHcl.l);
 console.log('Opacity = %d', cHcl.opacity);
 
+cHcl = d3Color.lch(40, 50, 120);
+cHcl = d3Color.lch(40, 50, 120, 0.5);
+cHcl = d3Color.lch('steelblue');
+cHcl = d3Color.lch('rgba(20, 100, 200, 0.5)');
+cHcl = d3Color.lch(c);
+
 // Signature tests for Cubehelix
 
 let cCubehelix: d3Color.CubehelixColor;
@@ -134,6 +140,8 @@ if (color instanceof d3Color.rgb) {
     cLab = color;
 } else if (color instanceof d3Color.hcl) {
     cHcl = color;
+} else if (color instanceof d3Color.lch) {
+    cHcl = color;
 } else if (color instanceof d3Color.cubehelix) {
     cCubehelix = color;
 } else if (color === null) {
diff --git a/types/d3-color/index.d.ts b/types/d3-color/index.d.ts
index 465618b5e8..70ff67477e 100644
--- a/types/d3-color/index.d.ts
+++ b/types/d3-color/index.d.ts
@@ -146,6 +146,13 @@ export interface HCLColorFactory extends Function {
     readonly prototype: HCLColor;
 }
 
+export interface LCHColorFactory extends Function {
+    (l: number, c: number, h: number, opacity?: number): HCLColor;
+    (cssColorSpecifier: string): HCLColor;
+    (color: ColorSpaceObject | ColorCommonInstance): HCLColor;
+    readonly prototype: HCLColor;
+}
+
 export interface CubehelixColor extends Color {
     h: number;
     s: number;
@@ -184,4 +191,6 @@ export const gray: GrayColorFactory;
 
 export const hcl: HCLColorFactory;
 
+export const lch: LCHColorFactory;
+
 export const cubehelix: CubehelixColorFactory;

From 4b4c00c4bb1832e668a9818521f57202dc71d64a Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 7 May 2018 22:04:42 +0200
Subject: [PATCH 016/575] Fix comments

---
 types/d3-color/index.d.ts | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/types/d3-color/index.d.ts b/types/d3-color/index.d.ts
index 70ff67477e..3c11d8f88d 100644
--- a/types/d3-color/index.d.ts
+++ b/types/d3-color/index.d.ts
@@ -28,11 +28,6 @@ export interface ColorCommonInstance {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-    /**
-   * Returns a hexadecimal string representing this color.
-   * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-   */
-    hex(): string;
 }
 
 export interface Color {
@@ -57,10 +52,10 @@ export interface RGBColor extends Color {
      * Returns the RGB equivalent of this color.
      */
     rgb(): this;
-    /**
-     * Returns a hexadecimal string representing this color.
-     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-     */
+   /**
+    * Returns a hexadecimal string representing this color.
+    * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+    */
     hex(): string;
 }
 
@@ -79,7 +74,7 @@ export interface HSLColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-    /**
+  /**
    * Returns a hexadecimal string representing this color.
    * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
    */
@@ -101,7 +96,7 @@ export interface LabColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-    /**
+   /**
     * Returns a hexadecimal string representing this color.
     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
     */
@@ -121,7 +116,6 @@ export interface LabColorFactory extends Function {
 export interface GrayColorFactory extends Function {
     (l: number, opacity?: number): LabColor;
     readonly prototype: LabColor;
-
 }
 
 export interface HCLColor extends Color {
@@ -132,10 +126,10 @@ export interface HCLColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-    /**
-   * Returns a hexadecimal string representing this color.
-   * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-   */
+   /**
+    * Returns a hexadecimal string representing this color.
+    * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+    */
     hex(): string;
 }
 
@@ -161,7 +155,7 @@ export interface CubehelixColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-    /**
+  /**
    * Returns a hexadecimal string representing this color.
    * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
    */

From ee0fd76b1ac8258cdc8daaed11b4e8877a088f28 Mon Sep 17 00:00:00 2001
From: jethro larson <jethrolarson@sbgtv.com>
Date: Mon, 7 May 2018 19:43:25 -0700
Subject: [PATCH 017/575] Add checkPropTypes definition to @types/prop-types

I used the jsdoc as guide in
https://github.com/facebook/prop-types/blob/master/checkPropTypes.js
---
 types/prop-types/index.d.ts          | 12 ++++++++++++
 types/prop-types/prop-types-tests.ts |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/types/prop-types/index.d.ts b/types/prop-types/index.d.ts
index ebeef159b0..67146e6cc7 100644
--- a/types/prop-types/index.d.ts
+++ b/types/prop-types/index.d.ts
@@ -28,3 +28,15 @@ export function oneOfType(types: Array<Validator<any>>): Requireable<any>;
 export function arrayOf(type: Validator<any>): Requireable<any>;
 export function objectOf(type: Validator<any>): Requireable<any>;
 export function shape(type: ValidationMap<any>): Requireable<any>;
+
+/**
+ * Assert that the values match with the type specs.
+ * Error messages are memorized and will only be shown once.
+ *
+ * @param typeSpecs Map of name to a ReactPropType
+ * @param values Runtime values that need to be type-checked
+ * @param location e.g. "prop", "context", "child context"
+ * @param componentName Name of the component for error messages.
+ * @param getStack Returns the component stack.
+ */
+export function checkPropTypes(typeSpecs: any, values: any, location: string, componentName: string, getStack?: () => any): void;
diff --git a/types/prop-types/prop-types-tests.ts b/types/prop-types/prop-types-tests.ts
index 238a22b1ef..4d5a939b6e 100644
--- a/types/prop-types/prop-types-tests.ts
+++ b/types/prop-types/prop-types-tests.ts
@@ -25,3 +25,5 @@ const propTypes: PropTypes.ValidationMap<Props> = {
     node: PropTypes.node.isRequired,
     element: PropTypes.element.isRequired
 };
+
+PropTypes.checkPropTypes({xs: PropTypes.array}, {xs: []}, 'location', 'componentName');

From 097f69c5878da16b861f3e69870e79fe63559340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Tue, 8 May 2018 13:33:16 +0400
Subject: [PATCH 018/575] PouchDB: update options with find selector and others

---
 types/pouchdb-core/index.d.ts        | 38 +++++++++++++++++++++++++++-
 types/pouchdb-replication/index.d.ts |  8 +++++-
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/types/pouchdb-core/index.d.ts b/types/pouchdb-core/index.d.ts
index 4b1d56d860..c077051ffb 100644
--- a/types/pouchdb-core/index.d.ts
+++ b/types/pouchdb-core/index.d.ts
@@ -2,11 +2,12 @@
 // Project: https://pouchdb.com/
 // Definitions by: Simon Paulger <https://github.com/spaulg>, Jakub Navratil <https://github.com/trubit>,
 //                 Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>,
-//                 Tobias Bales <https://github.com/TobiasBales>
+//                 Tobias Bales <https://github.com/TobiasBales>, Sebastián Ramírez <https://github.com/tiangolo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 /// <reference types="debug" />
+/// <reference types="pouchdb-find" />
 
 interface Buffer extends Uint8Array {
     write(string: string, offset?: number, length?: number, encoding?: string): number;
@@ -412,6 +413,41 @@ declare namespace PouchDB {
              * Note: options.filter must be set to '_view' for this option to work.
              */
             view?: string;
+
+            /**
+             * Filter using a query/pouchdb-find selector. Note: Selectors are not supported in CouchDB 1.x.
+             * Cannot be used in combination with the filter option.
+             */
+            selector?: PouchDB.Find.Selector;
+
+            /**
+             * (previously options.returnDocs): Is available for non-http databases and defaults to true.
+             * Passing false prevents the changes feed from keeping all the documents in memory – in other
+             * words complete always has an empty results array, and the change event is the only way to get the event.
+             * Useful for large change sets where otherwise you would run out of memory.
+             */
+            return_docs?: boolean;
+
+            /**
+             * Only available for http databases, this configures how many changes to fetch at a time.
+             * Increasing this can reduce the number of requests made. Default is 25.
+             */
+            batch_size?: number;
+
+            /**
+             * Specifies how many revisions are returned in the changes array.
+             * The default, 'main_only', will only return the current “winning” revision;
+             * 'all_docs' will return all leaf revisions (including conflicts and deleted former conflicts).
+             * Most likely you won’t need this unless you’re writing a replicator.
+             */
+            style?: 'main_only' | 'all_docs';
+
+            /**
+             * Only available for http databases. Specifies that seq information only be generated every N changes.
+             * Larger values can improve changes throughput with CouchDB 2.0 and later.
+             * Note that last_seq is always populated regardless.
+             */
+            seq_interval?: number;
         }
 
         interface ChangesResponseChange<Content extends {}> {
diff --git a/types/pouchdb-replication/index.d.ts b/types/pouchdb-replication/index.d.ts
index b0611b840a..97dbc238a6 100644
--- a/types/pouchdb-replication/index.d.ts
+++ b/types/pouchdb-replication/index.d.ts
@@ -1,10 +1,11 @@
 // Type definitions for pouchdb-replication 6.1
 // Project: https://pouchdb.com/
-// Definitions by: Jakub Navratil <https://github.com/trubit>
+// Definitions by: Jakub Navratil <https://github.com/trubit>, Sebastián Ramírez <https://github.com/tiangolo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 /// <reference types="pouchdb-core" />
+/// <reference types="pouchdb-find" />
 
 declare namespace PouchDB {
     namespace Replication {
@@ -43,6 +44,11 @@ declare namespace PouchDB {
              */
             view?: string;
 
+            /**
+             * Filter using a query/pouchdb-find selector. Note: Selectors are not supported in CouchDB 1.x.
+             */
+            selector?: PouchDB.Find.Selector;
+
             /** Replicate changes after the given sequence number. */
             since?: any;
 

From b76cc39de3e26cc3430b3ac6c8048e97207a1f47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Tue, 8 May 2018 13:44:13 +0400
Subject: [PATCH 019/575] Update versions of packages

---
 types/pouchdb-core/index.d.ts        | 2 +-
 types/pouchdb-replication/index.d.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/pouchdb-core/index.d.ts b/types/pouchdb-core/index.d.ts
index c077051ffb..01c856fb57 100644
--- a/types/pouchdb-core/index.d.ts
+++ b/types/pouchdb-core/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for pouchdb-core 6.1
+// Type definitions for pouchdb-core 6.4.3
 // Project: https://pouchdb.com/
 // Definitions by: Simon Paulger <https://github.com/spaulg>, Jakub Navratil <https://github.com/trubit>,
 //                 Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>,
diff --git a/types/pouchdb-replication/index.d.ts b/types/pouchdb-replication/index.d.ts
index 97dbc238a6..b16256bff0 100644
--- a/types/pouchdb-replication/index.d.ts
+++ b/types/pouchdb-replication/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for pouchdb-replication 6.1
+// Type definitions for pouchdb-replication 6.4.3
 // Project: https://pouchdb.com/
 // Definitions by: Jakub Navratil <https://github.com/trubit>, Sebastián Ramírez <https://github.com/tiangolo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 44a334cfb920b9badbb95f16d38cdccdb04894be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Tue, 8 May 2018 14:06:13 +0400
Subject: [PATCH 020/575] PouchDB update version, remove PATCH

---
 types/pouchdb-core/index.d.ts        | 2 +-
 types/pouchdb-replication/index.d.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/pouchdb-core/index.d.ts b/types/pouchdb-core/index.d.ts
index 01c856fb57..16758500e5 100644
--- a/types/pouchdb-core/index.d.ts
+++ b/types/pouchdb-core/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for pouchdb-core 6.4.3
+// Type definitions for pouchdb-core 6.4
 // Project: https://pouchdb.com/
 // Definitions by: Simon Paulger <https://github.com/spaulg>, Jakub Navratil <https://github.com/trubit>,
 //                 Brian Geppert <https://github.com/geppy>, Frederico Galvão <https://github.com/fredgalvao>,
diff --git a/types/pouchdb-replication/index.d.ts b/types/pouchdb-replication/index.d.ts
index b16256bff0..dab75401d5 100644
--- a/types/pouchdb-replication/index.d.ts
+++ b/types/pouchdb-replication/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for pouchdb-replication 6.4.3
+// Type definitions for pouchdb-replication 6.4
 // Project: https://pouchdb.com/
 // Definitions by: Jakub Navratil <https://github.com/trubit>, Sebastián Ramírez <https://github.com/tiangolo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 9fdadb327a9b42907ed416b1fd13b3f0a4dce025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Tue, 8 May 2018 14:12:01 +0400
Subject: [PATCH 021/575] PouchDB: remove unnecessary qualifier

---
 types/pouchdb-core/index.d.ts        | 2 +-
 types/pouchdb-replication/index.d.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/pouchdb-core/index.d.ts b/types/pouchdb-core/index.d.ts
index 16758500e5..7534ad902c 100644
--- a/types/pouchdb-core/index.d.ts
+++ b/types/pouchdb-core/index.d.ts
@@ -418,7 +418,7 @@ declare namespace PouchDB {
              * Filter using a query/pouchdb-find selector. Note: Selectors are not supported in CouchDB 1.x.
              * Cannot be used in combination with the filter option.
              */
-            selector?: PouchDB.Find.Selector;
+            selector?: Find.Selector;
 
             /**
              * (previously options.returnDocs): Is available for non-http databases and defaults to true.
diff --git a/types/pouchdb-replication/index.d.ts b/types/pouchdb-replication/index.d.ts
index dab75401d5..a0f581b40a 100644
--- a/types/pouchdb-replication/index.d.ts
+++ b/types/pouchdb-replication/index.d.ts
@@ -47,7 +47,7 @@ declare namespace PouchDB {
             /**
              * Filter using a query/pouchdb-find selector. Note: Selectors are not supported in CouchDB 1.x.
              */
-            selector?: PouchDB.Find.Selector;
+            selector?: Find.Selector;
 
             /** Replicate changes after the given sequence number. */
             since?: any;

From e54e1ba90ece9c45226be130b85030bc7d00eb5a Mon Sep 17 00:00:00 2001
From: leanazulyoro <leanazulyoro@gmail.com>
Date: Tue, 8 May 2018 11:36:44 -0300
Subject: [PATCH 022/575] Fix: return type for restify's conditionaHandler;
 Added: test for restify's conditionalHandler

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

diff --git a/types/restify/index.d.ts b/types/restify/index.d.ts
index 30a5220022..bacea67cab 100644
--- a/types/restify/index.d.ts
+++ b/types/restify/index.d.ts
@@ -955,7 +955,7 @@ export namespace plugins {
     /**
      * Runs first handler that matches to the condition
      */
-    function conditionalHandler(candidates: HandlerCandidate | HandlerCandidate[]): RequestHandler[];
+    function conditionalHandler(candidates: HandlerCandidate | HandlerCandidate[]): RequestHandler;
 
     /**
      * Conditional headers (If-*)
diff --git a/types/restify/restify-tests.ts b/types/restify/restify-tests.ts
index 1ba9b05768..8601d912ac 100644
--- a/types/restify/restify-tests.ts
+++ b/types/restify/restify-tests.ts
@@ -148,6 +148,14 @@ server.use(restify.plugins.throttle({
         }
     }
 }));
+server.use(restify.plugins.conditionalHandler([{
+    contentType: ['text/plain'],
+    handler: (req: restify.Request, res: restify.Response, next: restify.Next): void => {
+        res.send('OK');
+        next();
+    },
+    version: '0.0.0',
+}]));
 
 const logger = Logger.createLogger({ name: "test" });
 

From ded5430271d96e7438e202caae82ece7e7dda2c5 Mon Sep 17 00:00:00 2001
From: Sinziana Nicolae <sinziana.nicolae@hootsuite.com>
Date: Tue, 8 May 2018 19:10:40 +0300
Subject: [PATCH 023/575] Add types for daySize and verticalBorderSpacing in
 DayPickerRangeControllerShape

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

diff --git a/types/react-dates/index.d.ts b/types/react-dates/index.d.ts
index dc852dde3b..e9dc35bf05 100644
--- a/types/react-dates/index.d.ts
+++ b/types/react-dates/index.d.ts
@@ -224,10 +224,12 @@ declare namespace ReactDates {
         renderCalendarInfo?: () => (string | JSX.Element),
         onOutsideClick?: (e: any) => void,
         keepOpenOnDateSelect?: boolean,
+        verticalBorderSpacing?: number,
 
         // navigation related props
         navPrev?: string | JSX.Element,
         navNext?: string | JSX.Element,
+        daySize?: number,
         hideKeyboardShortcutsPanel?: boolean;
         onPrevMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,
         onNextMonthClick?: (e: React.EventHandler<React.MouseEvent<HTMLSpanElement>>) => void,

From a66d69a74651b8d584c849111017265c1e2b4b1b Mon Sep 17 00:00:00 2001
From: Sinziana Nicolae <sinziana.nicolae@hootsuite.com>
Date: Tue, 8 May 2018 19:32:03 +0300
Subject: [PATCH 024/575] Change order of types

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

diff --git a/types/react-dates/index.d.ts b/types/react-dates/index.d.ts
index 1d42034e78..92fa68e8d7 100644
--- a/types/react-dates/index.d.ts
+++ b/types/react-dates/index.d.ts
@@ -166,7 +166,7 @@ declare namespace ReactDates {
         hideKeyboardShortcutsPanel?: boolean,
         daySize?: number,
         isRTL?: boolean,
-        verticalSpacing?: number,        
+        verticalSpacing?: number,
         verticalHeight?: number| null,
 
         // navigation related props
@@ -242,20 +242,20 @@ declare namespace ReactDates {
         renderCalendarInfo?: () => (string | JSX.Element),
         onOutsideClick?: (e: any) => void,
         keepOpenOnDateSelect?: boolean,
-        verticalBorderSpacing?: number,
+        hideKeyboardShortcutsPanel?: boolean;
         noBorder?: boolean,
+        verticalBorderSpacing?: number,
         firstDayOfWeek? : 0 | 1 | 2 | 3 | 4 | 5 | 6,
 
         // navigation related props
         navPrev?: string | JSX.Element,
         navNext?: string | JSX.Element,
-        daySize?: number,
-        hideKeyboardShortcutsPanel?: boolean;
         onPrevMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
         onNextMonthClick?: (newCurrentMonth: momentPropTypes.momentObj) => void,
         transitionDuration?: number,
 
         // day presentation and interaction related props
+        daySize?: number,
         renderCalendarDay?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
         renderDayContents?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
         minimumNights?: number,

From aa10525f10489fcbd69898e4e1622ea1278d44fe Mon Sep 17 00:00:00 2001
From: Zanaxhir <artox@gmx.net>
Date: Wed, 9 May 2018 09:17:47 +0200
Subject: [PATCH 025/575] add keepFocusOnInput

https://github.com/airbnb/react-dates/blob/master/src/components/DateRangePicker.jsx#L68
---
 types/react-dates/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-dates/index.d.ts b/types/react-dates/index.d.ts
index f9444c1b7c..c4c65b582c 100644
--- a/types/react-dates/index.d.ts
+++ b/types/react-dates/index.d.ts
@@ -41,6 +41,7 @@ declare namespace ReactDates {
         endDateId?: string,
         endDatePlaceholderText?: string,
         disabled?: boolean,
+        keepFocusOnInput?: boolean,
         required?: boolean,
         readOnly?: boolean,
         screenReaderInputMessage?: string,

From eb77b54d756a418e1714ecb93b3a813e715fbcac Mon Sep 17 00:00:00 2001
From: Damien Sandras <ds@beip.be>
Date: Wed, 9 May 2018 11:12:30 +0200
Subject: [PATCH 026/575] sip.js: Add P-Asserted-Identity property

This was part of upstream merge request 549.
---
 types/sip.js/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/sip.js/index.d.ts b/types/sip.js/index.d.ts
index 65aa453a68..65466ee840 100644
--- a/types/sip.js/index.d.ts
+++ b/types/sip.js/index.d.ts
@@ -102,6 +102,7 @@ export interface Session {
     request?: IncomingRequest | OutgoingRequest;
     localIdentity?: NameAddrHeader;
     remoteIdentity?: NameAddrHeader;
+    assertedIdentity?: NameAddrHeader;
     data: ClientContext | ServerContext;
     sessionDescriptionHandler: SessionDescriptionHandler;
 

From 233bdad5ad2ae9beada01d533937929cf1982b04 Mon Sep 17 00:00:00 2001
From: Matthew Bull <matthew@splyt.com>
Date: Wed, 9 May 2018 14:54:57 +0100
Subject: [PATCH 027/575] Fixing export to match package chai-jest-snapshots
 doesn't use `export default`, so `import * as chaiJestSnapshots from
 'chai-jest-snapshots'` gives compiler errors and `import chaiJestSnapshots
 from 'chai-jest-snapshots'` gives runtime errors

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

diff --git a/types/chai-jest-snapshot/chai-jest-snapshot-tests.ts b/types/chai-jest-snapshot/chai-jest-snapshot-tests.ts
index c93c4a1d04..cd35998db8 100644
--- a/types/chai-jest-snapshot/chai-jest-snapshot-tests.ts
+++ b/types/chai-jest-snapshot/chai-jest-snapshot-tests.ts
@@ -1,4 +1,4 @@
-import chaiJestSnapshot from 'chai-jest-snapshot';
+import * as chaiJestSnapshot from 'chai-jest-snapshot';
 import { expect } from 'chai';
 
 chai.use(chaiJestSnapshot);
diff --git a/types/chai-jest-snapshot/index.d.ts b/types/chai-jest-snapshot/index.d.ts
index 470e4fa423..27ec049b14 100644
--- a/types/chai-jest-snapshot/index.d.ts
+++ b/types/chai-jest-snapshot/index.d.ts
@@ -40,4 +40,4 @@ interface ChaiJestSnapshot {
 }
 
 declare var ChaiJestSnapshot: ChaiJestSnapshot;
-export default ChaiJestSnapshot;
+export = ChaiJestSnapshot;

From ebfd51b6d2fb5227e22745dc0d5067248aa68633 Mon Sep 17 00:00:00 2001
From: stuckupfool <stuckupfool@gmail.com>
Date: Wed, 9 May 2018 09:28:36 -0500
Subject: [PATCH 028/575] Update README.md

---
 types/rc-slider/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/rc-slider/README.md b/types/rc-slider/README.md
index 622c75a90e..6c56f6c2e1 100644
--- a/types/rc-slider/README.md
+++ b/types/rc-slider/README.md
@@ -1,5 +1,5 @@
 # Installation
-> `npm install --save @types/rc-select`
+> `npm install --save @types/rc-slider`
 
 # Summary
 This package contains type definitions for rc-slider (https://github.com/react-component/slider).

From 583174c2f39b4ccc8d191df32a5676b0e5e7c15e Mon Sep 17 00:00:00 2001
From: Todd Brannam <tbrannam@casualpenguin.com>
Date: Wed, 9 May 2018 16:00:26 -0400
Subject: [PATCH 029/575] Update index.d.ts

Add support for alternative Provider options, such as ApolloProvider

exposing new-ish `options` parameter in `Navigatiotor`

`function registerComponent(screenID, generator, store = undefined, Provider = undefined, options = {})`
---
 types/react-native-navigation/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-native-navigation/index.d.ts b/types/react-native-navigation/index.d.ts
index 75c0d51be0..16da706d06 100644
--- a/types/react-native-navigation/index.d.ts
+++ b/types/react-native-navigation/index.d.ts
@@ -7,7 +7,7 @@
 import * as React from 'react';
 
 export namespace Navigation {
-    function registerComponent(screenID: string, generator: () => React.ComponentType<any>, store?: any, provider?: any): void;
+    function registerComponent(screenID: string, generator: () => React.ComponentType<any>, store?: any, provider?: any, options?: any): void;
     function startTabBasedApp(params: TabBasedApp): void;
     function startSingleScreenApp(params: SingleScreenApp): void;
     function showModal(params: ModalScreen): void;

From 0496cb27f7a980d2d3061d9d1175d66c86c4fcf9 Mon Sep 17 00:00:00 2001
From: Dmytro Kossa <misc@dmitryx.com>
Date: Wed, 9 May 2018 18:14:46 -0700
Subject: [PATCH 030/575] polymer/index.d.ts - add observeNodes /
 unobserveNodes

Documented here: https://www.polymer-project.org/1.0/docs/devguide/local-dom#observe-nodes
---
 types/polymer/index.d.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/types/polymer/index.d.ts b/types/polymer/index.d.ts
index a4eca3e70b..569842066a 100644
--- a/types/polymer/index.d.ts
+++ b/types/polymer/index.d.ts
@@ -232,6 +232,12 @@ declare global {
       flush():void;
     }
 
+    interface ObservedNodeInfo {
+      target: Node;
+      addedNodes: Node[];
+      removedNode: Node[];
+    }
+
     interface DomApi {
 
       appendChild(node: Node): Node;
@@ -257,6 +263,10 @@ declare global {
       setAttribute(name: string, value: any):void;
 
       removeAttribute(name: string):void;
+        
+      observeNodes(callback: (info: ObservedNodeInfo) => void): {};
+
+      unobserveNodes(observer: {}): void;
 
       childNodes:Node[];
 

From 5af75097bb469ebf4be90279038bf020c9a1a9b1 Mon Sep 17 00:00:00 2001
From: Todd Brannam <tbrannam@casualpenguin.com>
Date: Wed, 9 May 2018 21:27:42 -0400
Subject: [PATCH 031/575] Update react-native-navigation-tests.tsx

Add example that exercises the expanded function `registerComponent`
---
 .../react-native-navigation-tests.tsx          | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/types/react-native-navigation/react-native-navigation-tests.tsx b/types/react-native-navigation/react-native-navigation-tests.tsx
index 004673e10a..371465b1c9 100644
--- a/types/react-native-navigation/react-native-navigation-tests.tsx
+++ b/types/react-native-navigation/react-native-navigation-tests.tsx
@@ -63,7 +63,23 @@ const Drawer = (props: NavigationComponentProps) => {
     );
 };
 
-Navigation.registerComponent('example.Screen1', () => Screen1);
+interface TestProviderProps {
+    test: string;
+}
+
+class TestProvider extends React.Component<TestProviderProps> {
+    getChildContext() {
+        return {
+            test: this.props.test
+        };
+    }
+
+    render() {
+        return this.props.children;
+    }
+}
+
+Navigation.registerComponent('example.Screen1', () => Screen1, {}, TestProvider, {test: "test"});
 Navigation.registerComponent('example.Screen2', () => Screen2);
 Navigation.registerComponent('example.Drawer', () => Drawer);
 

From 349b0b7dc839ecfd1399e9f9aba0e29c125a47a3 Mon Sep 17 00:00:00 2001
From: Pascal Iske <info@pascal-iske.de>
Date: Thu, 10 May 2018 13:08:58 +0200
Subject: [PATCH 032/575] fix(medium-editor): toolbar flag should also accept a
 boolean

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

diff --git a/types/medium-editor/index.d.ts b/types/medium-editor/index.d.ts
index c5724fd665..d5b84f1553 100644
--- a/types/medium-editor/index.d.ts
+++ b/types/medium-editor/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for medium-editor 5.0
 // Project: https://yabwe.github.io/medium-editor/
 // Definitions by: keika299 <https://github.com/keika299>
+//                 pascaliske <https://github.com/pascaliske>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace MediumEditor {
@@ -76,7 +77,7 @@ declare namespace MediumEditor {
         ownerDocument?: Document;
         spellcheck?: boolean;
         targetBlank?: boolean;
-        toolbar?: ToolbarOptions;
+        toolbar?: ToolbarOptions | boolean;
         anchorPreview?: AnchorPreviewOptions | boolean;
         placeholder?: PlaceholderOptions | boolean;
         anchor?: AnchorFormOptions;

From 2016139475410827edcbbbcc17d6794e14c65bee Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Thu, 10 May 2018 16:37:44 +0200
Subject: [PATCH 033/575] Interop definitions - 
 https://github.com/Microsoft/TypeScript/issues/21440

---
 .../activex-interop/activex-interop-tests.ts  |  49 ++++++++
 types/activex-interop/index.d.ts              | 113 ++++++++++++++++++
 types/activex-interop/tsconfig.json           |  21 ++++
 types/activex-interop/tslint.json             |   3 +
 4 files changed, 186 insertions(+)
 create mode 100644 types/activex-interop/activex-interop-tests.ts
 create mode 100644 types/activex-interop/index.d.ts
 create mode 100644 types/activex-interop/tsconfig.json
 create mode 100644 types/activex-interop/tslint.json

diff --git a/types/activex-interop/activex-interop-tests.ts b/types/activex-interop/activex-interop-tests.ts
new file mode 100644
index 0000000000..e2ece7401e
--- /dev/null
+++ b/types/activex-interop/activex-interop-tests.ts
@@ -0,0 +1,49 @@
+// copied from the definitions in activex-scripting
+interface Dictionary<TKey = any, TItem = any> {
+    /** Add a new key and item to the dictionary. */
+    Add(Key: TKey, Item: TItem): void;
+
+    /** Get the number of items in the dictionary. */
+    readonly Count: number;
+
+    /** Determine if a given key is in the dictionary. */
+    Exists(Key: TKey): boolean;
+    HashVal(Key: TKey): any;
+
+    /** Set or get the item for a given key */
+    Item(Key: TKey): TItem;
+
+    /** Get an array containing all items in the dictionary. */
+    Items(): SafeArray<TItem>;
+
+    /** Change a key to a different key. */
+    Key(Key: TKey): TKey;
+
+    /** Get an array containing all keys in the dictionary. */
+    Keys(): SafeArray<TKey>;
+
+    /** Remove a given key from the dictionary. */
+    Remove(Key: TKey): void;
+
+    /** Remove all information from the dictionary. */
+    RemoveAll(): void;
+
+    /** Set or get the item for a given key */
+    (Key: TKey): TItem;
+}
+
+interface ActiveXObjectNameMap {
+    'Scripting.Dictionary': Dictionary;
+}
+
+const dict: Dictionary<string, number> = new ActiveXObject('Scripting.Dictionary');
+dict.Add('one', 1);
+dict.Add('two', 2);
+dict.Add('three', 3);
+
+const keyEnumerator = new Enumerator(dict.Keys());
+keyEnumerator.moveFirst();
+while (!keyEnumerator.atEnd()) {
+    const item = dict(keyEnumerator.item());
+    const power = Math.pow(item, 2);
+}
diff --git a/types/activex-interop/index.d.ts b/types/activex-interop/index.d.ts
new file mode 100644
index 0000000000..5b2a0acc42
--- /dev/null
+++ b/types/activex-interop/index.d.ts
@@ -0,0 +1,113 @@
+// Type definitions for Javascript Automation interop 0.0
+// Project: https://msdn.microsoft.com/en-us/library/ff521046(v=vs.85).aspx
+// Definitions by: Zev Spitz <https://github.com/zspitz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+// tslint:disable-next-line no-empty-interface
+interface ActiveXObjectNameMap { }
+
+interface ActiveXObject {
+    new <K extends keyof ActiveXObjectNameMap>(progid: K): ActiveXObjectNameMap[K];
+    new(s: string): any;
+}
+declare var ActiveXObject: ActiveXObject;
+
+/**
+ * Represents an Automation SAFEARRAY
+ */
+declare class SafeArray<T = any> {
+    private constructor();
+    private SafeArray_typekey: SafeArray<T>;
+}
+
+/**
+ * Allows enumerating over a COM collection, which may not have indexed item access.
+ */
+interface Enumerator<T = any> {
+    /**
+     * Returns true if the current item is the last one in the collection, or the collection is empty,
+     * or the current item is undefined.
+     */
+    atEnd(): boolean;
+
+    /**
+     * Returns the current item in the collection
+     */
+    item(): T;
+
+    /**
+     * Resets the current item in the collection to the first item. If there are no items in the collection,
+     * the current item is set to undefined.
+     */
+    moveFirst(): void;
+
+    /**
+     * Moves the current item to the next item in the collection. If the enumerator is at the end of
+     * the collection or the collection is empty, the current item is set to undefined.
+     */
+    moveNext(): void;
+}
+
+interface EnumeratorConstructor {
+    new <T = any>(collection: SafeArray<T> | { Item(index: any): T }): Enumerator<T>;
+    new (collection: any): Enumerator;
+}
+
+declare var Enumerator: EnumeratorConstructor;
+
+/**
+ * Enables reading from a COM safe array, which might have an alternate lower bound, or multiple dimensions.
+ */
+interface VBArray<T = any> {
+    /**
+     * Returns the number of dimensions (1-based).
+     */
+    dimensions(): number;
+
+    /**
+     * Takes an index for each dimension in the array, and returns the item at the corresponding location.
+     */
+    getItem(dimension1Index: number, ...dimensionNIndexes: number[]): T;
+
+    /**
+     * Returns the smallest available index for a given dimension.
+     * @param dimension 1-based dimension (defaults to 1)
+     */
+    lbound(dimension?: number): number;
+
+    /**
+     * Returns the largest available index for a given dimension.
+     * @param dimension 1-based dimension (defaults to 1)
+     */
+    ubound(dimension?: number): number;
+
+    /**
+     * Returns a Javascript array with all the elements in the VBArray. If there are multiple dimensions,
+     * each successive dimension is appended to the end of the array.
+     * Example: [[1,2,3],[4,5,6]] becomes [1,2,3,4,5,6]
+     */
+    toArray(): T[];
+}
+
+interface VBArrayConstructor {
+    new <T = any>(safeArray: SafeArray<T>): VBArray<T>;
+}
+
+declare var VBArray: VBArrayConstructor;
+
+/**
+ * Automation date (VT_DATE)
+ */
+declare class VarDate {
+    private constructor();
+    private VarDate_typekey: VarDate;
+}
+
+interface DateConstructor {
+    new(vd: VarDate): Date;
+}
+
+interface Date {
+    getVarDate: () => VarDate;
+}
diff --git a/types/activex-interop/tsconfig.json b/types/activex-interop/tsconfig.json
new file mode 100644
index 0000000000..49c7698384
--- /dev/null
+++ b/types/activex-interop/tsconfig.json
@@ -0,0 +1,21 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es5"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [ "../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "activex-interop-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/activex-interop/tslint.json b/types/activex-interop/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/activex-interop/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 1a13b1ee20ed4f5a97eacc2fcc73e9aec8a0e2f6 Mon Sep 17 00:00:00 2001
From: Aankhen <Aankhen@users.noreply.github.com>
Date: Wed, 9 May 2018 12:08:59 +0530
Subject: [PATCH 034/575] Mention `npx` when talking about `dts-gen` in
 README.md.

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

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

From ebd3517511fe6252993f48b9481f7b602ec9ce17 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Thu, 10 May 2018 17:05:31 +0200
Subject: [PATCH 035/575] WSH definitions

---
 types/windows-script-host/index.d.ts          | 201 ++++++++++++++++++
 types/windows-script-host/package.json        |   6 +
 types/windows-script-host/tsconfig.json       |  23 ++
 types/windows-script-host/tslint.json         |   1 +
 .../windows-script-host-tests.ts              |   1 +
 5 files changed, 232 insertions(+)
 create mode 100644 types/windows-script-host/index.d.ts
 create mode 100644 types/windows-script-host/package.json
 create mode 100644 types/windows-script-host/tsconfig.json
 create mode 100644 types/windows-script-host/tslint.json
 create mode 100644 types/windows-script-host/windows-script-host-tests.ts

diff --git a/types/windows-script-host/index.d.ts b/types/windows-script-host/index.d.ts
new file mode 100644
index 0000000000..2130ecc805
--- /dev/null
+++ b/types/windows-script-host/index.d.ts
@@ -0,0 +1,201 @@
+// Type definitions for Windows Script Host 5.8
+// Project: https://msdn.microsoft.com/en-us/library/9bbdkx3k.aspx
+// Definitions by: Zev Spitz <https://github.com/zspitz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// tslint:disable-next-line interface-name
+interface ITextWriter {
+    Write(s: string): void;
+    WriteLine(s: string): void;
+    Close(): void;
+}
+
+interface TextStreamBase {
+    /**
+     * The column number of the current character position in an input stream.
+     */
+    Column: number;
+
+    /**
+     * The current line number in an input stream.
+     */
+    Line: number;
+
+    /**
+     * Closes a text stream.
+     * It is not necessary to close standard streams; they close automatically when the process ends. If
+     * you close a standard stream, be aware that any other pointers to that standard stream become invalid.
+     */
+    Close(): void;
+}
+
+interface TextStreamWriter extends TextStreamBase {
+    /**
+     * Sends a string to an output stream.
+     */
+    Write(s: string): void;
+
+    /**
+     * Sends a specified number of blank lines (newline characters) to an output stream.
+     */
+    WriteBlankLines(intLines: number): void;
+
+    /**
+     * Sends a string followed by a newline character to an output stream.
+     */
+    WriteLine(s: string): void;
+}
+
+interface TextStreamReader extends TextStreamBase {
+    /**
+     * Returns a specified number of characters from an input stream, starting at the current pointer position.
+     * Does not return until the ENTER key is pressed.
+     * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
+     */
+    Read(characters: number): string;
+
+    /**
+     * Returns all characters from an input stream.
+     * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
+     */
+    ReadAll(): string;
+
+    /**
+     * Returns an entire line from an input stream.
+     * Although this method extracts the newline character, it does not add it to the returned string.
+     * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
+     */
+    ReadLine(): string;
+
+    /**
+     * Skips a specified number of characters when reading from an input text stream.
+     * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
+     * @param characters Positive number of characters to skip forward. (Backward skipping is not supported.)
+     */
+    Skip(characters: number): void;
+
+    /**
+     * Skips the next line when reading from an input text stream.
+     * Can only be used on a stream in reading mode, not writing or appending mode.
+     */
+    SkipLine(): void;
+
+    /**
+     * Indicates whether the stream pointer position is at the end of a line.
+     */
+    AtEndOfLine: boolean;
+
+    /**
+     * Indicates whether the stream pointer position is at the end of a stream.
+     */
+    AtEndOfStream: boolean;
+}
+
+declare var WScript: {
+    /**
+     * Outputs text to either a message box (under WScript.exe) or the command console window followed by
+     * a newline (under CScript.exe).
+     */
+    Echo(s: any): void;
+
+    /**
+     * Exposes the write-only error output stream for the current script.
+     * Can be accessed only while using CScript.exe.
+     */
+    StdErr: TextStreamWriter;
+
+    /**
+     * Exposes the write-only output stream for the current script.
+     * Can be accessed only while using CScript.exe.
+     */
+    StdOut: TextStreamWriter;
+    Arguments: { length: number; Item(n: number): string; };
+
+    /**
+     *  The full path of the currently running script.
+     */
+    ScriptFullName: string;
+
+    /**
+     * Forces the script to stop immediately, with an optional exit code.
+     */
+    Quit(exitCode?: number): number;
+
+    /**
+     * The Windows Script Host build version number.
+     */
+    BuildVersion: number;
+
+    /**
+     * Fully qualified path of the host executable.
+     */
+    FullName: string;
+
+    /**
+     * Gets/sets the script mode - interactive(true) or batch(false).
+     */
+    Interactive: boolean;
+
+    /**
+     * The name of the host executable (WScript.exe or CScript.exe).
+     */
+    Name: string;
+
+    /**
+     * Path of the directory containing the host executable.
+     */
+    Path: string;
+
+    /**
+     * The filename of the currently running script.
+     */
+    ScriptName: string;
+
+    /**
+     * Exposes the read-only input stream for the current script.
+     * Can be accessed only while using CScript.exe.
+     */
+    StdIn: TextStreamReader;
+
+    /**
+     * Windows Script Host version
+     */
+    Version: string;
+
+    /**
+     * Connects a COM object's event sources to functions named with a given prefix, in the form prefix_event.
+     */
+    ConnectObject(objEventSource: any, strPrefix: string): void;
+
+    /**
+     * Creates a COM object.
+     * @param strProgiID
+     * @param strPrefix Function names in the form prefix_event will be bound to this object's COM events.
+     */
+    CreateObject(strProgID: string, strPrefix?: string): any;
+
+    /**
+     * Disconnects a COM object from its event sources.
+     */
+    DisconnectObject(obj: any): void;
+
+    /**
+     * Retrieves an existing object with the specified ProgID from memory, or creates a new one from a file.
+     * @param strPathname Fully qualified path to the file containing the object persisted to disk.
+     *                       For objects in memory, pass a zero-length string.
+     * @param strProgID
+     * @param strPrefix Function names in the form prefix_event will be bound to this object's COM events.
+     */
+    GetObject(strPathname: string, strProgID?: string, strPrefix?: string): any;
+
+    /**
+     * Suspends script execution for a specified length of time, then continues execution.
+     * @param intTime Interval (in milliseconds) to suspend script execution.
+     */
+    Sleep(intTime: number): void;
+};
+
+/**
+ * WSH is an alias for WScript under Windows Script Host
+ */
+declare var WSH: typeof WScript;
diff --git a/types/windows-script-host/package.json b/types/windows-script-host/package.json
new file mode 100644
index 0000000000..731af0072b
--- /dev/null
+++ b/types/windows-script-host/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "activex-interop": "*"
+    }
+}
\ No newline at end of file
diff --git a/types/windows-script-host/tsconfig.json b/types/windows-script-host/tsconfig.json
new file mode 100644
index 0000000000..d53dad8a20
--- /dev/null
+++ b/types/windows-script-host/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es5"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "windows-script-host-tests.ts"
+    ]
+}
diff --git a/types/windows-script-host/tslint.json b/types/windows-script-host/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/windows-script-host/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/windows-script-host/windows-script-host-tests.ts b/types/windows-script-host/windows-script-host-tests.ts
new file mode 100644
index 0000000000..7bd4e876b5
--- /dev/null
+++ b/types/windows-script-host/windows-script-host-tests.ts
@@ -0,0 +1 @@
+WScript.Echo(WScript.Arguments.length);

From 56986bfcb639dcc8144a50cb7717fb257a151ba6 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Thu, 10 May 2018 17:21:13 +0200
Subject: [PATCH 036/575] Add old jQuery type definition compatibility

---
 types/select2/index.d.ts       | 53 ++++++++++++++++++++++++++--------
 types/select2/select2-tests.ts |  7 +++++
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/types/select2/index.d.ts b/types/select2/index.d.ts
index 6a7d7c6aaf..e78ef74572 100644
--- a/types/select2/index.d.ts
+++ b/types/select2/index.d.ts
@@ -6,9 +6,36 @@
 // TypeScript Version: 2.3
 
 /// <reference types="jquery"/>
+/// <reference types="requirejs"/>
 
 export as namespace Select2;
 
+// --------------------------------------------------------------------------
+// For jQuery v1 and v2 backward compatibility
+// --------------------------------------------------------------------------
+
+export type Sub<O extends string, D extends string> =
+    {[K in O]: (Record<D, never> & Record<string, K>)[K]}[O];
+
+/**
+ * Same as jQuery v3 `JQuery.AjaxSettingsBase`.
+ */
+export type JQueryAjaxSettingsBase =
+    Pick<JQueryAjaxSettings, Sub<keyof JQueryAjaxSettings, "url">>;
+
+/**
+ * Same as jQuery v3 `JQuery.EventHandlerBase`.
+ */
+export type JQueryEventHandlerBase<TContext extends object, T> =
+    (this: TContext, t: T, ...args: any[]) => void | false;
+
+/**
+ * Same as jQuery v3 `JQuery.PlainObject`.
+ */
+export interface PlainObject<T = any> {
+    [key: string]: T;
+}
+
 // --------------------------------------------------------------------------
 // Some Interfaces
 // --------------------------------------------------------------------------
@@ -110,7 +137,7 @@ export interface Translation {
 
 export interface DataParams {
     data: OptionData; // TODO: must be data source
-    originalEvent: JQuery.Event;
+    originalEvent: BaseJQueryEventObject;
 }
 
 export interface IngParams {
@@ -118,7 +145,7 @@ export interface IngParams {
     prevented: boolean;
 }
 
-export interface Event<TElement, T> extends JQuery.Event<TElement, undefined> {
+export interface Event<TElement, T> extends BaseJQueryEventObject {
     params: T;
 }
 
@@ -133,10 +160,10 @@ export interface Trigger {
 // Ajax Option
 // --------------------------------------------------------------------------
 
-export interface AjaxOptions<Result = DataFormat | GroupedDataFormat, RemoteResult = any> extends JQuery.Ajax.AjaxSettingsBase<any> {
+export interface AjaxOptions<Result = DataFormat | GroupedDataFormat, RemoteResult = any> extends JQueryAjaxSettingsBase {
     delay?: number;
     url?: string | ((params: QueryOptions) => string);
-    data?: (params: QueryOptions) => JQuery.PlainObject;
+    data?: (params: QueryOptions) => PlainObject;
     transport?: (settings: JQueryAjaxSettings, success?: (data: RemoteResult) => undefined, failure?: () => undefined) => void;
     processResults?: (data: RemoteResult, params: QueryOptions) => ProcessedResult<Result>;
 }
@@ -195,6 +222,8 @@ export interface Options<Result = DataFormat | GroupedDataFormat, RemoteResult =
 // --------------------------------------------------------------------------
 
 export interface Select2Plugin<TElement extends Node = HTMLElement>  {
+    amd: { require: Require; };
+
     defaults: {
         set: (key: string, value: any) => void;
         reset: () => void;
@@ -230,13 +259,13 @@ declare global {
         trigger(events: Trigger): void;
 
         // TODO: events "change" and "change.select2"
-        on(events: "select2:closing", handler?: JQuery.EventHandlerBase<TElement, Event<TElement, IngParams>>): this;
-        on(events: "select2:close", handler?: JQuery.EventHandlerBase<TElement, Event<TElement, {}>>): this;
-        on(events: "select2:opening", handler?: JQuery.EventHandlerBase<TElement, Event<TElement, IngParams>>): this;
-        on(events: "select2:open", handler?: JQuery.EventHandlerBase<TElement, Event<TElement, {}>>): this;
-        on(events: "select2:selecting", handler?: JQuery.EventHandlerBase<TElement, Event<TElement, IngParams>>): this;
-        on(events: "select2:select", handler?: JQuery.EventHandlerBase<TElement, Event<TElement, DataParams>>): this;
-        on(events: "select2:unselecting", handler?: JQuery.EventHandlerBase<TElement, Event<TElement, IngParams>>): this;
-        on(events: "select2:unselect", handler?: JQuery.EventHandlerBase<TElement, Event<TElement, DataParams>>): this;
+        on(events: "select2:closing", handler?: JQueryEventHandlerBase<TElement, Event<TElement, IngParams>>): this;
+        on(events: "select2:close", handler?: JQueryEventHandlerBase<TElement, Event<TElement, {}>>): this;
+        on(events: "select2:opening", handler?: JQueryEventHandlerBase<TElement, Event<TElement, IngParams>>): this;
+        on(events: "select2:open", handler?: JQueryEventHandlerBase<TElement, Event<TElement, {}>>): this;
+        on(events: "select2:selecting", handler?: JQueryEventHandlerBase<TElement, Event<TElement, IngParams>>): this;
+        on(events: "select2:select", handler?: JQueryEventHandlerBase<TElement, Event<TElement, DataParams>>): this;
+        on(events: "select2:unselecting", handler?: JQueryEventHandlerBase<TElement, Event<TElement, IngParams>>): this;
+        on(events: "select2:unselect", handler?: JQueryEventHandlerBase<TElement, Event<TElement, DataParams>>): this;
     }
 }
diff --git a/types/select2/select2-tests.ts b/types/select2/select2-tests.ts
index 7da04a1be5..b3ce0d5896 100644
--- a/types/select2/select2-tests.ts
+++ b/types/select2/select2-tests.ts
@@ -733,6 +733,13 @@ $(".js-example-rtl").select2({
 // =====================================================
 // See: https://select2.org/advanced
 
+$.fn.select2.amd.require(
+    ["select2/utils", "select2/selection/single", "select2/selection/placeholder"],
+    (Utils: any, SingleSelection: any, Placeholder: any) => {
+        const CustomSelectionAdapter = Utils.Decorate(SingleSelection, Placeholder);
+    }
+);
+
 // TODO (Adapters)
 
 // =====================================================

From f5b66558be0dbb6f5b2292368627c61afbec7eb5 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Thu, 10 May 2018 17:32:57 +0200
Subject: [PATCH 037/575] Fix TS version

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

diff --git a/types/select2/index.d.ts b/types/select2/index.d.ts
index e78ef74572..a0c1ce3b1d 100644
--- a/types/select2/index.d.ts
+++ b/types/select2/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 //                 denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="jquery"/>
 /// <reference types="requirejs"/>

From 2341c608c142049274d331fff83bbe0ce878ab56 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Fri, 11 May 2018 02:58:34 +0200
Subject: [PATCH 038/575] Merge IWshRuntimeLibrary; -Object methods use
 ActiveXObjectNameMap

---
 types/activex-interop/index.d.ts      |   4 +-
 types/windows-script-host/index.d.ts  | 501 ++++++++++++++++++++++----
 types/windows-script-host/tslint.json |   7 +-
 3 files changed, 431 insertions(+), 81 deletions(-)

diff --git a/types/activex-interop/index.d.ts b/types/activex-interop/index.d.ts
index 5b2a0acc42..caa74fff38 100644
--- a/types/activex-interop/index.d.ts
+++ b/types/activex-interop/index.d.ts
@@ -96,9 +96,7 @@ interface VBArrayConstructor {
 
 declare var VBArray: VBArrayConstructor;
 
-/**
- * Automation date (VT_DATE)
- */
+/** Automation date (VT_DATE) */
 declare class VarDate {
     private constructor();
     private VarDate_typekey: VarDate;
diff --git a/types/windows-script-host/index.d.ts b/types/windows-script-host/index.d.ts
index 2130ecc805..b74ba7736c 100644
--- a/types/windows-script-host/index.d.ts
+++ b/types/windows-script-host/index.d.ts
@@ -2,93 +2,401 @@
 // Project: https://msdn.microsoft.com/en-us/library/9bbdkx3k.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-// tslint:disable-next-line interface-name
-interface ITextWriter {
-    Write(s: string): void;
-    WriteLine(s: string): void;
-    Close(): void;
-}
+/// <reference types="activex-interop" />
 
-interface TextStreamBase {
-    /**
-     * The column number of the current character position in an input stream.
-     */
-    Column: number;
+declare namespace IWshRuntimeLibrary {
+    type WindowStyle = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
+    type ShortcutWindowStyle = 1 | 3 | 7;
 
-    /**
-     * The current line number in an input stream.
-     */
-    Line: number;
+    const enum ButtonType {
+        OK,
+        OKCancel,
+        AbortRetryIgnore,
+        YesNoCancel,
+        YesNo,
+        RetryCancel,
+        CancelTryagainContinue
+    }
 
-    /**
-     * Closes a text stream.
-     * It is not necessary to close standard streams; they close automatically when the process ends. If
-     * you close a standard stream, be aware that any other pointers to that standard stream become invalid.
-     */
-    Close(): void;
-}
+    const enum EventType {
+        AuditFailure = 5,
+        AuditSuccess = 4,
+        Error = 1,
+        Information = 3,
+        Success = 0,
+        Warning = 2
+    }
 
-interface TextStreamWriter extends TextStreamBase {
-    /**
-     * Sends a string to an output stream.
-     */
-    Write(s: string): void;
+    const enum IconType {
+        Stop = 16,
+        QuestionMark = 32,
+        ExclamationMakr = 48,
+        InformationMark = 64,
+    }
 
-    /**
-     * Sends a specified number of blank lines (newline characters) to an output stream.
-     */
-    WriteBlankLines(intLines: number): void;
+    const enum PopupType {
+        SecondButtonDefault = 256,
+        ThirdButtonDefault = 512,
+        Modal = 4096,
+        RightJustified = 524288,
+        RTL = 1048576,
+    }
 
-    /**
-     * Sends a string followed by a newline character to an output stream.
-     */
-    WriteLine(s: string): void;
-}
+    const enum PopupSelection {
+        NoButton = -1,
+        OK = 1,
+        Cancel = 2,
+        Abort = 3,
+        Retry = 4,
+        Ignore = 5,
+        Yes = 6,
+        No = 7,
+        TryAgain = 10,
+        Continue = 11,
+    }
 
-interface TextStreamReader extends TextStreamBase {
-    /**
-     * Returns a specified number of characters from an input stream, starting at the current pointer position.
-     * Does not return until the ENTER key is pressed.
-     * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
-     */
-    Read(characters: number): string;
+    const enum WshExecStatus {
+        WshFailed = 2,
+        WshFinished = 1,
+        WshRunning = 0,
+    }
 
-    /**
-     * Returns all characters from an input stream.
-     * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
-     */
-    ReadAll(): string;
+    const enum WshWindowStyle {
+        WshHide = 0,
+        WshMaximizedFocus = 3,
+        WshMinimizedFocus = 2,
+        WshMinimizedNoFocus = 6,
+        WshNormalFocus = 1,
+        WshNormalNoFocus = 4,
+    }
 
-    /**
-     * Returns an entire line from an input stream.
-     * Although this method extracts the newline character, it does not add it to the returned string.
-     * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
-     */
-    ReadLine(): string;
+    class TextStreamBase {
+        /**
+         * The column number of the current character position in an input stream.
+         */
+        Column: number;
 
-    /**
-     * Skips a specified number of characters when reading from an input text stream.
-     * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
-     * @param characters Positive number of characters to skip forward. (Backward skipping is not supported.)
-     */
-    Skip(characters: number): void;
+        /**
+         * The current line number in an input stream.
+         */
+        Line: number;
 
-    /**
-     * Skips the next line when reading from an input text stream.
-     * Can only be used on a stream in reading mode, not writing or appending mode.
-     */
-    SkipLine(): void;
+        /**
+         * Closes a text stream.
+         * It is not necessary to close standard streams; they close automatically when the process ends. If
+         * you close a standard stream, be aware that any other pointers to that standard stream become invalid.
+         */
+        Close(): void;
+    }
 
-    /**
-     * Indicates whether the stream pointer position is at the end of a line.
-     */
-    AtEndOfLine: boolean;
+    class TextStreamWriter extends TextStreamBase {
+        private 'IWshRuntimeLibrary.TextStreamWriter_typekey': TextStreamWriter;
+        private constructor();
 
-    /**
-     * Indicates whether the stream pointer position is at the end of a stream.
-     */
-    AtEndOfStream: boolean;
+        /**
+         * Sends a string to an output stream.
+         */
+        Write(s: string): void;
+
+        /**
+         * Sends a specified number of blank lines (newline characters) to an output stream.
+         */
+        WriteBlankLines(intLines: number): void;
+
+        /**
+         * Sends a string followed by a newline character to an output stream.
+         */
+        WriteLine(s: string): void;
+    }
+
+    class TextStreamReader extends TextStreamBase {
+        private 'IWshRuntimeLibrary.TextStreamReader_typekey': TextStreamReader;
+        private constructor();
+
+        /**
+         * Returns a specified number of characters from an input stream, starting at the current pointer position.
+         * Does not return until the ENTER key is pressed.
+         * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
+         */
+        Read(characters: number): string;
+
+        /**
+         * Returns all characters from an input stream.
+         * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
+         */
+        ReadAll(): string;
+
+        /**
+         * Returns an entire line from an input stream.
+         * Although this method extracts the newline character, it does not add it to the returned string.
+         * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
+         */
+        ReadLine(): string;
+
+        /**
+         * Skips a specified number of characters when reading from an input text stream.
+         * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
+         * @param characters Positive number of characters to skip forward. (Backward skipping is not supported.)
+         */
+        Skip(characters: number): void;
+
+        /**
+         * Skips the next line when reading from an input text stream.
+         * Can only be used on a stream in reading mode, not writing or appending mode.
+         */
+        SkipLine(): void;
+
+        /**
+         * Indicates whether the stream pointer position is at the end of a line.
+         */
+        AtEndOfLine: boolean;
+
+        /**
+         * Indicates whether the stream pointer position is at the end of a stream.
+         */
+        AtEndOfStream: boolean;
+    }
+
+    /** Generic Collection Object */
+    interface WshCollection {
+        Count(): number;
+        Item(Index: any): any;
+        readonly length: number;
+        (Index: any): any;
+    }
+
+    /** Environment Variables Collection Object */
+    interface WshEnvironment {
+        Count(): number;
+        Item(Name: string): string;
+        readonly length: number;
+        Remove(Name: string): void;
+        (Name: string): string;
+    }
+
+    /** WSHExec object */
+    class WshExec {
+        private 'IWshRuntimeLibrary.WshExec_typekey': WshExec;
+        private constructor();
+        readonly ExitCode: number;
+        readonly ProcessID: number;
+        readonly Status: WshExecStatus;
+        readonly StdErr: TextStreamWriter;
+        readonly StdIn: TextStreamReader;
+        readonly StdOut: TextStreamWriter;
+        Terminate(): void;
+    }
+
+    /** Network Object */
+    class WshNetwork {
+        private 'IWshRuntimeLibrary.WshNetwork_typekey': WshNetwork;
+        private constructor();
+
+        /**
+         * Adds a remote MS-DOS-based printer connection to your computer system.
+         * @param LocalName Local name to assign to the connected printer.
+         * @param RemoteName Name of the remote printer.
+         * @param UpdateProfile [false] Whether the printer mapping is stored in the current user's profile.
+         *
+         * If you are mapping a remote printer using the profile of someone other than current user, you can specify _UserName_ and _Password_.
+         */
+        AddPrinterConnection(LocalName: string, RemoteName: string, UpdateProfile?: boolean, UserName?: string, Password?: string): void;
+
+        /**
+         * @param string Path to printer connection
+         * @param string [DriverName='']
+         * @param string [Port='LPT1']
+         *
+         * Unlike the **AddPrinterConnection** method, this method allows you to create a printer connection without directing it to a specific port, such as LPT1.
+         */
+        AddWindowsPrinterConnection(PrinterName: string, DriverName?: string, Port?: string): void;
+        readonly ComputerName: string;
+        EnumNetworkDrives(): WshCollection;
+        EnumPrinterConnections(): WshCollection;
+
+        /**
+         * Adds a remote MS-DOS-based printer connection to your computer system.
+         * @param LocalName Name by which the mapped drive will be known locally
+         * @param RemoteName Share's UNC name (\\xxx\yyy)
+         * @param UpdateProfile [false] Whether the printer mapping is stored in the current user's profile.
+         *
+         * If you are mapping a network drive using the profile of someone other than current user, you can specify _UserName_ and _Password_.
+         */
+        MapNetworkDrive(LocalName: string, RemoteName: string, UpdateProfile?: boolean, UserName?: string, Password?: string): void;
+        readonly Organization: string;
+
+        /**
+         * Removes a shared network drive from your computer system
+         * @param Name Name of the mapped drive you want to remove. This will be the drive letter if the drive has a mapping between a local name (drive letter) and a remote name (UNC name);
+         * it will be the UNC path if there is no such mapping
+         * @param Force [false] Remove the connections even if the resource is in use
+         * @param UpdateProfile [false] Remove the mapping from the user's profile
+         */
+        RemoveNetworkDrive(Name: string, Force?: boolean, UpdateProfile?: boolean): void;
+
+        /**
+         * Removes a shared network printer connection from your computer system
+         * @param Name Name that identifies the printer. Can be a UNC name (in the form `\\xxx\yyy`) or a local name (such as `LPT1`)
+         * @param Force [false] Remove printer connection even if a user is still connected
+         * @param UpdateProfile [false] Remove the printer connection from the user's profile
+         *
+         * The **RemovePrinterConnection** method removes both Windows and MS-DOS based printer connections. If the printer was connected using the method **AddPrinterConnection**,
+         * _Name_ must be the printer's local name. If the printer was connected using the **AddWindowsPrinterConnection** method or was added manually (using the Add Printer wizard),
+         * then _Name_ must be the printer's UNC name.
+         */
+        RemovePrinterConnection(Name: string, Force?: true, UpdateProfile?: true): void;
+        SetDefaultPrinter(Name: string): void;
+        readonly Site: string;
+        readonly UserDomain: string;
+        readonly UserName: string;
+        readonly UserProfile: string;
+    }
+
+    /** Shell Object */
+    class WshShell {
+        private 'IWshRuntimeLibrary.WshShell_typekey': WshShell;
+        private constructor();
+
+        /**
+         * Activates an application window
+         * @param App Title of application as it appears in the title bar, or the process ID
+         * @param Wait
+         *
+         * This method changes the focus to the named application or window. The window must be attached to the calling thread's message queue. It does not affect whether it is maximized or
+         * minimized. Focus moves from the activated application window when the user takes action to change the focus (or closes the window).
+         *
+         * In determining which application to activate, the specified title is compared to the title string of each running application. If no exact match exists, any application whose title
+         * string begins with title is activated. If an application still cannot be found, any application whose title string ends with title is activated. If more than one instance of the
+         * application named by title exists, one instance is arbitrarily activated.
+         *
+         * The method might return `false` under the following conditions:
+         *
+         * * The window is not brought to the foreground.
+         * * The window is brought to the foreground but is not given keyboard focus.
+         * * A Command Prompt window (`cmd.exe`) is brought to the foreground and is given keyboard focus.
+         */
+        AppActivate(App: string | number, Wait?: any): boolean;
+
+        /**
+         * Creates a shortcut
+         * @param PathLink Path where the shortcut should be created
+         *
+         * The shortcut object exists in memory until you save it to disk with the **Save** method.
+         */
+        CreateShortcut(PathLink: string): WshShortcut | WshURLShortcut;
+        CurrentDirectory: string;
+
+        /**
+         * Note that **Environment** doesn't actually return a callable object; the call is only usable in the context of the **Environment** property. The following:
+         *
+         *     let env = new ActiveXObject('WScript.Shell').Environment;
+         *     WScript.Echo(env('System'));
+         *
+         * will return an empty string, unless there is an environment variable named `System`
+         */
+        Environment: WshEnvironment & ((Type: 'System' | 'User' | 'Process' | 'Volatile') => WshEnvironment);
+        Exec(Command: string): WshExec;
+        ExpandEnvironmentStrings(Src: string): string;
+
+        /** @param string [Target=''] Name of the computer system where the event should be logged; default is the local computer system */
+        LogEvent(Type: EventType, Message: string, Target?: string): boolean;
+        Popup(Text: string, SecondsToWait?: number, Title?: string, Type?: ButtonType | IconType | PopupType): PopupSelection;
+        RegDelete(Name: string): void;
+
+        /**
+         * Returns the value of a key or value-name from the registry
+         * @param Name Key (ends with a final `\`) or value-name (doesn't end with a final `\`)
+         *
+         * Returns one of the following, based on the registry value type:
+         *
+         * * **REG_SZ** -- a string
+         * * **REG_DWORD** -- a number
+         * * **REG_SBINARY** -- a binary value, as a COM SafeArray containing integers
+         * * **REG_EXPAND_SZ** -- an expandable string
+         * * **REG_MULTI_SZ** -- an array of srings, as a COM SafeArray
+         */
+        RegRead(Name: string): string | number | SafeArray<string> | SafeArray<number>;
+
+        /**
+         * Creates a new key, adds another value-name to an existing key and assigns it a value, or changes the value of an existing value-name
+         * @param Name Key (ends with a final `\`) or value-name (doesn't end with a final `\`)
+         * @param Value Will be coerced to `string` or `integer` based on the value-name type:
+         * `REG_SZ | REG_EXPAND_SZ` will be converted to `string`;
+         * `REG_DWORD | REG_BINARY` will be converted to `integer`
+         * @param Type
+         */
+        RegWrite(Name: string, Value: any, Type?: 'REG_SZ' | 'REG_DWORD' | 'REG_BINARY' | 'REG_EXPAND_SZ'): void;
+
+        /**
+         * Runs a program in a new process.
+         * @param Command Command-line, including any parameters you want to pass to the executable file.
+         * @param WindowStyle Appearance of the program window. Not all programs make use of this information.
+         * @param WaitOnReturn Block script until program finishes executing.
+         *
+         * If `false` is passed into **WaitOnReturn**, the **Run** method will return 0 immediately. If `true` is passed in, **Run** will return the program's error code, if any.
+         *
+         * Environment variables will be expanded within the command line.
+         *
+         * Passing a registered file type will automatically open the program registered to the file type.
+         *
+         * Possible values for **WindowStyle**:
+         *
+         * * **0** -- Hides the window and activates another window.
+         * * **1** -- Activates and displays a window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag
+         * when displaying the window for the first time.
+         * * **2** -- Activates the window and displays it as a minimized window.
+         * * **3** -- Activates the window and displays it as a maximized window.
+         * * **4** -- Displays a window in its most recent size and position. The active window remains active.
+         * * **5** -- Activates the window and displays it in its current size and position.
+         * * **6** -- Minimizes the specified window and activates the next top-level window in the Z order.
+         * * **7** -- Displays the window as a minimized window. The active window remains active.
+         * * **8** -- Displays the window in its current state. The active window remains active.
+         * * **9** -- Activates and displays the window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag
+         * when restoring a minimized window.
+         * * **10** -- Sets the show-state based on the state of the program that started the application.
+         */
+        Run(Command: string, WindowStyle?: WindowStyle, WaitOnReturn?: boolean): number;
+        SendKeys(Keys: string, Wait?: boolean): void;
+        readonly SpecialFolders: WshCollection;
+    }
+
+    /** Shortcut Object */
+    class WshShortcut {
+        private 'IWshRuntimeLibrary.WshShortcut_typekey': WshShortcut;
+        private constructor();
+        Arguments: string;
+        Description: string;
+        readonly FullName: string;
+        Hotkey: string;
+        IconLocation: string;
+        Load(PathLink: string): void;
+        readonly RelativePath: string;
+        Save(): void;
+        TargetPath: string;
+
+        /**
+         * Possible values:
+         *
+         * * **1** -- Activates and displays a window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag
+         * when displaying the window for the first time.
+         * * **3** -- Activates the window and displays it as a maximized window.
+         * * **7** -- Displays the window as a minimized window. The active window remains active.
+         */
+        WindowStyle: ShortcutWindowStyle;
+        WorkingDirectory: string;
+    }
+
+    /** URLShortcut Object */
+    class WshURLShortcut {
+        private 'IWshRuntimeLibrary.WshURLShortcut_typekey': WshURLShortcut;
+        private constructor();
+        readonly FullName: string;
+        Load(PathLink: string): void;
+        Save(): void;
+        TargetPath: string;
+    }
 }
 
 declare var WScript: {
@@ -102,13 +410,13 @@ declare var WScript: {
      * Exposes the write-only error output stream for the current script.
      * Can be accessed only while using CScript.exe.
      */
-    StdErr: TextStreamWriter;
+    StdErr: IWshRuntimeLibrary.TextStreamWriter;
 
     /**
      * Exposes the write-only output stream for the current script.
      * Can be accessed only while using CScript.exe.
      */
-    StdOut: TextStreamWriter;
+    StdOut: IWshRuntimeLibrary.TextStreamWriter;
     Arguments: { length: number; Item(n: number): string; };
 
     /**
@@ -155,7 +463,7 @@ declare var WScript: {
      * Exposes the read-only input stream for the current script.
      * Can be accessed only while using CScript.exe.
      */
-    StdIn: TextStreamReader;
+    StdIn: IWshRuntimeLibrary.TextStreamReader;
 
     /**
      * Windows Script Host version
@@ -172,7 +480,7 @@ declare var WScript: {
      * @param strProgiID
      * @param strPrefix Function names in the form prefix_event will be bound to this object's COM events.
      */
-    CreateObject(strProgID: string, strPrefix?: string): any;
+    CreateObject<K extends keyof ActiveXObjectNameMap = any>(strProgID: K, strPrefix?: string): ActiveXObjectNameMap[K];
 
     /**
      * Disconnects a COM object from its event sources.
@@ -186,6 +494,7 @@ declare var WScript: {
      * @param strProgID
      * @param strPrefix Function names in the form prefix_event will be bound to this object's COM events.
      */
+    GetObject<K extends keyof ActiveXObjectNameMap>(strPathname: string, strProgID: K, strPrefix?: string): ActiveXObjectNameMap[K];
     GetObject(strPathname: string, strProgID?: string, strPrefix?: string): any;
 
     /**
@@ -199,3 +508,41 @@ declare var WScript: {
  * WSH is an alias for WScript under Windows Script Host
  */
 declare var WSH: typeof WScript;
+
+declare namespace WSHControllerLibrary {
+    class WSHController {
+        private 'WSHControllerLibrary.WSHController_typekey': WSHController;
+        private constructor();
+        CreateScript(Command: string, Server?: any): any;
+    }
+}
+
+declare namespace ScriptSigner {
+    class Signer {
+        private 'ScriptSigner.Signer_typekey': Signer;
+        private constructor();
+
+        /** @param Store [Store='my'] */
+        Sign(FileExtension: string, Text: string, Certificate: string, Store?: string): string;
+
+        /** @param Store [Store='my'] */
+        SignFile(FileName: string, Certificate: string, Store?: string): void;
+
+        /** @param ShowUI [ShowUI=false] */
+        Verify(FileExtension: string, Text: string, ShowUI?: boolean): boolean;
+
+        /** @param ShowUI [ShowUI=false] */
+        VerifyFile(FileName: string, ShowUI?: boolean): boolean;
+    }
+}
+
+interface ActiveXObjectNameMap {
+    'WSHController': WSHControllerLibrary.WSHController;
+    'Scripting.Signer': ScriptSigner.Signer;
+    'WScript.Network': IWshRuntimeLibrary.WshNetwork;
+    'WScript.Shell': IWshRuntimeLibrary.WshShell;
+}
+
+interface ActiveXObject {
+    set(obj: IWshRuntimeLibrary.WshEnvironment, propertyName: 'Item', parameterTypes: [string], newValue: string): void;
+}
diff --git a/types/windows-script-host/tslint.json b/types/windows-script-host/tslint.json
index 3db14f85ea..ed91c31f9c 100644
--- a/types/windows-script-host/tslint.json
+++ b/types/windows-script-host/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-const-enum": false
+    }
+}
\ No newline at end of file

From 4eacdfac29c3c1fc59e15aa279d3d491147bdf7f Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Fri, 11 May 2018 04:02:23 +0200
Subject: [PATCH 039/575] WshNamed, WshUnnamed and default properties

---
 types/windows-script-host/index.d.ts          | 42 ++++++++++++++++++-
 .../windows-script-host-tests.ts              | 31 +++++++++++++-
 2 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/types/windows-script-host/index.d.ts b/types/windows-script-host/index.d.ts
index b74ba7736c..d348f3d20d 100644
--- a/types/windows-script-host/index.d.ts
+++ b/types/windows-script-host/index.d.ts
@@ -159,6 +159,23 @@ declare namespace IWshRuntimeLibrary {
         AtEndOfStream: boolean;
     }
 
+    /** Provides access to the entire collection of command-line parameters, in the order in which they were originally entered. */
+    interface WshArguments {
+        Count(): number;
+        Item(index: number): string;
+        Length: number;
+        Named: WshNamed;
+
+        /**
+         * When you run the **ShowUsage** method, a help screen (referred to as the usage) appears and displays details about the script's command line options.
+         * This information comes from the runtime section of the `*.WSF` file. Everything written between the `<runtime>` and `</runtime>` tags is pieced together
+         * to produce what is called a "usage statement." The usage statement tells the user how to use the script.
+         */
+        ShowUsage(): void;
+        Unnamed: WshUnnamed;
+        (index: number): string;
+    }
+
     /** Generic Collection Object */
     interface WshCollection {
         Count(): number;
@@ -171,7 +188,7 @@ declare namespace IWshRuntimeLibrary {
     interface WshEnvironment {
         Count(): number;
         Item(Name: string): string;
-        readonly length: number;
+        readonly Length: number;
         Remove(Name: string): void;
         (Name: string): string;
     }
@@ -189,6 +206,19 @@ declare namespace IWshRuntimeLibrary {
         Terminate(): void;
     }
 
+    /**
+     * Provides access to the named command-line arguments
+     *
+     * Note that enumerating over this object returns the **names** of the arguments, not the values
+     */
+    interface WshNamed {
+        Count(): number;
+        Exists(Key: string): boolean;
+        Item(name: string): string;
+        Length: number;
+        (name: string): string;
+    }
+
     /** Network Object */
     class WshNetwork {
         private 'IWshRuntimeLibrary.WshNetwork_typekey': WshNetwork;
@@ -388,6 +418,14 @@ declare namespace IWshRuntimeLibrary {
         WorkingDirectory: string;
     }
 
+    /** Provides access to the unnamed command-line arguments */
+    interface WshUnnamed {
+        Count(): number;
+        Item(index: number): string;
+        Length: number;
+        (index: number): string;
+    }
+
     /** URLShortcut Object */
     class WshURLShortcut {
         private 'IWshRuntimeLibrary.WshURLShortcut_typekey': WshURLShortcut;
@@ -417,7 +455,7 @@ declare var WScript: {
      * Can be accessed only while using CScript.exe.
      */
     StdOut: IWshRuntimeLibrary.TextStreamWriter;
-    Arguments: { length: number; Item(n: number): string; };
+    Arguments: IWshRuntimeLibrary.WshArguments;
 
     /**
      *  The full path of the currently running script.
diff --git a/types/windows-script-host/windows-script-host-tests.ts b/types/windows-script-host/windows-script-host-tests.ts
index 7bd4e876b5..d4851f2626 100644
--- a/types/windows-script-host/windows-script-host-tests.ts
+++ b/types/windows-script-host/windows-script-host-tests.ts
@@ -1 +1,30 @@
-WScript.Echo(WScript.Arguments.length);
+const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
+    const results: T[] = [];
+    const enumerator = new Enumerator<T>(col);
+    enumerator.moveFirst();
+    while (!enumerator.atEnd()) {
+        results.push(enumerator.item());
+        enumerator.moveNext();
+    }
+    return results;
+};
+
+// Show all of the arguments.
+WScript.Echo(`${WScript.Arguments.Length} arguments`);
+
+for (const arg of collectionToArray(WScript.Arguments)) {
+    WScript.Echo(`    ${arg}`);
+}
+
+// Show the unnamed arguments.
+WScript.Echo(`${WScript.Arguments.Unnamed.Length} unnamed arguments`);
+
+for (const unnamed of collectionToArray(WScript.Arguments.Unnamed)) {
+    WScript.Echo(`    ${unnamed}`);
+}
+
+// Show the named arguments.
+WScript.Echo(`${WScript.Arguments.Named.Length} named arguments`);
+for (const key of collectionToArray(WScript.Arguments.Named)) {
+    WScript.Echo(`    ${key}=${WScript.Arguments.Named(key)}`);
+}

From 54d571dec83a159d56da5849794343404d7fa786 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Fri, 11 May 2018 04:06:05 +0200
Subject: [PATCH 040/575] Merge activex-iwshruntimelibrary into
 windows-script-host

---
 .../activex-iwshruntimelibrary-tests.ts       |  49 ---
 types/activex-iwshruntimelibrary/index.d.ts   | 348 ------------------
 types/activex-iwshruntimelibrary/package.json |   6 -
 .../activex-iwshruntimelibrary/tsconfig.json  |  24 --
 types/activex-iwshruntimelibrary/tslint.json  |   3 -
 .../windows-script-host-tests.ts              |  50 +++
 6 files changed, 50 insertions(+), 430 deletions(-)
 delete mode 100644 types/activex-iwshruntimelibrary/activex-iwshruntimelibrary-tests.ts
 delete mode 100644 types/activex-iwshruntimelibrary/index.d.ts
 delete mode 100644 types/activex-iwshruntimelibrary/package.json
 delete mode 100644 types/activex-iwshruntimelibrary/tsconfig.json
 delete mode 100644 types/activex-iwshruntimelibrary/tslint.json

diff --git a/types/activex-iwshruntimelibrary/activex-iwshruntimelibrary-tests.ts b/types/activex-iwshruntimelibrary/activex-iwshruntimelibrary-tests.ts
deleted file mode 100644
index 14a90f9a8a..0000000000
--- a/types/activex-iwshruntimelibrary/activex-iwshruntimelibrary-tests.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-const wshn = new ActiveXObject('WScript.Network');
-
-// https://msdn.microsoft.com/en-us/library/s6wt333f(v=vs.84).aspx
-// https://msdn.microsoft.com/en-us/library/wck0hkd7(v=vs.84).aspx
-// https://msdn.microsoft.com/en-us/library/tte130y1(v=vs.84).aspx
-// https://msdn.microsoft.com/en-us/library/3fxhka75(v=vs.84).aspx
-{
-    WScript.Echo('Domain = ' + wshn.UserDomain);
-    WScript.Echo('Computer Name = ' + wshn.ComputerName);
-    WScript.Echo('User Name = ' + wshn.UserName);
-}
-
-// https://msdn.microsoft.com/en-us/library/zsdh7hkb(v=vs.84).aspx
-wshn.AddWindowsPrinterConnection('\\\\printserv\\DefaultPrinter');
-
-// https://msdn.microsoft.com/en-us/library/kxsdca3c(v=vs.84).aspx
-wshn.AddPrinterConnection("LPT1", "\\\\Server\\Print1");
-
-// https://msdn.microsoft.com/en-us/library/t9zt39at(v=vs.84).aspx
-// https://msdn.microsoft.com/en-us/library/zhds6k80(v=vs.84).aspx
-{
-    const drives = wshn.EnumNetworkDrives();
-    const printers = wshn.EnumPrinterConnections();
-    WScript.Echo("Network drive mappings:");
-    for (let i = 0; i < drives.length; i += 2) {
-        WScript.Echo(`Drive ${drives.Item(i)} = ${drives.Item(i + 1)}`);
-    }
-    WScript.Echo('');
-    WScript.Echo("Network printer mappings:");
-    for (let i = 0; i < printers.length; i += 2) {
-        WScript.Echo(`Port ${printers.Item(i)} = ${printers.Item(i + 1)}`);
-    }
-}
-
-// https://msdn.microsoft.com/en-us/library/8kst88h6(v=vs.84).aspx
-wshn.MapNetworkDrive('E:', '\\\\Server\\Public');
-
-// https://msdn.microsoft.com/en-us/library/d16d7wbf(v=vs.84).aspx
-wshn.RemoveNetworkDrive('E:');
-
-// https://msdn.microsoft.com/en-us/library/tsbh2yy7(v=vs.84).aspx
-wshn.RemovePrinterConnection('\\\\PRN-CORP1\\B41-4523-A', true, true);
-
-// https://msdn.microsoft.com/en-us/library/2ccwwdct(v=vs.84).aspx
-{
-    const printerPath = "\\\\research\\library1";
-    wshn.AddWindowsPrinterConnection(printerPath);
-    wshn.SetDefaultPrinter(printerPath);
-}
diff --git a/types/activex-iwshruntimelibrary/index.d.ts b/types/activex-iwshruntimelibrary/index.d.ts
deleted file mode 100644
index d5b052eaae..0000000000
--- a/types/activex-iwshruntimelibrary/index.d.ts
+++ /dev/null
@@ -1,348 +0,0 @@
-// Type definitions for Windows Script Host Object Model - IWshRuntimeLibrary 1.0
-// Project: https://msdn.microsoft.com/en-us/library/9bbdkx3k(v=vs.84).aspx
-// Definitions by: Zev Spitz <https://github.com/zspitz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
-
-declare namespace IWshRuntimeLibrary {
-    type WindowStyle = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
-    type ShortcutWindowStyle = 1 | 3 | 7;
-
-    // tslint:disable-next-line no-const-enum
-    const enum ButtonType {
-        OK,
-        OKCancel,
-        AbortRetryIgnore,
-        YesNoCancel,
-        YesNo,
-        RetryCancel,
-        CancelTryagainContinue
-    }
-
-    // tslint:disable-next-line no-const-enum
-    const enum EventType {
-        AuditFailure = 5,
-        AuditSuccess = 4,
-        Error = 1,
-        Information = 3,
-        Success = 0,
-        Warning = 2
-    }
-
-    // tslint:disable-next-line no-const-enum
-    const enum IconType {
-        Stop = 16,
-        QuestionMark = 32,
-        ExclamationMakr = 48,
-        InformationMark = 64,
-    }
-
-    // tslint:disable-next-line no-const-enum
-    const enum PopupType {
-        SecondButtonDefault = 256,
-        ThirdButtonDefault = 512,
-        Modal = 4096,
-        RightJustified = 524288,
-        RTL = 1048576,
-    }
-
-    // tslint:disable-next-line no-const-enum
-    const enum PopupSelection {
-        NoButton = -1,
-        OK = 1,
-        Cancel = 2,
-        Abort = 3,
-        Retry = 4,
-        Ignore = 5,
-        Yes = 6,
-        No = 7,
-        TryAgain = 10,
-        Continue = 11,
-    }
-
-    // tslint:disable-next-line no-const-enum
-    const enum WshExecStatus {
-        WshFailed = 2,
-        WshFinished = 1,
-        WshRunning = 0,
-    }
-
-    // tslint:disable-next-line no-const-enum
-    const enum WshWindowStyle {
-        WshHide = 0,
-        WshMaximizedFocus = 3,
-        WshMinimizedFocus = 2,
-        WshMinimizedNoFocus = 6,
-        WshNormalFocus = 1,
-        WshNormalNoFocus = 4,
-    }
-
-    class TextStream {
-        private 'IWshRuntimeLibrary.TextStream_typekey': TextStream;
-        private constructor();
-        readonly AtEndOfLine: boolean;
-        readonly AtEndOfStream: boolean;
-        Close(): void;
-        readonly Column: number;
-        readonly Line: number;
-        Read(Characters: number): string;
-        ReadAll(): string;
-        ReadLine(): string;
-        Skip(Characters: number): void;
-        SkipLine(): void;
-        Write(Text: string): void;
-        WriteBlankLines(Lines: number): void;
-
-        /** @param string [Text=''] */
-        WriteLine(Text?: string): void;
-    }
-
-    /** Generic Collection Object */
-    interface WshCollection {
-        Count(): number;
-        Item(Index: any): any;
-        readonly length: number;
-        (Index: any): any;
-    }
-
-    /** Environment Variables Collection Object */
-    interface WshEnvironment {
-        Count(): number;
-        Item(Name: string): string;
-        readonly length: number;
-        Remove(Name: string): void;
-        (Name: string): string;
-    }
-
-    /** WSHExec object */
-    class WshExec {
-        private 'IWshRuntimeLibrary.WshExec_typekey': WshExec;
-        private constructor();
-        readonly ExitCode: number;
-        readonly ProcessID: number;
-        readonly Status: WshExecStatus;
-        readonly StdErr: TextStream;
-        readonly StdIn: TextStream;
-        readonly StdOut: TextStream;
-        Terminate(): void;
-    }
-
-    /** Network Object */
-    class WshNetwork {
-        private 'IWshRuntimeLibrary.WshNetwork_typekey': WshNetwork;
-        private constructor();
-
-        /**
-         * Adds a remote MS-DOS-based printer connection to your computer system.
-         * @param LocalName Local name to assign to the connected printer.
-         * @param RemoteName Name of the remote printer.
-         * @param UpdateProfile [false] Whether the printer mapping is stored in the current user's profile.
-         *
-         * If you are mapping a remote printer using the profile of someone other than current user, you can specify _UserName_ and _Password_.
-         */
-        AddPrinterConnection(LocalName: string, RemoteName: string, UpdateProfile?: boolean, UserName?: string, Password?: string): void;
-
-        /**
-         * @param string Path to printer connection
-         * @param string [DriverName='']
-         * @param string [Port='LPT1']
-         *
-         * Unlike the **AddPrinterConnection** method, this method allows you to create a printer connection without directing it to a specific port, such as LPT1.
-         */
-        AddWindowsPrinterConnection(PrinterName: string, DriverName?: string, Port?: string): void;
-        readonly ComputerName: string;
-        EnumNetworkDrives(): WshCollection;
-        EnumPrinterConnections(): WshCollection;
-
-        /**
-         * Adds a remote MS-DOS-based printer connection to your computer system.
-         * @param LocalName Name by which the mapped drive will be known locally
-         * @param RemoteName Share's UNC name (\\xxx\yyy)
-         * @param UpdateProfile [false] Whether the printer mapping is stored in the current user's profile.
-         *
-         * If you are mapping a network drive using the profile of someone other than current user, you can specify _UserName_ and _Password_.
-         */
-        MapNetworkDrive(LocalName: string, RemoteName: string, UpdateProfile?: boolean, UserName?: string, Password?: string): void;
-        readonly Organization: string;
-
-        /**
-         * Removes a shared network drive from your computer system
-         * @param Name Name of the mapped drive you want to remove. This will be the drive letter if the drive has a mapping between a local name (drive letter) and a remote name (UNC name);
-         * it will be the UNC path if there is no such mapping
-         * @param Force [false] Remove the connections even if the resource is in use
-         * @param UpdateProfile [false] Remove the mapping from the user's profile
-         */
-        RemoveNetworkDrive(Name: string, Force?: boolean, UpdateProfile?: boolean): void;
-
-        /**
-         * Removes a shared network printer connection from your computer system
-         * @param Name Name that identifies the printer. Can be a UNC name (in the form `\\xxx\yyy`) or a local name (such as `LPT1`)
-         * @param Force [false] Remove printer connection even if a user is still connected
-         * @param UpdateProfile [false] Remove the printer connection from the user's profile
-         *
-         * The **RemovePrinterConnection** method removes both Windows and MS-DOS based printer connections. If the printer was connected using the method **AddPrinterConnection**,
-         * _Name_ must be the printer's local name. If the printer was connected using the **AddWindowsPrinterConnection** method or was added manually (using the Add Printer wizard),
-         * then _Name_ must be the printer's UNC name.
-         */
-        RemovePrinterConnection(Name: string, Force?: true, UpdateProfile?: true): void;
-        SetDefaultPrinter(Name: string): void;
-        readonly Site: string;
-        readonly UserDomain: string;
-        readonly UserName: string;
-        readonly UserProfile: string;
-    }
-
-    /** Shell Object */
-    class WshShell {
-        private 'IWshRuntimeLibrary.WshShell_typekey': WshShell;
-        private constructor();
-
-        /**
-         * Activates an application window
-         * @param App Title of application as it appears in the title bar, or the process ID
-         * @param Wait
-         *
-         * This method changes the focus to the named application or window. The window must be attached to the calling thread's message queue. It does not affect whether it is maximized or
-         * minimized. Focus moves from the activated application window when the user takes action to change the focus (or closes the window).
-         *
-         * In determining which application to activate, the specified title is compared to the title string of each running application. If no exact match exists, any application whose title
-         * string begins with title is activated. If an application still cannot be found, any application whose title string ends with title is activated. If more than one instance of the
-         * application named by title exists, one instance is arbitrarily activated.
-         *
-         * The method might return `false` under the following conditions:
-         *
-         * * The window is not brought to the foreground.
-         * * The window is brought to the foreground but is not given keyboard focus.
-         * * A Command Prompt window (`cmd.exe`) is brought to the foreground and is given keyboard focus.
-         */
-        AppActivate(App: string | number, Wait?: any): boolean;
-
-        /**
-         * Creates a shortcut
-         * @param PathLink Path where the shortcut should be created
-         *
-         * The shortcut object exists in memory until you save it to disk with the **Save** method.
-         */
-        CreateShortcut(PathLink: string): WshShortcut | WshURLShortcut;
-        CurrentDirectory: string;
-
-        /**
-         * Note that **Environment** doesn't actually return a callable object; the call is only usable in the context of the **Environment** property. The following:
-         *
-         *     let env = new ActiveXObject('WScript.Shell').Environment;
-         *     WScript.Echo(env('System'));
-         *
-         * will return an empty string, unless there is an environment variable named `System`
-         */
-        Environment: WshEnvironment & ((Type: 'System' | 'User' | 'Process' | 'Volatile') => WshEnvironment);
-        Exec(Command: string): WshExec;
-        ExpandEnvironmentStrings(Src: string): string;
-
-        /** @param string [Target=''] Name of the computer system where the event should be logged; default is the local computer system */
-        LogEvent(Type: EventType, Message: string, Target?: string): boolean;
-        Popup(Text: string, SecondsToWait?: number, Title?: string, Type?: ButtonType | IconType | PopupType): PopupSelection;
-        RegDelete(Name: string): void;
-
-        /**
-         * Returns the value of a key or value-name from the registry
-         * @param Name Key (ends with a final `\`) or value-name (doesn't end with a final `\`)
-         *
-         * Returns one of the following, based on the registry value type:
-         *
-         * * **REG_SZ** -- a string
-         * * **REG_DWORD** -- a number
-         * * **REG_SBINARY** -- a binary value, as a COM SafeArray containing integers
-         * * **REG_EXPAND_SZ** -- an expandable string
-         * * **REG_MULTI_SZ** -- an array of srings, as a COM SafeArray
-         */
-        RegRead(Name: string): string | number | SafeArray<string> | SafeArray<number>;
-
-        /**
-         * Creates a new key, adds another value-name to an existing key and assigns it a value, or changes the value of an existing value-name
-         * @param Name Key (ends with a final `\`) or value-name (doesn't end with a final `\`)
-         * @param Value Will be coerced to `string` or `integer` based on the value-name type:
-         * `REG_SZ | REG_EXPAND_SZ` will be converted to `string`;
-         * `REG_DWORD | REG_BINARY` will be converted to `integer`
-         * @param Type
-         */
-        RegWrite(Name: string, Value: any, Type?: 'REG_SZ' | 'REG_DWORD' | 'REG_BINARY' | 'REG_EXPAND_SZ'): void;
-
-        /**
-         * Runs a program in a new process.
-         * @param Command Command-line, including any parameters you want to pass to the executable file.
-         * @param WindowStyle Appearance of the program window. Not all programs make use of this information.
-         * @param WaitOnReturn Block script until program finishes executing.
-         *
-         * If `false` is passed into **WaitOnReturn**, the **Run** method will return 0 immediately. If `true` is passed in, **Run** will return the program's error code, if any.
-         *
-         * Environment variables will be expanded within the command line.
-         *
-         * Passing a registered file type will automatically open the program registered to the file type.
-         *
-         * Possible values for **WindowStyle**:
-         *
-         * * **0** -- Hides the window and activates another window.
-         * * **1** -- Activates and displays a window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag
-         * when displaying the window for the first time.
-         * * **2** -- Activates the window and displays it as a minimized window.
-         * * **3** -- Activates the window and displays it as a maximized window.
-         * * **4** -- Displays a window in its most recent size and position. The active window remains active.
-         * * **5** -- Activates the window and displays it in its current size and position.
-         * * **6** -- Minimizes the specified window and activates the next top-level window in the Z order.
-         * * **7** -- Displays the window as a minimized window. The active window remains active.
-         * * **8** -- Displays the window in its current state. The active window remains active.
-         * * **9** -- Activates and displays the window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag
-         * when restoring a minimized window.
-         * * **10** -- Sets the show-state based on the state of the program that started the application.
-         */
-        Run(Command: string, WindowStyle?: WindowStyle, WaitOnReturn?: boolean): number;
-        SendKeys(Keys: string, Wait?: boolean): void;
-        readonly SpecialFolders: WshCollection;
-    }
-
-    /** Shortcut Object */
-    class WshShortcut {
-        private 'IWshRuntimeLibrary.WshShortcut_typekey': WshShortcut;
-        private constructor();
-        Arguments: string;
-        Description: string;
-        readonly FullName: string;
-        Hotkey: string;
-        IconLocation: string;
-        Load(PathLink: string): void;
-        readonly RelativePath: string;
-        Save(): void;
-        TargetPath: string;
-
-        /**
-         * Possible values:
-         *
-         * * **1** -- Activates and displays a window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag
-         * when displaying the window for the first time.
-         * * **3** -- Activates the window and displays it as a maximized window.
-         * * **7** -- Displays the window as a minimized window. The active window remains active.
-         */
-        WindowStyle: ShortcutWindowStyle;
-        WorkingDirectory: string;
-    }
-
-    /** URLShortcut Object */
-    class WshURLShortcut {
-        private 'IWshRuntimeLibrary.WshURLShortcut_typekey': WshURLShortcut;
-        private constructor();
-        readonly FullName: string;
-        Load(PathLink: string): void;
-        Save(): void;
-        TargetPath: string;
-    }
-}
-
-interface ActiveXObject {
-    set(obj: IWshRuntimeLibrary.WshEnvironment, propertyName: 'Item', parameterTypes: [string], newValue: string): void;
-    new <K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
-}
-
-interface ActiveXObjectNameMap {
-    'WScript.Network': IWshRuntimeLibrary.WshNetwork;
-    'WScript.Shell': IWshRuntimeLibrary.WshShell;
-}
diff --git a/types/activex-iwshruntimelibrary/package.json b/types/activex-iwshruntimelibrary/package.json
deleted file mode 100644
index d9b1031263..0000000000
--- a/types/activex-iwshruntimelibrary/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "activex-helpers": "*"
-    }
-}
\ No newline at end of file
diff --git a/types/activex-iwshruntimelibrary/tsconfig.json b/types/activex-iwshruntimelibrary/tsconfig.json
deleted file mode 100644
index 1fa5abc39b..0000000000
--- a/types/activex-iwshruntimelibrary/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es5",
-            "scripthost"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "activex-iwshruntimelibrary-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/activex-iwshruntimelibrary/tslint.json b/types/activex-iwshruntimelibrary/tslint.json
deleted file mode 100644
index e60c15844f..0000000000
--- a/types/activex-iwshruntimelibrary/tslint.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "extends": "dtslint/dt.json"
-}
\ No newline at end of file
diff --git a/types/windows-script-host/windows-script-host-tests.ts b/types/windows-script-host/windows-script-host-tests.ts
index d4851f2626..c6b3449482 100644
--- a/types/windows-script-host/windows-script-host-tests.ts
+++ b/types/windows-script-host/windows-script-host-tests.ts
@@ -28,3 +28,53 @@ WScript.Echo(`${WScript.Arguments.Named.Length} named arguments`);
 for (const key of collectionToArray(WScript.Arguments.Named)) {
     WScript.Echo(`    ${key}=${WScript.Arguments.Named(key)}`);
 }
+
+const wshn = new ActiveXObject('WScript.Network');
+
+// https://msdn.microsoft.com/en-us/library/s6wt333f(v=vs.84).aspx
+// https://msdn.microsoft.com/en-us/library/wck0hkd7(v=vs.84).aspx
+// https://msdn.microsoft.com/en-us/library/tte130y1(v=vs.84).aspx
+// https://msdn.microsoft.com/en-us/library/3fxhka75(v=vs.84).aspx
+{
+    WScript.Echo('Domain = ' + wshn.UserDomain);
+    WScript.Echo('Computer Name = ' + wshn.ComputerName);
+    WScript.Echo('User Name = ' + wshn.UserName);
+}
+
+// https://msdn.microsoft.com/en-us/library/zsdh7hkb(v=vs.84).aspx
+wshn.AddWindowsPrinterConnection('\\\\printserv\\DefaultPrinter');
+
+// https://msdn.microsoft.com/en-us/library/kxsdca3c(v=vs.84).aspx
+wshn.AddPrinterConnection("LPT1", "\\\\Server\\Print1");
+
+// https://msdn.microsoft.com/en-us/library/t9zt39at(v=vs.84).aspx
+// https://msdn.microsoft.com/en-us/library/zhds6k80(v=vs.84).aspx
+{
+    const drives = wshn.EnumNetworkDrives();
+    const printers = wshn.EnumPrinterConnections();
+    WScript.Echo("Network drive mappings:");
+    for (let i = 0; i < drives.length; i += 2) {
+        WScript.Echo(`Drive ${drives.Item(i)} = ${drives.Item(i + 1)}`);
+    }
+    WScript.Echo('');
+    WScript.Echo("Network printer mappings:");
+    for (let i = 0; i < printers.length; i += 2) {
+        WScript.Echo(`Port ${printers.Item(i)} = ${printers.Item(i + 1)}`);
+    }
+}
+
+// https://msdn.microsoft.com/en-us/library/8kst88h6(v=vs.84).aspx
+wshn.MapNetworkDrive('E:', '\\\\Server\\Public');
+
+// https://msdn.microsoft.com/en-us/library/d16d7wbf(v=vs.84).aspx
+wshn.RemoveNetworkDrive('E:');
+
+// https://msdn.microsoft.com/en-us/library/tsbh2yy7(v=vs.84).aspx
+wshn.RemovePrinterConnection('\\\\PRN-CORP1\\B41-4523-A', true, true);
+
+// https://msdn.microsoft.com/en-us/library/2ccwwdct(v=vs.84).aspx
+{
+    const printerPath = "\\\\research\\library1";
+    wshn.AddWindowsPrinterConnection(printerPath);
+    wshn.SetDefaultPrinter(printerPath);
+}

From 469a87a3746e38d074f6c2f1f0c6cdc810f7ab2a Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Fri, 11 May 2018 04:24:18 +0200
Subject: [PATCH 041/575] WScript.Echo optional parameter

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

diff --git a/types/windows-script-host/index.d.ts b/types/windows-script-host/index.d.ts
index d348f3d20d..50f0c52216 100644
--- a/types/windows-script-host/index.d.ts
+++ b/types/windows-script-host/index.d.ts
@@ -442,7 +442,7 @@ declare var WScript: {
      * Outputs text to either a message box (under WScript.exe) or the command console window followed by
      * a newline (under CScript.exe).
      */
-    Echo(s: any): void;
+    Echo(s?: any): void;
 
     /**
      * Exposes the write-only error output stream for the current script.

From aaddad94417811ca4c79ce59f9e6cf58cc9099bb Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Fri, 11 May 2018 04:32:25 +0200
Subject: [PATCH 042/575] Deleted package.json

---
 types/windows-script-host/package.json | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 types/windows-script-host/package.json

diff --git a/types/windows-script-host/package.json b/types/windows-script-host/package.json
deleted file mode 100644
index 731af0072b..0000000000
--- a/types/windows-script-host/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "activex-interop": "*"
-    }
-}
\ No newline at end of file

From 9fddebe8432d66164d89c22af73f8ec64f05d2f1 Mon Sep 17 00:00:00 2001
From: robmandoe <39183315+robmandoe@users.noreply.github.com>
Date: Fri, 11 May 2018 17:17:13 +1000
Subject: [PATCH 043/575] needs... objectCaching?: boolean; ...on
 IObjectOptions

added...
	/**
	 * When `true`, object is cached on an additional canvas.
	 */
	objectCaching?: boolean;

to...  interface IObjectOptions

otherwise our developers need to make this change manually after every 'npm install' in our project
---
 types/fabric/fabric-impl.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/fabric/fabric-impl.d.ts b/types/fabric/fabric-impl.d.ts
index e35b0ebe0d..13bde18c3e 100644
--- a/types/fabric/fabric-impl.d.ts
+++ b/types/fabric/fabric-impl.d.ts
@@ -2098,6 +2098,11 @@ interface IObjectOptions {
 	 */
 	backgroundColor?: string;
 
+	/**
+	 * When `true`, object is cached on an additional canvas.
+	 */
+	objectCaching?: boolean;
+
 	/**
 	 * When defined, an object is rendered via stroke and this property specifies its color
 	 */

From 1762c042d8ebbef3fd8a351799657d6329f7c3f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hasan=20Tayyar=20BE=C5=9E=C4=B0K?= <tayyar.besik@gmail.com>
Date: Fri, 11 May 2018 10:12:12 +0200
Subject: [PATCH 044/575] open() is deprecated in mongoose >= 4.11.0

Breaking change in @Automattic/mongoose

https://github.com/Automattic/mongoose/commit/dda165eebdb241397e9990440dc8e9c1f733db76#diff-259dec4414a400a6e895f16ff1d0ca3b
---
 types/mongoose/index.d.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index 481b37c0a3..713448faec 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -190,6 +190,7 @@ declare module "mongoose" {
 
     /**
      * Opens the connection to MongoDB.
+     * @deprecated open() is deprecated in mongoose >= 4.11.0
      * @param mongodb://uri or the host to which you are connecting
      * @param database database name
      * @param port database port
@@ -200,6 +201,19 @@ declare module "mongoose" {
      */
     open(connection_string: string, database?: string, port?: number,
       options?: ConnectionOpenOptions, callback?: (err: any) => void): any;
+    
+     /**
+     * Opens the connection to MongoDB.
+     * @param mongodb://uri or the host to which you are connecting
+     * @param database database name
+     * @param port database port
+     * @param options Mongoose forces the db option forceServerObjectId false and cannot be overridden.
+     *   Mongoose defaults the server auto_reconnect options to true which can be overridden.
+     *   See the node-mongodb-native driver instance for options that it understands.
+     *   Options passed take precedence over options included in connection strings.
+     */
+    openUri(connection_string: string, database?: string, port?: number,
+      options?: ConnectionOpenOptions, callback?: (err: any) => void): any;
 
     /** Helper for dropDatabase() */
     dropDatabase(callback?: (err: any) => void): Promise<any>;

From 3a0af70d4b60efa7d4edec670255813347a491cf Mon Sep 17 00:00:00 2001
From: Sinziana Nicolae <sinziana.nicolae@hootsuite.com>
Date: Fri, 11 May 2018 11:19:13 +0300
Subject: [PATCH 045/575] Add types for phrases DateRangePickerPhrases

---
 types/react-dates/index.d.ts | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/types/react-dates/index.d.ts b/types/react-dates/index.d.ts
index 92fa68e8d7..1ecebfb22c 100644
--- a/types/react-dates/index.d.ts
+++ b/types/react-dates/index.d.ts
@@ -266,9 +266,34 @@ declare namespace ReactDates {
         // internationalization props
         monthFormat?: string,
         phrases?: {
-            focusStartDate: string,
-            clearDates: string,
-            keyboardNavigationInstructions: string,
+            calendarLabel?: string,
+            closeDatePicker?: string,
+            clearDates?: string,
+            focusStartDate?: string,
+            jumpToPrevMonth?: string,
+            jumpToNextMonth?: string,
+            keyboardShortcuts?: string,
+            showKeyboardShortcutsPanel?: string,
+            hideKeyboardShortcutsPanel?: string,
+            openThisPanel?: string,
+            enterKey?: string,
+            leftArrowRightArrow?: string,
+            upArrowDownArrow?: string,
+            pageUpPageDown?: string,
+            homeEnd?: string,
+            escape?: string,
+            questionMark?: string,
+            selectFocusedDate?: string,
+            moveFocusByOneDay?: string,
+            moveFocusByOneWeek?: string,
+            moveFocusByOneMonth?: string,
+            moveFocustoStartAndEndOfWeek?: string,
+            returnFocusToInput?: string,
+            keyboardNavigationInstructions?: string,
+            chooseAvailableStartDate?: (date: string) => string,
+            chooseAvailableEndDate?: (date: string) => string,
+            dateIsUnavailable?: (date: string) => string,
+            dateIsSelected?: (date: string) => string,
         }
     }
 

From b629667f8e17f6a9342898c71ff211eeec766b52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hasan=20Tayyar=20BE=C5=9E=C4=B0K?= <tayyar.besik@gmail.com>
Date: Fri, 11 May 2018 10:59:00 +0200
Subject: [PATCH 046/575] types/mongoose version bump to 5.0.15

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

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index 713448faec..a28bfc6d84 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mongoose 5.0.14
+// Type definitions for Mongoose 5.0.15
 // Project: http://mongoosejs.com/
 // Definitions by: horiuchi <https://github.com/horiuchi>
 //                 sindrenm <https://github.com/sindrenm>

From 44bfd4f2834db05d88aa05c9fb6712915934656f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hasan=20Tayyar=20BE=C5=9E=C4=B0K?= <tayyar.besik@gmail.com>
Date: Fri, 11 May 2018 10:59:17 +0200
Subject: [PATCH 047/575] add test for Connection.openUri

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

diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index aaedb577d3..df4762c488 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -129,6 +129,12 @@ conn1.openSet('mongodb://localhost/test', 'db', {
   replset: null,
   mongos: true
 }, function (err) {}).then(cb).catch(cb);
+conn1.openUri('mongodb://localhost/test', 'myDb', 27017, {
+  replset: null,
+  config: {
+    autoIndex: false
+  }
+}, function (err) {}).open('');
 conn1.close().catch(function (err) {});
 conn1.collection('name').$format(999);
 conn1.model('myModel', new mongoose.Schema({}), 'myCol').find();

From 77b25f26c0448ab1c42d4b0b33a67d209c524502 Mon Sep 17 00:00:00 2001
From: Rodrigo Saboya <saboya@users.noreply.github.com>
Date: Fri, 11 May 2018 08:49:53 -0300
Subject: [PATCH 048/575] wreck: Updating type definitions to v14.0.0.

---
 types/h2o2/tsconfig.json      |  3 ++
 types/wreck/index.d.ts        | 70 +++++++++++++++++++++++++------
 types/wreck/v7/index.d.ts     | 38 +++++++++++++++++
 types/wreck/v7/tsconfig.json  | 28 +++++++++++++
 types/wreck/v7/tslint.json    | 79 +++++++++++++++++++++++++++++++++++
 types/wreck/v7/wreck-tests.ts | 38 +++++++++++++++++
 types/wreck/wreck-tests.ts    |  8 ++--
 7 files changed, 249 insertions(+), 15 deletions(-)
 create mode 100644 types/wreck/v7/index.d.ts
 create mode 100644 types/wreck/v7/tsconfig.json
 create mode 100644 types/wreck/v7/tslint.json
 create mode 100644 types/wreck/v7/wreck-tests.ts

diff --git a/types/h2o2/tsconfig.json b/types/h2o2/tsconfig.json
index 767fa4e7b7..870a359f9b 100644
--- a/types/h2o2/tsconfig.json
+++ b/types/h2o2/tsconfig.json
@@ -25,6 +25,9 @@
             ],
             "inert": [
                 "inert/v4"
+            ],
+            "wreck": [
+                "wreck/v7"
             ]
         },
         "noEmit": true,
diff --git a/types/wreck/index.d.ts b/types/wreck/index.d.ts
index e695cf00a9..ff10218012 100644
--- a/types/wreck/index.d.ts
+++ b/types/wreck/index.d.ts
@@ -1,27 +1,70 @@
-// Type definitions for wreck 7.0.0
+// Type definitions for wreck 14.0.0
 // Project: https://github.com/hapijs/wreck
 // Definitions by: Marcin Porębski <https://github.com/marcinporebski>
+//                 Rodrigo Saboya <https://github.com/saboya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
 
 /// <reference types="node" />
 
 
-import http = require('http');
-import stream = require('stream');
+import * as Boom from "boom";
+import * as events from "events";
+import * as http from "http";
+import * as stream from "stream";
+import * as Url from "url";
 
+interface RequestOptions {
+    baseUrl?: string;
+    socketPath? : string;
+    payload?: any;
+    headers?: { [key: string]: any };
+    redirects?: number;
+    redirect303?: boolean;
+    beforeRedirect?: (redirectMethod: string, statusCode: number, location: string, resHeaders: { [key: string]: any }, redirectOptions: any, next: () => {}) => void;
+    redirected?: (statusCode: number, location: string, req: http.ClientRequest) => void;
+    timeout?: number;
+    maxBytes?: number;
+    rejectUnauthorized?: boolean;
+    downstreamRes?: any;
+    agent?: WreckObject["agents"] | false;
+    secureProtocol?: string;
+    ciphers?: string;
+    events?: boolean;
+}
+
+interface ReadOptions {
+    timeout?: number;
+    json?: true | "strict" | "force";
+    gunzip?: boolean | "force";
+    maxBytes?: number;
+}
+
+interface RequestResponse {
+    res: http.IncomingMessage,
+    payload: any,
+}
+
+declare type RequestCallback = (uri: string, options: RequestOptions & { payload?: any }) => void;
+declare type ResponseCallback = (err: Boom | undefined, details: { req: http.ClientRequest, res: http.IncomingMessage | undefined, start: number, url: Url.URL }) => void;
+
+declare class WreckEventEmitter extends events.EventEmitter {
+    on(event: "request", listener: RequestCallback): this;
+    on(event: "response", listener: ResponseCallback): this;
+}
 
 interface WreckObject {
-    defaults: (options: any) => WreckObject;
+    defaults: (options: RequestOptions) => WreckObject;
 
-    request: (method: string, uri: string, options: any, callback?: (err: any, response: http.IncomingMessage) => void) => http.ClientRequest;
+    request: (method: string, uri: string, options: RequestOptions) => Promise<http.IncomingMessage> & { req: http.ClientRequest };
 
-    read: (response: http.IncomingMessage, options: any, callback: (err: any, payload: any) => void) => void;
+    read: (response: http.IncomingMessage, options: ReadOptions) => Promise<any>;
 
-    get: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
-    post: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
-    patch: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
-    put: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
-    delete: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+    get: (uri: string, options: RequestOptions & ReadOptions) => Promise<RequestResponse>;
+    post: (uri: string, options: RequestOptions & ReadOptions) => Promise<RequestResponse>;
+    patch: (uri: string, options: RequestOptions & ReadOptions) => Promise<RequestResponse>;
+    put: (uri: string, options: RequestOptions & ReadOptions) => Promise<RequestResponse>;
+    delete: (uri: string, options: RequestOptions & ReadOptions) => Promise<RequestResponse>;
 
     toReadableStream: (payload: any, encoding?: string) => stream.Readable;
 
@@ -29,8 +72,11 @@ interface WreckObject {
 
     agents: {
         http: http.Agent,
-        https: http.Agent
+        https: http.Agent,
+        httpsAllowUnauthorized: http.Agent
     };
+
+    events?: WreckEventEmitter;
 }
 
 declare var wreck: WreckObject;
diff --git a/types/wreck/v7/index.d.ts b/types/wreck/v7/index.d.ts
new file mode 100644
index 0000000000..e695cf00a9
--- /dev/null
+++ b/types/wreck/v7/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for wreck 7.0.0
+// Project: https://github.com/hapijs/wreck
+// Definitions by: Marcin Porębski <https://github.com/marcinporebski>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+
+import http = require('http');
+import stream = require('stream');
+
+
+interface WreckObject {
+    defaults: (options: any) => WreckObject;
+
+    request: (method: string, uri: string, options: any, callback?: (err: any, response: http.IncomingMessage) => void) => http.ClientRequest;
+
+    read: (response: http.IncomingMessage, options: any, callback: (err: any, payload: any) => void) => void;
+
+    get: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+    post: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+    patch: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+    put: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+    delete: (uri: string, options: any, callback: (err: any, response: http.IncomingMessage, payload: any) => void) => http.ClientRequest;
+
+    toReadableStream: (payload: any, encoding?: string) => stream.Readable;
+
+    parseCacheControl: (field: string) => any;
+
+    agents: {
+        http: http.Agent,
+        https: http.Agent
+    };
+}
+
+declare var wreck: WreckObject;
+
+export = wreck;
diff --git a/types/wreck/v7/tsconfig.json b/types/wreck/v7/tsconfig.json
new file mode 100644
index 0000000000..f67dc5c5fa
--- /dev/null
+++ b/types/wreck/v7/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "wreck": [
+                "wreck/v7"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "wreck-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/wreck/v7/tslint.json b/types/wreck/v7/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/wreck/v7/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/wreck/v7/wreck-tests.ts b/types/wreck/v7/wreck-tests.ts
new file mode 100644
index 0000000000..163f65ffa1
--- /dev/null
+++ b/types/wreck/v7/wreck-tests.ts
@@ -0,0 +1,38 @@
+
+import Wreck = require('wreck');
+
+Wreck.get('https://google.com/', {}, function (err: any, res: any, payload: any) {
+    /* do stuff */
+});
+
+
+var method = 'GET'; // GET, POST, PUT, DELETE
+var uri    = 'https://google.com/';
+var readableStream = Wreck.toReadableStream('foo=bar');
+
+var wreck = Wreck.defaults({
+    headers: { 'x-foo-bar': 123 }
+});
+
+// cascading example -- does not alter `wreck`
+var wreckWithTimeout = wreck.defaults({
+    timeout: 5
+});
+
+// all attributes are optional
+var options = {
+    maxBytes:  1048576, // 1 MB, default: unlimited
+    rejectUnauthorized: true
+};
+
+var optionalCallback = function (err: any, res: any) {
+
+    /* handle err if it exists, in which case res will be undefined */
+
+    // buffer the response stream
+    Wreck.read(res, null, function (err: any, body: any) {
+        /* do stuff */
+    });
+};
+
+var req = wreck.request(method, uri, options, optionalCallback);
diff --git a/types/wreck/wreck-tests.ts b/types/wreck/wreck-tests.ts
index 163f65ffa1..1b3ff1820d 100644
--- a/types/wreck/wreck-tests.ts
+++ b/types/wreck/wreck-tests.ts
@@ -1,7 +1,7 @@
 
 import Wreck = require('wreck');
 
-Wreck.get('https://google.com/', {}, function (err: any, res: any, payload: any) {
+Wreck.get('https://google.com/', {}).then((response) => {
     /* do stuff */
 });
 
@@ -30,9 +30,11 @@ var optionalCallback = function (err: any, res: any) {
     /* handle err if it exists, in which case res will be undefined */
 
     // buffer the response stream
-    Wreck.read(res, null, function (err: any, body: any) {
+    Wreck.read(res, null).then((payload) => {
         /* do stuff */
     });
 };
 
-var req = wreck.request(method, uri, options, optionalCallback);
+var req = wreck.request(method, uri, options).then((response) => {
+    /* do stuff */
+});

From 8ca3d37a5612fa5c577c73fe99e6b20deddc08aa Mon Sep 17 00:00:00 2001
From: Marcin Biernat <mb@marcinbiernat.pl>
Date: Sun, 29 Apr 2018 18:48:06 +0200
Subject: [PATCH 049/575] Improve R.evolve typings

---
 types/ramda/index.d.ts     | 30 +++++++++++++++----
 types/ramda/ramda-tests.ts | 60 ++++++++++++++++++++++++++++++--------
 2 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 9849ee48b1..e3eda424ec 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -20,6 +20,7 @@
 //                 Keagan McClelland <https://github.com/CaptJakk>
 //                 Tomas Szabo <https://github.com/deftomat>
 //                 Bonggyun Lee <https://github.com/deptno>
+//                 Marcin Biernat <https://github.com/biern>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -82,9 +83,28 @@ declare namespace R {
       (obj: Dictionary<T>): Dictionary<T>;
     }
 
-    type Evolver<T> =
-        | ((x: T) => T)
-        | { [K in keyof T]?: Evolver<T[K]> };
+    type Evolve<O extends Evolvable<E>, E extends Evolver> = {
+        [P in keyof O]: P extends keyof E ? EvolveValue<O[P], E[P]> : O[P];
+    };
+
+    type EvolveValue<V, E> =
+        E extends (value: V) => any ? ReturnType<E> :
+        E extends Evolver ? EvolveNestedValue<V, E> :
+        never;
+
+    type EvolveNestedValue<V, E extends Evolver> =
+        V extends object ? (V extends Evolvable<E> ? Evolve<V, E> : never) : never;
+
+    interface Evolver {
+        [key: string]: ((value: any) => any) | Evolver;
+    }
+
+    // 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
+    };
 
     // @see https://gist.github.com/donnut/fd56232da58d25ceecf1, comment by @albrow
     interface CurriedTypeGuard2<T1, T2, R extends T2> {
@@ -604,8 +624,8 @@ declare namespace R {
         /**
          * Creates a new object by evolving a shallow copy of object, according to the transformation functions.
          */
-        evolve<V>(transformations: Evolver<V>, obj: V): V;
-        evolve<V>(transformations: Evolver<V>): <W extends V>(obj: W) => W;
+        evolve<E extends Evolver, V extends Evolvable<E>>(transformations: E, obj: V): Evolve<V, E>;
+        evolve<E extends Evolver>(transformations: E): <V extends Evolvable<E>>(obj: V) => Evolve<V, E>;
 
         /*
          * A function that always returns false. Any passed in parameters are ignored.
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 8cbbf9ceac..ff19276316 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -1307,19 +1307,55 @@ type Pair = KeyValuePair<string, number>;
 };
 
 () => {
-    const a1 = R.evolve({elapsed: R.add(1), remaining: R.add(-1)}, {name: "Tomato", elapsed: 100, remaining: 1400});
-    const a2 = R.evolve({elapsed: R.add(1), remaining: R.add(-1)})({name: "Tomato", elapsed: 100, remaining: 1400});
-};
+    // No type transformation
 
-() => {
-    // const tomato = {firstName: 'Tomato ', data: {elapsed: 100, remaining: 1400}, id:123};
-    // const transformations = {
-    //     firstName: R.trim,
-    //     lastName: R.trim, // Will not get invoked.
-    //     data: {elapsed: R.add(1), remaining: R.add(-1)}
-    // };
-    // const a = R.evolve(transformations, tomato); // => {firstName: 'Tomato', data: {elapsed: 101, remaining: 1399}, id:123}
-    // const b = R.evolve(transformations)(tomato); // => {firstName: 'Tomato', data: {elapsed: 101, remaining: 1399}, id:123}
+    const a1 = R.evolve({ elapsed: R.add(1), remaining: R.add(-1) }, { name: "Tomato", elapsed: 100, remaining: 1400 });
+
+    const a1Test: { elapsed: number, remaining: number, name: string } = a1;
+
+    const a2 = R.evolve({ elapsed: R.add(1), remaining: R.add(-1) })({ name: "Tomato", elapsed: 100, remaining: 1400 });
+
+    const a2Test: { elapsed: number, remaining: number, name: string } = a2;
+
+    // Object doesn't have all evolver keys
+
+    const a3 = R.evolve({ age: R.add(1), name: R.trim }, { name: "Potato", elapsed: 100 });
+
+    const a3Test: { name: string, elapsed: number } = a3;
+
+    // Flat transformation
+
+    const ex0 = R.evolve({ a: parseInt }, { a: '10', b: 1 });
+
+    const ex0Test: { a: number, b: number } = ex0;
+
+    // Nested transformation:
+
+    const ex1 = R.evolve(
+        { a: { b: R.toString, d: { e: R.toString } } },
+        { a: { b: 1, c: null, d: { e: 2 } } },
+    );
+
+    const ex1Test: { a: { b: string, c: null, d: { e: string } } } = ex1;
+
+    // Mapping a nested object with a single function
+
+    const ex2 = R.evolve(
+        { a: (obj: { foo: string }) => ({ bar: 1, baz: 2 }) },
+        { a: { foo: 'a', skipped: 3 }, b: null },
+    );
+
+    const ex2Test: { a: { bar: number, baz: number }, b: null } = ex2;
+
+    // Nested curried:
+
+    const ex3 = R.evolve(
+        { a: { b: R.toString, d: { e: R.toString } } },
+    )(
+        { a: { b: 1, c: null, d: { e: 2 } } }
+    );
+
+    const ex3Test: { a: { b: string, c: null, d: { e: string } } } = ex3;
 };
 
 () => {

From 40986a91adc214b92ffce92898f7c6489a7ef314 Mon Sep 17 00:00:00 2001
From: Sinziana Nicolae <sinziana.nicolae@hootsuite.com>
Date: Fri, 11 May 2018 19:28:21 +0300
Subject: [PATCH 050/575] Remove wrong types

---
 types/react-dates/index.d.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/types/react-dates/index.d.ts b/types/react-dates/index.d.ts
index 1ecebfb22c..3d0be63905 100644
--- a/types/react-dates/index.d.ts
+++ b/types/react-dates/index.d.ts
@@ -267,9 +267,6 @@ declare namespace ReactDates {
         monthFormat?: string,
         phrases?: {
             calendarLabel?: string,
-            closeDatePicker?: string,
-            clearDates?: string,
-            focusStartDate?: string,
             jumpToPrevMonth?: string,
             jumpToNextMonth?: string,
             keyboardShortcuts?: string,
@@ -289,9 +286,9 @@ declare namespace ReactDates {
             moveFocusByOneMonth?: string,
             moveFocustoStartAndEndOfWeek?: string,
             returnFocusToInput?: string,
-            keyboardNavigationInstructions?: string,
             chooseAvailableStartDate?: (date: string) => string,
             chooseAvailableEndDate?: (date: string) => string,
+            chooseAvailableDate?: (date: string) => string,
             dateIsUnavailable?: (date: string) => string,
             dateIsSelected?: (date: string) => string,
         }

From 120a90e9670c7197fc0a2e5c83a62898c5c6114c Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Fri, 11 May 2018 20:27:08 +0200
Subject: [PATCH 051/575] d3-color : fix comment indent remove prototypes

---
 types/d3-color/index.d.ts | 45 +++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/types/d3-color/index.d.ts b/types/d3-color/index.d.ts
index 3c11d8f88d..68a92ed321 100644
--- a/types/d3-color/index.d.ts
+++ b/types/d3-color/index.d.ts
@@ -28,6 +28,11 @@ export interface ColorCommonInstance {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
+    /**
+     * Returns a hexadecimal string representing this color.
+     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+     */
+   hex(): string;
 }
 
 export interface Color {
@@ -53,9 +58,9 @@ export interface RGBColor extends Color {
      */
     rgb(): this;
    /**
-    * Returns a hexadecimal string representing this color.
-    * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-    */
+     * Returns a hexadecimal string representing this color.
+     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+     */
     hex(): string;
 }
 
@@ -74,10 +79,10 @@ export interface HSLColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-  /**
-   * Returns a hexadecimal string representing this color.
-   * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-   */
+    /**
+     * Returns a hexadecimal string representing this color.
+     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+     */
     hex(): string;
 }
 
@@ -96,10 +101,10 @@ export interface LabColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-   /**
-    * Returns a hexadecimal string representing this color.
-    * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-    */
+    /**
+     * Returns a hexadecimal string representing this color.
+     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+     */
     hex(): string;
 }
 
@@ -115,7 +120,6 @@ export interface LabColorFactory extends Function {
  */
 export interface GrayColorFactory extends Function {
     (l: number, opacity?: number): LabColor;
-    readonly prototype: LabColor;
 }
 
 export interface HCLColor extends Color {
@@ -126,10 +130,10 @@ export interface HCLColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-   /**
-    * Returns a hexadecimal string representing this color.
-    * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-    */
+    /**
+     * Returns a hexadecimal string representing this color.
+     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+     */
     hex(): string;
 }
 
@@ -144,7 +148,6 @@ export interface LCHColorFactory extends Function {
     (l: number, c: number, h: number, opacity?: number): HCLColor;
     (cssColorSpecifier: string): HCLColor;
     (color: ColorSpaceObject | ColorCommonInstance): HCLColor;
-    readonly prototype: HCLColor;
 }
 
 export interface CubehelixColor extends Color {
@@ -155,10 +158,10 @@ export interface CubehelixColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-  /**
-   * Returns a hexadecimal string representing this color.
-   * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-   */
+    /**
+     * Returns a hexadecimal string representing this color.
+     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+     */
     hex(): string;
 }
 

From 1180203388f48d6751800415c883d71da24fb677 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Fri, 11 May 2018 20:28:31 +0200
Subject: [PATCH 052/575] d3-color : Fix prototype test

---
 types/d3-color/d3-color-tests.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/types/d3-color/d3-color-tests.ts b/types/d3-color/d3-color-tests.ts
index 9be5a3d067..2d324e7886 100644
--- a/types/d3-color/d3-color-tests.ts
+++ b/types/d3-color/d3-color-tests.ts
@@ -136,12 +136,8 @@ if (color instanceof d3Color.rgb) {
     cHSL = color;
 } else if (color instanceof d3Color.lab) {
     cLab = color;
-} else if (color instanceof d3Color.gray) {
-    cLab = color;
 } else if (color instanceof d3Color.hcl) {
     cHcl = color;
-} else if (color instanceof d3Color.lch) {
-    cHcl = color;
 } else if (color instanceof d3Color.cubehelix) {
     cCubehelix = color;
 } else if (color === null) {

From 8ae3c459e6d150b1212f475b744c120f293324c5 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Fri, 11 May 2018 20:42:49 +0200
Subject: [PATCH 053/575] d3-color : fix border effects

---
 types/d3-color/index.d.ts | 10 ++++++----
 types/d3-hsv/index.d.ts   |  6 ++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/types/d3-color/index.d.ts b/types/d3-color/index.d.ts
index 68a92ed321..68dcf9e358 100644
--- a/types/d3-color/index.d.ts
+++ b/types/d3-color/index.d.ts
@@ -57,7 +57,7 @@ export interface RGBColor extends Color {
      * Returns the RGB equivalent of this color.
      */
     rgb(): this;
-   /**
+    /**
      * Returns a hexadecimal string representing this color.
      * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
      */
@@ -118,9 +118,11 @@ export interface LabColorFactory extends Function {
 /**
  * Constructs a new Lab color with the specified l value and a = b = 0.
  */
-export interface GrayColorFactory extends Function {
-    (l: number, opacity?: number): LabColor;
-}
+// export interface GrayColorFactory extends Function {
+//     (l: number, opacity?: number): LabColor;
+// }
+
+export type GrayColorFactory = (l: number, opacity?: number) => LabColor;
 
 export interface HCLColor extends Color {
     h: number;
diff --git a/types/d3-hsv/index.d.ts b/types/d3-hsv/index.d.ts
index 1728af0874..7452dbcc2b 100644
--- a/types/d3-hsv/index.d.ts
+++ b/types/d3-hsv/index.d.ts
@@ -68,6 +68,12 @@ export interface HSVColor extends Color {
      * Returns the RGB equivalent of this color.
      */
     rgb(): RGBColor;
+
+    /**
+     * Returns a hexadecimal string representing this color.
+     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+     */
+    hex(): string;
 }
 
 export const hsv: HSVColorFactory;

From 23ca115b22d0e61c93382cb76facc338a679cc84 Mon Sep 17 00:00:00 2001
From: Collin Kostichuk <collin.kostichuk@genivar.com>
Date: Thu, 10 May 2018 14:21:45 -0600
Subject: [PATCH 054/575] Updated types for @material group to v0.35.0

---
 types/material-components-web/index.d.ts      |  15 +-
 types/material__animation/index.d.ts          |   4 +-
 types/material__auto-init/index.d.ts          |   6 +-
 types/material__base/component.d.ts           |  10 +-
 types/material__base/foundation.d.ts          |   4 +-
 types/material__base/index.d.ts               |   6 +-
 types/material__checkbox/adapter.d.ts         |  12 +-
 types/material__checkbox/constants.d.ts       |   8 +-
 types/material__checkbox/foundation.d.ts      |  10 +-
 types/material__checkbox/index.d.ts           |   8 +-
 types/material__chips/chip-set/adapter.d.ts   |  50 ++++++
 .../chip-set}/constants.d.ts                  |   8 +-
 .../material__chips/chip-set/foundation.d.ts  |  44 +++++
 types/material__chips/chip-set/index.d.ts     |  35 ++++
 types/material__chips/chip/adapter.d.ts       |  77 +++++++++
 types/material__chips/chip/constants.d.ts     |  38 +++++
 types/material__chips/chip/foundation.d.ts    |  32 ++++
 types/material__chips/chip/index.d.ts         |  39 +++++
 types/material__chips/index.d.ts              |  24 +++
 types/material__chips/tsconfig.json           |  32 ++++
 types/material__chips/tslint.json             |   1 +
 types/material__dialog/adapter.d.ts           |   4 +-
 types/material__dialog/constants.d.ts         |   2 +-
 types/material__dialog/foundation.d.ts        |   8 +-
 types/material__dialog/index.d.ts             |  19 +--
 types/material__drawer/index.d.ts             |  12 +-
 .../persistent/constants.d.ts                 |  10 +-
 .../persistent/foundation.d.ts                |   4 +-
 types/material__drawer/persistent/index.d.ts  |   4 +-
 types/material__drawer/slidable/index.d.ts    |   6 +-
 .../material__drawer/temporary/constants.d.ts |  10 +-
 .../temporary/foundation.d.ts                 |   4 +-
 types/material__drawer/temporary/index.d.ts   |   2 -
 types/material__drawer/util.d.ts              |   4 +-
 types/material__floating-label/adapter.d.ts   |  51 ++++++
 types/material__floating-label/constants.d.ts |  23 +++
 .../material__floating-label/foundation.d.ts  |  40 +++++
 types/material__floating-label/index.d.ts     |  48 ++++++
 types/material__floating-label/tsconfig.json  |  27 +++
 types/material__floating-label/tslint.json    |   1 +
 types/material__form-field/adapter.d.ts       |   8 +-
 types/material__form-field/constants.d.ts     |   2 +-
 types/material__form-field/foundation.d.ts    |   4 +-
 types/material__form-field/index.d.ts         |   6 +-
 types/material__grid-list/adapter.d.ts        |   2 +-
 types/material__grid-list/foundation.d.ts     |   6 +-
 types/material__grid-list/index.d.ts          |  12 +-
 types/material__icon-toggle/adapter.d.ts      |  29 ++--
 types/material__icon-toggle/foundation.d.ts   |  28 +---
 types/material__icon-toggle/index.d.ts        |  12 +-
 types/material__line-ripple/adapter.d.ts      |  53 ++++++
 types/material__line-ripple/constants.d.ts    |  23 +++
 types/material__line-ripple/foundation.d.ts   |  45 +++++
 types/material__line-ripple/index.d.ts        |  47 ++++++
 types/material__line-ripple/tsconfig.json     |  27 +++
 types/material__line-ripple/tslint.json       |   1 +
 types/material__linear-progress/adapter.d.ts  |   2 +-
 .../material__linear-progress/foundation.d.ts |   7 +-
 types/material__linear-progress/index.d.ts    |  12 +-
 .../material__menu/{simple => }/adapter.d.ts  |  44 +++--
 types/material__menu/constants.d.ts           |  77 +++++++++
 types/material__menu/foundation.d.ts          |  68 ++++++++
 types/material__menu/index.d.ts               |  47 +++++-
 types/material__menu/simple/constants.d.ts    |  52 ------
 types/material__menu/simple/index.d.ts        |  42 -----
 types/material__menu/tsconfig.json            |  11 +-
 types/material__notched-outline/adapter.d.ts  |  57 +++++++
 .../material__notched-outline/constants.d.ts  |  27 +++
 .../material__notched-outline/foundation.d.ts |  38 +++++
 types/material__notched-outline/index.d.ts    |  41 +++++
 types/material__notched-outline/tsconfig.json |  27 +++
 types/material__notched-outline/tslint.json   |   1 +
 types/material__radio/adapter.d.ts            |   8 +-
 types/material__radio/foundation.d.ts         |  23 ++-
 types/material__radio/index.d.ts              |  10 +-
 types/material__ripple/adapter.d.ts           |  16 +-
 types/material__ripple/constants.d.ts         |   8 +-
 types/material__ripple/foundation.d.ts        |  35 +---
 types/material__ripple/index.d.ts             |  24 ++-
 types/material__select/adapter.d.ts           |  58 +------
 types/material__select/constants.d.ts         |   8 +-
 types/material__select/foundation.d.ts        |  21 +--
 types/material__select/index.d.ts             |  24 +--
 types/material__selection-control/index.d.ts  |   4 +-
 types/material__slider/adapter.d.ts           |   4 +-
 types/material__slider/foundation.d.ts        |   3 +-
 types/material__slider/index.d.ts             |  30 ++--
 types/material__snackbar/adapter.d.ts         |   4 +-
 types/material__snackbar/constants.d.ts       |   2 +
 types/material__snackbar/foundation.d.ts      |  20 +--
 types/material__snackbar/index.d.ts           |  17 +-
 .../adapter.d.ts                              |  52 +++---
 types/material__tab/constants.d.ts            |  27 +++
 .../foundation.d.ts                           |  30 ++--
 types/material__tab/index.d.ts                |  33 ++++
 types/material__tab/tsconfig.json             |  27 +++
 types/material__tab/tslint.json               |   1 +
 types/material__tabs/index.d.ts               |  10 +-
 .../tab-bar-scroller/adapter.d.ts             |   2 +-
 .../tab-bar-scroller/foundation.d.ts          |   2 +-
 .../tab-bar-scroller/index.d.ts               |  17 +-
 types/material__tabs/tab-bar/adapter.d.ts     |   2 +-
 types/material__tabs/tab-bar/foundation.d.ts  |   4 +-
 types/material__tabs/tab-bar/index.d.ts       |   6 +-
 types/material__tabs/tab/adapter.d.ts         |   2 +-
 types/material__tabs/tab/foundation.d.ts      |   4 +-
 types/material__tabs/tab/index.d.ts           |  11 +-
 types/material__textfield/adapter.d.ts        | 156 +++++++++---------
 types/material__textfield/constants.d.ts      |  19 ++-
 types/material__textfield/foundation.d.ts     |  60 +++----
 .../helper-text/adapter.d.ts                  |   4 +-
 .../helper-text/foundation.d.ts               |  12 +-
 .../helper-text/index.d.ts                    |   2 -
 types/material__textfield/icon/adapter.d.ts   |  56 +++++++
 .../icon/constants.d.ts}                      |   8 +-
 .../material__textfield/icon/foundation.d.ts  |  35 ++++
 .../{bottom-line => icon}/index.d.ts          |  16 +-
 types/material__textfield/index.d.ts          |  56 +++++--
 types/material__textfield/tsconfig.json       |   8 +-
 types/material__toolbar/adapter.d.ts          |   2 +-
 types/material__toolbar/constants.d.ts        |   1 +
 types/material__toolbar/foundation.d.ts       |  12 +-
 types/material__toolbar/index.d.ts            |  15 +-
 types/material__toolbar/tsconfig.json         |   1 -
 types/material__top-app-bar/adapter.d.ts      |  77 +++++++++
 types/material__top-app-bar/constants.d.ts    |  38 +++++
 .../fixed/foundation.d.ts                     |  22 +++
 .../foundation.d.ts                           |  25 +--
 types/material__top-app-bar/index.d.ts        |  38 +++++
 .../short/foundation.d.ts                     |  22 +++
 .../standard/foundation.d.ts                  |  22 +++
 types/material__top-app-bar/tsconfig.json     |  30 ++++
 types/material__top-app-bar/tslint.json       |   1 +
 133 files changed, 2095 insertions(+), 792 deletions(-)
 create mode 100644 types/material__chips/chip-set/adapter.d.ts
 rename types/{material__textfield/bottom-line => material__chips/chip-set}/constants.d.ts (80%)
 create mode 100644 types/material__chips/chip-set/foundation.d.ts
 create mode 100644 types/material__chips/chip-set/index.d.ts
 create mode 100644 types/material__chips/chip/adapter.d.ts
 create mode 100644 types/material__chips/chip/constants.d.ts
 create mode 100644 types/material__chips/chip/foundation.d.ts
 create mode 100644 types/material__chips/chip/index.d.ts
 create mode 100644 types/material__chips/index.d.ts
 create mode 100644 types/material__chips/tsconfig.json
 create mode 100644 types/material__chips/tslint.json
 create mode 100644 types/material__floating-label/adapter.d.ts
 create mode 100644 types/material__floating-label/constants.d.ts
 create mode 100644 types/material__floating-label/foundation.d.ts
 create mode 100644 types/material__floating-label/index.d.ts
 create mode 100644 types/material__floating-label/tsconfig.json
 create mode 100644 types/material__floating-label/tslint.json
 create mode 100644 types/material__line-ripple/adapter.d.ts
 create mode 100644 types/material__line-ripple/constants.d.ts
 create mode 100644 types/material__line-ripple/foundation.d.ts
 create mode 100644 types/material__line-ripple/index.d.ts
 create mode 100644 types/material__line-ripple/tsconfig.json
 create mode 100644 types/material__line-ripple/tslint.json
 rename types/material__menu/{simple => }/adapter.d.ts (69%)
 create mode 100644 types/material__menu/constants.d.ts
 create mode 100644 types/material__menu/foundation.d.ts
 delete mode 100644 types/material__menu/simple/constants.d.ts
 delete mode 100644 types/material__menu/simple/index.d.ts
 create mode 100644 types/material__notched-outline/adapter.d.ts
 create mode 100644 types/material__notched-outline/constants.d.ts
 create mode 100644 types/material__notched-outline/foundation.d.ts
 create mode 100644 types/material__notched-outline/index.d.ts
 create mode 100644 types/material__notched-outline/tsconfig.json
 create mode 100644 types/material__notched-outline/tslint.json
 rename types/{material__textfield/bottom-line => material__tab}/adapter.d.ts (58%)
 create mode 100644 types/material__tab/constants.d.ts
 rename types/{material__textfield/bottom-line => material__tab}/foundation.d.ts (64%)
 create mode 100644 types/material__tab/index.d.ts
 create mode 100644 types/material__tab/tsconfig.json
 create mode 100644 types/material__tab/tslint.json
 create mode 100644 types/material__textfield/icon/adapter.d.ts
 rename types/{material__toolbar/util.d.ts => material__textfield/icon/constants.d.ts} (77%)
 create mode 100644 types/material__textfield/icon/foundation.d.ts
 rename types/material__textfield/{bottom-line => icon}/index.d.ts (58%)
 create mode 100644 types/material__top-app-bar/adapter.d.ts
 create mode 100644 types/material__top-app-bar/constants.d.ts
 create mode 100644 types/material__top-app-bar/fixed/foundation.d.ts
 rename types/{material__menu/simple => material__top-app-bar}/foundation.d.ts (63%)
 create mode 100644 types/material__top-app-bar/index.d.ts
 create mode 100644 types/material__top-app-bar/short/foundation.d.ts
 create mode 100644 types/material__top-app-bar/standard/foundation.d.ts
 create mode 100644 types/material__top-app-bar/tsconfig.json
 create mode 100644 types/material__top-app-bar/tslint.json

diff --git a/types/material-components-web/index.d.ts b/types/material-components-web/index.d.ts
index c5d1434942..f1f9874f4b 100644
--- a/types/material-components-web/index.d.ts
+++ b/types/material-components-web/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -23,13 +23,17 @@
 import autoInit from 'material__auto-init';
 import * as base from 'material__base';
 import * as checkbox from 'material__checkbox';
+import * as chips from 'material__chips';
 import * as dialog from 'material__dialog';
 import * as drawer from 'material__drawer';
+import * as floatingLabel from 'material__floating-label';
 import * as formField from 'material__form-field';
 import * as gridList from 'material__grid-list';
 import * as iconToggle from 'material__icon-toggle';
 import * as linearProgress from 'material__linear-progress';
+import * as lineRipple from 'material__line-ripple';
 import * as menu from 'material__menu';
+import * as notchedOutline from 'material__notched-outline';
 import * as radio from 'material__radio';
 import * as ripple from 'material__ripple';
 import * as select from 'material__select';
@@ -39,19 +43,23 @@ import * as snackbar from 'material__snackbar';
 import * as tabs from 'material__tabs';
 import * as textField from 'material__textfield';
 import * as toolbar from 'material__toolbar';
-
+import * as topAppBar from 'material__top-app-bar';
 // Export all components.
 export {
     autoInit,
     base,
     checkbox,
+    chips,
     dialog,
     drawer,
+    floatingLabel,
     formField,
     gridList,
     iconToggle,
+    lineRipple,
     linearProgress,
     menu,
+    notchedOutline,
     radio,
     ripple,
     select,
@@ -61,4 +69,5 @@ export {
     tabs,
     textField,
     toolbar,
+    topAppBar
 };
diff --git a/types/material__animation/index.d.ts b/types/material__animation/index.d.ts
index 8baf562003..2527cf9e71 100644
--- a/types/material__animation/index.d.ts
+++ b/types/material__animation/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
diff --git a/types/material__auto-init/index.d.ts b/types/material__auto-init/index.d.ts
index 026b692b99..2993089fce 100644
--- a/types/material__auto-init/index.d.ts
+++ b/types/material__auto-init/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -32,6 +32,8 @@ export interface MDCAutoInit {
 /**
  * Auto-initializes all mdc components on a page.
  */
+// tslint:disable-next-line:strict-export-declare-modifiers
 declare const mdcAutoInit: MDCAutoInit;
 
+// tslint:disable-next-line:strict-export-declare-modifiers
 export default mdcAutoInit;
diff --git a/types/material__base/component.d.ts b/types/material__base/component.d.ts
index 0a645b26a4..43c085cdce 100644
--- a/types/material__base/component.d.ts
+++ b/types/material__base/component.d.ts
@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,7 @@
 
 import MDCFoundation from './foundation';
 
-export class MDCComponent<A, F extends MDCFoundation<A>> {
+export default class MDCComponent<A, F extends MDCFoundation<A>> {
     static attachTo(root: Element): MDCComponent<any, MDCFoundation<any>>;
 
     constructor(root: Element, foundation?: F, ...args: any[]);
@@ -45,13 +45,13 @@ export class MDCComponent<A, F extends MDCFoundation<A>> {
      * Wrapper method to add an event listener to the component's root element. This is most useful when
      * listening for custom events.
      */
-    listen(evtType: string, handler: EventListenerOrEventListenerObject): void;
+    listen(evtType: string, handler: EventListener): void;
 
     /**
      * Wrapper method to remove an event listener to the component's root element. This is most useful when
      * unlistening for custom events.
      */
-    unlisten(evtType: string, handler: EventListenerOrEventListenerObject): void;
+    unlisten(evtType: string, handler: EventListener): void;
 
     /**
      * Fires a cross-browser-compatible custom event from the component root of the given type,
@@ -59,5 +59,3 @@ export class MDCComponent<A, F extends MDCFoundation<A>> {
      */
     emit(evtType: string, evtData: any, shouldBubble?: boolean): void;
 }
-
-export default MDCComponent;
diff --git a/types/material__base/foundation.d.ts b/types/material__base/foundation.d.ts
index 7612d0daea..7bd61ec18e 100644
--- a/types/material__base/foundation.d.ts
+++ b/types/material__base/foundation.d.ts
@@ -23,7 +23,7 @@ export interface MDCNumbers {
     [key: string]: number;
 }
 
-export class MDCFoundation<A> {
+export default class MDCFoundation<A> {
     static readonly cssClasses: MDCStrings;
 
     static readonly strings: MDCStrings;
@@ -40,5 +40,3 @@ export class MDCFoundation<A> {
     // Subclasses should override this method to perform de-initialization routines (de-registering events, etc.)
     destroy(): void;
 }
-
-export default MDCFoundation;
diff --git a/types/material__base/index.d.ts b/types/material__base/index.d.ts
index 0172cb35f6..bc4d2ee1a3 100644
--- a/types/material__base/index.d.ts
+++ b/types/material__base/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -21,7 +21,7 @@
  * limitations under the License.
  */
 
-import { MDCNumbers, MDCStrings, MDCFoundation } from './foundation';
+import MDCFoundation, { MDCNumbers, MDCStrings } from './foundation';
 import MDCComponent from './component';
 
 export {MDCNumbers, MDCStrings, MDCFoundation, MDCComponent};
diff --git a/types/material__checkbox/adapter.d.ts b/types/material__checkbox/adapter.d.ts
index aedeed30f5..a68eefb002 100644
--- a/types/material__checkbox/adapter.d.ts
+++ b/types/material__checkbox/adapter.d.ts
@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,13 +29,17 @@ import { MDCSelectionControlState } from 'material__selection-control';
  * Implement this adapter for your framework of choice to delegate updates to
  * the component in your framework of choice. See architecture documentation
  * for more details.
- * https://github.com/material-components/material-components-web/blob/master/docs/architecture.md
+ * https://github.com/material-components/material-components-web/blob/master/docs/code/architecture.md
  */
-export class MDCCheckboxAdapter {
+export default interface MDCCheckboxAdapter {
     addClass(className: string): void;
 
     removeClass(className: string): void;
 
+    setNativeControlAttr(attr: string, value: string): void;
+
+    removeNativeControlAttr(attr: string): void;
+
     registerAnimationEndHandler(handler: EventListener): void;
 
     deregisterAnimationEndHandler(handler: EventListener): void;
@@ -50,5 +54,3 @@ export class MDCCheckboxAdapter {
 
     isAttachedToDOM(): boolean;
 }
-
-export default MDCCheckboxAdapter;
diff --git a/types/material__checkbox/constants.d.ts b/types/material__checkbox/constants.d.ts
index ee665f4c05..b522139b55 100644
--- a/types/material__checkbox/constants.d.ts
+++ b/types/material__checkbox/constants.d.ts
@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- import { MDCStrings, MDCNumbers } from 'material__base';
+import { MDCStrings, MDCNumbers } from 'material__base';
 
 export interface cssClasses extends MDCStrings {
     UPGRADED: 'mdc-checkbox--upgraded';
@@ -35,8 +35,10 @@ export interface strings extends MDCStrings {
     TRANSITION_STATE_CHECKED: 'checked';
     TRANSITION_STATE_UNCHECKED: 'unchecked';
     TRANSITION_STATE_INDETERMINATE: 'indeterminate';
+    ARIA_CHECKED_ATTR: 'aria-checked';
+    ARIA_CHECKED_INDETERMINATE_VALUE: 'mixed';
 }
 
 export interface numbers extends MDCNumbers {
-    ANIM_END_LATCH_MS: 100;
+    ANIM_END_LATCH_MS: 250;
 }
diff --git a/types/material__checkbox/foundation.d.ts b/types/material__checkbox/foundation.d.ts
index 73216efcd6..cf04fe98f7 100644
--- a/types/material__checkbox/foundation.d.ts
+++ b/types/material__checkbox/foundation.d.ts
@@ -19,7 +19,7 @@ import MDCFoundation from 'material__base/foundation';
 import MDCCheckboxAdapter from './adapter';
 import { cssClasses, strings, numbers } from './constants';
 
-export class MDCCheckboxFoundation extends MDCFoundation<MDCCheckboxAdapter> {
+export default class MDCCheckboxFoundation extends MDCFoundation<MDCCheckboxAdapter> {
     static readonly cssClasses: cssClasses;
 
     static readonly strings: strings;
@@ -30,7 +30,7 @@ export class MDCCheckboxFoundation extends MDCFoundation<MDCCheckboxAdapter> {
 
     isChecked(): boolean;
 
-    setChecked(checked: boolean): boolean;
+    setChecked(checked: boolean): void;
 
     isIndeterminate(): boolean;
 
@@ -43,6 +43,8 @@ export class MDCCheckboxFoundation extends MDCFoundation<MDCCheckboxAdapter> {
     getValue(): string;
 
     setValue(value: string): void;
-}
 
-export default MDCCheckboxFoundation;
+    handleAnimationEnd(): void;
+
+    handleChange(): void;
+}
diff --git a/types/material__checkbox/index.d.ts b/types/material__checkbox/index.d.ts
index 9190c3d5a9..308bc077bb 100644
--- a/types/material__checkbox/index.d.ts
+++ b/types/material__checkbox/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -32,8 +32,6 @@ export {MDCCheckboxAdapter, MDCCheckboxFoundation};
 export class MDCCheckbox extends MDCComponent<MDCCheckboxAdapter, MDCCheckboxFoundation> implements MDCSelectionControl {
     static attachTo(root: Element): MDCCheckbox;
 
-    getDefaultFoundation(): MDCCheckboxFoundation;
-
     readonly ripple: MDCRipple;
 
     checked: boolean;
@@ -43,6 +41,4 @@ export class MDCCheckbox extends MDCComponent<MDCCheckboxAdapter, MDCCheckboxFou
     disabled: boolean;
 
     value: string;
-
-    destroy(): void;
 }
diff --git a/types/material__chips/chip-set/adapter.d.ts b/types/material__chips/chip-set/adapter.d.ts
new file mode 100644
index 0000000000..79c588acd9
--- /dev/null
+++ b/types/material__chips/chip-set/adapter.d.ts
@@ -0,0 +1,50 @@
+/**
+ * @license
+ * Copyright 2017 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Adapter for MDC Chip Set.
+ *
+ * Defines the shape of the adapter expected by the foundation. Implement this
+ * adapter to integrate the Chip Set into your framework. See
+ * https://github.com/material-components/material-components-web/blob/master/docs/authoring-components.md
+ * for more information.
+ *
+ */
+
+import { MDCChip } from '../chip';
+
+export default interface MDCChipSetAdapter {
+    /**
+     * Returns true if the root element contains the given class name.
+     */
+    hasClass(className: string): boolean;
+    /**
+     * Registers an event handler on the root element for a given event.
+     */
+    registerInteractionHandler(evtType: string, handler: EventListener): void;
+    /**
+     * Deregisters an event handler on the root element for a given event.
+     */
+    deregisterInteractionHandler(evtType: string, handler: EventListener): void;
+    /**
+     * Appends and returns a new chip element with the given text, leading icon, and trailing icon.
+     */
+    appendChip(text: string, leadingIcon?: Element | null, trailingIcon?: Element | null): Element;
+    /**
+     * Removes the chip object from the chip set.
+     */
+    removeChip(chip: MDCChip): void;
+}
diff --git a/types/material__textfield/bottom-line/constants.d.ts b/types/material__chips/chip-set/constants.d.ts
similarity index 80%
rename from types/material__textfield/bottom-line/constants.d.ts
rename to types/material__chips/chip-set/constants.d.ts
index 519b9fb8e5..6c8d4a6d19 100644
--- a/types/material__textfield/bottom-line/constants.d.ts
+++ b/types/material__chips/chip-set/constants.d.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google Inc. All Rights Reserved.
+ * Copyright 2016 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import { MDCStrings } from 'material__base';
 
 export interface strings extends MDCStrings {
-    ANIMATION_END_EVENT: 'MDCTextFieldBottomLine:animation-end';
+   CHIP_SELECTOR: '.mdc-chip';
 }
 
 export interface cssClasses extends MDCStrings {
-    BOTTOM_LINE_ACTIVE: 'mdc-text-field__bottom-line--active';
+    CHOICE: 'mdc-chip-set--choice';
+    FILTER: 'mdc-chip-set--filter';
 }
diff --git a/types/material__chips/chip-set/foundation.d.ts b/types/material__chips/chip-set/foundation.d.ts
new file mode 100644
index 0000000000..714f10c5fd
--- /dev/null
+++ b/types/material__chips/chip-set/foundation.d.ts
@@ -0,0 +1,44 @@
+/**
+ * @license
+ * Copyright 2017 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import MDCFoundation from 'material__base/foundation';
+import MDCChipFoundation from './foundation';
+import MDCChipSetAdapter from './adapter';
+import { strings, cssClasses } from './constants';
+
+export default class MDCChipSetFoundation extends MDCFoundation<MDCChipSetAdapter> {
+    static readonly strings: strings;
+
+    static readonly cssClasses: cssClasses;
+
+    static readonly defaultAdapter: MDCChipSetAdapter;
+
+    /**
+     * Returns a new chip element with the given text, leading icon, and trailing icon,
+     * added to the root chip set element.
+     */
+    addChip(text: string, leadingIcon?: Element | null, trailingIcon?: Element | null): Element;
+
+    /**
+     * Selects the given chip. Deselects all other chips if the chip set is of the choice variant.
+     */
+    select(chipFoundation: MDCChipFoundation): void;
+
+    /**
+     * Deselects the given chip.
+     */
+    deselect(chipFoundation: MDCChipFoundation): void;
+}
diff --git a/types/material__chips/chip-set/index.d.ts b/types/material__chips/chip-set/index.d.ts
new file mode 100644
index 0000000000..a516d3b374
--- /dev/null
+++ b/types/material__chips/chip-set/index.d.ts
@@ -0,0 +1,35 @@
+/**
+ * @license
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import MDCComponent from 'material__base/component';
+import MDCChipSetFoundation from './foundation';
+import MDCChipSetAdapter from './adapter';
+import { MDCChip } from '../chip';
+
+export { MDCChipSetFoundation, MDCChipSetAdapter };
+
+export class MDCChipSet extends MDCComponent<MDCChipSetAdapter, MDCChipSetFoundation> {
+    static attachTo(root: any): MDCChipSet;
+
+    initialize(chipFactory?: (el: Element) => MDCChip): void;
+
+    initialSyncWithDOM(): void;
+
+    /**
+     * Creates a new chip in the chip set with the given text, leading icon, and trailing icon.
+     */
+    addChip(text: string, leadingIcon?: Element | null, trailingIcon?: Element | null): void;
+}
diff --git a/types/material__chips/chip/adapter.d.ts b/types/material__chips/chip/adapter.d.ts
new file mode 100644
index 0000000000..52ffcef68f
--- /dev/null
+++ b/types/material__chips/chip/adapter.d.ts
@@ -0,0 +1,77 @@
+/**
+ * @license
+ * Copyright 2017 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Adapter for MDC Chip.
+ *
+ * Defines the shape of the adapter expected by the foundation. Implement this
+ * adapter to integrate the Chip into your framework. See
+ * https://github.com/material-components/material-components-web/blob/master/docs/authoring-components.md
+ * for more information.
+ */
+export default interface MDCChipAdapter {
+    addClass(className: string): void;
+
+    removeClass(className: string): void;
+
+    hasClass(className: string): boolean;
+
+    addClassToLeadingIcon(className: string): void;
+
+    removeClassFromLeadingIcon(className: string): void;
+    /**
+     * Returns true if target has className, false otherwise.
+     */
+    eventTargetHasClass(target: EventTarget, className: string): boolean;
+    /**
+     * Registers an event listener on the root element for a given event.
+     */
+    registerEventHandler(evtType: string, handler: EventListener): void;
+    /**
+     * Deregisters an event listener on the root element for a given event.
+     */
+    deregisterEventHandler(evtType: string, handler: EventListener): void;
+    /**
+     * Registers an event listener on the trailing icon element for a given event.
+     */
+    registerTrailingIconInteractionHandler(evtType: string, handler: EventListener): void;
+    /**
+     * Deregisters an event listener on the trailing icon element for a given event.
+     */
+    deregisterTrailingIconInteractionHandler(evtType: string, handler: EventListener): void;
+    /**
+     * Emits a custom "MDCChip:interaction" event denoting the chip has been
+     * interacted with (typically on click or keydown).
+     */
+    notifyInteraction(): void;
+    /**
+     * Emits a custom "MDCChip:trailingIconInteraction" event denoting the trailing icon has been
+     * interacted with (typically on click or keydown).
+     */
+    notifyTrailingIconInteraction(): void;
+    /**
+     * Emits a custom event "MDCChip:removal" denoting the chip will be removed.
+     */
+    notifyRemoval(): void;
+    /**
+     * Returns the computed property value of the given style property on the root element.
+     */
+    getComputedStyleValue(propertyName: string): string;
+    /**
+     * Sets the property value of the given style property on the root element.
+     */
+    setStyleProperty(propertyName: string, value: string): void;
+}
diff --git a/types/material__chips/chip/constants.d.ts b/types/material__chips/chip/constants.d.ts
new file mode 100644
index 0000000000..79f1891445
--- /dev/null
+++ b/types/material__chips/chip/constants.d.ts
@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { MDCStrings } from 'material__base';
+
+export interface strings extends MDCStrings {
+    ENTRY_ANIMATION_NAME: 'mdc-chip-entry';
+    INTERACTION_EVENT: 'MDCChip:interaction';
+    TRAILING_ICON_INTERACTION_EVENT: 'MDCChip:trailingIconInteraction';
+    REMOVAL_EVENT: 'MDCChip:removal';
+    CHECKMARK_SELECTOR: '.mdc-chip__checkmark';
+    LEADING_ICON_SELECTOR: '.mdc-chip__icon--leading';
+    TRAILING_ICON_SELECTOR: '.mdc-chip__icon--trailing';
+}
+
+export interface cssClasses extends MDCStrings {
+    CHECKMARK: 'mdc-chip__checkmark';
+    CHIP: 'mdc-chip';
+    CHIP_EXIT: 'mdc-chip--exit';
+    HIDDEN_LEADING_ICON: 'mdc-chip__icon--leading-hidden';
+    LEADING_ICON: 'mdc-chip__icon--leading';
+    TRAILING_ICON: 'mdc-chip__icon--trailing';
+    SELECTED: 'mdc-chip--selected';
+    TEXT: 'mdc-chip__text';
+}
diff --git a/types/material__chips/chip/foundation.d.ts b/types/material__chips/chip/foundation.d.ts
new file mode 100644
index 0000000000..383cbb9089
--- /dev/null
+++ b/types/material__chips/chip/foundation.d.ts
@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import MDCFoundation from 'material__base/foundation';
+import MDCChipAdapter from './adapter';
+import { cssClasses, strings } from './constants';
+
+export default class MDCChipFoundation extends MDCFoundation<MDCChipAdapter> {
+    static readonly strings: strings;
+
+    static readonly cssClasses: cssClasses;
+
+    static readonly defaultAdapter: MDCChipAdapter;
+
+    isSelected(): boolean;
+
+    setSelected(selected: boolean): void;
+}
diff --git a/types/material__chips/chip/index.d.ts b/types/material__chips/chip/index.d.ts
new file mode 100644
index 0000000000..a0320e69b3
--- /dev/null
+++ b/types/material__chips/chip/index.d.ts
@@ -0,0 +1,39 @@
+/**
+ * @license
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import MDCComponent from 'material__base/component';
+import MDCChipFoundation from './foundation';
+import MDCChipAdapter from './adapter';
+import { MDCRipple } from 'material__ripple';
+
+export {  MDCChipFoundation, MDCChipAdapter };
+
+export class MDCChip extends MDCComponent<MDCChipAdapter, MDCChipFoundation> {
+    static attachTo(root: Element): MDCChip;
+    /**
+     * Returns true if the chip is selected.
+     */
+    isSelected(): boolean;
+
+    /**
+     * Destroys the chip and removes the root element from the DOM.
+     */
+    remove(): void;
+
+    readonly foundation: MDCChipFoundation;
+
+    readonly ripple: MDCRipple;
+}
diff --git a/types/material__chips/index.d.ts b/types/material__chips/index.d.ts
new file mode 100644
index 0000000000..935d897236
--- /dev/null
+++ b/types/material__chips/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for Material Components Web 0.35
+// Project: https://material.io/components/
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/**
+ * Copyright 2017 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { MDCChipFoundation, MDCChip, MDCChipAdapter } from './chip';
+import { MDCChipSetFoundation, MDCChipSet, MDCChipSetAdapter } from './chip-set';
+export { MDCChipFoundation, MDCChip, MDCChipAdapter, MDCChipSetFoundation, MDCChipSet, MDCChipSetAdapter };
diff --git a/types/material__chips/tsconfig.json b/types/material__chips/tsconfig.json
new file mode 100644
index 0000000000..424cb5a424
--- /dev/null
+++ b/types/material__chips/tsconfig.json
@@ -0,0 +1,32 @@
+{
+    "files": [
+        "chip/adapter.d.ts",
+        "chip/constants.d.ts",
+        "chip/foundation.d.ts",
+        "chip/index.d.ts",
+        "chip-set/adapter.d.ts",
+        "chip-set/constants.d.ts",
+        "chip-set/foundation.d.ts",
+        "chip-set/index.d.ts",
+        "index.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file
diff --git a/types/material__chips/tslint.json b/types/material__chips/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/material__chips/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/material__dialog/adapter.d.ts b/types/material__dialog/adapter.d.ts
index fd6bc3cf9f..beaa1a2a3e 100644
--- a/types/material__dialog/adapter.d.ts
+++ b/types/material__dialog/adapter.d.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-export interface MSDDialogAdapter {
+export default interface MDCDialogAdapter {
     addClass(className: string): void;
 
     removeClass(className: string): void;
@@ -50,6 +50,4 @@ export interface MSDDialogAdapter {
     untrapFocusOnSurface(): void;
 
     isDialog(el: Element): boolean;
-
-    layoutFooterRipples(): void;
 }
diff --git a/types/material__dialog/constants.d.ts b/types/material__dialog/constants.d.ts
index a45628627c..297876ba7d 100644
--- a/types/material__dialog/constants.d.ts
+++ b/types/material__dialog/constants.d.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
- import { MDCStrings } from 'material__base';
+import { MDCStrings } from 'material__base';
 
 export interface cssClasses extends MDCStrings {
     ROOT: 'mdc-dialog';
diff --git a/types/material__dialog/foundation.d.ts b/types/material__dialog/foundation.d.ts
index f28c541dd2..e17b8388e5 100644
--- a/types/material__dialog/foundation.d.ts
+++ b/types/material__dialog/foundation.d.ts
@@ -16,14 +16,14 @@
 
 import { MDCFoundation } from 'material__base';
 import { cssClasses, strings } from './constants';
-import { MSDDialogAdapter } from './adapter';
+import MDCDialogAdapter from './adapter';
 
-export class MDCDialogFoundation extends MDCFoundation<MSDDialogAdapter> {
+export default class MDCDialogFoundation extends MDCFoundation<MDCDialogAdapter> {
     static readonly cssClasses: cssClasses;
 
     static readonly strings: strings;
 
-    static readonly defaultAdapter: MSDDialogAdapter;
+    static readonly defaultAdapter: MDCDialogAdapter;
 
     open(): void;
 
@@ -35,5 +35,3 @@ export class MDCDialogFoundation extends MDCFoundation<MSDDialogAdapter> {
 
     cancel(shouldNotify: boolean): void;
 }
-
-export default MDCDialogFoundation;
diff --git a/types/material__dialog/index.d.ts b/types/material__dialog/index.d.ts
index 7d8ab69e30..491d2ad9fd 100644
--- a/types/material__dialog/index.d.ts
+++ b/types/material__dialog/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -21,26 +21,17 @@
  */
 
 import { MDCComponent } from 'material__base';
-import { MDCRipple } from 'material__ripple';
-
 import MDCDialogFoundation from './foundation';
-import { MSDDialogAdapter } from './adapter';
+import MDCDialogAdapter from './adapter';
 import * as util from './util';
 
-export {MSDDialogAdapter, MDCDialogFoundation, util};
+export {MDCDialogAdapter, MDCDialogFoundation, util};
 
-export class MDCDialog extends MDCComponent<MSDDialogAdapter, MDCDialogFoundation> {
+export class MDCDialog extends MDCComponent<MDCDialogAdapter, MDCDialogFoundation> {
     static attachTo(root: Element): MDCDialog;
 
     readonly open: boolean;
-
-    initialize(): void;
-
-    destroy(): void;
-
     show(): void;
 
     close(): void;
-
-    getDefaultFoundation(): MDCDialogFoundation;
 }
diff --git a/types/material__drawer/index.d.ts b/types/material__drawer/index.d.ts
index 379ed35599..63cd5d8fda 100644
--- a/types/material__drawer/index.d.ts
+++ b/types/material__drawer/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -21,7 +21,7 @@
  */
 
 import * as util from './util';
-export {MDCSlidableDrawerAdapter} from './slidable';
-export {MDCTemporaryDrawer, MDCTemporaryDrawerFoundation} from './temporary';
-export {MDCPersistentDrawer, MDCPersistentDrawerFoundation} from './persistent';
-export {util};
+export { MDCSlidableDrawerAdapter } from './slidable';
+export { MDCTemporaryDrawer, MDCTemporaryDrawerFoundation } from './temporary';
+export { MDCPersistentDrawer, MDCPersistentDrawerFoundation } from './persistent';
+export { util };
diff --git a/types/material__drawer/persistent/constants.d.ts b/types/material__drawer/persistent/constants.d.ts
index 3d5f7c56ba..84dcce7f3f 100644
--- a/types/material__drawer/persistent/constants.d.ts
+++ b/types/material__drawer/persistent/constants.d.ts
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,13 +17,13 @@
 import { MDCStrings } from 'material__base';
 
 export interface cssClasses extends MDCStrings {
-    ROOT: 'mdc-persistent-drawer';
-    OPEN: 'mdc-persistent-drawer--open';
-    ANIMATING: 'mdc-persistent-drawer--animating';
+    ROOT: 'mdc-drawer--persistent';
+    OPEN: 'mdc-drawer--open';
+    ANIMATING: 'mdc-drawer--animating';
 }
 
 export interface strings extends MDCStrings {
-    DRAWER_SELECTOR: '.mdc-persistent-drawer__drawer';
+    DRAWER_SELECTOR: '.mdc-drawer--persistent .mdc-drawer__drawer';
     FOCUSABLE_ELEMENTS: 'a[href], area[href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), iframe, object, embed, [tabindex], [contenteditable]';
     OPEN_EVENT: 'MDCPersistentDrawer:open';
     CLOSE_EVENT: 'MDCPersistentDrawer:close';
diff --git a/types/material__drawer/persistent/foundation.d.ts b/types/material__drawer/persistent/foundation.d.ts
index 7d4d53f884..ce596f3c23 100644
--- a/types/material__drawer/persistent/foundation.d.ts
+++ b/types/material__drawer/persistent/foundation.d.ts
@@ -17,12 +17,10 @@
 import { MDCSlidableDrawerAdapter, MDCSlidableDrawerFoundation } from '../slidable';
 import { cssClasses, strings } from './constants';
 
-export class MDCPersistentDrawerFoundation extends MDCSlidableDrawerFoundation {
+export default class MDCPersistentDrawerFoundation extends MDCSlidableDrawerFoundation {
     static readonly cssClasses: cssClasses;
 
     static readonly strings: strings;
 
     static readonly defaultAdapter: MDCSlidableDrawerAdapter;
 }
-
-export default MDCPersistentDrawerFoundation;
diff --git a/types/material__drawer/persistent/index.d.ts b/types/material__drawer/persistent/index.d.ts
index 1c2286fd01..920258b2aa 100644
--- a/types/material__drawer/persistent/index.d.ts
+++ b/types/material__drawer/persistent/index.d.ts
@@ -15,7 +15,7 @@
  */
 
 import { MDCComponent } from 'material__base';
-import { MDCPersistentDrawerFoundation } from './foundation';
+import MDCPersistentDrawerFoundation from './foundation';
 import { MDCSlidableDrawerAdapter } from '../slidable';
 import * as util from '../util';
 
@@ -28,6 +28,4 @@ export class MDCPersistentDrawer extends MDCComponent<MDCSlidableDrawerAdapter,
 
     // Return the drawer element inside the component.
     readonly drawer: Element | null;
-
-    getDefaultFoundation(): MDCPersistentDrawerFoundation;
 }
diff --git a/types/material__drawer/slidable/index.d.ts b/types/material__drawer/slidable/index.d.ts
index b56661948d..a41d83ad4b 100644
--- a/types/material__drawer/slidable/index.d.ts
+++ b/types/material__drawer/slidable/index.d.ts
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-export {FOCUSABLE_ELEMENTS} from './constants';
-export {MDCSlidableDrawerFoundation} from './foundation';
-export {MDCSlidableDrawerAdapter} from './adapter';
+export { FOCUSABLE_ELEMENTS } from './constants';
+export { MDCSlidableDrawerFoundation } from './foundation';
+export { MDCSlidableDrawerAdapter } from './adapter';
diff --git a/types/material__drawer/temporary/constants.d.ts b/types/material__drawer/temporary/constants.d.ts
index b175492a82..ef00408a31 100644
--- a/types/material__drawer/temporary/constants.d.ts
+++ b/types/material__drawer/temporary/constants.d.ts
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,14 +17,14 @@
 import { MDCStrings } from 'material__base';
 
 export interface cssClasses extends MDCStrings {
-    ROOT: 'mdc-temporary-drawer';
-    OPEN: 'mdc-temporary-drawer--open';
-    ANIMATING: 'mdc-temporary-drawer--animating';
+    ROOT: 'mdc-drawer--temporary';
+    OPEN: 'mdc-drawer--open';
+    ANIMATING: 'mdc-drawer--animating';
     SCROLL_LOCK: 'mdc-drawer-scroll-lock';
 }
 
 export interface strings extends MDCStrings {
-    DRAWER_SELECTOR: '.mdc-temporary-drawer__drawer';
+    DRAWER_SELECTOR: '.mdc-drawer--temporary .mdc-drawer__drawer';
     OPACITY_VAR_NAME: '--mdc-temporary-drawer-opacity';
     FOCUSABLE_ELEMENTS: 'a[href], area[href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), iframe, object, embed, [tabindex], [contenteditable]';
     OPEN_EVENT: 'MDCTemporaryDrawer:open';
diff --git a/types/material__drawer/temporary/foundation.d.ts b/types/material__drawer/temporary/foundation.d.ts
index df1763c274..adb78d0296 100644
--- a/types/material__drawer/temporary/foundation.d.ts
+++ b/types/material__drawer/temporary/foundation.d.ts
@@ -17,7 +17,7 @@
 import { MDCSlidableDrawerFoundation, MDCSlidableDrawerAdapter } from '../slidable';
 import { cssClasses, strings } from './constants';
 
-export class MDCTemporaryDrawerFoundation extends MDCSlidableDrawerFoundation {
+export default class MDCTemporaryDrawerFoundation extends MDCSlidableDrawerFoundation {
     static readonly cssClasses: cssClasses;
 
     static readonly strings: strings;
@@ -28,5 +28,3 @@ export class MDCTemporaryDrawerFoundation extends MDCSlidableDrawerFoundation {
 
     close(): void;
 }
-
-export default MDCTemporaryDrawerFoundation;
diff --git a/types/material__drawer/temporary/index.d.ts b/types/material__drawer/temporary/index.d.ts
index 4e27965e43..c6dd1c9928 100644
--- a/types/material__drawer/temporary/index.d.ts
+++ b/types/material__drawer/temporary/index.d.ts
@@ -28,6 +28,4 @@ export class MDCTemporaryDrawer extends MDCComponent<MDCSlidableDrawerAdapter, M
 
     /* Return the drawer element inside the component. */
     readonly drawer: Element | null;
-
-    getDefaultFoundation(): MDCTemporaryDrawerFoundation;
 }
diff --git a/types/material__drawer/util.d.ts b/types/material__drawer/util.d.ts
index 66fa930b43..052af84e48 100644
--- a/types/material__drawer/util.d.ts
+++ b/types/material__drawer/util.d.ts
@@ -24,10 +24,12 @@ export function getTransformPropertyName(globalObj?: Window, forceRefresh?: bool
 export function supportsCssCustomProperties(globalObj?: Window): boolean;
 
 // Determine whether the current browser supports passive event listeners, and if so, use them.
-export function applyPassive(globalObj?: Window, forceRefresh?: boolean): boolean;
+export function applyPassive(globalObj?: Window, forceRefresh?: boolean): boolean | { passive: boolean; };
 
 // Save the tab state for an element.
+// tslint:disable-next-line:void-return
 export function saveElementTabState(el: Element): void;
 
 // Restore the tab state for an element, if it was saved.
+// tslint:disable-next-line:void-return
 export function restoreElementTabState(el: Element): void;
diff --git a/types/material__floating-label/adapter.d.ts b/types/material__floating-label/adapter.d.ts
new file mode 100644
index 0000000000..d7409be5ee
--- /dev/null
+++ b/types/material__floating-label/adapter.d.ts
@@ -0,0 +1,51 @@
+/**
+ * @license
+ * Copyright 2017 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Adapter for MDC Floating Label.
+ *
+ * Defines the shape of the adapter expected by the foundation. Implement this
+ * adapter to integrate the floating label into your framework. See
+ * https://github.com/material-components/material-components-web/blob/master/docs/authoring-components.md
+ * for more information.
+ */
+
+export default interface MDCFloatingLabelAdapter {
+    /**
+     * Adds a class to the label element.
+     */
+    addClass(className: string): void;
+
+    /**
+     * Removes a class from the label element.
+     */
+    removeClass(className: string): void;
+
+    /**
+     * Returns the width of the label element.
+     */
+    getWidth(): number;
+
+    /**
+     * Registers an event listener on the root element for a given event.
+     */
+    registerInteractionHandler(evtType: string, handler: EventListener): void;
+
+    /**
+     * Deregisters an event listener on the root element for a given event.
+     */
+    deregisterInteractionHandler(evtType: string, handler: EventListener): void;
+}
diff --git a/types/material__floating-label/constants.d.ts b/types/material__floating-label/constants.d.ts
new file mode 100644
index 0000000000..acd4d27ae6
--- /dev/null
+++ b/types/material__floating-label/constants.d.ts
@@ -0,0 +1,23 @@
+/**
+ * @license
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { MDCStrings } from 'material__base';
+
+export interface cssClasses extends MDCStrings {
+    LABEL_FLOAT_ABOVE: 'mdc-floating-label--float-above';
+    LABEL_SHAKE: 'mdc-floating-label--shake';
+}
diff --git a/types/material__floating-label/foundation.d.ts b/types/material__floating-label/foundation.d.ts
new file mode 100644
index 0000000000..0ba5c71988
--- /dev/null
+++ b/types/material__floating-label/foundation.d.ts
@@ -0,0 +1,40 @@
+/**
+ * @license
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import MDCFoundation from 'material__base/foundation';
+import MDCFloatingLabelAdapter from './adapter';
+import { cssClasses } from './constants';
+
+export default class MDCFloatingLabelFoundation extends MDCFoundation<MDCFloatingLabelAdapter> {
+    static readonly cssClasses: cssClasses;
+
+    static readonly defaultAdapter: MDCFloatingLabelAdapter;
+
+    /**
+     * Returns the width of the label element.
+     */
+    getWidth(): number;
+
+    /**
+     * Styles the label to produce the label shake for errors.
+     */
+    shake(shouldShake: boolean): void;
+
+    /**
+     * Styles the label to float or dock.
+     */
+    float(shouldFloat: boolean): void;
+}
diff --git a/types/material__floating-label/index.d.ts b/types/material__floating-label/index.d.ts
new file mode 100644
index 0000000000..6b426a75d3
--- /dev/null
+++ b/types/material__floating-label/index.d.ts
@@ -0,0 +1,48 @@
+// Type definitions for Material Components Web 0.35
+// Project: https://material.io/components/
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/**
+ * @license
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import MDCComponent from 'material__base/component';
+import MDCFloatingLabelFoundation from './foundation';
+import MDCFloatingLabelAdapter from './adapter';
+
+export { MDCFloatingLabelFoundation, MDCFloatingLabelAdapter };
+
+export class MDCFloatingLabel extends MDCComponent<MDCFloatingLabelAdapter, MDCFloatingLabelFoundation> {
+    static attachTo(root: Element): MDCFloatingLabel;
+
+    /**
+     * Styles the label to produce the label shake for errors.
+     * @param  shouldShake styles the label to shake by adding shake class
+     * if true, otherwise will stop shaking by removing shake class.
+     */
+    shake(shouldShake: boolean): void;
+
+    /**
+     * Styles label to float/dock.
+     * @param shouldFloat styles the label to float by adding float class
+     * if true, otherwise docks the label by removing the float class.
+     */
+    float(shouldFloat: boolean): void;
+
+    getWidth(): number;
+}
diff --git a/types/material__floating-label/tsconfig.json b/types/material__floating-label/tsconfig.json
new file mode 100644
index 0000000000..2af99c6e5e
--- /dev/null
+++ b/types/material__floating-label/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "files": [
+        "constants.d.ts",
+        "adapter.d.ts",
+        "index.d.ts",
+        "foundation.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file
diff --git a/types/material__floating-label/tslint.json b/types/material__floating-label/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/material__floating-label/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/material__form-field/adapter.d.ts b/types/material__form-field/adapter.d.ts
index 7033f363eb..722014eced 100644
--- a/types/material__form-field/adapter.d.ts
+++ b/types/material__form-field/adapter.d.ts
@@ -26,11 +26,9 @@
  * Implement this adapter for your framework of choice to delegate updates to
  * the component in your framework of choice. See architecture documentation
  * for more details.
- * https://github.com/material-components/material-components-web/blob/master/docs/architecture.md
- *
- * @record
+ * https://github.com/material-components/material-components-web/blob/master/docs/code/architecture.md
  */
-export class MDCFormFieldAdapter {
+export default interface MDCFormFieldAdapter {
     registerInteractionHandler(type: string, handler: EventListener): void;
 
     deregisterInteractionHandler(type: string, handler: EventListener): void;
@@ -39,5 +37,3 @@ export class MDCFormFieldAdapter {
 
     deactivateInputRipple(): void;
 }
-
-export default MDCFormFieldAdapter;
diff --git a/types/material__form-field/constants.d.ts b/types/material__form-field/constants.d.ts
index ba55acabcd..a40f571acc 100644
--- a/types/material__form-field/constants.d.ts
+++ b/types/material__form-field/constants.d.ts
@@ -18,7 +18,7 @@
 import { MDCStrings } from 'material__base';
 
 export interface cssClasses extends MDCStrings {
-    ROOT: 'mdc-form-field';
+  ROOT: 'mdc-form-field';
 }
 
 export interface strings extends MDCStrings {
diff --git a/types/material__form-field/foundation.d.ts b/types/material__form-field/foundation.d.ts
index 026beedfc2..aec781d9ab 100644
--- a/types/material__form-field/foundation.d.ts
+++ b/types/material__form-field/foundation.d.ts
@@ -19,12 +19,10 @@ import MDCFoundation from 'material__base/foundation';
 import MDCFormFieldAdapter from './adapter';
 import { cssClasses, strings } from './constants';
 
-export class MDCFormFieldFoundation extends MDCFoundation<MDCFormFieldAdapter> {
+export default class MDCFormFieldFoundation extends MDCFoundation<MDCFormFieldAdapter> {
     static readonly cssClasses: cssClasses;
 
     static readonly strings: strings;
 
     static readonly defaultAdapter: MDCFormFieldAdapter;
 }
-
-export default MDCFormFieldFoundation;
diff --git a/types/material__form-field/index.d.ts b/types/material__form-field/index.d.ts
index 1fcc30b4c4..812df5c0c0 100644
--- a/types/material__form-field/index.d.ts
+++ b/types/material__form-field/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -32,6 +32,4 @@ export class MDCFormField extends MDCComponent<MDCFormFieldAdapter, MDCFormField
     static attachTo(root: Element): MDCFormField;
 
     input: MDCSelectionControl;
-
-    getDefaultFoundation(): MDCFormFieldFoundation;
 }
diff --git a/types/material__grid-list/adapter.d.ts b/types/material__grid-list/adapter.d.ts
index 1dcbcbf251..d24d86f6d8 100644
--- a/types/material__grid-list/adapter.d.ts
+++ b/types/material__grid-list/adapter.d.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-export interface MDCGridListAdapter {
+export default interface MDCGridListAdapter {
     getOffsetWidth(): number;
 
     getNumberOfTiles(): number;
diff --git a/types/material__grid-list/foundation.d.ts b/types/material__grid-list/foundation.d.ts
index 04843273d6..fae88428ac 100644
--- a/types/material__grid-list/foundation.d.ts
+++ b/types/material__grid-list/foundation.d.ts
@@ -16,14 +16,12 @@
 
 import { MDCFoundation } from 'material__base';
 import { strings } from './constants';
-import { MDCGridListAdapter } from './adapter';
+import MDCGridListAdapter from './adapter';
 
-export class MDCGridListFoundation extends MDCFoundation<MDCGridListAdapter> {
+export default class MDCGridListFoundation extends MDCFoundation<MDCGridListAdapter> {
     static readonly strings: strings;
 
     static readonly defaultAdapter: MDCGridListAdapter;
 
     alignCenter(): void;
 }
-
-export default MDCGridListFoundation;
diff --git a/types/material__grid-list/index.d.ts b/types/material__grid-list/index.d.ts
index 2a1e98d912..87ee0a138e 100644
--- a/types/material__grid-list/index.d.ts
+++ b/types/material__grid-list/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -21,13 +21,11 @@
  */
 
 import { MDCComponent } from 'material__base';
-import { MDCGridListAdapter } from './adapter';
+import MDCGridListAdapter from './adapter';
 import MDCGridListFoundation from './foundation';
 
-export {MDCGridListAdapter, MDCGridListFoundation};
+export { MDCGridListAdapter, MDCGridListFoundation };
 
 export class MDCGridList extends MDCComponent<MDCGridListAdapter, MDCGridListFoundation> {
-  static attachTo(root: Element): MDCGridList;
-
-  getDefaultFoundation(): MDCGridListFoundation;
+    static attachTo(root: Element): MDCGridList;
 }
diff --git a/types/material__icon-toggle/adapter.d.ts b/types/material__icon-toggle/adapter.d.ts
index 52481fe732..56ac8a32dc 100644
--- a/types/material__icon-toggle/adapter.d.ts
+++ b/types/material__icon-toggle/adapter.d.ts
@@ -29,33 +29,30 @@
  * Implement this adapter for your framework of choice to delegate updates to
  * the component in your framework of choice. See architecture documentation
  * for more details.
- * https://github.com/material-components/material-components-web/blob/master/docs/architecture.md
- *
- * @record
+ * https://github.com/material-components/material-components-web/blob/master/docs/code/architecture.md
  */
+export default interface MDCIconToggleAdapter {
+    addClass(className: string): void;
 
-export class MDCIconToggleAdapter {
-  addClass(className: string): void;
+    removeClass(className: string): void;
 
-  removeClass(className: string): void;
+    registerInteractionHandler(type: string, handler: EventListener): void;
 
-  registerInteractionHandler(type: string, handler: EventListener): void;
+    deregisterInteractionHandler(type: string, handler: EventListener): void;
 
-  deregisterInteractionHandler(type: string, handler: EventListener): void;
+    setText(text: string): void;
 
-  setText(text: string): void;
+    getTabIndex(): number;
 
-  getTabIndex(): number;
+    setTabIndex(tabIndex: number): void;
 
-  setTabIndex(tabIndex: number): void;
+    getAttr(name: string): string;
 
-  getAttr(name: string): string;
+    setAttr(name: string, value: string): void;
 
-  setAttr(name: string, value: string): void;
+    rmAttr(name: string): void;
 
-  rmAttr(name: string): void;
-
-  notifyChange(evtData: IconToggleEvent): void;
+    notifyChange(evtData: IconToggleEvent): void;
 }
 
 export interface IconToggleEvent {
diff --git a/types/material__icon-toggle/foundation.d.ts b/types/material__icon-toggle/foundation.d.ts
index 65d25c1307..cd8910713f 100644
--- a/types/material__icon-toggle/foundation.d.ts
+++ b/types/material__icon-toggle/foundation.d.ts
@@ -16,10 +16,10 @@
  */
 
 import MDCFoundation from 'material__base/foundation';
-import { MDCIconToggleAdapter, IconToggleEvent } from './adapter';
+import MDCIconToggleAdapter from './adapter';
 import { cssClasses, strings } from './constants';
 
-export class MDCIconToggleFoundation extends MDCFoundation<MDCIconToggleAdapter> {
+export default class MDCIconToggleFoundation extends MDCFoundation<MDCIconToggleAdapter> {
     static readonly cssClasses: cssClasses;
 
     static readonly strings: strings;
@@ -38,27 +38,3 @@ export class MDCIconToggleFoundation extends MDCFoundation<MDCIconToggleAdapter>
 
     isKeyboardActivated(): boolean;
 }
-
-export interface KeyboardKey {
-    key: string;
-    keyCode: number;
-}
-
-export function isSpace(keyboardKey: KeyboardKey): boolean;
-
-export class IconToggleState {
-    /**
-     * The aria-label value of the icon toggle, or undefined if there is no aria-label.
-     */
-    label: string|undefined;
-    /**
-     * The text for the icon toggle, or undefined if there is no text.
-     */
-    content: string|undefined;
-    /**
-     * The CSS class to add to the icon toggle, or undefined if there is no CSS class.
-     */
-    cssClass: string|undefined;
-}
-
-export default MDCIconToggleFoundation;
diff --git a/types/material__icon-toggle/index.d.ts b/types/material__icon-toggle/index.d.ts
index bfced0b532..beae5b83db 100644
--- a/types/material__icon-toggle/index.d.ts
+++ b/types/material__icon-toggle/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -23,18 +23,14 @@
 
 import MDCComponent from 'material__base/component';
 import MDCIconToggleFoundation from './foundation';
-import { MDCIconToggleAdapter } from './adapter';
-import { MDCRipple, MDCRippleFoundation } from 'material__ripple';
+import MDCIconToggleAdapter from './adapter';
+import { MDCRipple } from 'material__ripple';
 
 export {MDCIconToggleAdapter, MDCIconToggleFoundation};
 
 export class MDCIconToggle extends MDCComponent<MDCIconToggleAdapter, MDCIconToggleFoundation> {
     static attachTo(root: Element): MDCIconToggle;
 
-    destroy(): void;
-
-    getDefaultFoundation(): MDCIconToggleFoundation;
-
     initialSyncWithDOM(): void;
 
     readonly ripple: MDCRipple;
diff --git a/types/material__line-ripple/adapter.d.ts b/types/material__line-ripple/adapter.d.ts
new file mode 100644
index 0000000000..93865a952a
--- /dev/null
+++ b/types/material__line-ripple/adapter.d.ts
@@ -0,0 +1,53 @@
+/**
+ * @license
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Adapter for MDC TextField Line Ripple.
+ *
+ * Defines the shape of the adapter expected by the foundation. Implement this
+ * adapter to integrate the line ripple into your framework. See
+ * https://github.com/material-components/material-components-web/blob/master/docs/authoring-components.md
+ * for more information.
+ */
+
+export default interface MDCLineRippleAdapter {
+    /**
+     * Adds a class to the line ripple element.
+     */
+    addClass(className: string): void;
+
+    /**
+     * Removes a class from the line ripple element.
+     */
+    removeClass(className: string): void;
+
+    hasClass(className: string): boolean;
+
+    /**
+     * Sets the style property with propertyName to value on the root element.
+     */
+    setStyle(propertyName: string, value: string): void;
+
+    /**
+     * Registers an event listener on the line ripple element for a given event.
+     */
+    registerEventHandler(evtType: string, handler: EventListener): void;
+
+    /**
+     * Deregisters an event listener on the line ripple element for a given event.
+     */
+    deregisterEventHandler(evtType: string, handler: EventListener): void;
+}
diff --git a/types/material__line-ripple/constants.d.ts b/types/material__line-ripple/constants.d.ts
new file mode 100644
index 0000000000..722570a2f5
--- /dev/null
+++ b/types/material__line-ripple/constants.d.ts
@@ -0,0 +1,23 @@
+/**
+ * @license
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { MDCStrings } from 'material__base';
+
+export interface cssClasses extends MDCStrings {
+    LINE_RIPPLE_ACTIVE: 'mdc-line-ripple--active';
+    LINE_RIPPLE_DEACTIVATING: 'mdc-line-ripple--deactivating';
+}
diff --git a/types/material__line-ripple/foundation.d.ts b/types/material__line-ripple/foundation.d.ts
new file mode 100644
index 0000000000..2d525b7083
--- /dev/null
+++ b/types/material__line-ripple/foundation.d.ts
@@ -0,0 +1,45 @@
+/**
+ * @license
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import MDCFoundation from 'material__base/foundation';
+import { cssClasses } from './constants';
+import MDCLineRippleAdapter from './adapter';
+
+export default class MDCLineRippleFoundation extends MDCFoundation<MDCLineRippleAdapter> {
+    static readonly cssClasses: cssClasses;
+
+    static readonly defaultAdapter: MDCLineRippleAdapter;
+
+    /**
+     * Activates the line ripple
+     */
+    activate(): void;
+
+    /**
+     * Sets the center of the ripple animation to the given X coordinate.
+     */
+    setRippleCenter(xCoordinate: number): void;
+
+    /**
+     * Deactivates the line ripple
+     */
+    deactivate(): void;
+
+    /**
+     * Handles a transition end event
+     */
+    handleTransitionEnd(evt: Event): void;
+}
diff --git a/types/material__line-ripple/index.d.ts b/types/material__line-ripple/index.d.ts
new file mode 100644
index 0000000000..f76ed98d10
--- /dev/null
+++ b/types/material__line-ripple/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for Material Components Web 0.35
+// Project: https://material.io/components/
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/**
+ * @license
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import MDCComponent from 'material__base/component';
+import MDCLineRippleFoundation from './foundation';
+import MDCLineRippleAdapter from './adapter';
+
+export { MDCLineRippleFoundation, MDCLineRippleAdapter };
+
+export class MDCLineRipple extends MDCComponent<MDCLineRippleAdapter, MDCLineRippleFoundation> {
+    static attachTo(root: Element): MDCLineRipple;
+
+    /**
+     * Activates the line ripple
+     */
+    activate(): void;
+
+    /**
+     * Deactivates the line ripple
+     */
+    deactivate(): void;
+
+    /**
+     * Sets the transform origin given a user's click location. The `rippleCenter` is the
+     * x-coordinate of the middle of the ripple.
+     */
+    setRippleCenter(xCoordinate: number): void;
+}
diff --git a/types/material__line-ripple/tsconfig.json b/types/material__line-ripple/tsconfig.json
new file mode 100644
index 0000000000..2af99c6e5e
--- /dev/null
+++ b/types/material__line-ripple/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "files": [
+        "constants.d.ts",
+        "adapter.d.ts",
+        "index.d.ts",
+        "foundation.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file
diff --git a/types/material__line-ripple/tslint.json b/types/material__line-ripple/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/material__line-ripple/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/material__linear-progress/adapter.d.ts b/types/material__linear-progress/adapter.d.ts
index 92afccc19d..a8dd2dc163 100644
--- a/types/material__linear-progress/adapter.d.ts
+++ b/types/material__linear-progress/adapter.d.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-export interface MDCLinearProgressAdapter {
+export default interface MDCLinearProgressAdapter {
     addClass(className: string): void;
 
     getPrimaryBar(): Element;
diff --git a/types/material__linear-progress/foundation.d.ts b/types/material__linear-progress/foundation.d.ts
index 4abd553a09..5d67b121c7 100644
--- a/types/material__linear-progress/foundation.d.ts
+++ b/types/material__linear-progress/foundation.d.ts
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-import { MDCFoundation } from 'material__base';
-import { transformStyleProperties } from 'material__animation';
-import { MDCLinearProgressAdapter } from './adapter';
+import MDCFoundation from 'material__base/foundation';
+import MDCLinearProgressAdapter from './adapter';
 import { cssClasses, strings } from './constants';
 
-export class MDCLinearProgressFoundation extends MDCFoundation<MDCLinearProgressAdapter> {
+export default class MDCLinearProgressFoundation extends MDCFoundation<MDCLinearProgressAdapter> {
     static readonly cssClasses: cssClasses;
 
     static readonly strings: strings;
diff --git a/types/material__linear-progress/index.d.ts b/types/material__linear-progress/index.d.ts
index 765d8cb368..4161a165f8 100644
--- a/types/material__linear-progress/index.d.ts
+++ b/types/material__linear-progress/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -21,10 +21,10 @@
  */
 
 import { MDCComponent } from 'material__base';
-import { MDCLinearProgressAdapter } from './adapter';
-import { MDCLinearProgressFoundation } from './foundation';
+import MDCLinearProgressAdapter from './adapter';
+import MDCLinearProgressFoundation from './foundation';
 
-export {MDCLinearProgressAdapter, MDCLinearProgressFoundation};
+export { MDCLinearProgressAdapter, MDCLinearProgressFoundation };
 
 export class MDCLinearProgress extends MDCComponent<MDCLinearProgressAdapter, MDCLinearProgressFoundation> {
     static attachTo(root: Element): MDCLinearProgress;
@@ -40,6 +40,4 @@ export class MDCLinearProgress extends MDCComponent<MDCLinearProgressAdapter, MD
     open(): void;
 
     close(): void;
-
-    getDefaultFoundation(): MDCLinearProgressFoundation;
 }
diff --git a/types/material__menu/simple/adapter.d.ts b/types/material__menu/adapter.d.ts
similarity index 69%
rename from types/material__menu/simple/adapter.d.ts
rename to types/material__menu/adapter.d.ts
index 7fdd1e4f3a..b8e31f36c5 100644
--- a/types/material__menu/simple/adapter.d.ts
+++ b/types/material__menu/adapter.d.ts
@@ -14,9 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
- * Adapter for MDC Simple Menu. Provides an interface for managing
+ * Adapter for MDC Menu. Provides an interface for managing
  * - classes
  * - dom
  * - focus
@@ -30,11 +29,10 @@
  * Implement this adapter for your framework of choice to delegate updates to
  * the component in your framework of choice. See architecture documentation
  * for more details.
- * https://github.com/material-components/material-components-web/blob/master/docs/architecture.md
- *
- * @record
+ * https://github.com/material-components/material-components-web/blob/master/docs/code/architecture.md
  */
-export default class MDCSimpleMenuAdapter {
+
+export default interface MDCMenuAdapter {
     addClass(className: string): void;
 
     removeClass(className: string): void;
@@ -45,17 +43,13 @@ export default class MDCSimpleMenuAdapter {
 
     getAttributeForEventTarget(target: EventTarget, attributeName: string): string;
 
-    getInnerDimensions(): {width: number, height: number};
+    getInnerDimensions(): { width: number; height: number; };
 
     hasAnchor(): boolean;
 
-    getAnchorDimensions(): {width: number, height: number, top: number, right: number, bottom: number, left: number};
+    getAnchorDimensions(): { width: number; height: number; top: number; right: number; bottom: number; left: number; };
 
-    getWindowDimensions(): {width: number, height: number};
-
-    setScale(x: number, y: number): void;
-
-    setInnerScale(x: number, y: number): void;
+    getWindowDimensions(): { width: number; height: number; };
 
     getNumberOfItems(): number;
 
@@ -67,13 +61,9 @@ export default class MDCSimpleMenuAdapter {
 
     deregisterBodyClickHandler(handler: EventListener): void;
 
-    getYParamsForItemAtIndex(index: number): {top: number, height: number};
-
-    setTransitionDelayForItemAtIndex(index: number, value: string|null): void;
-
     getIndexForEventTarget(target: EventTarget): number;
 
-    notifySelected(evtData: {index: number}): void;
+    notifySelected(evtData: { index: number; }): void;
 
     notifyCancel(): void;
 
@@ -94,11 +84,19 @@ export default class MDCSimpleMenuAdapter {
     setTransformOrigin(origin: string): void;
 
     setPosition(position: {
-        top: string|undefined,
-        right: string|undefined,
-        bottom: string|undefined,
-        left: string|undefined
+        top: (string|undefined),
+        right: (string|undefined),
+        bottom: (string|undefined),
+        left: (string|undefined)
     }): void;
 
-    getAccurateTime(): number;
+    setMaxHeight(height: number): void;
+
+    setAttrForOptionAtIndex(index: number, attr: string, value: string): void;
+
+    rmAttrForOptionAtIndex(index: number, attr: string): void;
+
+    addClassForOptionAtIndex(index: number, className: string): void;
+
+    rmClassForOptionAtIndex(index: number, className: string): void;
 }
diff --git a/types/material__menu/constants.d.ts b/types/material__menu/constants.d.ts
new file mode 100644
index 0000000000..8bec0c2e0c
--- /dev/null
+++ b/types/material__menu/constants.d.ts
@@ -0,0 +1,77 @@
+/**
+ * @license
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { MDCStrings, MDCNumbers } from 'material__base';
+
+export interface cssClasses extends MDCStrings {
+    ROOT: 'mdc-menu';
+    OPEN: 'mdc-menu--open';
+    ANIMATING_OPEN: 'mdc-menu--animating-open';
+    ANIMATING_CLOSED: 'mdc-menu--animating-closed';
+    SELECTED_LIST_ITEM: 'mdc-list-item--selected';
+}
+
+export interface strings extends MDCStrings {
+    ITEMS_SELECTOR: '.mdc-menu__items';
+    SELECTED_EVENT: 'MDCMenu:selected';
+    CANCEL_EVENT: 'MDCMenu:cancel';
+    ARIA_DISABLED_ATTR: 'aria-disabled';
+}
+
+export interface numbers extends MDCNumbers {
+    // Amount of time to wait before triggering a selected event on the menu. Note that this time
+    // will most likely be bumped up once interactive lists are supported to allow for the ripple to
+    // animate before closing the menu
+    SELECTED_TRIGGER_DELAY: 50;
+    // Total duration of menu open animation.
+    TRANSITION_OPEN_DURATION: 120;
+    // Total duration of menu close animation.
+    TRANSITION_CLOSE_DURATION: 75;
+    // Margin left to the edge of the viewport when menu is at maximum possible height.
+    MARGIN_TO_EDGE: 32;
+    // Ratio of anchor width to menu width for switching from corner positioning to center positioning.
+    ANCHOR_TO_MENU_WIDTH_RATIO: 0.67;
+    // Ratio of vertical offset to menu height for switching from corner to mid-way origin positioning.
+    OFFSET_TO_MENU_HEIGHT_RATIO: 0.1;
+}
+
+/**
+ * Enum for bits in the {@see Corner) bitmap.
+ */
+export interface CornerBit extends MDCNumbers {
+    BOTTOM: 1;
+    CENTER: 2;
+    RIGHT: 4;
+    FLIP_RTL: 8;
+}
+/**
+ * Enum for representing an element corner for positioning the menu.
+ *
+ * The START constants map to LEFT if element directionality is left
+ * to right and RIGHT if the directionality is right to left.
+ * Likewise END maps to RIGHT or LEFT depending on the directionality.
+ */
+export interface Corner extends MDCNumbers {
+  TOP_LEFT: 0;
+  TOP_RIGHT: CornerBit["RIGHT"];
+  BOTTOM_LEFT: CornerBit["BOTTOM"];
+  BOTTOM_RIGHT: CornerBit["BOTTOM"] | CornerBit["RIGHT"];
+  TOP_START: CornerBit["FLIP_RTL"];
+  TOP_END: CornerBit["FLIP_RTL"] | CornerBit["RIGHT"];
+  BOTTOM_START: CornerBit["BOTTOM"] | CornerBit["FLIP_RTL"];
+  BOTTOM_END: CornerBit["BOTTOM"] | CornerBit["RIGHT"] | CornerBit["FLIP_RTL"];
+}
diff --git a/types/material__menu/foundation.d.ts b/types/material__menu/foundation.d.ts
new file mode 100644
index 0000000000..d2fe3a2c4a
--- /dev/null
+++ b/types/material__menu/foundation.d.ts
@@ -0,0 +1,68 @@
+/**
+ * @license
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import MDCFoundation from 'material__base/foundation';
+import { cssClasses, strings, numbers, CornerBit, Corner } from './constants';
+import MDCMenuAdapter from './adapter';
+
+export interface AnchorMargin {
+    top: number;
+    right: number;
+    bottom: number;
+    left: number;
+}
+
+export default class MDCMenuFoundation extends MDCFoundation<MDCMenuFoundation> {
+    static readonly cssClasses: cssClasses;
+
+    static readonly strings: strings;
+
+    static readonly numbers: numbers;
+
+    static readonly Corner: Corner;
+
+    static readonly defaultAdapter: MDCMenuAdapter;
+
+    /**
+     * @param corner Default anchor corner alignment of top-left menu corner.
+     */
+    setAnchorCorner(corner: Corner): void;
+
+    /**
+     * @param margin 4-plet of margins from anchor.
+     */
+    setAnchorMargin(margin: AnchorMargin): void;
+
+    setRememberSelection(rememberSelection: boolean): void;
+
+    setQuickOpen(quickOpen: boolean): void;
+
+    open({focusIndex}?: {
+        focusIndex?: null;
+    }): void;
+
+    close(evt?: Event): void;
+
+    isOpen(): boolean;
+
+    getSelectedIndex(): number;
+
+    /**
+     * @param index Index of the item to set as selected.
+     */
+    setSelectedIndex(index: number): void;
+}
diff --git a/types/material__menu/index.d.ts b/types/material__menu/index.d.ts
index af9360d1a8..3c50c13690 100644
--- a/types/material__menu/index.d.ts
+++ b/types/material__menu/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -20,7 +20,44 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import MDCComponent from 'material__base/component';
+import MDCMenuFoundation, { AnchorMargin } from './foundation';
+import MDCMenuAdapter from './adapter';
+import { Corner, CornerBit } from './constants';
 
-import * as util from './util';
-import { MDCSimpleMenu, MDCSimpleMenuAdapter, MDCSimpleMenuFoundation } from './simple/index';
-export { MDCSimpleMenu, MDCSimpleMenuAdapter, MDCSimpleMenuFoundation, util };
+export { MDCMenuFoundation, MDCMenuAdapter, AnchorMargin, Corner, CornerBit };
+
+export class MDCMenu extends MDCComponent<MDCMenuAdapter, MDCMenuFoundation> {
+    static attachTo(root: Element): MDCMenu;
+
+    open: boolean;
+
+    show(options?: { focusIndex?: number | null; }): void;
+
+    hide(): void;
+
+    /**
+     * @param corner Default anchor corner alignment of top-left menu corner.
+     */
+    setAnchorCorner(corner: Corner): void;
+
+    setAnchorMargin(margin: AnchorMargin): void;
+
+    /**
+     * Return the items within the menu. Note that this only contains the set of elements within
+     * the items container that are proper list items, and not supplemental / presentational DOM
+     * elements.
+     */
+    readonly items: Element[];
+
+    /**
+     * Return the item within the menu that is selected.
+     */
+    getOptionByIndex(index: number): Element | null;
+
+    selectedItemIndex: number;
+
+    rememberSelection: boolean;
+
+    quickOpen: boolean;
+}
diff --git a/types/material__menu/simple/constants.d.ts b/types/material__menu/simple/constants.d.ts
deleted file mode 100644
index 58e2f16614..0000000000
--- a/types/material__menu/simple/constants.d.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * @license
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { MDCStrings, MDCNumbers } from 'material__base';
-
-export interface cssClasses extends MDCStrings {
-    ROOT: 'mdc-simple-menu';
-    OPEN: 'mdc-simple-menu--open';
-    ANIMATING: 'mdc-simple-menu--animating';
-    TOP_RIGHT: 'mdc-simple-menu--open-from-top-right';
-    BOTTOM_LEFT: 'mdc-simple-menu--open-from-bottom-left';
-    BOTTOM_RIGHT: 'mdc-simple-menu--open-from-bottom-right';
-}
-
-export interface strings extends MDCStrings {
-    ITEMS_SELECTOR: '.mdc-simple-menu__items';
-    SELECTED_EVENT: 'MDCSimpleMenu:selected';
-    CANCEL_EVENT: 'MDCSimpleMenu:cancel';
-    ARIA_DISABLED_ATTR: 'aria-disabled';
-}
-
-export interface numbers extends MDCNumbers {
-  // Amount of time to wait before triggering a selected event on the menu. Note that this time
-  // will most likely be bumped up once interactive lists are supported to allow for the ripple to
-  // animate before closing the menu
-  SELECTED_TRIGGER_DELAY: 50;
-  // Total duration of the menu animation.
-  TRANSITION_DURATION_MS: 300;
-  // The menu starts its open animation with the X axis at this time value (0 - 1).
-  TRANSITION_SCALE_ADJUSTMENT_X: 0.5;
-  // The time value the menu waits until the animation starts on the Y axis (0 - 1).
-  TRANSITION_SCALE_ADJUSTMENT_Y: 0.2;
-  // The cubic bezier control points for the animation (cubic-bezier(0, 0, 0.2, 1)).
-  TRANSITION_X1: 0;
-  TRANSITION_Y1: 0;
-  TRANSITION_X2: 0.2;
-  TRANSITION_Y2: 1;
-}
diff --git a/types/material__menu/simple/index.d.ts b/types/material__menu/simple/index.d.ts
deleted file mode 100644
index c2315810ba..0000000000
--- a/types/material__menu/simple/index.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @license
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import MDCComponent from 'material__base/component';
-import MDCSimpleMenuFoundation from './foundation';
-import MDCSimpleMenuAdapter from './adapter';
-import { getTransformPropertyName } from '../util';
-
-export {MDCSimpleMenuAdapter, MDCSimpleMenuFoundation};
-
-export class MDCSimpleMenu extends MDCComponent<MDCSimpleMenuAdapter, MDCSimpleMenuFoundation> {
-  static attachTo(root: Element): MDCSimpleMenu;
-
-  open: boolean;
-
-  show(options?: {focusIndex?: number}): void;
-
-  hide(): void;
-
-  /**
-   * Return the items within the menu. Note that this only contains the set of elements within
-   * the items container that are proper list items, and not supplemental / presentational DOM
-   * elements.
-   */
-  readonly items: Element[];
-
-  getDefaultFoundation(): MDCSimpleMenuFoundation;
-}
diff --git a/types/material__menu/tsconfig.json b/types/material__menu/tsconfig.json
index 74016e9380..b257a72f11 100644
--- a/types/material__menu/tsconfig.json
+++ b/types/material__menu/tsconfig.json
@@ -1,11 +1,10 @@
 {
     "files": [
-        "simple/constants.d.ts",
-        "simple/adapter.d.ts",
-        "simple/index.d.ts",
-        "simple/foundation.d.ts",
-        "util.d.ts",
-        "index.d.ts"
+        "constants.d.ts",
+        "adapter.d.ts",
+        "index.d.ts",
+        "foundation.d.ts",
+        "util.d.ts"
     ],
     "compilerOptions": {
         "module": "commonjs",
diff --git a/types/material__notched-outline/adapter.d.ts b/types/material__notched-outline/adapter.d.ts
new file mode 100644
index 0000000000..8e44143e25
--- /dev/null
+++ b/types/material__notched-outline/adapter.d.ts
@@ -0,0 +1,57 @@
+/**
+ * @license
+ * Copyright 2017 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Adapter for MDC Notched Outline.
+ *
+ * Defines the shape of the adapter expected by the foundation. Implement this
+ * adapter to integrate the Notched Outline into your framework. See
+ * https://github.com/material-components/material-components-web/blob/master/docs/authoring-components.md
+ * for more information.
+ */
+
+export default interface MDCNotchedOutlineAdapter {
+    /**
+     * Returns the width of the root element.
+     */
+    getWidth(): number;
+
+    /**
+     * Returns the height of the root element.
+     */
+    getHeight(): number;
+
+    /**
+     * Adds a class to the root element.
+     */
+    addClass(className: string): void;
+
+    /**
+     * Removes a class from the root element.
+     */
+    removeClass(className: string): void;
+
+    /**
+     * Sets the "d" attribute of the outline element's SVG path.
+     */
+    setOutlinePathAttr(value: string): void;
+
+    /**
+     * Returns the idle outline element's computed style value of the given css property `propertyName`.
+     * We achieve this via `getComputedStyle(...).getPropertyValue(propertyName)`.
+     */
+    getIdleOutlineStyleValue(propertyName: string): string;
+}
diff --git a/types/material__notched-outline/constants.d.ts b/types/material__notched-outline/constants.d.ts
new file mode 100644
index 0000000000..2a18a77b8b
--- /dev/null
+++ b/types/material__notched-outline/constants.d.ts
@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { MDCStrings } from 'material__base';
+
+export interface strings extends MDCStrings {
+    PATH_SELECTOR: '.mdc-notched-outline__path';
+    IDLE_OUTLINE_SELECTOR: '.mdc-notched-outline__idle';
+}
+
+export interface cssClasses extends MDCStrings {
+    OUTLINE_NOTCHED: 'mdc-notched-outline--notched';
+}
diff --git a/types/material__notched-outline/foundation.d.ts b/types/material__notched-outline/foundation.d.ts
new file mode 100644
index 0000000000..30234d65f9
--- /dev/null
+++ b/types/material__notched-outline/foundation.d.ts
@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright 2017 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import MDCFoundation from 'material__base/foundation';
+import { cssClasses, strings } from './constants';
+import MDCNotchedOutlineAdapter from './adapter';
+
+export default class MDCNotchedOutlineFoundation extends MDCFoundation<MDCNotchedOutlineAdapter> {
+    static readonly strings: strings;
+
+    static readonly cssClasses: cssClasses;
+
+    static readonly defaultAdapter: MDCNotchedOutlineAdapter;
+
+    /**
+     * Adds the outline notched selector and updates the notch width
+     * calculated based off of notchWidth and isRtl.
+     */
+    notch(notchWidth: number, isRtl?: boolean): void;
+
+    /**
+     * Removes notched outline selector to close the notch in the outline.
+     */
+    closeNotch(): void;
+}
diff --git a/types/material__notched-outline/index.d.ts b/types/material__notched-outline/index.d.ts
new file mode 100644
index 0000000000..d22a9a6918
--- /dev/null
+++ b/types/material__notched-outline/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for Material Components Web 0.35
+// Project: https://material.io/components/
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/**
+ * @license
+ * Copyright 2017 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import MDCComponent from 'material__base/component';
+import MDCNotchedOutlineFoundation from './foundation';
+import MDCNotchedOutlineAdapter from './adapter';
+
+export { MDCNotchedOutlineFoundation, MDCNotchedOutlineAdapter };
+
+export class MDCNotchedOutline extends MDCComponent<MDCNotchedOutlineAdapter, MDCNotchedOutlineFoundation> {
+    static attachTo(root: Element): MDCNotchedOutline;
+
+    /**
+     * Updates outline selectors and SVG path to open notch.
+     */
+    notch(notchWidth: number, isRtl?: boolean): void;
+
+    /**
+     * Updates the outline selectors to close notch and return it to idle state.
+     */
+    closeNotch(): void;
+}
diff --git a/types/material__notched-outline/tsconfig.json b/types/material__notched-outline/tsconfig.json
new file mode 100644
index 0000000000..2af99c6e5e
--- /dev/null
+++ b/types/material__notched-outline/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "files": [
+        "constants.d.ts",
+        "adapter.d.ts",
+        "index.d.ts",
+        "foundation.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file
diff --git a/types/material__notched-outline/tslint.json b/types/material__notched-outline/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/material__notched-outline/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/material__radio/adapter.d.ts b/types/material__radio/adapter.d.ts
index 91035ea177..1238d2bae4 100644
--- a/types/material__radio/adapter.d.ts
+++ b/types/material__radio/adapter.d.ts
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,14 +27,12 @@ import { MDCSelectionControlState } from 'material__selection-control';
  * Implement this adapter for your framework of choice to delegate updates to
  * the component in your framework of choice. See architecture documentation
  * for more details.
- * https://github.com/material-components/material-components-web/blob/master/docs/architecture.md
+ * https://github.com/material-components/material-components-web/blob/master/docs/code/architecture.md
  */
-export class MDCRadioAdapter {
+export default interface MDCRadioAdapter {
     addClass(className: string): void;
 
     removeClass(className: string): void;
 
     getNativeControl(): MDCSelectionControlState;
 }
-
-export default MDCRadioAdapter;
diff --git a/types/material__radio/foundation.d.ts b/types/material__radio/foundation.d.ts
index f27bd30f1b..bb0720e831 100644
--- a/types/material__radio/foundation.d.ts
+++ b/types/material__radio/foundation.d.ts
@@ -15,28 +15,25 @@
  */
 
 import MDCFoundation from 'material__base/foundation';
-import { MDCSelectionControlState } from 'material__selection-control';
 import MDCRadioAdapter from './adapter';
 import { cssClasses, strings } from './constants';
 
-export class MDCRadioFoundation extends MDCFoundation<MDCRadioAdapter> {
-  static readonly cssClasses: cssClasses;
+export default class MDCRadioFoundation extends MDCFoundation<MDCRadioAdapter> {
+    static readonly cssClasses: cssClasses;
 
-  static readonly strings: strings;
+    static readonly strings: strings;
 
-  static readonly defaultAdapter: MDCRadioAdapter;
+    static readonly defaultAdapter: MDCRadioAdapter;
 
-  isChecked(): boolean;
+    isChecked(): boolean;
 
-  setChecked(checked: boolean): void;
+    setChecked(checked: boolean): void;
 
-  isDisabled(): boolean;
+    isDisabled(): boolean;
 
-  setDisabled(disabled: boolean): void;
+    setDisabled(disabled: boolean): void;
 
-  getValue(): string;
+    getValue(): string;
 
-  setValue(value?: string): void;
+    setValue(value?: string): void;
 }
-
-export default MDCRadioFoundation;
diff --git a/types/material__radio/index.d.ts b/types/material__radio/index.d.ts
index e9001d9d84..d73206b791 100644
--- a/types/material__radio/index.d.ts
+++ b/types/material__radio/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -25,7 +25,7 @@ import MDCComponent from 'material__base/component';
 import { MDCSelectionControl } from 'material__selection-control';
 import MDCRadioAdapter from './adapter';
 import MDCRadioFoundation from './foundation';
-import { MDCRipple, MDCRippleFoundation } from 'material__ripple';
+import { MDCRipple } from 'material__ripple';
 
 export {MDCRadioAdapter, MDCRadioFoundation};
 
@@ -39,8 +39,4 @@ export class MDCRadio extends MDCComponent<MDCRadioAdapter, MDCRadioFoundation>
     value: string;
 
     readonly ripple: MDCRipple;
-
-    destroy(): void;
-
-    getDefaultFoundation(): MDCRadioFoundation;
 }
diff --git a/types/material__ripple/adapter.d.ts b/types/material__ripple/adapter.d.ts
index 0d2d319aab..ff5ab11231 100644
--- a/types/material__ripple/adapter.d.ts
+++ b/types/material__ripple/adapter.d.ts
@@ -32,11 +32,9 @@
  * Implement this adapter for your framework of choice to delegate updates to
  * the component in your framework of choice. See architecture documentation
  * for more details.
- * https://github.com/material-components/material-components-web/blob/master/docs/architecture.md
- *
- * @record
+ * https://github.com/material-components/material-components-web/blob/master/docs/code/architecture.md
  */
-export default class MDCRippleAdapter {
+export default interface MDCRippleAdapter {
     browserSupportsCssVars(): boolean;
 
     isUnbounded(): boolean;
@@ -49,17 +47,23 @@ export default class MDCRippleAdapter {
 
     removeClass(className: string): void;
 
+    containsEventTarget(target: EventTarget): void;
+
     registerInteractionHandler(evtType: string, handler: EventListener): void;
 
     deregisterInteractionHandler(evtType: string, handler: EventListener): void;
 
+    registerDocumentInteractionHandler(evtType: string, handler: EventListener): void;
+
+    deregisterDocumentInteractionHandler(evtType: string, handler: EventListener): void;
+
     registerResizeHandler(handler: EventListener): void;
 
     deregisterResizeHandler(handler: EventListener): void;
 
-    updateCssVariable(varName: string, value: number|string): void;
+    updateCssVariable(varName: string, value: number | string | null): void;
 
     computeBoundingRect(): ClientRect;
 
-    getWindowPageOffset(): {x: number, y: number};
+    getWindowPageOffset(): { x: number; y: number; };
 }
diff --git a/types/material__ripple/constants.d.ts b/types/material__ripple/constants.d.ts
index 285d5f3f2c..b1dd4c12b4 100644
--- a/types/material__ripple/constants.d.ts
+++ b/types/material__ripple/constants.d.ts
@@ -24,15 +24,14 @@ export interface cssClasses extends MDCStrings {
     ROOT: 'mdc-ripple-upgraded';
     UNBOUNDED: 'mdc-ripple-upgraded--unbounded';
     BG_FOCUSED: 'mdc-ripple-upgraded--background-focused';
-    BG_ACTIVE_FILL: 'mdc-ripple-upgraded--background-active-fill';
     FG_ACTIVATION: 'mdc-ripple-upgraded--foreground-activation';
     FG_DEACTIVATION: 'mdc-ripple-upgraded--foreground-deactivation';
 }
 
 export interface strings extends MDCStrings {
-    VAR_FG_SIZE: '--mdc-ripple-fg-size';
     VAR_LEFT: '--mdc-ripple-left';
     VAR_TOP: '--mdc-ripple-top';
+    VAR_FG_SIZE: '--mdc-ripple-fg-size';
     VAR_FG_SCALE: '--mdc-ripple-fg-scale';
     VAR_FG_TRANSLATE_START: '--mdc-ripple-fg-translate-start';
     VAR_FG_TRANSLATE_END: '--mdc-ripple-fg-translate-end';
@@ -41,6 +40,7 @@ export interface strings extends MDCStrings {
 export interface numbers extends MDCNumbers {
     PADDING: 10;
     INITIAL_ORIGIN_SCALE: 0.6;
-    DEACTIVATION_TIMEOUT_MS: 300;
-    FG_DEACTIVATION_MS: 83;
+    DEACTIVATION_TIMEOUT_MS: 225; // Corresponds to $mdc-ripple-translate-duration (i.e. activation animation duration)
+    FG_DEACTIVATION_MS: 150; // Corresponds to $mdc-ripple-fade-out-duration (i.e. deactivation animation duration)
+    TAP_DELAY_MS: 300; // Delay between touch and simulated mouse events on touch devices
 }
diff --git a/types/material__ripple/foundation.d.ts b/types/material__ripple/foundation.d.ts
index b67632e441..fe6d33403a 100644
--- a/types/material__ripple/foundation.d.ts
+++ b/types/material__ripple/foundation.d.ts
@@ -18,39 +18,6 @@
 import MDCFoundation from 'material__base/foundation';
 import MDCRippleAdapter from './adapter';
 import { cssClasses, strings, numbers } from './constants';
-import { getNormalizedEventCoords } from './util';
-
-export interface ActivationStateType {
-    isActivated: boolean|undefined;
-    hasDeactivationUXRun: boolean|undefined;
-    wasActivatedByPointer: boolean|undefined;
-    wasElementMadeActive: boolean|undefined;
-    activationStartTime: number|undefined;
-    activationEvent: Event;
-    isProgrammatic: boolean|undefined;
-}
-
-export interface ListenerInfoType {
-    activate: string|undefined;
-    deactivate: string|undefined;
-    focus: string|undefined;
-    blur: string|undefined;
-}
-
-export interface ListenersType {
-    activate(e: Event): void;
-
-    deactivate(e: Event): void;
-
-    focus(): void;
-
-    blur(): void;
-}
-
-export interface PointType {
-    x: number;
-    y: number;
-}
 
 export default class MDCRippleFoundation extends MDCFoundation<MDCRippleAdapter> {
     static readonly cssClasses: cssClasses;
@@ -66,4 +33,6 @@ export default class MDCRippleFoundation extends MDCFoundation<MDCRippleAdapter>
     deactivate(event?: Event): void;
 
     layout(): void;
+
+    setUnbounded(unbounded: boolean): void;
 }
diff --git a/types/material__ripple/index.d.ts b/types/material__ripple/index.d.ts
index 2f8379ac84..aaef1a6aff 100644
--- a/types/material__ripple/index.d.ts
+++ b/types/material__ripple/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -29,21 +29,19 @@ import * as util from './util';
 export {MDCRippleAdapter, MDCRippleFoundation, util};
 
 export class MDCRipple extends MDCComponent<MDCRippleAdapter, MDCRippleFoundation> {
-  static attachTo(root: Element, bound?: {isUnbounded: boolean|undefined}): MDCRipple;
+    static attachTo(root: Element, options?: { isUnbounded?: boolean; }): MDCRipple;
 
-  static createAdapter(instance: RippleCapableSurface): MDCRippleAdapter;
+    static createAdapter(instance: RippleCapableSurface): MDCRippleAdapter;
 
-  unbounded: boolean;
+    unbounded: boolean;
 
-  activate(): void;
+    activate(): void;
 
-  deactivate(): void;
+    deactivate(): void;
 
-  layout(): void;
+    layout(): void;
 
-  getDefaultFoundation(): MDCRippleFoundation;
-
-  initialSyncWithDOM(): void;
+    initialSyncWithDOM(): void;
 }
 
 /**
@@ -57,10 +55,10 @@ export class RippleCapableSurface {
     /**
      * Whether or not the ripple bleeds out of the bounds of the element.
      */
-    unbounded: boolean|undefined;
+    unbounded: boolean | undefined;
 
     /**
      * Whether or not the ripple is attached to a disabled component.
      */
-    disabled: boolean|undefined;
+    disabled: boolean | undefined;
 }
diff --git a/types/material__select/adapter.d.ts b/types/material__select/adapter.d.ts
index 2828b77361..b3b425e7a3 100644
--- a/types/material__select/adapter.d.ts
+++ b/types/material__select/adapter.d.ts
@@ -14,68 +14,28 @@
  * limitations under the License.
  */
 
-export interface MDCSelectAdapter {
+export default interface MDCSelectAdapter {
     addClass(className: string): void;
 
     removeClass(className: string): void;
 
-    addBodyClass(className: string): void;
+    floatLabel(value: boolean): void;
 
-    removeBodyClass(className: string): void;
+    activateBottomLine(): void;
 
-    setAttr(attr: string, value: string): void;
-
-    rmAttr(attr: string): void;
-
-    computeBoundingRect(): {left: number, top: number};
+    deactivateBottomLine(): void;
 
     registerInteractionHandler(type: string, handler: EventListener): void;
 
     deregisterInteractionHandler(type: string, handler: EventListener): void;
 
-    focus(): void;
+    getSelectedIndex(): number;
 
-    makeTabbable(): void;
+    setSelectedIndex(index: number): void;
 
-    makeUntabbable(): void;
+    setDisabled(disabled: boolean): void;
 
-    getComputedStyleValue(propertyName: string): string;
+    getValue(): string;
 
-    setStyle(propertyName: string, value: string): void;
-
-    create2dRenderingContext(): {font: string, measureText: (val: string) => {width: number}};
-
-    setMenuElStyle(propertyName: string, value: string): void;
-
-    setMenuElAttr(attr: string, value: string): void;
-
-    rmMenuElAttr(attr: string): void;
-
-    getMenuElOffsetHeight(): number;
-
-    openMenu(focusIndex: number): void;
-
-    isMenuOpen(): boolean;
-
-    setSelectedTextContent(textContent: string): void;
-
-    getNumberOfOptions(): number;
-
-    getTextForOptionAtIndex(index: number): string;
-
-    getValueForOptionAtIndex(index: number): string;
-
-    setAttrForOptionAtIndex(index: number, attr: string, value: string): void;
-
-    rmAttrForOptionAtIndex(index: number, attr: string): void;
-
-    getOffsetTopForOptionAtIndex(index: number): number;
-
-    registerMenuInteractionHandler(type: string, handler: EventListener): void;
-
-    deregisterMenuInteractionHandler(type: string, handler: EventListener): void;
-
-    notifyChange(): void;
-
-    getWindowInnerHeight(): number;
+    setValue(value: string): void;
 }
diff --git a/types/material__select/constants.d.ts b/types/material__select/constants.d.ts
index 1566d71322..f9a93da7b1 100644
--- a/types/material__select/constants.d.ts
+++ b/types/material__select/constants.d.ts
@@ -17,12 +17,14 @@
 import { MDCStrings } from 'material__base';
 
 export interface cssClasses extends MDCStrings {
-    ROOT: 'mdc-select';
-    OPEN: 'mdc-select--open';
+    BOX: 'mdc-select--box';
     DISABLED: 'mdc-select--disabled';
-    SCROLL_LOCK: 'mdc-select-scroll-lock';
+    ROOT: 'mdc-select';
 }
 
 export interface strings extends MDCStrings {
     CHANGE_EVENT: 'MDCSelect:change';
+    LINE_RIPPLE_SELECTOR: '.mdc-line-ripple';
+    LABEL_SELECTOR: '.mdc-floating-label';
+    NATIVE_CONTROL_SELECTOR: '.mdc-select__native-control';
 }
diff --git a/types/material__select/foundation.d.ts b/types/material__select/foundation.d.ts
index 6f66f79b5f..641c2a301a 100644
--- a/types/material__select/foundation.d.ts
+++ b/types/material__select/foundation.d.ts
@@ -16,25 +16,18 @@
 
 import { MDCFoundation } from 'material__base';
 import { cssClasses, strings } from './constants';
-import { MDCSimpleMenuFoundation } from 'material__menu';
-import { MDCSelectAdapter } from './adapter';
+import MDCSelectAdapter from './adapter';
 
 export default class MDCSelectFoundation extends MDCFoundation<MDCSelectAdapter> {
-  static readonly cssClasses: cssClasses;
+    static readonly cssClasses: cssClasses;
 
-  static readonly strings: strings;
+    static readonly strings: strings;
 
-  static readonly defaultAdapter: MDCSelectAdapter;
+    static readonly defaultAdapter: MDCSelectAdapter;
 
-  getValue(): string;
+    setSelectedIndex(index: number): void;
 
-  getSelectedIndex(): number;
+    setValue(value: string): void;
 
-  setSelectedIndex(index: number): void;
-
-  isDisabled(): boolean;
-
-  setDisabled(disabled: boolean): void;
-
-  resize(): void;
+    setDisabled(disabled: boolean): void;
 }
diff --git a/types/material__select/index.d.ts b/types/material__select/index.d.ts
index 78746a97d1..a487461ae7 100644
--- a/types/material__select/index.d.ts
+++ b/types/material__select/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -21,33 +21,23 @@
  */
 
 import { MDCComponent } from 'material__base';
-import { MDCSimpleMenu } from 'material__menu';
-
-import { MDCSelectAdapter } from './adapter';
 import MDCSelectFoundation from './foundation';
+import MDCSelectAdapter from './adapter';
+import { MDCFloatingLabel } from 'material__floating-label';
+import { MDCLineRipple } from 'material__line-ripple';
 
 export {MDCSelectAdapter, MDCSelectFoundation};
 
 export class MDCSelect extends MDCComponent<MDCSelectAdapter, MDCSelectFoundation> {
     static attachTo(root: Element): MDCSelect;
 
-    readonly value: string;
-
-    readonly options: Element[];
-
-    readonly selectedOptions: NodeListOf<Element>;
+    value: string;
 
     selectedIndex: number;
 
     disabled: boolean;
 
-    item(index: number): Element|null;
-
-    nameditem(key: string): Element|null;
-
-    initialize(menuFactory?: (el: Element) => MDCSimpleMenu): void;
-
-    getDefaultFoundation(): MDCSelectFoundation;
+    initialize(labelFactory?: (el: Element) => MDCFloatingLabel, lineRippleFactory?: (el: Element) => MDCLineRipple): void;
 
     initialSyncWithDOM(): void;
 }
diff --git a/types/material__selection-control/index.d.ts b/types/material__selection-control/index.d.ts
index 9c7f90c3fd..b5ce84d6ce 100644
--- a/types/material__selection-control/index.d.ts
+++ b/types/material__selection-control/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
diff --git a/types/material__slider/adapter.d.ts b/types/material__slider/adapter.d.ts
index 940ae04d76..b558c20799 100644
--- a/types/material__slider/adapter.d.ts
+++ b/types/material__slider/adapter.d.ts
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-export interface MDCSliderAdapter {
+export default interface MDCSliderAdapter {
     hasClass(className: string): boolean;
 
     addClass(className: string): void;
 
     removeClass(className: string): void;
 
-    getAttribute(name: string): string|null;
+    getAttribute(name: string): string | null;
 
     setAttribute(name: string, value: string): void;
 
diff --git a/types/material__slider/foundation.d.ts b/types/material__slider/foundation.d.ts
index 5da6942f49..97abb60e28 100644
--- a/types/material__slider/foundation.d.ts
+++ b/types/material__slider/foundation.d.ts
@@ -16,9 +16,8 @@
 
 import { cssClasses, strings, numbers } from './constants';
 
-import { getCorrectEventName, getCorrectPropertyName } from 'material__animation';
 import MDCFoundation from 'material__base/foundation';
-import { MDCSliderAdapter } from './adapter';
+import MDCSliderAdapter from './adapter';
 
 export default class MDCSliderFoundation extends MDCFoundation<MDCSliderAdapter> {
     static readonly cssClasses: cssClasses;
diff --git a/types/material__slider/index.d.ts b/types/material__slider/index.d.ts
index 0d0e472775..1a1c02d86a 100644
--- a/types/material__slider/index.d.ts
+++ b/types/material__slider/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -23,32 +23,30 @@
 import MDCComponent from 'material__base/component';
 
 import MDCSliderFoundation from './foundation';
-import { MDCSliderAdapter } from './adapter';
+import MDCSliderAdapter from './adapter';
 
 export {MDCSliderAdapter, MDCSliderFoundation};
 
 export class MDCSlider extends MDCComponent<MDCSliderAdapter, MDCSliderFoundation> {
-  static attachTo(root: Element): MDCSlider;
+    static attachTo(root: Element): MDCSlider;
 
-  value: number;
+    value: number;
 
-  min: number;
+    min: number;
 
-  max: number;
+    max: number;
 
-  step: number;
+    step: number;
 
-  disabled: boolean;
+    disabled: boolean;
 
-  initialize(): void;
+    initialize(): void;
 
-  getDefaultFoundation(): MDCSliderFoundation;
+    initialSyncWithDOM(): void;
 
-  initialSyncWithDOM(): void;
+    layout(): void;
 
-  layout(): void;
+    stepUp(amount?: number): void;
 
-  stepUp(amount?: number): void;
-
-  stepDown(amount?: number): void;
+    stepDown(amount?: number): void;
 }
diff --git a/types/material__snackbar/adapter.d.ts b/types/material__snackbar/adapter.d.ts
index 412329bd97..12ac56c6f7 100644
--- a/types/material__snackbar/adapter.d.ts
+++ b/types/material__snackbar/adapter.d.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-export interface MDCSnackbarAdapter {
+export default interface MDCSnackbarAdapter {
     addClass(className: string): void;
     removeClass(className: string): void;
     setAriaHidden(): void;
@@ -35,4 +35,6 @@ export interface MDCSnackbarAdapter {
     deregisterActionClickHandler(handler: EventListener): void;
     registerTransitionEndHandler(handler: EventListener): void;
     deregisterTransitionEndHandler(handler: EventListener): void;
+    notifyShow(): void;
+    notifyHide(): void;
 }
diff --git a/types/material__snackbar/constants.d.ts b/types/material__snackbar/constants.d.ts
index 7bf6758a0a..7c5cf27999 100644
--- a/types/material__snackbar/constants.d.ts
+++ b/types/material__snackbar/constants.d.ts
@@ -30,6 +30,8 @@ export interface strings extends MDCStrings {
     TEXT_SELECTOR: '.mdc-snackbar__text';
     ACTION_WRAPPER_SELECTOR: '.mdc-snackbar__action-wrapper';
     ACTION_BUTTON_SELECTOR: '.mdc-snackbar__action-button';
+    SHOW_EVENT: 'MDCSnackbar:show';
+    HIDE_EVENT: 'MDCSnackbar:hide';
 }
 
 export interface numbers extends MDCNumbers {
diff --git a/types/material__snackbar/foundation.d.ts b/types/material__snackbar/foundation.d.ts
index 5c85ab5f85..a695a1a33e 100644
--- a/types/material__snackbar/foundation.d.ts
+++ b/types/material__snackbar/foundation.d.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import { MDCFoundation } from 'material__base';
+import MDCFoundation from 'material__base/foundation';
 import { cssClasses, strings, numbers } from './constants';
-import { MDCSnackbarAdapter } from './adapter';
+import MDCSnackbarAdapter from './adapter';
 
 export interface MDCSnackbarData {
     message: string;
@@ -27,18 +27,18 @@ export interface MDCSnackbarData {
     timeout?: number;
 }
 
-export class MDCSnackbarFoundation extends MDCFoundation<MDCSnackbarAdapter> {
-  static readonly cssClasses: cssClasses;
+export default class MDCSnackbarFoundation extends MDCFoundation<MDCSnackbarAdapter> {
+    static readonly cssClasses: cssClasses;
 
-  static readonly strings: strings;
+    static readonly strings: strings;
 
-  static readonly defaultAdapter: MDCSnackbarAdapter;
+    static readonly defaultAdapter: MDCSnackbarAdapter;
 
-  readonly active: boolean;
+    readonly active: boolean;
 
-  dismissesOnAction(): boolean;
+    dismissesOnAction(): boolean;
 
-  setDismissOnAction(dismissOnAction: boolean): void;
+    setDismissOnAction(dismissOnAction: boolean): void;
 
-  show(data: MDCSnackbarData): void;
+    show(data: MDCSnackbarData): void;
 }
diff --git a/types/material__snackbar/index.d.ts b/types/material__snackbar/index.d.ts
index 11ac69f573..da6ecd4ca2 100644
--- a/types/material__snackbar/index.d.ts
+++ b/types/material__snackbar/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -21,18 +21,15 @@
  */
 
 import { MDCComponent } from 'material__base';
-import { MDCSnackbarAdapter } from './adapter';
-import { MDCSnackbarFoundation, MDCSnackbarData } from './foundation';
-import { getCorrectEventName } from 'material__animation';
+import MDCSnackbarAdapter from './adapter';
+import MDCSnackbarFoundation, { MDCSnackbarData } from './foundation';
 
 export {MDCSnackbarAdapter, MDCSnackbarFoundation};
 
 export class MDCSnackbar extends MDCComponent<MDCSnackbarAdapter, MDCSnackbarFoundation> {
-  static attachTo(root: Element): MDCSnackbar;
+    static attachTo(root: Element): MDCSnackbar;
 
-  show(data: MDCSnackbarData): void;
+    show(data: MDCSnackbarData): void;
 
-  getDefaultFoundation(): MDCSnackbarFoundation;
-
-  dismissesOnAction: boolean;
+    dismissesOnAction: boolean;
 }
diff --git a/types/material__textfield/bottom-line/adapter.d.ts b/types/material__tab/adapter.d.ts
similarity index 58%
rename from types/material__textfield/bottom-line/adapter.d.ts
rename to types/material__tab/adapter.d.ts
index 25b8de0477..90b89dca00 100644
--- a/types/material__textfield/bottom-line/adapter.d.ts
+++ b/types/material__tab/adapter.d.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google Inc. All Rights Reserved.
+ * Copyright 2018 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,47 +14,41 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
- * Adapter for MDC TextField Bottom Line.
+ * Adapter for MDC Tab.
  *
  * Defines the shape of the adapter expected by the foundation. Implement this
- * adapter to integrate the TextField bottom line into your framework. See
+ * adapter to integrate the Tab  into your framework. See
  * https://github.com/material-components/material-components-web/blob/master/docs/authoring-components.md
- * for more information.
- *
- * @record
  */
-export default class MDCTextFieldBottomLineAdapter {
+export default interface MDCTabAdapter {
     /**
-     * Adds a class to the bottom line element.
-     */
-    addClass(className: string): void;
-
-    /**
-     * Removes a class from the bottom line element.
-     */
-    removeClass(className: string): void;
-
-    /**
-     * Sets an attribute with a given value on the bottom line element.
-     */
-    setAttr(attr: string, value: string): void;
-
-    /**
-     * Registers an event listener on the bottom line element for a given event.
+     * Registers an event listener on the root element for a given event.
      */
     registerEventHandler(evtType: string, handler: EventListener): void;
 
     /**
-     * Deregisters an event listener on the bottom line element for a given event.
+     * Deregisters an event listener on the root element for a given event.
      */
     deregisterEventHandler(evtType: string, handler: EventListener): void;
 
     /**
-     * Emits a custom event "MDCTextFieldBottomLine:animation-end" denoting the
-     * bottom line has finished its animation; either the activate or
-     * deactivate animation
+     * Adds the given className to the root element.
      */
-    notifyAnimationEnd(): void;
+    addClass(className: string): void;
+
+    /**
+     * Removes the given className from the root element.
+     */
+    removeClass(className: string): void;
+
+    /**
+     * Returns whether the root element has the given className.
+     */
+    hasClass(className: string): boolean;
+
+    /**
+     * Sets the given attrName of the root element to the given value.
+     */
+    setAttr(attr: string, value: string): void;
 }
diff --git a/types/material__tab/constants.d.ts b/types/material__tab/constants.d.ts
new file mode 100644
index 0000000000..7d4a710a64
--- /dev/null
+++ b/types/material__tab/constants.d.ts
@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { MDCStrings } from 'material__base';
+
+export interface cssClasses extends MDCStrings {
+    ACTIVE: 'mdc-tab--active';
+    ANIMATING_ACTIVATE: 'mdc-tab--animating-activate';
+    ANIMATING_DEACTIVATE: 'mdc-tab--animating-deactivate';
+}
+
+export interface strings extends MDCStrings {
+    ARIA_SELECTED: 'aria-selected';
+}
diff --git a/types/material__textfield/bottom-line/foundation.d.ts b/types/material__tab/foundation.d.ts
similarity index 64%
rename from types/material__textfield/bottom-line/foundation.d.ts
rename to types/material__tab/foundation.d.ts
index 6945695348..bd438ef48e 100644
--- a/types/material__textfield/bottom-line/foundation.d.ts
+++ b/types/material__tab/foundation.d.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google Inc. All Rights Reserved.
+ * Copyright 2018 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,35 +14,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import MDCFoundation from 'material__base/foundation';
-import MDCTextFieldBottomLineAdapter from './adapter';
 import { cssClasses, strings } from './constants';
+import MDCTabAdapter from './adapter';
 
-export default class MDCTextFieldBottomLineFoundation extends MDCFoundation<MDCTextFieldBottomLineAdapter> {
+export default class MDCTabFoundation extends MDCFoundation<MDCTabAdapter> {
     static readonly cssClasses: cssClasses;
 
     static readonly strings: strings;
 
-    static readonly defaultAdapter: MDCTextFieldBottomLineAdapter;
+    static readonly defaultAdapter: MDCTabAdapter;
+
+    handleTransitionEnd(evt: Event): void;
 
     /**
-     * Activates the bottom line
+     * Returns the Tab's active state
+     */
+    isActive(): boolean;
+
+    /**
+     * Activates the Tab
      */
     activate(): void;
 
     /**
-     * Sets the transform origin given a user's click location.
-     */
-    setTransformOrigin(evt: Event): void;
-
-    /**
-     * Deactivates the bottom line
+     * Deactivates the Tab
      */
     deactivate(): void;
-
-    /**
-     * Handles a transition end event
-     */
-    handleTransitionEnd(evt: Event): void;
 }
diff --git a/types/material__tab/index.d.ts b/types/material__tab/index.d.ts
new file mode 100644
index 0000000000..b2cc71129e
--- /dev/null
+++ b/types/material__tab/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for Material Components Web 0.35
+// Project: https://material.io/components/
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/**
+ * @license
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import MDCComponent from 'material__base/component';
+import MDCTabFoundation from './foundation';
+import MDCTabAdapter from './adapter';
+
+export { MDCTabFoundation, MDCTabAdapter };
+
+export class MDCTab extends MDCComponent<MDCTabAdapter, MDCTabFoundation> {
+    static attachTo(root: Element): MDCTab;
+
+    active: boolean;
+}
diff --git a/types/material__tab/tsconfig.json b/types/material__tab/tsconfig.json
new file mode 100644
index 0000000000..2af99c6e5e
--- /dev/null
+++ b/types/material__tab/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "files": [
+        "constants.d.ts",
+        "adapter.d.ts",
+        "index.d.ts",
+        "foundation.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file
diff --git a/types/material__tab/tslint.json b/types/material__tab/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/material__tab/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/material__tabs/index.d.ts b/types/material__tabs/index.d.ts
index b268e55a8d..b5a9d4143e 100644
--- a/types/material__tabs/index.d.ts
+++ b/types/material__tabs/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -20,6 +20,6 @@
  * limitations under the License.
  */
 
-export {MDCTabFoundation, MDCTab} from './tab/index';
-export {MDCTabBarAdapter, MDCTabBarFoundation, MDCTabBar} from './tab-bar/index';
-export {MDCTabBarScrollerAdapter, MDCTabBarScrollerFoundation, MDCTabBarScroller} from './tab-bar-scroller/index';
+export { MDCTabFoundation, MDCTab, MDCTabAdapter } from './tab';
+export { MDCTabBarFoundation, MDCTabBar, MDCTabBarAdapter } from './tab-bar';
+export { MDCTabBarScrollerFoundation, MDCTabBarScroller, MDCTabBarScrollerAdapter } from './tab-bar-scroller';
diff --git a/types/material__tabs/tab-bar-scroller/adapter.d.ts b/types/material__tabs/tab-bar-scroller/adapter.d.ts
index 8c1286fc74..b46d2d3e5f 100644
--- a/types/material__tabs/tab-bar-scroller/adapter.d.ts
+++ b/types/material__tabs/tab-bar-scroller/adapter.d.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-export interface MDCTabBarScrollerAdapter {
+export default interface MDCTabBarScrollerAdapter {
     addClass(className: string): void;
 
     removeClass(className: string): void;
diff --git a/types/material__tabs/tab-bar-scroller/foundation.d.ts b/types/material__tabs/tab-bar-scroller/foundation.d.ts
index ed470c20d2..273a6f048a 100644
--- a/types/material__tabs/tab-bar-scroller/foundation.d.ts
+++ b/types/material__tabs/tab-bar-scroller/foundation.d.ts
@@ -17,7 +17,7 @@
 import MDCFoundation from 'material__base/foundation';
 
 import { cssClasses, strings } from './constants';
-import { MDCTabBarScrollerAdapter } from './adapter';
+import MDCTabBarScrollerAdapter from './adapter';
 
 export default class MDCTabBarScrollerFoundation extends MDCFoundation<MDCTabBarScrollerAdapter> {
     static readonly cssClasses: cssClasses;
diff --git a/types/material__tabs/tab-bar-scroller/index.d.ts b/types/material__tabs/tab-bar-scroller/index.d.ts
index a9d71b305c..984a1fc838 100644
--- a/types/material__tabs/tab-bar-scroller/index.d.ts
+++ b/types/material__tabs/tab-bar-scroller/index.d.ts
@@ -14,23 +14,20 @@
  * limitations under the License.
  */
 
-import { getCorrectPropertyName } from 'material__animation';
 import MDCComponent from 'material__base/component';
 
-import { MDCTabBar } from '../tab-bar/index';
+import { MDCTabBar } from '../tab-bar';
 import MDCTabBarScrollerFoundation from './foundation';
-import { MDCTabBarScrollerAdapter } from './adapter';
+import MDCTabBarScrollerAdapter from './adapter';
 
-export {MDCTabBarScrollerAdapter, MDCTabBarScrollerFoundation};
+export { MDCTabBarScrollerAdapter, MDCTabBarScrollerFoundation };
 
 export class MDCTabBarScroller extends MDCComponent<MDCTabBarScrollerAdapter, MDCTabBarScrollerFoundation> {
-  static attachTo(root: Element): MDCTabBarScroller;
+    static attachTo(root: Element): MDCTabBarScroller;
 
-  readonly tabBar: MDCTabBar;
+    readonly tabBar: MDCTabBar;
 
-  initialize(tabBarFactory?: (el: Element) => MDCTabBar): void;
+    initialize(tabBarFactory?: (root: Element) => MDCTabBar): void;
 
-  getDefaultFoundation(): MDCTabBarScrollerFoundation;
-
-  layout(): void;
+    layout(): void;
 }
diff --git a/types/material__tabs/tab-bar/adapter.d.ts b/types/material__tabs/tab-bar/adapter.d.ts
index 1efa73f52c..0e43efc074 100644
--- a/types/material__tabs/tab-bar/adapter.d.ts
+++ b/types/material__tabs/tab-bar/adapter.d.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-export interface MDCTabBarAdapter {
+export default interface MDCTabBarAdapter {
     addClass(className: string): void;
 
     removeClass(className: string): void;
diff --git a/types/material__tabs/tab-bar/foundation.d.ts b/types/material__tabs/tab-bar/foundation.d.ts
index 2e5ccb1de2..84693dc2cd 100644
--- a/types/material__tabs/tab-bar/foundation.d.ts
+++ b/types/material__tabs/tab-bar/foundation.d.ts
@@ -15,10 +15,8 @@
  */
 
 import MDCFoundation from 'material__base/foundation';
-import { getCorrectPropertyName } from 'material__animation';
-
 import { cssClasses, strings } from './constants';
-import { MDCTabBarAdapter } from './adapter';
+import MDCTabBarAdapter from './adapter';
 
 export default class MDCTabBarFoundation extends MDCFoundation<MDCTabBarAdapter> {
     static readonly cssClasses: cssClasses;
diff --git a/types/material__tabs/tab-bar/index.d.ts b/types/material__tabs/tab-bar/index.d.ts
index 127a62217f..d50d841105 100644
--- a/types/material__tabs/tab-bar/index.d.ts
+++ b/types/material__tabs/tab-bar/index.d.ts
@@ -16,9 +16,9 @@
 
 import MDCComponent from 'material__base/component';
 
-import { MDCTab, MDCTabFoundation } from '../tab/index';
+import { MDCTab } from '../tab';
 import MDCTabBarFoundation from './foundation';
-import { MDCTabBarAdapter } from './adapter';
+import MDCTabBarAdapter from './adapter';
 
 export {MDCTabBarAdapter, MDCTabBarFoundation};
 
@@ -33,7 +33,5 @@ export class MDCTabBar extends MDCComponent<MDCTabBarAdapter, MDCTabBarFoundatio
 
     initialize(tabFactory?: (el: Element) => MDCTab): void;
 
-    getDefaultFoundation(): MDCTabBarFoundation;
-
     layout(): void;
 }
diff --git a/types/material__tabs/tab/adapter.d.ts b/types/material__tabs/tab/adapter.d.ts
index bc07aa5aa7..2058c690e4 100644
--- a/types/material__tabs/tab/adapter.d.ts
+++ b/types/material__tabs/tab/adapter.d.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-export interface MDCTabAdapter {
+export default interface MDCTabAdapter {
     addClass(className: string): void;
 
     removeClass(className: string): void;
diff --git a/types/material__tabs/tab/foundation.d.ts b/types/material__tabs/tab/foundation.d.ts
index 46e14065c8..04f727fcb2 100644
--- a/types/material__tabs/tab/foundation.d.ts
+++ b/types/material__tabs/tab/foundation.d.ts
@@ -16,9 +16,9 @@
 
 import MDCFoundation from 'material__base/foundation';
 import { cssClasses, strings } from './constants';
-import { MDCTabAdapter } from './adapter';
+import MDCTabAdapter from './adapter';
 
-export class MDCTabFoundation extends MDCFoundation<MDCTabAdapter> {
+export default class MDCTabFoundation extends MDCFoundation<MDCTabAdapter> {
     static readonly cssClasses: cssClasses;
 
     static readonly strings: strings;
diff --git a/types/material__tabs/tab/index.d.ts b/types/material__tabs/tab/index.d.ts
index bf41b77e65..43fc8b4ec6 100644
--- a/types/material__tabs/tab/index.d.ts
+++ b/types/material__tabs/tab/index.d.ts
@@ -15,11 +15,8 @@
  */
 
 import MDCComponent from 'material__base/component';
-import { MDCRipple } from 'material__ripple';
-
-import { MDCTabAdapter } from './adapter';
-import { cssClasses } from './constants';
-import { MDCTabFoundation } from './foundation';
+import MDCTabFoundation from './foundation';
+import MDCTabAdapter from './adapter';
 
 export {MDCTabAdapter, MDCTabFoundation};
 
@@ -34,10 +31,6 @@ export class MDCTab extends MDCComponent<MDCTabAdapter, MDCTabFoundation> {
 
     preventDefaultOnClick: boolean;
 
-    destroy(): void;
-
-    getDefaultFoundation(): MDCTabFoundation;
-
     initialSyncWithDOM(): void;
 
     measureSelf(): void;
diff --git a/types/material__textfield/adapter.d.ts b/types/material__textfield/adapter.d.ts
index ca13544c26..8a583b20e5 100644
--- a/types/material__textfield/adapter.d.ts
+++ b/types/material__textfield/adapter.d.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google Inc. All Rights Reserved.
+ * Copyright 2018 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,22 @@
  * limitations under the License.
  */
 
-import MDCTextFieldBottomLineFoundation from './bottom-line/foundation';
-import MDCTextFieldHelperTextFoundation from './helper-text/foundation';
+import { MDCTextFieldHelperTextFoundation } from './helper-text';
+import { MDCTextFieldIconFoundation } from './icon';
 
 export interface NativeInputType {
     value: string;
     disabled: boolean;
     badInput: boolean;
-    checkValidity(): boolean;
+    validity: {
+        badInput: boolean;
+        valid: boolean;
+    };
+}
+
+export interface FoundationMapType {
+    helperText?: MDCTextFieldHelperTextFoundation;
+    icon?: MDCTextFieldIconFoundation;
 }
 
 /**
@@ -32,10 +40,8 @@ export interface NativeInputType {
  * adapter to integrate the Text Field into your framework. See
  * https://github.com/material-components/material-components-web/blob/master/docs/authoring-components.md
  * for more information.
- *
- * @record
  */
-export class MDCTextFieldAdapter {
+export default interface MDCTextFieldAdapter {
     /**
      * Adds a class to the root Element.
      */
@@ -47,27 +53,9 @@ export class MDCTextFieldAdapter {
     removeClass(className: string): void;
 
     /**
-     * Adds a class to the label Element. We recommend you add a conditional
-     * check here, and in removeClassFromLabel for whether or not the label is
-     * present so that the JS component could be used with text fields that don't
-     * require a label, such as the full-width text field.
+     * Returns true if the root element contains the given class name.
      */
-    addClassToLabel(className: string): void;
-
-    /**
-     * Removes a class from the label Element.
-     */
-    removeClassFromLabel(className: string): void;
-
-    /**
-     * Sets an attribute on the icon Element.
-     */
-    setIconAttr(name: string, value: string): void;
-
-    /**
-     * Returns true if classname exists for a given target element.
-     */
-    eventTargetHasClass(target: EventTarget, className: string): boolean;
+    hasClass(className: string): boolean;
 
     /**
      * Registers an event handler on the root element for a given event.
@@ -79,28 +67,6 @@ export class MDCTextFieldAdapter {
      */
     deregisterTextFieldInteractionHandler(type: string, handler: EventListener): void;
 
-    /**
-     * Emits a custom event "MDCTextField:icon" denoting a user has clicked the icon.
-     */
-    notifyIconAction(): void;
-
-    /**
-     * Adds a class to the helper text element. Note that in our code we check for
-     * whether or not we have a helper text element and if we don't, we simply
-     * return.
-     */
-    addClassToHelperText(className: string): void;
-
-    /**
-     * Removes a class from the helper text element.
-     */
-    removeClassFromHelperText(className: string): void;
-
-    /**
-     * Returns whether or not the helper text element contains the given class.
-     */
-    helperTextHasClass(className: string): boolean;
-
     /**
      * Registers an event listener on the native input element for a given event.
      */
@@ -112,29 +78,14 @@ export class MDCTextFieldAdapter {
     deregisterInputInteractionHandler(evtType: string, handler: EventListener): void;
 
     /**
-     * Registers an event listener on the bottom line element for a given event.
+     * Registers a validation attribute change listener on the input element.
      */
-    registerBottomLineEventHandler(evtType: string, handler: EventListener): void;
+    registerValidationAttributeChangeHandler(handler: EventListener): void;
 
     /**
-     * Deregisters an event listener on the bottom line element for a given event.
+     * Disconnects a validation attribute observer on the input element.
      */
-    deregisterBottomLineEventHandler(evtType: string, handler: EventListener): void;
-
-    /**
-     * Sets an attribute with a given value on the helper text element.
-     */
-    setHelperTextAttr(name: string, value: string): void;
-
-    /**
-     * Removes an attribute from the helper text element.
-     */
-    removeHelperTextAttr(name: string): void;
-
-    /**
-     * Sets the text content for the help text element
-     */
-    setHelperTextContent(content: string): void;
+    deregisterValidationAttributeChangeHandler(observer: MutationObserver): void;
 
     /**
      * Returns an object representing the native text input element, with a
@@ -145,17 +96,72 @@ export class MDCTextFieldAdapter {
      * in your implementation it's important to keep this in mind. Also note that
      * this method can return null, which the foundation will handle gracefully.
      */
-    getNativeInput(): Element|NativeInputType;
+    getNativeInput(): (Element | (NativeInputType | null)) | null;
 
     /**
-     * Returns the foundation for the bottom line element. Returns undefined if
-     * there is no bottom line element.
+     * Returns true if the textfield is focused.
+     * We achieve this via `document.activeElement === this.root_`.
      */
-    getBottomLineFoundation(): MDCTextFieldBottomLineFoundation;
+    isFocused(): boolean;
 
     /**
-     * Returns the foundation for the helper text element. Returns undefined if
-     * there is no helper text element.
+     * Returns true if the direction of the root element is set to RTL.
      */
-    getHelperTextFoundation(): MDCTextFieldHelperTextFoundation;
+    isRtl(): boolean;
+
+    /**
+     * Activates the line ripple.
+     */
+    activateLineRipple(): void;
+
+    /**
+     * Deactivates the line ripple.
+     */
+    deactivateLineRipple(): void;
+
+    /**
+     * Sets the transform origin of the line ripple.
+     */
+    setLineRippleTransformOrigin(normalizedX: number): void;
+
+    /**
+     * Only implement if label exists.
+     * Shakes label if shouldShake is true.
+     */
+    shakeLabel(shouldShake: boolean): void;
+
+    /**
+     * Only implement if label exists.
+     * Floats the label above the input element if shouldFloat is true.
+     */
+    floatLabel(shouldFloat: boolean): void;
+
+    /**
+     * Returns true if label element exists, false if it doesn't.
+     */
+    hasLabel(): boolean;
+
+    /**
+     * Only implement if label exists.
+     * Returns width of label in pixels.
+     */
+    getLabelWidth(): number;
+
+    /**
+     * Returns true if outline element exists, false if it doesn't.
+     */
+    hasOutline(): boolean;
+
+    /**
+     * Only implement if outline element exists.
+     * Updates SVG Path and outline element based on the
+     * label element width and RTL context.
+     */
+    notchOutline(labelWidth: number, isRtl: boolean | undefined): void;
+
+    /**
+     * Only implement if outline element exists.
+     * Closes notch in outline element.
+     */
+    closeOutline(): void;
 }
diff --git a/types/material__textfield/constants.d.ts b/types/material__textfield/constants.d.ts
index 7150bb4b14..8877368c48 100644
--- a/types/material__textfield/constants.d.ts
+++ b/types/material__textfield/constants.d.ts
@@ -15,26 +15,29 @@
  * limitations under the License.
  */
 
-import { MDCStrings } from 'material__base';
+import { MDCStrings, MDCNumbers } from 'material__base';
 
 export interface strings extends MDCStrings {
     ARIA_CONTROLS: 'aria-controls';
     INPUT_SELECTOR: '.mdc-text-field__input';
-    LABEL_SELECTOR: '.mdc-text-field__label';
+    LABEL_SELECTOR: '.mdc-floating-label';
     ICON_SELECTOR: '.mdc-text-field__icon';
-    ICON_EVENT: 'MDCTextField:icon';
-    BOTTOM_LINE_SELECTOR: '.mdc-text-field__bottom-line';
+    OUTLINE_SELECTOR: '.mdc-notched-outline';
+    LINE_RIPPLE_SELECTOR: '.mdc-line-ripple';
 }
 
 export interface cssClasses extends MDCStrings {
     ROOT: 'mdc-text-field';
     UPGRADED: 'mdc-text-field--upgraded';
     DISABLED: 'mdc-text-field--disabled';
+    DENSE: 'mdc-text-field--dense';
     FOCUSED: 'mdc-text-field--focused';
     INVALID: 'mdc-text-field--invalid';
-    LABEL_FLOAT_ABOVE: 'mdc-text-field__label--float-above';
-    LABEL_SHAKE: 'mdc-text-field__label--shake';
     BOX: 'mdc-text-field--box';
-    TEXT_FIELD_ICON: 'mdc-text-field__icon';
-    TEXTAREA: 'mdc-text-field--textarea';
+    OUTLINED: 'mdc-text-field--outlined';
+}
+
+export interface numbers extends MDCNumbers {
+    LABEL_SCALE: 0.75;
+    DENSE_LABEL_SCALE: 0.923;
 }
diff --git a/types/material__textfield/foundation.d.ts b/types/material__textfield/foundation.d.ts
index d36d83867e..ffc0436f45 100644
--- a/types/material__textfield/foundation.d.ts
+++ b/types/material__textfield/foundation.d.ts
@@ -16,29 +16,44 @@
  */
 
 import MDCFoundation from 'material__base/foundation';
-import { MDCTextFieldAdapter, NativeInputType } from './adapter';
-import MDCTextFieldBottomLineFoundation from './bottom-line/foundation';
-import { cssClasses, strings } from './constants';
+import { cssClasses, strings, numbers } from './constants';
+import MDCTextFieldAdapter, { FoundationMapType } from './adapter';
 
 export default class MDCTextFieldFoundation extends MDCFoundation<MDCTextFieldAdapter> {
     static readonly cssClasses: cssClasses;
 
     static readonly strings: strings;
 
+    static readonly numbers: numbers;
+
+    readonly shouldShake: boolean;
+
+    readonly shouldFloat: boolean;
+
     static readonly defaultAdapter: MDCTextFieldAdapter;
 
-    handleTextFieldInteraction(evt: Event): void;
+    constructor(adapter: MDCTextFieldAdapter, foundationMap?: FoundationMapType);
 
+    /**
+     * Handles user interactions with the Text Field.
+     */
+    handleTextFieldInteraction(): void;
+
+    /**
+     * Opens/closes the notched outline.
+     */
+
+    notchOutline(openNotch: boolean): void;
     /**
      * Activates the text field focus state.
      */
-    activateFocus(): void;
 
+    activateFocus(): void;
     /**
-     * Sets the bottom line's transform origin, so that the bottom line activate
+     * Sets the line ripple's transform origin, so that the line ripple activate
      * animation will animate out from the user's click location.
      */
-    setBottomLineTransformOrigin(evt: Event): void;
+    setTransformOrigin(evt: Event): void;
 
     /**
      * Activates the Text Field's focus state in cases when the input value
@@ -46,34 +61,19 @@ export default class MDCTextFieldFoundation extends MDCFoundation<MDCTextFieldAd
      */
     autoCompleteFocus(): void;
 
-    /**
-     * Handles when bottom line animation ends, performing actions that must wait
-     * for animations to finish.
-     */
-    handleBottomLineAnimationEnd(): void;
-
-    /**
-     * Deactives the Text Field's focus state.
-     */
     deactivateFocus(): void;
 
-    /**
-     * True if the Text Field is disabled.
-     */
+    getValue(): string;
+
+    setValue(value: string): void;
+
+    isValid(): boolean;
+
+    setValid(isValid: boolean): void;
+
     isDisabled(): boolean;
 
-    /**
-     * Sets the text-field disabled or enabled.
-     */
     setDisabled(disabled: boolean): void;
 
-    /**
-     * Sets the content of the helper text.
-     */
     setHelperTextContent(content: string): void;
-
-    /**
-     * Sets the validity state of the Text Field.
-     */
-    setValid(isValid: boolean): void;
 }
diff --git a/types/material__textfield/helper-text/adapter.d.ts b/types/material__textfield/helper-text/adapter.d.ts
index d8320bd0f4..08fce86630 100644
--- a/types/material__textfield/helper-text/adapter.d.ts
+++ b/types/material__textfield/helper-text/adapter.d.ts
@@ -22,10 +22,8 @@
  * adapter to integrate the TextField helper text into your framework. See
  * https://github.com/material-components/material-components-web/blob/master/docs/authoring-components.md
  * for more information.
- *
- * @record
  */
-export default class MDCTextFieldHelperTextAdapter {
+export default interface MDCTextFieldHelperTextAdapter {
     /**
      * Adds a class to the helper text element.
      */
diff --git a/types/material__textfield/helper-text/foundation.d.ts b/types/material__textfield/helper-text/foundation.d.ts
index eccf531e51..449679040a 100644
--- a/types/material__textfield/helper-text/foundation.d.ts
+++ b/types/material__textfield/helper-text/foundation.d.ts
@@ -26,11 +26,17 @@ export default class MDCTextFieldHelperTextFoundation extends MDCFoundation<MDCT
 
     static readonly defaultAdapter: MDCTextFieldHelperTextAdapter;
 
-    /**
-     * Sets the content of the helper text field.
-     */
     setContent(content: string): void;
 
+    /** @param isPersistent Sets the persistency of the helper text. */
+    setPersistent(isPersistent: boolean): void;
+
+    /**
+     * @param isValidation True to make the helper text act as an
+     *   error validation message.
+     */
+    setValidation(isValidation: boolean): void;
+
     /** Makes the helper text visible to the screen reader. */
     showToScreenReader(): void;
 
diff --git a/types/material__textfield/helper-text/index.d.ts b/types/material__textfield/helper-text/index.d.ts
index 6c26000366..7b94f38264 100644
--- a/types/material__textfield/helper-text/index.d.ts
+++ b/types/material__textfield/helper-text/index.d.ts
@@ -26,6 +26,4 @@ export class MDCTextFieldHelperText extends MDCComponent<MDCTextFieldHelperTextA
     static attachTo(root: Element): MDCTextFieldHelperText;
 
     readonly foundation: MDCTextFieldHelperTextFoundation;
-
-    getDefaultFoundation(): MDCTextFieldHelperTextFoundation;
 }
diff --git a/types/material__textfield/icon/adapter.d.ts b/types/material__textfield/icon/adapter.d.ts
new file mode 100644
index 0000000000..9e266b9b3d
--- /dev/null
+++ b/types/material__textfield/icon/adapter.d.ts
@@ -0,0 +1,56 @@
+/**
+ * @license
+ * Copyright 2017 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Adapter for MDC Text Field Icon.
+ *
+ * Defines the shape of the adapter expected by the foundation. Implement this
+ * adapter to integrate the text field icon into your framework. See
+ * https://github.com/material-components/material-components-web/blob/master/docs/authoring-components.md
+ * for more information.
+ */
+
+export default interface MDCTextFieldIconAdapter {
+    /**
+     * Gets the value of an attribute on the icon element.
+     */
+    getAttr(attr: string): string;
+
+    /**
+     * Sets an attribute on the icon element.
+     */
+    setAttr(attr: string, value: string): void;
+
+    /**
+     * Removes an attribute from the icon element.
+     */
+    removeAttr(attr: string): void;
+
+    /**
+     * Registers an event listener on the icon element for a given event.
+     */
+    registerInteractionHandler(evtType: string, handler: EventListener): void;
+
+    /**
+     * Deregisters an event listener on the icon element for a given event.
+     */
+    deregisterInteractionHandler(evtType: string, handler: EventListener): void;
+
+    /**
+     * Emits a custom event "MDCTextField:icon" denoting a user has clicked the icon.
+     */
+    notifyIconAction(): void;
+}
diff --git a/types/material__toolbar/util.d.ts b/types/material__textfield/icon/constants.d.ts
similarity index 77%
rename from types/material__toolbar/util.d.ts
rename to types/material__textfield/icon/constants.d.ts
index 37506958e7..aa65239f4c 100644
--- a/types/material__toolbar/util.d.ts
+++ b/types/material__textfield/icon/constants.d.ts
@@ -1,4 +1,5 @@
 /**
+ * @license
  * Copyright 2016 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { MDCStrings } from 'material__base';
 
-// Determine whether the current browser supports passive event listeners, and if so, use them.
-export function applyPassive(globalObj?: Window, forceRefresh?: boolean): boolean;
+export interface strings extends MDCStrings {
+    ICON_EVENT: 'MDCTextField:icon';
+    ICON_ROLE: 'button';
+}
diff --git a/types/material__textfield/icon/foundation.d.ts b/types/material__textfield/icon/foundation.d.ts
new file mode 100644
index 0000000000..a62677d60f
--- /dev/null
+++ b/types/material__textfield/icon/foundation.d.ts
@@ -0,0 +1,35 @@
+/**
+ * @license
+ * Copyright 2017 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import MDCFoundation from 'material__base/foundation';
+import { strings } from './constants';
+import MDCTextFieldIconAdapter from './adapter';
+
+export default class MDCTextFieldIconFoundation extends MDCFoundation<MDCTextFieldIconAdapter> {
+    static readonly strings: strings;
+
+    static readonly defaultAdapter: MDCTextFieldIconAdapter;
+
+    /**
+     * Sets the content of the helper text field.
+     */
+    setDisabled(disabled: boolean): void;
+
+    /**
+     * Handles an interaction event
+     */
+    handleInteraction(evt: Event): void;
+}
diff --git a/types/material__textfield/bottom-line/index.d.ts b/types/material__textfield/icon/index.d.ts
similarity index 58%
rename from types/material__textfield/bottom-line/index.d.ts
rename to types/material__textfield/icon/index.d.ts
index a0ed4ff36d..3e6cfc542b 100644
--- a/types/material__textfield/bottom-line/index.d.ts
+++ b/types/material__textfield/icon/index.d.ts
@@ -14,18 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import MDCComponent from 'material__base/component';
+import MDCTextFieldIconFoundation from './foundation';
+import MDCTextFieldIconAdapter from './adapter';
 
-import MDCTextFieldBottomLineAdapter from './adapter';
-import MDCTextFieldBottomLineFoundation from './foundation';
+export { MDCTextFieldIconFoundation, MDCTextFieldIconAdapter };
 
-export {MDCTextFieldBottomLineAdapter, MDCTextFieldBottomLineFoundation};
+export class MDCTextFieldIcon extends MDCComponent<MDCTextFieldIconAdapter, MDCTextFieldIconFoundation> {
+    static attachTo(root: Element): MDCTextFieldIcon;
 
-export class MDCTextFieldBottomLine extends MDCComponent<MDCTextFieldBottomLineAdapter, MDCTextFieldBottomLineFoundation> {
-    static attachTo(root: Element): MDCTextFieldBottomLine;
-
-    readonly foundation: MDCTextFieldBottomLineFoundation;
-
-    getDefaultFoundation(): MDCTextFieldBottomLineFoundation;
+    readonly foundation: MDCTextFieldIconFoundation;
 }
diff --git a/types/material__textfield/index.d.ts b/types/material__textfield/index.d.ts
index 85d4c36420..b3e61550c9 100644
--- a/types/material__textfield/index.d.ts
+++ b/types/material__textfield/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -22,25 +22,29 @@
  */
 
 import MDCComponent from 'material__base/component';
-import { MDCRipple } from 'material__ripple';
-
-import { cssClasses, strings } from './constants';
-import { MDCTextFieldAdapter } from './adapter';
 import MDCTextFieldFoundation from './foundation';
-import { MDCTextFieldBottomLine } from './bottom-line/index';
-import { MDCTextFieldHelperText } from './helper-text/index';
+import MDCTextFieldAdapter, { FoundationMapType } from './adapter';
+import { MDCTextFieldHelperText, MDCTextFieldHelperTextFoundation, MDCTextFieldHelperTextAdapter } from './helper-text';
+import { MDCTextFieldIcon, MDCTextFieldIconFoundation, MDCTextFieldIconAdapter } from './icon';
+import { MDCRipple, MDCRippleFoundation } from 'material__ripple';
+import { MDCLineRipple } from 'material__line-ripple';
+import { MDCFloatingLabel } from 'material__floating-label';
+import { MDCNotchedOutline } from 'material__notched-outline';
 
-export {MDCTextFieldAdapter, MDCTextFieldFoundation};
+export { MDCTextFieldFoundation, MDCTextFieldAdapter, MDCTextFieldHelperText };
+export { MDCTextFieldHelperTextFoundation, MDCTextFieldHelperTextAdapter, MDCTextFieldIcon };
+export { MDCTextFieldIconFoundation, MDCTextFieldIconAdapter };
 
 export class MDCTextField extends MDCComponent<MDCTextFieldAdapter, MDCTextFieldFoundation> {
     static attachTo(root: Element): MDCTextField;
 
     initialize(
-      rippleFactory?: (el: Element) => MDCRipple,
-      bottomLineFactory?: (el: Element) => MDCTextFieldBottomLine
-    ): void;
-
-    destroy(): void;
+        rippleFactory?: (el: Element, foundation: MDCRippleFoundation) => MDCRipple,
+        lineRippleFactory?: (el: Element) => MDCLineRipple,
+        helperTextFactory?: (el: Element) => MDCTextFieldHelperText,
+        iconFactory?: (el: Element) => MDCTextFieldIcon,
+        labelFactory?: (el: Element) => MDCFloatingLabel,
+        outlineFactory?: (el: Element) => MDCNotchedOutline): void;
 
     /**
      * Initiliazes the Text Field's internal state based on the environment's
@@ -48,14 +52,30 @@ export class MDCTextField extends MDCComponent<MDCTextFieldAdapter, MDCTextField
      */
     initialSyncWithDom(): void;
 
+    value: string;
+
     disabled: boolean;
 
     valid: boolean;
 
-    /**
-     * Sets the helper text element content.
-     */
+    required: boolean;
+
+    pattern: string;
+
+    minLength: number;
+
+    maxLength: number;
+
+    min: string;
+
+    max: string;
+
+    step: string;
+
     helperTextContent: string;
 
-    getDefaultFoundation(): MDCTextFieldFoundation;
+    /**
+     * Recomputes the outline SVG path for the outline element.
+     */
+    layout(): void;
 }
diff --git a/types/material__textfield/tsconfig.json b/types/material__textfield/tsconfig.json
index d70d268d9a..a7c337feeb 100644
--- a/types/material__textfield/tsconfig.json
+++ b/types/material__textfield/tsconfig.json
@@ -6,10 +6,10 @@
         "helper-text/adapter.d.ts",
         "helper-text/index.d.ts",
         "helper-text/foundation.d.ts",
-        "bottom-line/constants.d.ts",
-        "bottom-line/adapter.d.ts",
-        "bottom-line/index.d.ts",
-        "bottom-line/foundation.d.ts",
+        "icon/constants.d.ts",
+        "icon/adapter.d.ts",
+        "icon/index.d.ts",
+        "icon/foundation.d.ts",
         "index.d.ts",
         "foundation.d.ts"
     ],
diff --git a/types/material__toolbar/adapter.d.ts b/types/material__toolbar/adapter.d.ts
index 625b296cf8..7386d17c55 100644
--- a/types/material__toolbar/adapter.d.ts
+++ b/types/material__toolbar/adapter.d.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-export interface MDCToolbarAdapter {
+export default interface MDCToolbarAdapter {
     hasClass(className: string): boolean;
 
     addClass(className: string): void;
diff --git a/types/material__toolbar/constants.d.ts b/types/material__toolbar/constants.d.ts
index 8f984ac113..f00e8621cb 100644
--- a/types/material__toolbar/constants.d.ts
+++ b/types/material__toolbar/constants.d.ts
@@ -28,6 +28,7 @@ export interface cssClasses extends MDCStrings {
 
 export interface strings extends MDCStrings {
     TITLE_SELECTOR: '.mdc-toolbar__title';
+    ICON_SELECTOR: '.mdc-toolbar__icon';
     FIRST_ROW_SELECTOR: '.mdc-toolbar__row:first-child';
     CHANGE_EVENT: 'MDCToolbar:change';
 }
diff --git a/types/material__toolbar/foundation.d.ts b/types/material__toolbar/foundation.d.ts
index 883c0b19e0..fd54c7201c 100644
--- a/types/material__toolbar/foundation.d.ts
+++ b/types/material__toolbar/foundation.d.ts
@@ -15,16 +15,16 @@
  */
 import MDCFoundation from 'material__base/foundation';
 import { cssClasses, strings, numbers } from './constants';
-import { MDCToolbarAdapter } from './adapter';
+import MDCToolbarAdapter from './adapter';
 
 export default class MDCToolbarFoundation extends MDCFoundation<MDCToolbarAdapter> {
-  static readonly cssClasses: cssClasses;
+    static readonly cssClasses: cssClasses;
 
-  static readonly strings: strings;
+    static readonly strings: strings;
 
-  static readonly numbers: numbers;
+    static readonly numbers: numbers;
 
-  static readonly defaultAdapter: MDCToolbarAdapter;
+    static readonly defaultAdapter: MDCToolbarAdapter;
 
-  updateAdjustElementStyles(): void;
+    updateAdjustElementStyles(): void;
 }
diff --git a/types/material__toolbar/index.d.ts b/types/material__toolbar/index.d.ts
index 1b048c64c9..75bcbcda5f 100644
--- a/types/material__toolbar/index.d.ts
+++ b/types/material__toolbar/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Material Components Web 0.26
+// Type definitions for Material Components Web 0.35
 // Project: https://material.io/components/
-// Definitions by: Brent Douglas <https://github.com/BrentDouglas>
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -23,15 +23,12 @@
 import { MDCComponent } from 'material__base';
 
 import MDCToolbarFoundation from './foundation';
-import { MDCToolbarAdapter } from './adapter';
-import * as util from './util';
+import MDCToolbarAdapter from './adapter';
 
-export {MDCToolbarAdapter, MDCToolbarFoundation, util};
+export {MDCToolbarAdapter, MDCToolbarFoundation};
 
 export class MDCToolbar extends MDCComponent<MDCToolbarAdapter, MDCToolbarFoundation> {
-  static attachTo(root: HTMLElement): MDCToolbar;
+    static attachTo(root: Element): MDCToolbar;
 
-  fixedAdjustElement: HTMLElement;
-
-  getDefaultFoundation(): MDCToolbarFoundation;
+    fixedAdjustElement: HTMLElement;
 }
diff --git a/types/material__toolbar/tsconfig.json b/types/material__toolbar/tsconfig.json
index 826161ca25..2af99c6e5e 100644
--- a/types/material__toolbar/tsconfig.json
+++ b/types/material__toolbar/tsconfig.json
@@ -2,7 +2,6 @@
     "files": [
         "constants.d.ts",
         "adapter.d.ts",
-        "util.d.ts",
         "index.d.ts",
         "foundation.d.ts"
     ],
diff --git a/types/material__top-app-bar/adapter.d.ts b/types/material__top-app-bar/adapter.d.ts
new file mode 100644
index 0000000000..72d0f3430f
--- /dev/null
+++ b/types/material__top-app-bar/adapter.d.ts
@@ -0,0 +1,77 @@
+/**
+ * @license
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Adapter for MDC Top App Bar
+ *
+ * Defines the shape of the adapter expected by the foundation. Implement this
+ * adapter to integrate the Top App Bar into your framework. See
+ * https://github.com/material-components/material-components-web/blob/master/docs/authoring-components.md
+ * for more information.
+ */
+export default interface MDCTopAppBarAdapter {
+    /**
+     * Adds a class to the root Element.
+     */
+    addClass(className: string): void;
+
+    /**
+     * Removes a class from the root Element.
+     */
+    removeClass(className: string): void;
+
+    /**
+     * Returns true if the root Element contains the given class.
+     */
+    hasClass(className: string): boolean;
+
+    /**
+     * Sets the specified inline style property on the root Element to the given value.
+     */
+    setStyle(property: string, value: string): void;
+
+    /**
+     * Gets the height of the top app bar.
+     */
+    getTopAppBarHeight(): number;
+
+    /**
+     * Registers an event handler on the navigation icon element for a given event.
+     */
+    registerNavigationIconInteractionHandler(type: string, handler: EventListener): void;
+
+    /**
+     * Deregisters an event handler on the navigation icon element for a given event.
+     */
+    deregisterNavigationIconInteractionHandler(type: string, handler: EventListener): void;
+
+    /**
+     * Emits an event when the navigation icon is clicked.
+     */
+    notifyNavigationIconClicked(): void;
+
+    registerScrollHandler(handler: EventListener): void;
+
+    deregisterScrollHandler(handler: EventListener): void;
+
+    registerResizeHandler(handler: EventListener): void;
+
+    deregisterResizeHandler(handler: EventListener): void;
+
+    getViewportScrollY(): number;
+
+    getTotalActionItems(): number;
+}
diff --git a/types/material__top-app-bar/constants.d.ts b/types/material__top-app-bar/constants.d.ts
new file mode 100644
index 0000000000..9f16a92a3f
--- /dev/null
+++ b/types/material__top-app-bar/constants.d.ts
@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { MDCStrings, MDCNumbers } from 'material__base';
+
+export interface cssClasses extends MDCStrings {
+    FIXED_CLASS: 'mdc-top-app-bar--fixed';
+    FIXED_SCROLLED_CLASS: 'mdc-top-app-bar--fixed-scrolled';
+    SHORT_CLASS: 'mdc-top-app-bar--short';
+    SHORT_HAS_ACTION_ITEM_CLASS: 'mdc-top-app-bar--short-has-action-item';
+    SHORT_COLLAPSED_CLASS: 'mdc-top-app-bar--short-collapsed';
+}
+
+export interface numbers extends MDCNumbers {
+    DEBOUNCE_THROTTLE_RESIZE_TIME_MS: 100;
+    MAX_TOP_APP_BAR_HEIGHT: 128;
+}
+
+export interface strings extends MDCStrings {
+    ACTION_ITEM_SELECTOR: '.mdc-top-app-bar__action-item';
+    NAVIGATION_EVENT: 'MDCTopAppBar:nav';
+    NAVIGATION_ICON_SELECTOR: '.mdc-top-app-bar__navigation-icon';
+    ROOT_SELECTOR: '.mdc-top-app-bar';
+    TITLE_SELECTOR: '.mdc-top-app-bar__title';
+}
diff --git a/types/material__top-app-bar/fixed/foundation.d.ts b/types/material__top-app-bar/fixed/foundation.d.ts
new file mode 100644
index 0000000000..21b5e22092
--- /dev/null
+++ b/types/material__top-app-bar/fixed/foundation.d.ts
@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import MDCTopAppBarFoundation from '../foundation';
+import MDCTopAppBarAdapter from '../adapter';
+
+export default class MDCFixedTopAppBarFoundation extends MDCTopAppBarFoundation {
+}
diff --git a/types/material__menu/simple/foundation.d.ts b/types/material__top-app-bar/foundation.d.ts
similarity index 63%
rename from types/material__menu/simple/foundation.d.ts
rename to types/material__top-app-bar/foundation.d.ts
index 78071374b3..d0f6d68484 100644
--- a/types/material__menu/simple/foundation.d.ts
+++ b/types/material__top-app-bar/foundation.d.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2016 Google Inc. All Rights Reserved.
+ * Copyright 2018 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,28 +16,15 @@
  */
 
 import MDCFoundation from 'material__base/foundation';
-import MDCSimpleMenuAdapter from './adapter';
 import { cssClasses, strings, numbers } from './constants';
-import { clamp, bezierProgress } from '../util';
-
-export default class MDCSimpleMenuFoundation extends MDCFoundation<MDCSimpleMenuAdapter> {
-    static readonly cssClasses: cssClasses;
+import MDCTopAppBarAdapter from './adapter';
 
+export default class MDCTopAppBarBaseFoundation extends MDCFoundation<MDCTopAppBarAdapter> {
     static readonly strings: strings;
 
+    static readonly cssClasses: cssClasses;
+
     static readonly numbers: numbers;
 
-    static readonly defaultAdapter: MDCSimpleMenuAdapter;
-
-    /**
-     * Open the menu.
-     */
-    open(options?: {focusIndex?: number}): void;
-
-    /**
-     * Closes the menu.
-     */
-    close(evt?: Event): void;
-
-    isOpen(): boolean;
+    static readonly defaultAdapter: MDCTopAppBarAdapter;
 }
diff --git a/types/material__top-app-bar/index.d.ts b/types/material__top-app-bar/index.d.ts
new file mode 100644
index 0000000000..da37e36f23
--- /dev/null
+++ b/types/material__top-app-bar/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for Material Components Web 0.35
+// Project: https://material.io/components/
+// Definitions by: Brent Douglas <https://github.com/BrentDouglas>, Collin Kostichuk <https://github.com/ckosti>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/**
+ * @license
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import MDCComponent from 'material__base/component';
+import MDCTopAppBarBaseFoundation from './foundation';
+import MDCTopAppBarAdapter from './adapter';
+import MDCFixedTopAppBarFoundation from './fixed/foundation';
+import MDCShortTopAppBarFoundation from './short/foundation';
+import MDCTopAppBarFoundation from './standard/foundation';
+import { MDCRipple } from 'material__ripple';
+
+export { MDCTopAppBarBaseFoundation, MDCTopAppBarAdapter, MDCTopAppBarFoundation, MDCFixedTopAppBarFoundation, MDCShortTopAppBarFoundation };
+
+export class MDCTopAppBar extends MDCComponent<MDCTopAppBarAdapter, MDCTopAppBarFoundation> {
+    initialize(rippleFactory?: (el: Element) => MDCRipple): void;
+
+    static attachTo(root: Element): MDCTopAppBar;
+}
diff --git a/types/material__top-app-bar/short/foundation.d.ts b/types/material__top-app-bar/short/foundation.d.ts
new file mode 100644
index 0000000000..036b65216e
--- /dev/null
+++ b/types/material__top-app-bar/short/foundation.d.ts
@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import MDCTopAppBarBaseFoundation from '../foundation';
+import MDCTopAppBarAdapter from '../adapter';
+
+export default class MDCShortTopAppBarFoundation extends MDCTopAppBarBaseFoundation {
+}
diff --git a/types/material__top-app-bar/standard/foundation.d.ts b/types/material__top-app-bar/standard/foundation.d.ts
new file mode 100644
index 0000000000..d9d39b4646
--- /dev/null
+++ b/types/material__top-app-bar/standard/foundation.d.ts
@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import MDCTopAppBarBaseFoundation from '../foundation';
+import MDCTopAppBarAdapter from '../adapter';
+
+export default class MDCTopAppBarFoundation extends MDCTopAppBarBaseFoundation {
+}
diff --git a/types/material__top-app-bar/tsconfig.json b/types/material__top-app-bar/tsconfig.json
new file mode 100644
index 0000000000..5652908420
--- /dev/null
+++ b/types/material__top-app-bar/tsconfig.json
@@ -0,0 +1,30 @@
+{
+    "files": [
+        "fixed/foundation.d.ts",
+        "short/foundation.d.ts",
+        "standard/foundation.d.ts",
+        "constants.d.ts",
+        "adapter.d.ts",
+        "index.d.ts",
+        "foundation.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
\ No newline at end of file
diff --git a/types/material__top-app-bar/tslint.json b/types/material__top-app-bar/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/material__top-app-bar/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 14458ce965c6a63d4e8665abbe7259ff118c033d Mon Sep 17 00:00:00 2001
From: Deividi <deividi.cavarzan@gmail.com>
Date: Fri, 11 May 2018 22:09:45 -0300
Subject: [PATCH 055/575] added render function

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

diff --git a/types/react-text-mask/index.d.ts b/types/react-text-mask/index.d.ts
index 7ed81429e0..6bdaba03bc 100644
--- a/types/react-text-mask/index.d.ts
+++ b/types/react-text-mask/index.d.ts
@@ -20,6 +20,9 @@ export interface MaskedInputProps extends React.InputHTMLAttributes<HTMLInputEle
     pipe?: (conformedValue: string, config: any) => false | string | { value: string, indexesOfPipedChars: number[] };
 
     showMask?: boolean;
+    
+    render: (ref: MaskedInput, props: any) => any;
+
 }
 
 export interface conformToMaskResult {

From 16f2d8d59bb00b9e8e9368116f4c905441977b92 Mon Sep 17 00:00:00 2001
From: Deividi <deividi.cavarzan@gmail.com>
Date: Fri, 11 May 2018 22:24:05 -0300
Subject: [PATCH 056/575] Update index.d.ts

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

diff --git a/types/react-text-mask/index.d.ts b/types/react-text-mask/index.d.ts
index 6bdaba03bc..843441d99a 100644
--- a/types/react-text-mask/index.d.ts
+++ b/types/react-text-mask/index.d.ts
@@ -21,7 +21,7 @@ export interface MaskedInputProps extends React.InputHTMLAttributes<HTMLInputEle
 
     showMask?: boolean;
     
-    render: (ref: MaskedInput, props: any) => any;
+    render?: (ref: MaskedInput, props: any) => any;
 
 }
 

From d53b06240780bb741a83f11f46b1e60c9ec4d80a Mon Sep 17 00:00:00 2001
From: cavarzan <deividi.cavarzan@gmail.com>
Date: Fri, 11 May 2018 22:39:54 -0300
Subject: [PATCH 057/575] fix lint

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

diff --git a/types/react-text-mask/index.d.ts b/types/react-text-mask/index.d.ts
index 843441d99a..b2f3147667 100644
--- a/types/react-text-mask/index.d.ts
+++ b/types/react-text-mask/index.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for react-text-mask 5.1
+// Type definitions for react-text-mask 5.4.1
 // Project: https://github.com/text-mask/text-mask
-// Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>
+// Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>, Deividi Cavarzan <https://github.com/cavarzan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
-import * as React from "react";
+import * as React from 'react';
 
 export type maskArray = Array<string | RegExp>;
 
@@ -17,18 +17,17 @@ export interface MaskedInputProps extends React.InputHTMLAttributes<HTMLInputEle
 
     keepCharPositions?: boolean;
 
-    pipe?: (conformedValue: string, config: any) => false | string | { value: string, indexesOfPipedChars: number[] };
+    pipe?: (conformedValue: string, config: any) => false | string | { value: string; indexesOfPipedChars: number[] };
 
     showMask?: boolean;
-    
-    render?: (ref: MaskedInput, props: any) => any;
 
+    render?: (ref: MaskedInput, props: any) => any;
 }
 
 export interface conformToMaskResult {
     conformedValue: string;
     meta: {
-        someCharsRejected: boolean
+        someCharsRejected: boolean;
     };
 }
 

From ca07c3bfb46a6b5f2f02f49104f38188c1d6ecc1 Mon Sep 17 00:00:00 2001
From: Deividi <deividi.cavarzan@gmail.com>
Date: Fri, 11 May 2018 22:48:14 -0300
Subject: [PATCH 058/575] Update index.d.ts

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

diff --git a/types/react-text-mask/index.d.ts b/types/react-text-mask/index.d.ts
index b2f3147667..d598fcf711 100644
--- a/types/react-text-mask/index.d.ts
+++ b/types/react-text-mask/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-text-mask 5.4.1
+// Type definitions for react-text-mask 5.4
 // Project: https://github.com/text-mask/text-mask
 // Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>, Deividi Cavarzan <https://github.com/cavarzan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 06d81ef2cea31831548ed1e51fb6ba500a463199 Mon Sep 17 00:00:00 2001
From: James Barton <james@neodon.com>
Date: Sat, 12 May 2018 00:58:12 -0500
Subject: [PATCH 059/575] Add definitions for vue-markdown

---
 types/vue-markdown/index.d.ts            | 305 +++++++++++++++++++++++
 types/vue-markdown/package.json          |   6 +
 types/vue-markdown/tsconfig.json         |  24 ++
 types/vue-markdown/tslint.json           |   1 +
 types/vue-markdown/vue-markdown-tests.ts |  12 +
 5 files changed, 348 insertions(+)
 create mode 100644 types/vue-markdown/index.d.ts
 create mode 100644 types/vue-markdown/package.json
 create mode 100644 types/vue-markdown/tsconfig.json
 create mode 100644 types/vue-markdown/tslint.json
 create mode 100644 types/vue-markdown/vue-markdown-tests.ts

diff --git a/types/vue-markdown/index.d.ts b/types/vue-markdown/index.d.ts
new file mode 100644
index 0000000000..58482a0870
--- /dev/null
+++ b/types/vue-markdown/index.d.ts
@@ -0,0 +1,305 @@
+// Type definitions for vue-markdown 2.2
+// Project: https://github.com/miaolz123/vue-markdown#readme
+// Definitions by: James Barton <https://github.com/neodon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export default vue_markdown;
+export const vue_markdown: {
+    beforeMount: any;
+    computed: {
+        tocLastLevelComputed: any;
+    };
+    data: any;
+    md: {
+        block: {
+            State: any;
+            parse: any;
+            ruler: {
+                after: any;
+                at: any;
+                before: any;
+                disable: any;
+                enable: any;
+                enableOnly: any;
+                getRules: any;
+                push: any;
+            };
+            tokenize: any;
+        };
+        configure: any;
+        core: {
+            State: any;
+            process: any;
+            ruler: {
+                after: any;
+                at: any;
+                before: any;
+                disable: any;
+                enable: any;
+                enableOnly: any;
+                getRules: any;
+                push: any;
+            };
+        };
+        disable: any;
+        enable: any;
+        helpers: {
+            parseLinkDestination: any;
+            parseLinkLabel: any;
+            parseLinkTitle: any;
+        };
+        inline: {
+            State: any;
+            parse: any;
+            ruler: {
+                after: any;
+                at: any;
+                before: any;
+                disable: any;
+                enable: any;
+                enableOnly: any;
+                getRules: any;
+                push: any;
+            };
+            ruler2: {
+                after: any;
+                at: any;
+                before: any;
+                disable: any;
+                enable: any;
+                enableOnly: any;
+                getRules: any;
+                push: any;
+            };
+            skipToken: any;
+            tokenize: any;
+        };
+        linkify: {
+            add: any;
+            match: any;
+            normalize: any;
+            pretest: any;
+            re: {
+                email_fuzzy: RegExp;
+                host_fuzzy_test: RegExp;
+                link_fuzzy: RegExp;
+                link_no_ip_fuzzy: RegExp;
+                pretest: RegExp;
+                schema_search: RegExp;
+                schema_test: RegExp;
+                src_Any: string;
+                src_Cc: string;
+                src_P: string;
+                src_Z: string;
+                src_ZCc: string;
+                src_ZPCc: string;
+                src_auth: string;
+                src_domain: string;
+                src_domain_root: string;
+                src_email_name: string;
+                src_host: string;
+                src_host_port_strict: string;
+                src_host_strict: string;
+                src_host_terminator: string;
+                src_ip4: string;
+                src_path: string;
+                src_port: string;
+                src_tlds: string;
+                src_xn: string;
+                tpl_email_fuzzy: string;
+                tpl_host_fuzzy: string;
+                tpl_host_fuzzy_strict: string;
+                tpl_host_fuzzy_test: string;
+                tpl_host_no_ip_fuzzy: string;
+                tpl_host_port_fuzzy_strict: string;
+                tpl_host_port_no_ip_fuzzy_strict: string;
+                tpl_link_fuzzy: string;
+                tpl_link_no_ip_fuzzy: string;
+            };
+            set: any;
+            test: any;
+            testSchemaAt: any;
+            tlds: any;
+        };
+        normalizeLink: any;
+        normalizeLinkText: any;
+        options: {
+            breaks: boolean;
+            highlight: any;
+            html: boolean;
+            langPrefix: string;
+            linkify: boolean;
+            maxNesting: number;
+            quotes: string;
+            typographer: boolean;
+            xhtmlOut: boolean;
+        };
+        parse: any;
+        parseInline: any;
+        render: any;
+        renderInline: any;
+        renderer: {
+            render: any;
+            renderAttrs: any;
+            renderInline: any;
+            renderInlineAsText: any;
+            renderToken: any;
+            rules: {
+                code_block: any;
+                code_inline: any;
+                fence: any;
+                hardbreak: any;
+                html_block: any;
+                html_inline: any;
+                image: any;
+                softbreak: any;
+                text: any;
+            };
+        };
+        set: any;
+        use: any;
+        utils: {
+            arrayReplaceAt: any;
+            assign: any;
+            escapeHtml: any;
+            escapeRE: any;
+            fromCodePoint: any;
+            has: any;
+            isMdAsciiPunct: any;
+            isPunctChar: any;
+            isSpace: any;
+            isString: any;
+            isValidEntityCode: any;
+            isWhiteSpace: any;
+            lib: {
+                mdurl: {
+                    decode: any;
+                    encode: any;
+                    format: any;
+                    parse: any;
+                };
+                ucmicro: {
+                    Any: RegExp;
+                    Cc: RegExp;
+                    Cf: RegExp;
+                    P: RegExp;
+                    Z: RegExp;
+                };
+            };
+            normalizeReference: any;
+            unescapeAll: any;
+            unescapeMd: any;
+        };
+        validateLink: any;
+    };
+    props: {
+        anchorAttributes: {
+            default: any;
+            type: any;
+        };
+        breaks: {
+            default: boolean;
+            type: any;
+        };
+        emoji: {
+            default: boolean;
+            type: any;
+        };
+        highlight: {
+            default: boolean;
+            type: any;
+        };
+        html: {
+            default: boolean;
+            type: any;
+        };
+        langPrefix: {
+            default: string;
+            type: any;
+        };
+        linkify: {
+            default: boolean;
+            type: any;
+        };
+        postrender: {
+            default: any;
+            type: any;
+        };
+        prerender: {
+            default: any;
+            type: any;
+        };
+        quotes: {
+            default: string;
+            type: any;
+        };
+        show: {
+            default: boolean;
+            type: any;
+        };
+        source: {
+            default: string;
+            type: any;
+        };
+        tableClass: {
+            default: string;
+            type: any;
+        };
+        taskLists: {
+            default: boolean;
+            type: any;
+        };
+        toc: {
+            default: boolean;
+            type: any;
+        };
+        tocAnchorClass: {
+            default: string;
+            type: any;
+        };
+        tocAnchorLink: {
+            default: boolean;
+            type: any;
+        };
+        tocAnchorLinkClass: {
+            default: string;
+            type: any;
+        };
+        tocAnchorLinkSpace: {
+            default: boolean;
+            type: any;
+        };
+        tocAnchorLinkSymbol: {
+            default: string;
+            type: any;
+        };
+        tocClass: {
+            default: string;
+            type: any;
+        };
+        tocFirstLevel: {
+            default: number;
+            type: any;
+        };
+        tocId: {
+            type: any;
+        };
+        tocLastLevel: {
+            type: any;
+        };
+        typographer: {
+            default: boolean;
+            type: any;
+        };
+        watches: {
+            default: any;
+            type: any;
+        };
+        xhtmlOut: {
+            default: boolean;
+            type: any;
+        };
+    };
+    render: any;
+    template: string;
+};
diff --git a/types/vue-markdown/package.json b/types/vue-markdown/package.json
new file mode 100644
index 0000000000..20f817a6b3
--- /dev/null
+++ b/types/vue-markdown/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "vue": "^2.5.16"
+  }
+}
diff --git a/types/vue-markdown/tsconfig.json b/types/vue-markdown/tsconfig.json
new file mode 100644
index 0000000000..9b7defa032
--- /dev/null
+++ b/types/vue-markdown/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",
+        "vue-markdown-tests.ts"
+    ]
+}
diff --git a/types/vue-markdown/tslint.json b/types/vue-markdown/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/vue-markdown/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/vue-markdown/vue-markdown-tests.ts b/types/vue-markdown/vue-markdown-tests.ts
new file mode 100644
index 0000000000..369e4c614c
--- /dev/null
+++ b/types/vue-markdown/vue-markdown-tests.ts
@@ -0,0 +1,12 @@
+import Vue from 'vue';
+import VueMarkdown from 'vue-markdown';
+
+new Vue({
+    el: '#app',
+    components: {
+        VueMarkdown
+    },
+    template: `
+        # Test
+    `
+});

From 58dd75a89dd90dda5eca93c80bc47485da8eff05 Mon Sep 17 00:00:00 2001
From: Guy Lichtman <guy@lichtman.io>
Date: Sat, 12 May 2018 12:49:35 +0300
Subject: [PATCH 060/575] Add definitions for tar-stream

---
 types/tar-stream/index.d.ts          | 42 ++++++++++++++++++++++++++
 types/tar-stream/tar-stream-tests.ts | 44 ++++++++++++++++++++++++++++
 types/tar-stream/tsconfig.json       | 23 +++++++++++++++
 types/tar-stream/tslint.json         |  1 +
 4 files changed, 110 insertions(+)
 create mode 100644 types/tar-stream/index.d.ts
 create mode 100644 types/tar-stream/tar-stream-tests.ts
 create mode 100644 types/tar-stream/tsconfig.json
 create mode 100644 types/tar-stream/tslint.json

diff --git a/types/tar-stream/index.d.ts b/types/tar-stream/index.d.ts
new file mode 100644
index 0000000000..21643fa906
--- /dev/null
+++ b/types/tar-stream/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for tar-stream 1.6
+// Project: https://github.com/mafintosh/tar-stream
+// Definitions by: Guy Lichtman <https://github.com/glicht>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/// <reference types="node" />
+
+import stream = require('stream');
+
+export type Callback = (err?: Error | null) => any;
+
+// see https://github.com/mafintosh/tar-stream/blob/master/headers.js
+export interface Headers {
+    name: string;
+    mode?: number;
+    uid?: number;
+    gid?: number;
+    size?: number;
+    mtime?: Date;
+    linkname?: string | null;
+    type?: 'file' | 'link' | 'symlink' | 'character-device' | 'block-device' | 'directory' | 'fifo' |
+        'contiguous-file' | 'pax-header' | 'pax-global-header' | 'gnu-long-link-path' | 'gnu-long-path' | null;
+    uname?: string;
+    gname?: string;
+    devmajor?: number;
+    devminor?: number;
+}
+
+export interface Pack extends stream.Readable {
+    entry(headers: Headers, buffer?: string | Buffer | Callback, callback?: Callback): stream.Writable;
+    finalize(): void;
+}
+
+export interface Extract extends stream.Writable {
+    on(event: string, listener: (...args: any[]) => void): this;
+    on(event: "entry", listener: (headers: Headers, stream: stream.PassThrough, next: () => void ) => void): this;
+}
+
+export function extract(opts?: stream.WritableOptions): stream.Writable;
+
+export function pack(opts?: stream.ReadableOptions): Pack;
diff --git a/types/tar-stream/tar-stream-tests.ts b/types/tar-stream/tar-stream-tests.ts
new file mode 100644
index 0000000000..537c08bc0d
--- /dev/null
+++ b/types/tar-stream/tar-stream-tests.ts
@@ -0,0 +1,44 @@
+import tar = require('tar-stream');
+
+const pack = tar.pack();
+
+// add a file called my-test.txt with the content "Hello World!"
+pack.entry({ name: 'my-test1.txt' }, 'Hello World!');
+
+// add a file called my-stream-test.txt from a stream
+const entry = pack.entry({ name: 'my-test2.txt', size: 11 }, (err) => {
+  // the stream was added
+  // no more entries
+  pack.finalize();
+});
+
+entry.write('hello');
+entry.write(' ');
+entry.write('world');
+entry.end();
+
+const extract = tar.extract();
+
+const entries: any = {};
+
+extract.on('entry', (header, stream, next) => {
+  // header is the tar header
+  // stream is the content body (might be an empty stream)
+  // call next when you are done with this entry
+  entries[header.name] = true;
+  stream.on('end', () => {
+    next();
+  });
+
+  stream.resume(); // just auto drain the stream
+});
+
+extract.on('finish', () => {
+  // all entries read
+  console.assert(entries['my-test1.txt'], "missing entry");
+  console.assert(entries['my-test2.txt'], "missing entry");
+  console.log("Found all entries in extract");
+});
+
+// pipe the pack stream
+pack.pipe(extract);
diff --git a/types/tar-stream/tsconfig.json b/types/tar-stream/tsconfig.json
new file mode 100644
index 0000000000..efc9382e30
--- /dev/null
+++ b/types/tar-stream/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",
+        "tar-stream-tests.ts"
+    ]
+}
diff --git a/types/tar-stream/tslint.json b/types/tar-stream/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/tar-stream/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b1e3ed6ea9331001663434a9d1214299cf1e8015 Mon Sep 17 00:00:00 2001
From: Arnav Gupta <arnav@codingblocks.com>
Date: Sat, 12 May 2018 15:22:49 +0530
Subject: [PATCH 061/575] add types for discourse-sso

Signed-off-by: Arnav Gupta <arnav@codingblocks.com>
---
 types/discourse-sso/discourse-sso-tests.ts | 16 ++++++++++++
 types/discourse-sso/index.d.ts             | 30 ++++++++++++++++++++++
 types/discourse-sso/tsconfig.json          | 22 ++++++++++++++++
 types/discourse-sso/tslint.json            |  1 +
 4 files changed, 69 insertions(+)
 create mode 100644 types/discourse-sso/discourse-sso-tests.ts
 create mode 100644 types/discourse-sso/index.d.ts
 create mode 100644 types/discourse-sso/tsconfig.json
 create mode 100644 types/discourse-sso/tslint.json

diff --git a/types/discourse-sso/discourse-sso-tests.ts b/types/discourse-sso/discourse-sso-tests.ts
new file mode 100644
index 0000000000..fe61efe08a
--- /dev/null
+++ b/types/discourse-sso/discourse-sso-tests.ts
@@ -0,0 +1,16 @@
+import * as discourseSSO from 'discourse-sso'
+const sso = new discourseSSO('sso secret string')
+
+if (sso.validate('payload', 'sig')) {
+    const nonce = sso.getNonce('payload')
+
+    const userParams: discourseSSO.UserParams = {
+        nonce,
+        external_id: '1',
+        email: 'omg@mail.com',
+        username: 'myuser',
+        name: 'This Guy'
+    }
+
+    const loginString: string = sso.buildLoginString(userParams)
+}
\ No newline at end of file
diff --git a/types/discourse-sso/index.d.ts b/types/discourse-sso/index.d.ts
new file mode 100644
index 0000000000..90c652948d
--- /dev/null
+++ b/types/discourse-sso/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for discourse-sso 1.0
+// Project: https://github.com/ArmedGuy/discourse_sso_node
+// Definitions by: Arnav Gupta <https://github.com/championswimmer>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+
+
+declare class DiscourseSSO {
+    constructor(ssoSecret: string)
+    validate(payload: string, sig: string): boolean
+    getNonce(payload: string): string
+    buildLoginString(params: DiscourseSSO.UserParams): string
+}
+declare namespace DiscourseSSO {
+    
+    export interface UserParams {
+        nonce: string,
+        external_id: string,
+        email: string,
+        admin?: boolean,
+        moderator?: boolean,
+        username?: string,
+        name?: string,
+        avatar_url?: string,
+        add_groups?: string[],
+        remove_groups?: string[]
+    }
+}
+export = DiscourseSSO
\ No newline at end of file
diff --git a/types/discourse-sso/tsconfig.json b/types/discourse-sso/tsconfig.json
new file mode 100644
index 0000000000..c80e56868b
--- /dev/null
+++ b/types/discourse-sso/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",
+        "discourse-sso-tests.ts"
+    ]
+}
diff --git a/types/discourse-sso/tslint.json b/types/discourse-sso/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/discourse-sso/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 5d278b1acf938421de2f68f02080af9429573e00 Mon Sep 17 00:00:00 2001
From: Guy Lichtman <guy@lichtman.io>
Date: Sat, 12 May 2018 13:02:04 +0300
Subject: [PATCH 062/575] fix lint warning

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

diff --git a/types/tar-stream/index.d.ts b/types/tar-stream/index.d.ts
index 21643fa906..d6afd0af7a 100644
--- a/types/tar-stream/index.d.ts
+++ b/types/tar-stream/index.d.ts
@@ -34,7 +34,7 @@ export interface Pack extends stream.Readable {
 
 export interface Extract extends stream.Writable {
     on(event: string, listener: (...args: any[]) => void): this;
-    on(event: "entry", listener: (headers: Headers, stream: stream.PassThrough, next: () => void ) => void): this;
+    on(event: "entry", listener: (headers: Headers, stream: stream.PassThrough, next: () => void) => void): this;
 }
 
 export function extract(opts?: stream.WritableOptions): stream.Writable;

From bd9997047cccf10d7d275321e8847d462599af4d Mon Sep 17 00:00:00 2001
From: Arnav Gupta <arnav@codingblocks.com>
Date: Sat, 12 May 2018 15:53:39 +0530
Subject: [PATCH 063/575] Add strictFunctionTypes

Signed-off-by: Arnav Gupta <arnav@codingblocks.com>
---
 types/discourse-sso/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/discourse-sso/tsconfig.json b/types/discourse-sso/tsconfig.json
index c80e56868b..a0f1edbad5 100644
--- a/types/discourse-sso/tsconfig.json
+++ b/types/discourse-sso/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 2be4ed83e95c648aa9dc0593e3e465074eef899a Mon Sep 17 00:00:00 2001
From: Arnav Gupta <arnav@codingblocks.com>
Date: Sat, 12 May 2018 16:03:57 +0530
Subject: [PATCH 064/575] tslint fixes

Signed-off-by: Arnav Gupta <arnav@codingblocks.com>
---
 types/discourse-sso/discourse-sso-tests.ts | 10 +++----
 types/discourse-sso/index.d.ts             | 35 ++++++++++------------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/types/discourse-sso/discourse-sso-tests.ts b/types/discourse-sso/discourse-sso-tests.ts
index fe61efe08a..6ec2d967fc 100644
--- a/types/discourse-sso/discourse-sso-tests.ts
+++ b/types/discourse-sso/discourse-sso-tests.ts
@@ -1,8 +1,8 @@
-import * as discourseSSO from 'discourse-sso'
-const sso = new discourseSSO('sso secret string')
+import * as discourseSSO from 'discourse-sso';
+const sso = new discourseSSO('sso secret string');
 
 if (sso.validate('payload', 'sig')) {
-    const nonce = sso.getNonce('payload')
+    const nonce = sso.getNonce('payload');
 
     const userParams: discourseSSO.UserParams = {
         nonce,
@@ -12,5 +12,5 @@ if (sso.validate('payload', 'sig')) {
         name: 'This Guy'
     }
 
-    const loginString: string = sso.buildLoginString(userParams)
-}
\ No newline at end of file
+    const loginString: string = sso.buildLoginString(userParams);
+}
diff --git a/types/discourse-sso/index.d.ts b/types/discourse-sso/index.d.ts
index 90c652948d..322d2d609f 100644
--- a/types/discourse-sso/index.d.ts
+++ b/types/discourse-sso/index.d.ts
@@ -3,28 +3,25 @@
 // Definitions by: Arnav Gupta <https://github.com/championswimmer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
-
 declare class DiscourseSSO {
-    constructor(ssoSecret: string)
-    validate(payload: string, sig: string): boolean
-    getNonce(payload: string): string
-    buildLoginString(params: DiscourseSSO.UserParams): string
+    constructor(ssoSecret: string);
+    validate(payload: string, sig: string): boolean;
+    getNonce(payload: string): string;
+    buildLoginString(params: DiscourseSSO.UserParams): string;
 }
+
 declare namespace DiscourseSSO {
-    
     export interface UserParams {
-        nonce: string,
-        external_id: string,
-        email: string,
-        admin?: boolean,
-        moderator?: boolean,
-        username?: string,
-        name?: string,
-        avatar_url?: string,
-        add_groups?: string[],
-        remove_groups?: string[]
+        nonce: string;
+        external_id: string;
+        email: string;
+        admin?: boolean;
+        moderator?: boolean;
+        username?: string;
+        name?: string;
+        avatar_url?: string;
+        add_groups?: string[];
+        remove_groups?: string[];
     }
 }
-export = DiscourseSSO
\ No newline at end of file
+export = DiscourseSSO;
\ No newline at end of file

From bce8cdb6d36d24983dac1b482bdebba9be390d34 Mon Sep 17 00:00:00 2001
From: Arnav Gupta <arnav@codingblocks.com>
Date: Sat, 12 May 2018 16:16:43 +0530
Subject: [PATCH 065/575] more lint fixes

Signed-off-by: Arnav Gupta <arnav@codingblocks.com>
---
 types/discourse-sso/discourse-sso-tests.ts | 2 +-
 types/discourse-sso/index.d.ts             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/discourse-sso/discourse-sso-tests.ts b/types/discourse-sso/discourse-sso-tests.ts
index 6ec2d967fc..efe7eba95b 100644
--- a/types/discourse-sso/discourse-sso-tests.ts
+++ b/types/discourse-sso/discourse-sso-tests.ts
@@ -10,7 +10,7 @@ if (sso.validate('payload', 'sig')) {
         email: 'omg@mail.com',
         username: 'myuser',
         name: 'This Guy'
-    }
+    };
 
     const loginString: string = sso.buildLoginString(userParams);
 }
diff --git a/types/discourse-sso/index.d.ts b/types/discourse-sso/index.d.ts
index 322d2d609f..b8030e0735 100644
--- a/types/discourse-sso/index.d.ts
+++ b/types/discourse-sso/index.d.ts
@@ -11,7 +11,7 @@ declare class DiscourseSSO {
 }
 
 declare namespace DiscourseSSO {
-    export interface UserParams {
+    interface UserParams {
         nonce: string;
         external_id: string;
         email: string;
@@ -24,4 +24,4 @@ declare namespace DiscourseSSO {
         remove_groups?: string[];
     }
 }
-export = DiscourseSSO;
\ No newline at end of file
+export = DiscourseSSO;

From 207c35ed90020228f7eae20e6c511274a4afdf8f Mon Sep 17 00:00:00 2001
From: AJ Richardson <aj.ric.ar+git@gmail.com>
Date: Sat, 12 May 2018 08:36:50 -0400
Subject: [PATCH 066/575] Remove trivial files from tsconfig.json to avoid
 memory errors in tests

---
 types/lodash/common/array.d.ts |  32 +-
 types/lodash/lodash-tests.ts   |   8 +-
 types/lodash/tsconfig.json     | 686 +--------------------------------
 types/lowdb/_lodash.d.ts       |   4 +-
 4 files changed, 23 insertions(+), 707 deletions(-)

diff --git a/types/lodash/common/array.d.ts b/types/lodash/common/array.d.ts
index 5591bce088..6d4aff3056 100644
--- a/types/lodash/common/array.d.ts
+++ b/types/lodash/common/array.d.ts
@@ -929,28 +929,28 @@ declare module "../index" {
     // flattenDepth
 
     interface LoDashStatic {
-       /**
-       * Recursively flatten array up to depth times.
-       *
-       * @param array The array to recursively flatten.
-       * @param number The maximum recursion depth.
-       * @return Returns the new flattened array.
-       */
-       flattenDepth<T>(array: ListOfRecursiveArraysOrValues<T> | null | undefined, depth?: number): T[];
+        /**
+         * Recursively flatten array up to depth times.
+         *
+         * @param array The array to recursively flatten.
+         * @param number The maximum recursion depth.
+         * @return Returns the new flattened array.
+         */
+        flattenDepth<T>(array: ListOfRecursiveArraysOrValues<T> | null | undefined, depth?: number): T[];
     }
 
     interface LoDashImplicitWrapper<TValue> {
-       /**
-        * @see _.flattenDeep
-        */
-       flattenDepth<T>(this: LoDashImplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashImplicitWrapper<T[]>;
+        /**
+         * @see _.flattenDeep
+         */
+        flattenDepth<T>(this: LoDashImplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashImplicitWrapper<T[]>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
-       /**
-        * @see _.flattenDeep
-        */
-       flattenDepth<T>(this: LoDashExplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashExplicitWrapper<T[]>;
+        /**
+         * @see _.flattenDeep
+         */
+        flattenDepth<T>(this: LoDashExplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashExplicitWrapper<T[]>;
     }
 
     // fromPairs
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 6f4fae8529..52514f16f1 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -5793,19 +5793,19 @@ fp.now(); // $ExpectType number
     _.omit(dictionary, "a"); // $ExpectType Dictionary<AbcObject>
     _.omit(numericDictionary, "a");  // $ExpectType NumericDictionary<AbcObject>
 
-    _(obj).omit<AbcObject, "a">("a"); // ExpectType LoDashImplicitWrapper<Pick<AbcObject, "b" | "c">>   // NOTE: ExpectType disabled because it fails in TS2.4
+    _(obj).omit("a"); // ExpectType LoDashImplicitWrapper<Pick<AbcObject, "b" | "c">>   // NOTE: ExpectType disabled because it fails in TS2.4
     _(obj).omit(["b", 1], 0, "a"); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
     _(dictionary).omit("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
     _(numericDictionary).omit("a"); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
 
-    _.chain(obj).omit<AbcObject, "a">("a"); // ExpectType LoDashExplicitWrapper<Pick<AbcObject, "b" | "c">>   // NOTE: ExpectType disabled because it fails in TS2.4
+    _.chain(obj).omit("a"); // ExpectType LoDashExplicitWrapper<Pick<AbcObject, "b" | "c">>   // NOTE: ExpectType disabled because it fails in TS2.4
     _.chain(obj).omit(["b", 1], 0, "a"); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     _.chain(dictionary).omit("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
     _.chain(numericDictionary).omit("a"); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
 
     fp.omit("a", obj); // ExpectType Pick<AbcObject, "b" | "c">   // NOTE: ExpectType disabled because it fails in TS2.4
-    fp.omit<AbcObject, "a">("a")(obj); // ExpectType Pick<AbcObject, "b" | "c">   // NOTE: ExpectType disabled because it fails in TS2.3
-    fp.omit<AbcObject, "a" | "b">(["a", "b"])(obj); // ExpectType Pick<AbcObject, "c">   // NOTE: ExpectType disabled because it fails in TS2.3
+    fp.omit("a")(obj); // ExpectType Pick<AbcObject, "b" | "c">   // NOTE: ExpectType disabled because it fails in TS2.3
+    fp.omit(["a", "b"])(obj); // ExpectType Pick<AbcObject, "c">   // NOTE: ExpectType disabled because it fails in TS2.3
 }
 
 // _.omitBy
diff --git a/types/lodash/tsconfig.json b/types/lodash/tsconfig.json
index 60a2e8323c..5a160103d4 100644
--- a/types/lodash/tsconfig.json
+++ b/types/lodash/tsconfig.json
@@ -20,305 +20,7 @@
     "files": [
         "index.d.ts",
         "lodash-tests.ts",
-        "add.d.ts",
-        "after.d.ts",
-        "ary.d.ts",
-        "assign.d.ts",
-        "assignIn.d.ts",
-        "assignInWith.d.ts",
-        "assignWith.d.ts",
-        "at.d.ts",
-        "attempt.d.ts",
-        "before.d.ts",
-        "bind.d.ts",
-        "bindAll.d.ts",
-        "bindKey.d.ts",
-        "camelCase.d.ts",
-        "capitalize.d.ts",
-        "castArray.d.ts",
-        "ceil.d.ts",
-        "chain.d.ts",
-        "chunk.d.ts",
-        "clamp.d.ts",
-        "clone.d.ts",
-        "cloneDeep.d.ts",
-        "cloneDeepWith.d.ts",
-        "cloneWith.d.ts",
-        "compact.d.ts",
-        "concat.d.ts",
-        "cond.d.ts",
-        "conformsTo.d.ts",
-        "constant.d.ts",
-        "countBy.d.ts",
-        "create.d.ts",
-        "curry.d.ts",
-        "curryRight.d.ts",
-        "debounce.d.ts",
-        "deburr.d.ts",
-        "defaults.d.ts",
-        "defaultsDeep.d.ts",
-        "defaultTo.d.ts",
-        "defer.d.ts",
-        "delay.d.ts",
-        "difference.d.ts",
-        "differenceBy.d.ts",
-        "differenceWith.d.ts",
-        "divide.d.ts",
-        "drop.d.ts",
-        "dropRight.d.ts",
-        "dropRightWhile.d.ts",
-        "dropWhile.d.ts",
-        "each.d.ts",
-        "eachRight.d.ts",
-        "endsWith.d.ts",
-        "entries.d.ts",
-        "entriesIn.d.ts",
-        "eq.d.ts",
-        "escape.d.ts",
-        "escapeRegExp.d.ts",
-        "every.d.ts",
-        "extend.d.ts",
-        "extendWith.d.ts",
-        "fill.d.ts",
-        "filter.d.ts",
-        "find.d.ts",
-        "findIndex.d.ts",
-        "findKey.d.ts",
-        "findLast.d.ts",
-        "findLastIndex.d.ts",
-        "findLastKey.d.ts",
-        "first.d.ts",
-        "flatMap.d.ts",
-        "flatMapDeep.d.ts",
-        "flatMapDepth.d.ts",
-        "flatten.d.ts",
-        "flattenDeep.d.ts",
-        "flattenDepth.d.ts",
-        "flip.d.ts",
-        "floor.d.ts",
-        "flow.d.ts",
-        "flowRight.d.ts",
-        "forEach.d.ts",
-        "forEachRight.d.ts",
-        "forIn.d.ts",
-        "forInRight.d.ts",
-        "forOwn.d.ts",
-        "forOwnRight.d.ts",
         "fp.d.ts",
-        "fromPairs.d.ts",
-        "functions.d.ts",
-        "functionsIn.d.ts",
-        "get.d.ts",
-        "groupBy.d.ts",
-        "gt.d.ts",
-        "gte.d.ts",
-        "has.d.ts",
-        "hasIn.d.ts",
-        "head.d.ts",
-        "identity.d.ts",
-        "includes.d.ts",
-        "indexOf.d.ts",
-        "initial.d.ts",
-        "inRange.d.ts",
-        "intersection.d.ts",
-        "intersectionBy.d.ts",
-        "intersectionWith.d.ts",
-        "invert.d.ts",
-        "invertBy.d.ts",
-        "invoke.d.ts",
-        "invokeMap.d.ts",
-        "isArguments.d.ts",
-        "isArray.d.ts",
-        "isArrayBuffer.d.ts",
-        "isArrayLike.d.ts",
-        "isArrayLikeObject.d.ts",
-        "isBoolean.d.ts",
-        "isBuffer.d.ts",
-        "isDate.d.ts",
-        "isElement.d.ts",
-        "isEmpty.d.ts",
-        "isEqual.d.ts",
-        "isEqualWith.d.ts",
-        "isError.d.ts",
-        "isFinite.d.ts",
-        "isFunction.d.ts",
-        "isInteger.d.ts",
-        "isLength.d.ts",
-        "isMap.d.ts",
-        "isMatch.d.ts",
-        "isMatchWith.d.ts",
-        "isNaN.d.ts",
-        "isNative.d.ts",
-        "isNil.d.ts",
-        "isNull.d.ts",
-        "isNumber.d.ts",
-        "isObject.d.ts",
-        "isObjectLike.d.ts",
-        "isPlainObject.d.ts",
-        "isRegExp.d.ts",
-        "isSafeInteger.d.ts",
-        "isSet.d.ts",
-        "isString.d.ts",
-        "isSymbol.d.ts",
-        "isTypedArray.d.ts",
-        "isUndefined.d.ts",
-        "isWeakMap.d.ts",
-        "isWeakSet.d.ts",
-        "iteratee.d.ts",
-        "join.d.ts",
-        "kebabCase.d.ts",
-        "keyBy.d.ts",
-        "keys.d.ts",
-        "keysIn.d.ts",
-        "last.d.ts",
-        "lastIndexOf.d.ts",
-        "lowerCase.d.ts",
-        "lowerFirst.d.ts",
-        "lt.d.ts",
-        "lte.d.ts",
-        "map.d.ts",
-        "mapKeys.d.ts",
-        "mapValues.d.ts",
-        "matches.d.ts",
-        "matchesProperty.d.ts",
-        "max.d.ts",
-        "maxBy.d.ts",
-        "mean.d.ts",
-        "meanBy.d.ts",
-        "memoize.d.ts",
-        "merge.d.ts",
-        "mergeWith.d.ts",
-        "method.d.ts",
-        "methodOf.d.ts",
-        "min.d.ts",
-        "minBy.d.ts",
-        "mixin.d.ts",
-        "negate.d.ts",
-        "noConflict.d.ts",
-        "noop.d.ts",
-        "now.d.ts",
-        "nth.d.ts",
-        "nthArg.d.ts",
-        "omit.d.ts",
-        "omitBy.d.ts",
-        "once.d.ts",
-        "orderBy.d.ts",
-        "over.d.ts",
-        "overArgs.d.ts",
-        "overEvery.d.ts",
-        "overSome.d.ts",
-        "pad.d.ts",
-        "padEnd.d.ts",
-        "padStart.d.ts",
-        "parseInt.d.ts",
-        "partial.d.ts",
-        "partialRight.d.ts",
-        "partition.d.ts",
-        "pick.d.ts",
-        "pickBy.d.ts",
-        "property.d.ts",
-        "propertyOf.d.ts",
-        "pull.d.ts",
-        "pullAll.d.ts",
-        "pullAllBy.d.ts",
-        "pullAllWith.d.ts",
-        "pullAt.d.ts",
-        "random.d.ts",
-        "range.d.ts",
-        "rangeRight.d.ts",
-        "rearg.d.ts",
-        "reduce.d.ts",
-        "reduceRight.d.ts",
-        "reject.d.ts",
-        "remove.d.ts",
-        "repeat.d.ts",
-        "replace.d.ts",
-        "rest.d.ts",
-        "result.d.ts",
-        "reverse.d.ts",
-        "round.d.ts",
-        "runInContext.d.ts",
-        "sample.d.ts",
-        "sampleSize.d.ts",
-        "set.d.ts",
-        "setWith.d.ts",
-        "shuffle.d.ts",
-        "size.d.ts",
-        "slice.d.ts",
-        "snakeCase.d.ts",
-        "some.d.ts",
-        "sortBy.d.ts",
-        "sortedIndex.d.ts",
-        "sortedIndexBy.d.ts",
-        "sortedIndexOf.d.ts",
-        "sortedLastIndex.d.ts",
-        "sortedLastIndexBy.d.ts",
-        "sortedLastIndexOf.d.ts",
-        "sortedUniq.d.ts",
-        "sortedUniqBy.d.ts",
-        "split.d.ts",
-        "spread.d.ts",
-        "startCase.d.ts",
-        "startsWith.d.ts",
-        "subtract.d.ts",
-        "sum.d.ts",
-        "sumBy.d.ts",
-        "tail.d.ts",
-        "take.d.ts",
-        "takeRight.d.ts",
-        "takeRightWhile.d.ts",
-        "takeWhile.d.ts",
-        "tap.d.ts",
-        "template.d.ts",
-        "throttle.d.ts",
-        "thru.d.ts",
-        "times.d.ts",
-        "toArray.d.ts",
-        "toFinite.d.ts",
-        "toInteger.d.ts",
-        "toLength.d.ts",
-        "toLower.d.ts",
-        "toNumber.d.ts",
-        "toPairs.d.ts",
-        "toPairsIn.d.ts",
-        "toPath.d.ts",
-        "toPlainObject.d.ts",
-        "toSafeInteger.d.ts",
-        "toString.d.ts",
-        "toUpper.d.ts",
-        "transform.d.ts",
-        "trim.d.ts",
-        "trimEnd.d.ts",
-        "trimStart.d.ts",
-        "truncate.d.ts",
-        "unary.d.ts",
-        "unescape.d.ts",
-        "union.d.ts",
-        "unionBy.d.ts",
-        "unionWith.d.ts",
-        "uniq.d.ts",
-        "uniqBy.d.ts",
-        "uniqueId.d.ts",
-        "uniqWith.d.ts",
-        "unset.d.ts",
-        "unzip.d.ts",
-        "unzipWith.d.ts",
-        "update.d.ts",
-        "updateWith.d.ts",
-        "upperCase.d.ts",
-        "upperFirst.d.ts",
-        "values.d.ts",
-        "valuesIn.d.ts",
-        "without.d.ts",
-        "words.d.ts",
-        "wrap.d.ts",
-        "xor.d.ts",
-        "xorBy.d.ts",
-        "xorWith.d.ts",
-        "zip.d.ts",
-        "zipObject.d.ts",
-        "zipObjectDeep.d.ts",
-        "zipWith.d.ts",
         "common/array.d.ts",
         "common/collection.d.ts",
         "common/common.d.ts",
@@ -330,392 +32,6 @@
         "common/object.d.ts",
         "common/seq.d.ts",
         "common/string.d.ts",
-        "common/util.d.ts",
-        "fp/convert.d.ts",
-        "fp/add.d.ts",
-        "fp/after.d.ts",
-        "fp/all.d.ts",
-        "fp/allPass.d.ts",
-        "fp/always.d.ts",
-        "fp/any.d.ts",
-        "fp/anyPass.d.ts",
-        "fp/apply.d.ts",
-        "fp/ary.d.ts",
-        "fp/assign.d.ts",
-        "fp/assignAll.d.ts",
-        "fp/assignAllWith.d.ts",
-        "fp/assignIn.d.ts",
-        "fp/assignInAll.d.ts",
-        "fp/assignInAllWith.d.ts",
-        "fp/assignInWith.d.ts",
-        "fp/assignWith.d.ts",
-        "fp/assoc.d.ts",
-        "fp/assocPath.d.ts",
-        "fp/at.d.ts",
-        "fp/attempt.d.ts",
-        "fp/before.d.ts",
-        "fp/bind.d.ts",
-        "fp/bindAll.d.ts",
-        "fp/bindKey.d.ts",
-        "fp/camelCase.d.ts",
-        "fp/capitalize.d.ts",
-        "fp/castArray.d.ts",
-        "fp/ceil.d.ts",
-        "fp/chunk.d.ts",
-        "fp/clamp.d.ts",
-        "fp/clone.d.ts",
-        "fp/cloneDeep.d.ts",
-        "fp/cloneDeepWith.d.ts",
-        "fp/cloneWith.d.ts",
-        "fp/compact.d.ts",
-        "fp/complement.d.ts",
-        "fp/compose.d.ts",
-        "fp/concat.d.ts",
-        "fp/cond.d.ts",
-        "fp/conforms.d.ts",
-        "fp/conformsTo.d.ts",
-        "fp/constant.d.ts",
-        "fp/contains.d.ts",
-        "fp/countBy.d.ts",
-        "fp/create.d.ts",
-        "fp/curry.d.ts",
-        "fp/curryN.d.ts",
-        "fp/curryRight.d.ts",
-        "fp/curryRightN.d.ts",
-        "fp/debounce.d.ts",
-        "fp/deburr.d.ts",
-        "fp/defaults.d.ts",
-        "fp/defaultsAll.d.ts",
-        "fp/defaultsDeep.d.ts",
-        "fp/defaultsDeepAll.d.ts",
-        "fp/defaultTo.d.ts",
-        "fp/defer.d.ts",
-        "fp/delay.d.ts",
-        "fp/difference.d.ts",
-        "fp/differenceBy.d.ts",
-        "fp/differenceWith.d.ts",
-        "fp/dissoc.d.ts",
-        "fp/dissocPath.d.ts",
-        "fp/divide.d.ts",
-        "fp/drop.d.ts",
-        "fp/dropLast.d.ts",
-        "fp/dropLastWhile.d.ts",
-        "fp/dropRight.d.ts",
-        "fp/dropRightWhile.d.ts",
-        "fp/dropWhile.d.ts",
-        "fp/each.d.ts",
-        "fp/eachRight.d.ts",
-        "fp/endsWith.d.ts",
-        "fp/entries.d.ts",
-        "fp/entriesIn.d.ts",
-        "fp/eq.d.ts",
-        "fp/equals.d.ts",
-        "fp/escape.d.ts",
-        "fp/escapeRegExp.d.ts",
-        "fp/every.d.ts",
-        "fp/extend.d.ts",
-        "fp/extendAll.d.ts",
-        "fp/extendAllWith.d.ts",
-        "fp/extendWith.d.ts",
-        "fp/F.d.ts",
-        "fp/fill.d.ts",
-        "fp/filter.d.ts",
-        "fp/find.d.ts",
-        "fp/findFrom.d.ts",
-        "fp/findIndex.d.ts",
-        "fp/findIndexFrom.d.ts",
-        "fp/findKey.d.ts",
-        "fp/findLast.d.ts",
-        "fp/findLastFrom.d.ts",
-        "fp/findLastIndex.d.ts",
-        "fp/findLastIndexFrom.d.ts",
-        "fp/findLastKey.d.ts",
-        "fp/first.d.ts",
-        "fp/flatMap.d.ts",
-        "fp/flatMapDeep.d.ts",
-        "fp/flatMapDepth.d.ts",
-        "fp/flatten.d.ts",
-        "fp/flattenDeep.d.ts",
-        "fp/flattenDepth.d.ts",
-        "fp/flip.d.ts",
-        "fp/floor.d.ts",
-        "fp/flow.d.ts",
-        "fp/flowRight.d.ts",
-        "fp/forEach.d.ts",
-        "fp/forEachRight.d.ts",
-        "fp/forIn.d.ts",
-        "fp/forInRight.d.ts",
-        "fp/forOwn.d.ts",
-        "fp/forOwnRight.d.ts",
-        "fp/fromPairs.d.ts",
-        "fp/functions.d.ts",
-        "fp/functionsIn.d.ts",
-        "fp/get.d.ts",
-        "fp/getOr.d.ts",
-        "fp/groupBy.d.ts",
-        "fp/gt.d.ts",
-        "fp/gte.d.ts",
-        "fp/has.d.ts",
-        "fp/hasIn.d.ts",
-        "fp/head.d.ts",
-        "fp/identical.d.ts",
-        "fp/identity.d.ts",
-        "fp/includes.d.ts",
-        "fp/includesFrom.d.ts",
-        "fp/indexBy.d.ts",
-        "fp/indexOf.d.ts",
-        "fp/indexOfFrom.d.ts",
-        "fp/init.d.ts",
-        "fp/initial.d.ts",
-        "fp/inRange.d.ts",
-        "fp/intersection.d.ts",
-        "fp/intersectionBy.d.ts",
-        "fp/intersectionWith.d.ts",
-        "fp/invert.d.ts",
-        "fp/invertBy.d.ts",
-        "fp/invertObj.d.ts",
-        "fp/invoke.d.ts",
-        "fp/invokeArgs.d.ts",
-        "fp/invokeArgsMap.d.ts",
-        "fp/invokeMap.d.ts",
-        "fp/isArguments.d.ts",
-        "fp/isArray.d.ts",
-        "fp/isArrayBuffer.d.ts",
-        "fp/isArrayLike.d.ts",
-        "fp/isArrayLikeObject.d.ts",
-        "fp/isBoolean.d.ts",
-        "fp/isBuffer.d.ts",
-        "fp/isDate.d.ts",
-        "fp/isElement.d.ts",
-        "fp/isEmpty.d.ts",
-        "fp/isEqual.d.ts",
-        "fp/isEqualWith.d.ts",
-        "fp/isError.d.ts",
-        "fp/isFinite.d.ts",
-        "fp/isFunction.d.ts",
-        "fp/isInteger.d.ts",
-        "fp/isLength.d.ts",
-        "fp/isMap.d.ts",
-        "fp/isMatch.d.ts",
-        "fp/isMatchWith.d.ts",
-        "fp/isNaN.d.ts",
-        "fp/isNative.d.ts",
-        "fp/isNil.d.ts",
-        "fp/isNull.d.ts",
-        "fp/isNumber.d.ts",
-        "fp/isObject.d.ts",
-        "fp/isObjectLike.d.ts",
-        "fp/isPlainObject.d.ts",
-        "fp/isRegExp.d.ts",
-        "fp/isSafeInteger.d.ts",
-        "fp/isSet.d.ts",
-        "fp/isString.d.ts",
-        "fp/isSymbol.d.ts",
-        "fp/isTypedArray.d.ts",
-        "fp/isUndefined.d.ts",
-        "fp/isWeakMap.d.ts",
-        "fp/isWeakSet.d.ts",
-        "fp/iteratee.d.ts",
-        "fp/join.d.ts",
-        "fp/juxt.d.ts",
-        "fp/kebabCase.d.ts",
-        "fp/keyBy.d.ts",
-        "fp/keys.d.ts",
-        "fp/keysIn.d.ts",
-        "fp/last.d.ts",
-        "fp/lastIndexOf.d.ts",
-        "fp/lastIndexOfFrom.d.ts",
-        "fp/lowerCase.d.ts",
-        "fp/lowerFirst.d.ts",
-        "fp/lt.d.ts",
-        "fp/lte.d.ts",
-        "fp/map.d.ts",
-        "fp/mapKeys.d.ts",
-        "fp/mapValues.d.ts",
-        "fp/matches.d.ts",
-        "fp/matchesProperty.d.ts",
-        "fp/max.d.ts",
-        "fp/maxBy.d.ts",
-        "fp/mean.d.ts",
-        "fp/meanBy.d.ts",
-        "fp/memoize.d.ts",
-        "fp/merge.d.ts",
-        "fp/mergeAll.d.ts",
-        "fp/mergeAllWith.d.ts",
-        "fp/mergeWith.d.ts",
-        "fp/method.d.ts",
-        "fp/methodOf.d.ts",
-        "fp/min.d.ts",
-        "fp/minBy.d.ts",
-        "fp/multiply.d.ts",
-        "fp/nAry.d.ts",
-        "fp/negate.d.ts",
-        "fp/noConflict.d.ts",
-        "fp/noop.d.ts",
-        "fp/now.d.ts",
-        "fp/nth.d.ts",
-        "fp/nthArg.d.ts",
-        "fp/omit.d.ts",
-        "fp/omitAll.d.ts",
-        "fp/omitBy.d.ts",
-        "fp/once.d.ts",
-        "fp/orderBy.d.ts",
-        "fp/over.d.ts",
-        "fp/overArgs.d.ts",
-        "fp/overEvery.d.ts",
-        "fp/overSome.d.ts",
-        "fp/pad.d.ts",
-        "fp/padChars.d.ts",
-        "fp/padCharsEnd.d.ts",
-        "fp/padCharsStart.d.ts",
-        "fp/padEnd.d.ts",
-        "fp/padStart.d.ts",
-        "fp/parseInt.d.ts",
-        "fp/partial.d.ts",
-        "fp/partialRight.d.ts",
-        "fp/partition.d.ts",
-        "fp/path.d.ts",
-        "fp/pathEq.d.ts",
-        "fp/pathOr.d.ts",
-        "fp/paths.d.ts",
-        "fp/pick.d.ts",
-        "fp/pickAll.d.ts",
-        "fp/pickBy.d.ts",
-        "fp/pipe.d.ts",
-        "fp/pluck.d.ts",
-        "fp/prop.d.ts",
-        "fp/propEq.d.ts",
-        "fp/property.d.ts",
-        "fp/propertyOf.d.ts",
-        "fp/propOr.d.ts",
-        "fp/props.d.ts",
-        "fp/pull.d.ts",
-        "fp/pullAll.d.ts",
-        "fp/pullAllBy.d.ts",
-        "fp/pullAllWith.d.ts",
-        "fp/pullAt.d.ts",
-        "fp/random.d.ts",
-        "fp/range.d.ts",
-        "fp/rangeRight.d.ts",
-        "fp/rangeStep.d.ts",
-        "fp/rangeStepRight.d.ts",
-        "fp/rearg.d.ts",
-        "fp/reduce.d.ts",
-        "fp/reduceRight.d.ts",
-        "fp/reject.d.ts",
-        "fp/remove.d.ts",
-        "fp/repeat.d.ts",
-        "fp/replace.d.ts",
-        "fp/rest.d.ts",
-        "fp/restFrom.d.ts",
-        "fp/result.d.ts",
-        "fp/reverse.d.ts",
-        "fp/round.d.ts",
-        "fp/runInContext.d.ts",
-        "fp/sample.d.ts",
-        "fp/sampleSize.d.ts",
-        "fp/set.d.ts",
-        "fp/setWith.d.ts",
-        "fp/shuffle.d.ts",
-        "fp/size.d.ts",
-        "fp/slice.d.ts",
-        "fp/snakeCase.d.ts",
-        "fp/some.d.ts",
-        "fp/sortBy.d.ts",
-        "fp/sortedIndex.d.ts",
-        "fp/sortedIndexBy.d.ts",
-        "fp/sortedIndexOf.d.ts",
-        "fp/sortedLastIndex.d.ts",
-        "fp/sortedLastIndexBy.d.ts",
-        "fp/sortedLastIndexOf.d.ts",
-        "fp/sortedUniq.d.ts",
-        "fp/sortedUniqBy.d.ts",
-        "fp/split.d.ts",
-        "fp/spread.d.ts",
-        "fp/spreadFrom.d.ts",
-        "fp/startCase.d.ts",
-        "fp/startsWith.d.ts",
-        "fp/stubArray.d.ts",
-        "fp/stubFalse.d.ts",
-        "fp/stubObject.d.ts",
-        "fp/stubString.d.ts",
-        "fp/stubTrue.d.ts",
-        "fp/subtract.d.ts",
-        "fp/sum.d.ts",
-        "fp/sumBy.d.ts",
-        "fp/symmetricDifference.d.ts",
-        "fp/symmetricDifferenceBy.d.ts",
-        "fp/symmetricDifferenceWith.d.ts",
-        "fp/T.d.ts",
-        "fp/tail.d.ts",
-        "fp/take.d.ts",
-        "fp/takeLast.d.ts",
-        "fp/takeLastWhile.d.ts",
-        "fp/takeRight.d.ts",
-        "fp/takeRightWhile.d.ts",
-        "fp/takeWhile.d.ts",
-        "fp/tap.d.ts",
-        "fp/template.d.ts",
-        "fp/throttle.d.ts",
-        "fp/thru.d.ts",
-        "fp/times.d.ts",
-        "fp/toArray.d.ts",
-        "fp/toFinite.d.ts",
-        "fp/toInteger.d.ts",
-        "fp/toLength.d.ts",
-        "fp/toLower.d.ts",
-        "fp/toNumber.d.ts",
-        "fp/toPairs.d.ts",
-        "fp/toPairsIn.d.ts",
-        "fp/toPath.d.ts",
-        "fp/toPlainObject.d.ts",
-        "fp/toSafeInteger.d.ts",
-        "fp/toString.d.ts",
-        "fp/toUpper.d.ts",
-        "fp/transform.d.ts",
-        "fp/trim.d.ts",
-        "fp/trimChars.d.ts",
-        "fp/trimCharsEnd.d.ts",
-        "fp/trimCharsStart.d.ts",
-        "fp/trimEnd.d.ts",
-        "fp/trimStart.d.ts",
-        "fp/truncate.d.ts",
-        "fp/unapply.d.ts",
-        "fp/unary.d.ts",
-        "fp/unescape.d.ts",
-        "fp/union.d.ts",
-        "fp/unionBy.d.ts",
-        "fp/unionWith.d.ts",
-        "fp/uniq.d.ts",
-        "fp/uniqBy.d.ts",
-        "fp/uniqueId.d.ts",
-        "fp/uniqWith.d.ts",
-        "fp/unnest.d.ts",
-        "fp/unset.d.ts",
-        "fp/unzip.d.ts",
-        "fp/unzipWith.d.ts",
-        "fp/update.d.ts",
-        "fp/updateWith.d.ts",
-        "fp/upperCase.d.ts",
-        "fp/upperFirst.d.ts",
-        "fp/useWith.d.ts",
-        "fp/values.d.ts",
-        "fp/valuesIn.d.ts",
-        "fp/where.d.ts",
-        "fp/whereEq.d.ts",
-        "fp/without.d.ts",
-        "fp/words.d.ts",
-        "fp/wrap.d.ts",
-        "fp/xor.d.ts",
-        "fp/xorBy.d.ts",
-        "fp/xorWith.d.ts",
-        "fp/zip.d.ts",
-        "fp/zipAll.d.ts",
-        "fp/zipObj.d.ts",
-        "fp/zipObject.d.ts",
-        "fp/zipObjectDeep.d.ts",
-        "fp/zipWith.d.ts",
-        "fp/__.d.ts",
-        "fp/placeholder.d.ts"
+        "common/util.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/lowdb/_lodash.d.ts b/types/lowdb/_lodash.d.ts
index 982826fe5b..a7d2c424f0 100644
--- a/types/lowdb/_lodash.d.ts
+++ b/types/lowdb/_lodash.d.ts
@@ -127,7 +127,7 @@ declare module "./index" {
         first<T>(this: LoDashExplicitSyncWrapper<_.List<T> | null | undefined>): LoDashExplicitSyncWrapper<T | undefined>;
         flatten<T>(this: LoDashExplicitSyncWrapper<_.List<_.Many<T>> | null | undefined>): LoDashExplicitSyncWrapper<T[]>;
         flattenDeep<T>(this: LoDashExplicitSyncWrapper<_.ListOfRecursiveArraysOrValues<T> | null | undefined>): LoDashExplicitSyncWrapper<T[]>;
-       flattenDepth<T>(this: LoDashExplicitSyncWrapper<_.ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashExplicitSyncWrapper<T[]>;
+        flattenDepth<T>(this: LoDashExplicitSyncWrapper<_.ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashExplicitSyncWrapper<T[]>;
         fromPairs<T>(
           this: LoDashExplicitSyncWrapper<_.List<[_.PropertyName, T]> | null | undefined>
         ): LoDashExplicitSyncWrapper<_.Dictionary<T>>;
@@ -1695,7 +1695,7 @@ declare module "./index" {
         first<T>(this: LoDashExplicitAsyncWrapper<_.List<T> | null | undefined>): LoDashExplicitAsyncWrapper<T | undefined>;
         flatten<T>(this: LoDashExplicitAsyncWrapper<_.List<_.Many<T>> | null | undefined>): LoDashExplicitAsyncWrapper<T[]>;
         flattenDeep<T>(this: LoDashExplicitAsyncWrapper<_.ListOfRecursiveArraysOrValues<T> | null | undefined>): LoDashExplicitAsyncWrapper<T[]>;
-       flattenDepth<T>(this: LoDashExplicitAsyncWrapper<_.ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashExplicitAsyncWrapper<T[]>;
+        flattenDepth<T>(this: LoDashExplicitAsyncWrapper<_.ListOfRecursiveArraysOrValues<T> | null | undefined>, depth?: number): LoDashExplicitAsyncWrapper<T[]>;
         fromPairs<T>(
           this: LoDashExplicitAsyncWrapper<_.List<[_.PropertyName, T]> | null | undefined>
         ): LoDashExplicitAsyncWrapper<_.Dictionary<T>>;

From 79b40511a06e9e4079808147630cdb2bca3ebc33 Mon Sep 17 00:00:00 2001
From: AJ Richardson <aj.ric.ar+git@gmail.com>
Date: Sat, 12 May 2018 10:13:44 -0400
Subject: [PATCH 067/575] Trim down tests to avoid memory error

---
 types/lodash/lodash-tests.ts | 810 ++++++++++++-----------------------
 types/lodash/tsconfig.json   | 686 ++++++++++++++++++++++++++++-
 2 files changed, 956 insertions(+), 540 deletions(-)

diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 52514f16f1..88a5a88bfc 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -9,6 +9,20 @@ interface AbcObject {
     c: boolean;
 }
 
+const abcObject: AbcObject = anything;
+const array: AbcObject[] | null | undefined = anything;
+const list: _.List<AbcObject> | null | undefined = anything;
+const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+const arrayParam: AbcObject[] = [];
+const listParam: _.List<AbcObject> = [];
+const comparator = (a: AbcObject, b: AbcObject) => true;
+const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
+const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => true;
+const numericDictionaryIterator = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => true;
+const valueIterator = (value: AbcObject) => true;
+const stringIterator = (value: string) => "";
+
 // Wrapped array shortcut methods
 _([1, 2, 3, 4]).pop(); // $ExpectType number | undefined
 _([1, 2, 3, 4]).push(5, 6, 7); // $ExpectType LoDashImplicitWrapper<number[]>
@@ -32,8 +46,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.chunk
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-
     _.chunk(list); // $ExpectType AbcObject[][]
     _.chunk(list, 42); // $ExpectType AbcObject[][]
 
@@ -60,10 +72,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.difference
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const arrayParam: AbcObject[] = [];
-    const listParam: _.List<AbcObject> = [];
-
     _.difference(list); // $ExpectType AbcObject[]
     _.difference(list, listParam); // $ExpectType AbcObject[]
     _.difference(list, listParam, arrayParam, listParam); // $ExpectType AbcObject[]
@@ -82,19 +90,14 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.differenceBy
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const arrayParam: AbcObject[] = [];
-    const listParam: _.List<AbcObject> = [];
-    const iteratee = (value: AbcObject) => 1;
-
     _.differenceBy(list); // $ExpectType AbcObject[]
     _.differenceBy(list, listParam); // $ExpectType AbcObject[]
     _.differenceBy(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam); // $ExpectType AbcObject[]
 
-    _.differenceBy(list, listParam, iteratee); // $ExpectType AbcObject[]
-    _.differenceBy(list, listParam, arrayParam, listParam, arrayParam, listParam, iteratee); // $ExpectType AbcObject[]
+    _.differenceBy(list, listParam, valueIterator); // $ExpectType AbcObject[]
+    _.differenceBy(list, listParam, arrayParam, listParam, arrayParam, listParam, valueIterator); // $ExpectType AbcObject[]
     // $ExpectType AbcObject[]
-    _.differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, iteratee);
+    _.differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, valueIterator);
 
     _.differenceBy(list, listParam, "a"); // $ExpectType AbcObject[]
     _.differenceBy(list, listParam, arrayParam, listParam, arrayParam, listParam, "a"); // $ExpectType AbcObject[]
@@ -109,10 +112,10 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     _(list).differenceBy(listParam); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-    _(list).differenceBy(listParam, iteratee); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, iteratee); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).differenceBy(listParam, valueIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, valueIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(list).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, iteratee);
+    _(list).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, valueIterator);
 
     _(list).differenceBy(listParam, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
@@ -127,10 +130,10 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     _.chain(list).differenceBy(arrayParam); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-    _.chain(list).differenceBy(arrayParam, iteratee); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(list).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, iteratee); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).differenceBy(arrayParam, valueIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, valueIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(list).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, iteratee);
+    _.chain(list).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, valueIterator);
 
     _.chain(list).differenceBy(arrayParam, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
@@ -142,8 +145,8 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
 
-    fp.differenceBy(iteratee, list, arrayParam); // $ExpectType AbcObject[]
-    fp.differenceBy<AbcObject, AbcObject>(iteratee)(list)(listParam); // $ExpectType AbcObject[]
+    fp.differenceBy(valueIterator, list, arrayParam); // $ExpectType AbcObject[]
+    fp.differenceBy<AbcObject, AbcObject>(valueIterator)(list)(listParam); // $ExpectType AbcObject[]
     fp.differenceBy("a", list, arrayParam); // $ExpectType AbcObject[]
     fp.differenceBy({a: 1}, list, arrayParam); // $ExpectType AbcObject[]
 
@@ -188,21 +191,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
             return 0;
         });
         // $ExpectType T1[]
-        _.differenceBy([t1], [t2], [t3], (value) => {
-            value; // $ExpectType T1 | T2 | T3
-            return 0;
-        });
-        // $ExpectType T1[]
-        _.differenceBy([t1], [t2], [t3], [t4], (value) => {
-            value; // $ExpectType T1 | T2 | T3 | T4
-            return 0;
-        });
-        // $ExpectType T1[]
-        _.differenceBy([t1], [t2], [t3], [t4], [""], (value) => {
-            value; // $ExpectType string | T1 | T2 | T3 | T4
-            return 0;
-        });
-        // $ExpectType T1[]
         _.differenceBy([t1], [t2], [t3], [t4], [""], [42], (value) => {
             value; // $ExpectType string | number | T1 | T2 | T3 | T4
             return 0;
@@ -226,21 +214,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
             return 0;
         });
         // $ExpectType LoDashImplicitWrapper<T1[]>
-        _([t1]).differenceBy([t2], [t3], (value) => {
-            value; // $ExpectType T1 | T2 | T3
-            return 0;
-        });
-        // $ExpectType LoDashImplicitWrapper<T1[]>
-        _([t1]).differenceBy([t2], [t3], [t4], (value) => {
-            value; // $ExpectType T1 | T2 | T3 | T4
-            return 0;
-        });
-        // $ExpectType LoDashImplicitWrapper<T1[]>
-        _([t1]).differenceBy([t2], [t3], [t4], [""], (value) => {
-            value; // $ExpectType string | T1 | T2 | T3 | T4
-            return 0;
-        });
-        // $ExpectType LoDashImplicitWrapper<T1[]>
         _([t1]).differenceBy([t2], [t3], [t4], [""], [42], (value) => {
             value; // $ExpectType string | number | T1 | T2 | T3 | T4
             return 0;
@@ -264,21 +237,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
             return 0;
         });
         // $ExpectType LoDashExplicitWrapper<T1[]>
-        _.chain([t1]).differenceBy([t2], [t3], (value) => {
-            value; // $ExpectType T1 | T2 | T3
-            return 0;
-        });
-        // $ExpectType LoDashExplicitWrapper<T1[]>
-        _.chain([t1]).differenceBy([t2], [t3], [t4], (value) => {
-            value; // $ExpectType T1 | T2 | T3 | T4
-            return 0;
-        });
-        // $ExpectType LoDashExplicitWrapper<T1[]>
-        _.chain([t1]).differenceBy([t2], [t3], [t4], [""], (value) => {
-            value; // $ExpectType string | T1 | T2 | T3 | T4
-            return 0;
-        });
-        // $ExpectType LoDashExplicitWrapper<T1[]>
         _.chain([t1]).differenceBy([t2], [t3], [t4], [""], [42], (value) => {
             value; // $ExpectType string | number | T1 | T2 | T3 | T4
             return 0;
@@ -292,24 +250,13 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.differenceWith
 {
-    const list: _.List<AbcObject> | null | undefined = [] as any;
-    const arrayParam: AbcObject[] = [];
-    const listParam: _.List<AbcObject> = [];
-    const comparator = (a: AbcObject, b: AbcObject) => true;
-
     _.differenceWith(list); // $ExpectType AbcObject[]
-    _.differenceWith(list, arrayParam); // $ExpectType AbcObject[]
-    _.differenceWith(list, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam); // $ExpectType AbcObject[]
     _.differenceWith(list, arrayParam, comparator); // $ExpectType AbcObject[]
     _.differenceWith(list, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, comparator); // $ExpectType AbcObject[]
 
-    _(list).differenceWith(arrayParam); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(list).differenceWith(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).differenceWith(arrayParam, comparator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).differenceWith(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, comparator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-    _.chain(list).differenceWith(arrayParam); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(list).differenceWith(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).differenceWith(arrayParam, comparator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).differenceWith(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, comparator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
@@ -359,8 +306,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 // _.drop
 // _.dropRight
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-
     _.drop(list); // $ExpectType AbcObject[]
     _.drop(list, 42); // $ExpectType AbcObject[]
     _(list).drop(42); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
@@ -381,145 +326,132 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 // _.dropWhile
 // _.dropRightWhile
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const predicateFn = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
-    const predicateFn2 = (value: AbcObject) => true;
-
     _.dropWhile(list); // $ExpectType AbcObject[]
-    _.dropWhile(list, predicateFn); // $ExpectType AbcObject[]
+    _.dropWhile(list, listIterator); // $ExpectType AbcObject[]
     _.dropWhile(list, ""); // $ExpectType AbcObject[]
     _.dropWhile(list, {a: 42}); // $ExpectType AbcObject[]
 
     _(list).dropWhile(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(list).dropWhile(predicateFn); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).dropWhile(listIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).dropWhile(""); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).dropWhile({a: 42}); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
     _.chain(list).dropWhile(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(list).dropWhile(predicateFn); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).dropWhile(listIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).dropWhile(""); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).dropWhile({a: 42}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-    fp.dropWhile(predicateFn2, list); // $ExpectType AbcObject[]
-    fp.dropWhile(predicateFn2)(list); // $ExpectType AbcObject[]
+    fp.dropWhile(valueIterator, list); // $ExpectType AbcObject[]
+    fp.dropWhile(valueIterator)(list); // $ExpectType AbcObject[]
     fp.dropWhile("", list); // $ExpectType AbcObject[]
     fp.dropWhile({ a: 42 }, list); // $ExpectType AbcObject[]
 
     _.dropRightWhile(list); // $ExpectType AbcObject[]
-    _.dropRightWhile(list, predicateFn); // $ExpectType AbcObject[]
+    _.dropRightWhile(list, listIterator); // $ExpectType AbcObject[]
     _.dropRightWhile(list, ""); // $ExpectType AbcObject[]
     _.dropRightWhile(list, {a: 42}); // $ExpectType AbcObject[]
 
     _(list).dropRightWhile(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(list).dropRightWhile(predicateFn); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).dropRightWhile(listIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).dropRightWhile(""); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).dropRightWhile({a: 42}); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
     _.chain(list).dropRightWhile(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(list).dropRightWhile(predicateFn); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).dropRightWhile(listIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).dropRightWhile(""); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).dropRightWhile({a: 42}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-    fp.dropRightWhile(predicateFn2, list); // $ExpectType AbcObject[]
-    fp.dropRightWhile(predicateFn2)(list); // $ExpectType AbcObject[]
+    fp.dropRightWhile(valueIterator, list); // $ExpectType AbcObject[]
+    fp.dropRightWhile(valueIterator)(list); // $ExpectType AbcObject[]
     fp.dropRightWhile("", list); // $ExpectType AbcObject[]
     fp.dropRightWhile({ a: 42 }, list); // $ExpectType AbcObject[]
 }
 
 // _.fill
 {
-    const array: number[] | null | undefined = anything;
-    const list: _.List<number> | null | undefined = anything;
+    _.fill(array, abcObject); // $ExpectType AbcObject[]
+    _.fill(array, abcObject, 0); // $ExpectType AbcObject[]
+    _.fill(array, abcObject, 0, 10); // $ExpectType AbcObject[]
 
-    _.fill(array, 42); // $ExpectType number[]
-    _.fill(array, 42, 0); // $ExpectType number[]
-    _.fill(array, 42, 0, 10); // $ExpectType number[]
+    _.fill(list, abcObject); // $ExpectType ArrayLike<AbcObject>
+    _.fill(list, abcObject, 0); // $ExpectType ArrayLike<AbcObject>
+    _.fill(list, abcObject, 0, 10); // $ExpectType ArrayLike<AbcObject>
 
-    _.fill(list, 42); // $ExpectType ArrayLike<number>
-    _.fill(list, 42, 0); // $ExpectType ArrayLike<number>
-    _.fill(list, 42, 0, 10); // $ExpectType ArrayLike<number>
+    _(list).fill(abcObject); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
+    _(list).fill(abcObject, 0); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
+    _(list).fill(abcObject, 0, 10); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
 
-    _(list).fill(42); // $ExpectType LoDashImplicitWrapper<ArrayLike<number>>
-    _(list).fill(42, 0); // $ExpectType LoDashImplicitWrapper<ArrayLike<number>>
-    _(list).fill(42, 0, 10); // $ExpectType LoDashImplicitWrapper<ArrayLike<number>>
+    _.chain(list).fill(abcObject); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
+    _.chain(list).fill(abcObject, 0); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
+    _.chain(list).fill(abcObject, 0, 10); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
 
-    _.chain(list).fill(42); // $ExpectType LoDashExplicitWrapper<ArrayLike<number>>
-    _.chain(list).fill(42, 0); // $ExpectType LoDashExplicitWrapper<ArrayLike<number>>
-    _.chain(list).fill(42, 0, 10); // $ExpectType LoDashExplicitWrapper<ArrayLike<number>>
-
-    fp.fill(0, 10, 42, array); // $ExpectType number[]
-    fp.fill(0)(10)(42)(array); // $ExpectType number[]
-    fp.fill(0, 10, 42, list); // $ExpectType ArrayLike<number>
+    fp.fill(0, 10, abcObject, array); // $ExpectType AbcObject[]
+    fp.fill(0)(10)(abcObject)(array); // $ExpectType AbcObject[]
+    fp.fill(0, 10, abcObject, list); // $ExpectType ArrayLike<AbcObject>
 }
 
 // _.findIndex
 // _.findLastIndex
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const predicateFn = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
-    const predicateFn2 = (value: AbcObject) => true;
-
     _.findIndex(list); // $ExpectType number
-    _.findIndex(list, predicateFn); // $ExpectType number
+    _.findIndex(list, listIterator); // $ExpectType number
     _.findIndex(list, ""); // $ExpectType number
     _.findIndex(list, {a: 42}); // $ExpectType number
-    _.findIndex(list, predicateFn, 1); // $ExpectType number
+    _.findIndex(list, listIterator, 1); // $ExpectType number
 
     _(list).findIndex(); // $ExpectType number
-    _(list).findIndex(predicateFn); // $ExpectType number
+    _(list).findIndex(listIterator); // $ExpectType number
     _(list).findIndex(""); // $ExpectType number
     _(list).findIndex<{a: number}>({a: 42}); // $ExpectType number
-    _(list).findIndex(predicateFn, 1); // $ExpectType number
+    _(list).findIndex(listIterator, 1); // $ExpectType number
 
     _.chain(list).findIndex(); // $ExpectType LoDashExplicitWrapper<number>
-    _.chain(list).findIndex(predicateFn); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).findIndex(listIterator); // $ExpectType LoDashExplicitWrapper<number>
     _.chain(list).findIndex(""); // $ExpectType LoDashExplicitWrapper<number>
     _.chain(list).findIndex<{a: number}>({a: 42}); // $ExpectType LoDashExplicitWrapper<number>
-    _.chain(list).findIndex(predicateFn, 1); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).findIndex(listIterator, 1); // $ExpectType LoDashExplicitWrapper<number>
 
-    fp.findIndex(predicateFn2, list); // $ExpectType number
-    fp.findIndex(predicateFn2)(list); // $ExpectType number
+    fp.findIndex(valueIterator, list); // $ExpectType number
+    fp.findIndex(valueIterator)(list); // $ExpectType number
     fp.findIndex("", list); // $ExpectType number
     fp.findIndex({ a: 42 }, list); // $ExpectType number
 
-    fp.findIndexFrom(predicateFn2, 1, list); // $ExpectType number
-    fp.findIndexFrom(predicateFn2)(1)(list); // $ExpectType number
+    fp.findIndexFrom(valueIterator, 1, list); // $ExpectType number
+    fp.findIndexFrom(valueIterator)(1)(list); // $ExpectType number
     fp.findIndexFrom("", 1, list); // $ExpectType number
     fp.findIndexFrom({ a: 42 }, 1, list); // $ExpectType number
 
     _.findLastIndex(list); // $ExpectType number
-    _.findLastIndex(list, predicateFn); // $ExpectType number
+    _.findLastIndex(list, listIterator); // $ExpectType number
     _.findLastIndex(list, ""); // $ExpectType number
     _.findLastIndex(list, {a: 42}); // $ExpectType number
-    _.findLastIndex(list, predicateFn, 1); // $ExpectType number
+    _.findLastIndex(list, listIterator, 1); // $ExpectType number
 
     _(list).findLastIndex(); // $ExpectType number
-    _(list).findLastIndex(predicateFn); // $ExpectType number
+    _(list).findLastIndex(listIterator); // $ExpectType number
     _(list).findLastIndex(""); // $ExpectType number
     _(list).findLastIndex<{a: number}>({a: 42}); // $ExpectType number
-    _(list).findLastIndex(predicateFn, 1); // $ExpectType number
+    _(list).findLastIndex(listIterator, 1); // $ExpectType number
 
     _.chain(list).findLastIndex(); // $ExpectType LoDashExplicitWrapper<number>
-    _.chain(list).findLastIndex(predicateFn); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).findLastIndex(listIterator); // $ExpectType LoDashExplicitWrapper<number>
     _.chain(list).findLastIndex(""); // $ExpectType LoDashExplicitWrapper<number>
     _.chain(list).findLastIndex<{a: number}>({a: 42}); // $ExpectType LoDashExplicitWrapper<number>
-    _.chain(list).findLastIndex(predicateFn, 1); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).findLastIndex(listIterator, 1); // $ExpectType LoDashExplicitWrapper<number>
 
-    fp.findLastIndex(predicateFn2, list); // $ExpectType number
-    fp.findLastIndex(predicateFn2)(list); // $ExpectType number
+    fp.findLastIndex(valueIterator, list); // $ExpectType number
+    fp.findLastIndex(valueIterator)(list); // $ExpectType number
     fp.findLastIndex("", list); // $ExpectType number
     fp.findLastIndex({ a: 42 }, list); // $ExpectType number
 
-    fp.findLastIndexFrom(predicateFn2, 1, list); // $ExpectType number
-    fp.findLastIndexFrom(predicateFn2)(1)(list); // $ExpectType number
+    fp.findLastIndexFrom(valueIterator, 1, list); // $ExpectType number
+    fp.findLastIndexFrom(valueIterator)(1)(list); // $ExpectType number
     fp.findLastIndexFrom("", 1, list); // $ExpectType number
     fp.findLastIndexFrom({ a: 42 }, 1, list); // $ExpectType number
 }
 
 // _.first
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-
     _.first("abc"); // $ExpectType string | undefined
     _.first(list); // $ExpectType AbcObject | undefined
 
@@ -590,8 +522,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.head
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-
     _.head("abc"); // $ExpectType string | undefined
     _.head(list); // $ExpectType AbcObject | undefined
 
@@ -610,46 +540,41 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 // _.sortedIndexOf
 // _.sortedLastIndexOf
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const value: AbcObject = { a: 1, b: "", c: true };
+    _.indexOf(list, abcObject); // $ExpectType number
+    _.indexOf(list, abcObject, 42); // $ExpectType number
+    _(list).indexOf(abcObject); // $ExpectType number
+    _(list).indexOf(abcObject, 42); // $ExpectType number
+    _.chain(list).indexOf(abcObject); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).indexOf(abcObject, 42); // $ExpectType LoDashExplicitWrapper<number>
+    fp.indexOf(abcObject, list); // $ExpectType number
+    fp.indexOf(abcObject)(list); // $ExpectType number
+    fp.indexOfFrom(abcObject)(42)(list); // $ExpectType number
 
-    _.indexOf(list, value); // $ExpectType number
-    _.indexOf(list, value, 42); // $ExpectType number
-    _(list).indexOf(value); // $ExpectType number
-    _(list).indexOf(value, 42); // $ExpectType number
-    _.chain(list).indexOf(value); // $ExpectType LoDashExplicitWrapper<number>
-    _.chain(list).indexOf(value, 42); // $ExpectType LoDashExplicitWrapper<number>
-    fp.indexOf(value, list); // $ExpectType number
-    fp.indexOf(value)(list); // $ExpectType number
-    fp.indexOfFrom(value)(42)(list); // $ExpectType number
+    _.lastIndexOf(list, abcObject); // $ExpectType number
+    _.lastIndexOf(list, abcObject, 42); // $ExpectType number
+    _(list).lastIndexOf(abcObject); // $ExpectType number
+    _(list).lastIndexOf(abcObject, 42); // $ExpectType number
+    _.chain(list).lastIndexOf(abcObject); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).lastIndexOf(abcObject, 42); // $ExpectType LoDashExplicitWrapper<number>
+    fp.lastIndexOf(abcObject, list); // $ExpectType number
+    fp.lastIndexOf(abcObject)(list); // $ExpectType number
+    fp.lastIndexOfFrom(abcObject)(42)(list); // $ExpectType number
 
-    _.lastIndexOf(list, value); // $ExpectType number
-    _.lastIndexOf(list, value, 42); // $ExpectType number
-    _(list).lastIndexOf(value); // $ExpectType number
-    _(list).lastIndexOf(value, 42); // $ExpectType number
-    _.chain(list).lastIndexOf(value); // $ExpectType LoDashExplicitWrapper<number>
-    _.chain(list).lastIndexOf(value, 42); // $ExpectType LoDashExplicitWrapper<number>
-    fp.lastIndexOf(value, list); // $ExpectType number
-    fp.lastIndexOf(value)(list); // $ExpectType number
-    fp.lastIndexOfFrom(value)(42)(list); // $ExpectType number
+    _.sortedIndexOf(list, abcObject); // $ExpectType number
+    _(list).sortedIndexOf(abcObject); // $ExpectType number
+    _.chain(list).indexOf(abcObject); // $ExpectType LoDashExplicitWrapper<number>
+    fp.sortedIndexOf(abcObject, list); // $ExpectType number
+    fp.sortedIndexOf(abcObject)(list); // $ExpectType number
 
-    _.sortedIndexOf(list, value); // $ExpectType number
-    _(list).sortedIndexOf(value); // $ExpectType number
-    _.chain(list).indexOf(value); // $ExpectType LoDashExplicitWrapper<number>
-    fp.sortedIndexOf(value, list); // $ExpectType number
-    fp.sortedIndexOf(value)(list); // $ExpectType number
-
-    _.sortedLastIndexOf(list, value); // $ExpectType number
-    _(list).sortedLastIndexOf(value); // $ExpectType number
-    _.chain(list).sortedLastIndexOf(value); // $ExpectType LoDashExplicitWrapper<number>
-    fp.sortedLastIndexOf(value, list); // $ExpectType number
-    fp.sortedLastIndexOf(value)(list); // $ExpectType number
+    _.sortedLastIndexOf(list, abcObject); // $ExpectType number
+    _(list).sortedLastIndexOf(abcObject); // $ExpectType number
+    _.chain(list).sortedLastIndexOf(abcObject); // $ExpectType LoDashExplicitWrapper<number>
+    fp.sortedLastIndexOf(abcObject, list); // $ExpectType number
+    fp.sortedLastIndexOf(abcObject)(list); // $ExpectType number
 }
 
 // _.initial
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-
     _.initial(list); // $ExpectType AbcObject[]
     _(list).initial(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _.chain(list).initial(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
@@ -840,8 +765,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.last
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-
     _.last("abc"); // $ExpectType string | undefined
     _.last(list); // $ExpectType AbcObject | undefined
 
@@ -857,8 +780,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.nth
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-
     _.nth(list, 42); // $ExpectType AbcObject | undefined
     _(list).nth(42); // $ExpectType AbcObject | undefined
     _.chain(list).nth(42); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
@@ -871,32 +792,30 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 {
     const array: AbcObject[] = [];
     const list: _.List<AbcObject> = [];
-    const value: AbcObject = { a: 1, b: "", c: true };
 
     _.pull(array); // $ExpectType AbcObject[]
-    _.pull(array, value); // $ExpectType AbcObject[]
-    _.pull(array, value, value, value); // $ExpectType AbcObject[]
+    _.pull(array, abcObject); // $ExpectType AbcObject[]
+    _.pull(array, abcObject, abcObject, abcObject); // $ExpectType AbcObject[]
     _.pull(list); // $ExpectType ArrayLike<AbcObject>
-    _.pull(list, value); // $ExpectType ArrayLike<AbcObject>
-    _.pull(list, value, value, value); // $ExpectType ArrayLike<AbcObject>
+    _.pull(list, abcObject); // $ExpectType ArrayLike<AbcObject>
+    _.pull(list, abcObject, abcObject, abcObject); // $ExpectType ArrayLike<AbcObject>
 
     _(array).pull(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(array).pull(value); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(array).pull(value, value, value); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(array).pull(abcObject); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(array).pull(abcObject, abcObject, abcObject); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).pull(); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
-    _(list).pull(value); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
-    _(list).pull(value, value, value); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
+    _(list).pull(abcObject); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
+    _(list).pull(abcObject, abcObject, abcObject); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
 
     _.chain(array).pull(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(array).pull(value); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(array).pull(value, value, value); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(array).pull(abcObject); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(array).pull(abcObject, abcObject, abcObject); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).pull(); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
-    _.chain(list).pull(value); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
-    _.chain(list).pull(value, value, value); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
+    _.chain(list).pull(abcObject); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
+    _.chain(list).pull(abcObject, abcObject, abcObject); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
 
-    fp.pull(value, array); // $ExpectType AbcObject[]
-    fp.pull(value, list); // $ExpectType ArrayLike<AbcObject>
-    fp.pull(value)(list); // $ExpectType ArrayLike<AbcObject>
+    fp.pull(abcObject, array); // $ExpectType AbcObject[]
+    fp.pull(abcObject)(list); // $ExpectType ArrayLike<AbcObject>
 }
 
 // _.pullAt
@@ -1137,34 +1056,30 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 // _.remove
 {
     const list: _.List<AbcObject> = [];
-    const predicateFn = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
 
     _.remove(list); // $ExpectType AbcObject[]
-    _.remove(list, predicateFn); // $ExpectType AbcObject[]
+    _.remove(list, listIterator); // $ExpectType AbcObject[]
     _.remove(list, ""); // $ExpectType AbcObject[]
     _.remove(list, { a: 42 }); // $ExpectType AbcObject[]
 
     _(list).remove(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(list).remove(predicateFn); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).remove(listIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).remove(""); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).remove({ a: 42 }); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
     _.chain(list).remove(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(list).remove(predicateFn); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).remove(listIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).remove(""); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).remove({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-    const predicateFn2 = (value: AbcObject) => true;
-    fp.remove(predicateFn2, list); // $ExpectType AbcObject[]
-    fp.remove(predicateFn2)(list); // $ExpectType AbcObject[]
+    fp.remove(valueIterator, list); // $ExpectType AbcObject[]
+    fp.remove(valueIterator)(list); // $ExpectType AbcObject[]
     fp.remove("", list); // $ExpectType AbcObject[]
     fp.remove({ a: 42 }, list); // $ExpectType AbcObject[]
 }
 
 // _.tail
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-
     _.tail(list); // $ExpectType AbcObject[]
     _(list).tail(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _.chain(list).tail(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
@@ -1173,8 +1088,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.slice
 {
-    const array: AbcObject[] | null | undefined = anything;
-
     _.slice(array); // $ExpectType AbcObject[]
     _.slice(array, 42); // $ExpectType AbcObject[]
     _.slice(array, 42, 42); // $ExpectType AbcObject[]
@@ -1190,63 +1103,54 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 // _.sortedIndexBy
 // _.sortedLastIndexBy
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const value: AbcObject = { a: 1, b: "", c: true };
-    const listIterator = (value: AbcObject) => 0;
+    _.sortedIndexBy(list, abcObject, valueIterator); // $ExpectType number
+    _.sortedIndexBy(list, abcObject, ""); // $ExpectType number
+    _.sortedIndexBy(list, abcObject, { a: 42 }); // $ExpectType number
+    _(list).sortedIndexBy(abcObject, valueIterator); // $ExpectType number
+    _(list).sortedIndexBy(abcObject, ""); // $ExpectType number
+    _(list).sortedIndexBy(abcObject, { a: 42 }); // $ExpectType number
+    _.chain(list).sortedIndexBy(abcObject, valueIterator); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).sortedIndexBy(abcObject, ""); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).sortedIndexBy(abcObject, { a: 42 }); // $ExpectType LoDashExplicitWrapper<number>
+    fp.sortedIndexBy(valueIterator, abcObject, list); // $ExpectType number
+    fp.sortedIndexBy(valueIterator)(abcObject)(list); // $ExpectType number
+    fp.sortedIndexBy("a", abcObject, list); // $ExpectType number
+    fp.sortedIndexBy({ a: 42 }, abcObject, list); // $ExpectType number
 
-    _.sortedIndexBy(list, value, listIterator); // $ExpectType number
-    _.sortedIndexBy(list, value, ""); // $ExpectType number
-    _.sortedIndexBy(list, value, { a: 42 }); // $ExpectType number
-    _(list).sortedIndexBy(value, listIterator); // $ExpectType number
-    _(list).sortedIndexBy(value, ""); // $ExpectType number
-    _(list).sortedIndexBy(value, { a: 42 }); // $ExpectType number
-    _.chain(list).sortedIndexBy(value, listIterator); // $ExpectType LoDashExplicitWrapper<number>
-    _.chain(list).sortedIndexBy(value, ""); // $ExpectType LoDashExplicitWrapper<number>
-    _.chain(list).sortedIndexBy(value, { a: 42 }); // $ExpectType LoDashExplicitWrapper<number>
-    fp.sortedIndexBy(listIterator, value, list); // $ExpectType number
-    fp.sortedIndexBy(listIterator)(value)(list); // $ExpectType number
-    fp.sortedIndexBy("a", value, list); // $ExpectType number
-    fp.sortedIndexBy({ a: 42 }, value, list); // $ExpectType number
-
-    _.sortedLastIndexBy(list, value, listIterator); // $ExpectType number
-    _.sortedLastIndexBy(list, value, ""); // $ExpectType number
-    _.sortedLastIndexBy(list, value, { a: 42 }); // $ExpectType number
-    _(list).sortedLastIndexBy(value, listIterator); // $ExpectType number
-    _(list).sortedLastIndexBy(value, ""); // $ExpectType number
-    _(list).sortedLastIndexBy(value, { a: 42 }); // $ExpectType number
-    _.chain(list).sortedLastIndexBy(value, listIterator); // $ExpectType LoDashExplicitWrapper<number>
-    _.chain(list).sortedLastIndexBy(value, ""); // $ExpectType LoDashExplicitWrapper<number>
-    _.chain(list).sortedLastIndexBy(value, { a: 42 }); // $ExpectType LoDashExplicitWrapper<number>
-    fp.sortedLastIndexBy(listIterator, value, list); // $ExpectType number
-    fp.sortedLastIndexBy(listIterator)(value)(list); // $ExpectType number
-    fp.sortedLastIndexBy("a", value, list); // $ExpectType number
-    fp.sortedLastIndexBy({ a: 42 }, value, list); // $ExpectType number
+    _.sortedLastIndexBy(list, abcObject, valueIterator); // $ExpectType number
+    _.sortedLastIndexBy(list, abcObject, ""); // $ExpectType number
+    _.sortedLastIndexBy(list, abcObject, { a: 42 }); // $ExpectType number
+    _(list).sortedLastIndexBy(abcObject, valueIterator); // $ExpectType number
+    _(list).sortedLastIndexBy(abcObject, ""); // $ExpectType number
+    _(list).sortedLastIndexBy(abcObject, { a: 42 }); // $ExpectType number
+    _.chain(list).sortedLastIndexBy(abcObject, valueIterator); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).sortedLastIndexBy(abcObject, ""); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).sortedLastIndexBy(abcObject, { a: 42 }); // $ExpectType LoDashExplicitWrapper<number>
+    fp.sortedLastIndexBy(valueIterator, abcObject, list); // $ExpectType number
+    fp.sortedLastIndexBy(valueIterator)(abcObject)(list); // $ExpectType number
+    fp.sortedLastIndexBy("a", abcObject, list); // $ExpectType number
+    fp.sortedLastIndexBy({ a: 42 }, abcObject, list); // $ExpectType number
 }
 
 // _.sortedIndex
 // _.sortedLastIndex
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const value: AbcObject = { a: 1, b: "", c: true };
+    _.sortedIndex(list, abcObject); // $ExpectType number
+    _(list).sortedIndex(abcObject); // $ExpectType number
+    _.chain(list).sortedIndex(abcObject); // $ExpectType LoDashExplicitWrapper<number>
+    fp.sortedIndex(abcObject, list); // $ExpectType number
+    fp.sortedIndex(abcObject)(list); // $ExpectType number
 
-    _.sortedIndex(list, value); // $ExpectType number
-    _(list).sortedIndex(value); // $ExpectType number
-    _.chain(list).sortedIndex(value); // $ExpectType LoDashExplicitWrapper<number>
-    fp.sortedIndex(value, list); // $ExpectType number
-    fp.sortedIndex(value)(list); // $ExpectType number
-
-    _.sortedLastIndex(list, value); // $ExpectType number
-    _(list).sortedLastIndex(value); // $ExpectType number
-    _.chain(list).sortedLastIndex(value); // $ExpectType LoDashExplicitWrapper<number>
-    fp.sortedLastIndex(value, list); // $ExpectType number
-    fp.sortedLastIndex(value)(list); // $ExpectType number
+    _.sortedLastIndex(list, abcObject); // $ExpectType number
+    _(list).sortedLastIndex(abcObject); // $ExpectType number
+    _.chain(list).sortedLastIndex(abcObject); // $ExpectType LoDashExplicitWrapper<number>
+    fp.sortedLastIndex(abcObject, list); // $ExpectType number
+    fp.sortedLastIndex(abcObject)(list); // $ExpectType number
 }
 
 // _.take
 // _.takeRight
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-
     _.take(list); // $ExpectType AbcObject[]
     _.take(list, 42); // $ExpectType AbcObject[]
     _(list).take(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
@@ -1269,55 +1173,49 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 // _.takeWhile
 // _.takeRightWhile
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const predicateFn = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
-    const predicateFn2 = (value: AbcObject) => true;
-
     _.takeWhile(list); // $ExpectType AbcObject[]
-    _.takeWhile(list, predicateFn); // $ExpectType AbcObject[]
+    _.takeWhile(list, listIterator); // $ExpectType AbcObject[]
     _.takeWhile(list, ""); // $ExpectType AbcObject[]
     _.takeWhile(list, { a: 42 }); // $ExpectType AbcObject[]
 
     _(list).takeWhile(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(list).takeWhile(predicateFn); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).takeWhile(listIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).takeWhile(""); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).takeWhile({ a: 42 }); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
     _.chain(list).takeWhile(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(list).takeWhile(predicateFn); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).takeWhile(listIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).takeWhile(""); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).takeWhile({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-    fp.takeWhile(predicateFn2, list); // $ExpectType AbcObject[]
-    fp.takeWhile(predicateFn2)(list); // $ExpectType AbcObject[]
+    fp.takeWhile(valueIterator, list); // $ExpectType AbcObject[]
+    fp.takeWhile(valueIterator)(list); // $ExpectType AbcObject[]
     fp.takeWhile("a", list); // $ExpectType AbcObject[]
     fp.takeWhile({ a: 42 }, list); // $ExpectType AbcObject[]
 
     _.takeRightWhile(list); // $ExpectType AbcObject[]
-    _.takeRightWhile(list, predicateFn); // $ExpectType AbcObject[]
+    _.takeRightWhile(list, listIterator); // $ExpectType AbcObject[]
     _.takeRightWhile(list, ""); // $ExpectType AbcObject[]
     _.takeRightWhile(list, { a: 42 }); // $ExpectType AbcObject[]
 
     _(list).takeRightWhile(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(list).takeRightWhile(predicateFn); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).takeRightWhile(listIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).takeRightWhile(""); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).takeRightWhile({ a: 42 }); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
     _.chain(list).takeRightWhile(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(list).takeRightWhile(predicateFn); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).takeRightWhile(listIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).takeRightWhile(""); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).takeRightWhile({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-    fp.takeRightWhile(predicateFn2, list); // $ExpectType AbcObject[]
-    fp.takeRightWhile(predicateFn2)(list); // $ExpectType AbcObject[]
+    fp.takeRightWhile(valueIterator, list); // $ExpectType AbcObject[]
+    fp.takeRightWhile(valueIterator)(list); // $ExpectType AbcObject[]
     fp.takeRightWhile("a", list); // $ExpectType AbcObject[]
     fp.takeRightWhile({ a: 42 }, list); // $ExpectType AbcObject[]
 }
 
 // _.union
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-
     _.union(list); // $ExpectType AbcObject[]
     _.union(list, list); // $ExpectType AbcObject[]
     _.union(list, list, list); // $ExpectType AbcObject[]
@@ -1336,13 +1234,9 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.unionBy
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const iteratee = (value: AbcObject) => 1;
-
     _.unionBy(list, list); // $ExpectType AbcObject[]
-    _.unionBy(list, list, list, list, list, list); // $ExpectType AbcObject[]
-    _.unionBy(list, list, iteratee); // $ExpectType AbcObject[]
-    _.unionBy(list, list, list, list, list, list, iteratee); // $ExpectType AbcObject[]
+    _.unionBy(list, list, valueIterator); // $ExpectType AbcObject[]
+    _.unionBy(list, list, list, list, list, list, valueIterator); // $ExpectType AbcObject[]
     _.unionBy(list, list, "a"); // $ExpectType AbcObject[]
     // <AbcObject> param needed for TS 2.3
     _.unionBy<AbcObject>(list, list, list, list, list, list, "a"); // $ExpectType AbcObject[]
@@ -1350,9 +1244,8 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     _.unionBy(list, list, list, list, list, list, {a: 1}); // $ExpectType AbcObject[]
 
     _(list).unionBy(list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(list).unionBy(list, list, list, list, list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(list).unionBy(list, iteratee); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(list).unionBy(list, list, list, list, list, iteratee); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).unionBy(list, valueIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).unionBy(list, list, list, list, list, valueIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).unionBy(list, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     // <AbcObject> param needed for TS 2.3
     _(list).unionBy<AbcObject>(list, list, list, list, list, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
@@ -1360,17 +1253,16 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     _(list).unionBy(list, list, list, list, list, {a: 1}); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
     _.chain(list).unionBy(list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(list).unionBy(list, list, list, list, list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(list).unionBy(list, iteratee); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(list).unionBy(list, list, list, list, list, iteratee); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).unionBy(list, valueIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).unionBy(list, list, list, list, list, valueIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).unionBy(list, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     // <AbcObject> param needed for TS 2.3
     _.chain(list).unionBy<AbcObject>(list, list, list, list, list, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).unionBy(list, {a: 1}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).unionBy(list, list, list, list, list, {a: 1}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-    fp.unionBy(iteratee, list, list); // $ExpectType AbcObject[]
-    fp.unionBy(iteratee)(list)(list); // $ExpectType AbcObject[]
+    fp.unionBy(valueIterator, list, list); // $ExpectType AbcObject[]
+    fp.unionBy(valueIterator)(list)(list); // $ExpectType AbcObject[]
     fp.unionBy("a", list, list); // $ExpectType AbcObject[]
     fp.unionBy({ a: 1 }, list, list); // $ExpectType AbcObject[]
 }
@@ -1378,8 +1270,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 // _.uniq
 // _.sortedUniq
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-
     _.uniq("abc"); // $ExpectType string[]
     _.uniq(list); // $ExpectType AbcObject[]
     _(list).uniq(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
@@ -1398,10 +1288,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 // _.uniqBy
 // _.sortedUniqBy
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const stringIterator = (value: string) => "";
-    const valueIterator = (value: AbcObject) => 0;
-
     _.uniqBy("abc", stringIterator); // $ExpectType string[]
     _.uniqBy(list, valueIterator); // $ExpectType AbcObject[]
     _.uniqBy(list, "a"); // $ExpectType AbcObject[]
@@ -1495,8 +1381,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.xor
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-
     _.xor(list); // $ExpectType AbcObject[]
     _.xor(list, list); // $ExpectType AbcObject[]
     _.xor(list, list, list); // $ExpectType AbcObject[]
@@ -1515,13 +1399,9 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.xorBy
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const iteratee = (value: AbcObject) => 1;
-
     _.xorBy(list, list); // $ExpectType AbcObject[]
-    _.xorBy(list, list, list, list, list, list); // $ExpectType AbcObject[]
-    _.xorBy(list, list, iteratee); // $ExpectType AbcObject[]
-    _.xorBy(list, list, list, list, list, list, iteratee); // $ExpectType AbcObject[]
+    _.xorBy(list, list, valueIterator); // $ExpectType AbcObject[]
+    _.xorBy(list, list, list, list, list, list, valueIterator); // $ExpectType AbcObject[]
     _.xorBy(list, list, "a"); // $ExpectType AbcObject[]
     // <AbcObject> param needed for TS 2.3
     _.xorBy<AbcObject>(list, list, list, list, list, list, "a"); // $ExpectType AbcObject[]
@@ -1529,9 +1409,8 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     _.xorBy(list, list, list, list, list, list, {a: 1}); // $ExpectType AbcObject[]
 
     _(list).xorBy(list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(list).xorBy(list, list, list, list, list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(list).xorBy(list, iteratee); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(list).xorBy(list, list, list, list, list, iteratee); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).xorBy(list, valueIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).xorBy(list, list, list, list, list, valueIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).xorBy(list, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     // <AbcObject> param needed for TS 2.3
     _(list).xorBy<AbcObject>(list, list, list, list, list, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
@@ -1539,25 +1418,22 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     _(list).xorBy(list, list, list, list, list, {a: 1}); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
     _.chain(list).xorBy(list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(list).xorBy(list, list, list, list, list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(list).xorBy(list, iteratee); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(list).xorBy(list, list, list, list, list, iteratee); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).xorBy(list, valueIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).xorBy(list, list, list, list, list, valueIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).xorBy(list, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     // <AbcObject> param needed for TS 2.3
     _.chain(list).xorBy<AbcObject>(list, list, list, list, list, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).xorBy(list, {a: 1}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).xorBy(list, list, list, list, list, {a: 1}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-    fp.xorBy(iteratee, list, list); // $ExpectType AbcObject[]
-    fp.xorBy(iteratee)(list)(list); // $ExpectType AbcObject[]
+    fp.xorBy(valueIterator, list, list); // $ExpectType AbcObject[]
+    fp.xorBy(valueIterator)(list)(list); // $ExpectType AbcObject[]
     fp.xorBy("a", list, list); // $ExpectType AbcObject[]
     fp.xorBy({ a: 1 }, list, list); // $ExpectType AbcObject[]
 }
 
 // _.zip
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-
     _.zip(list); // $ExpectType (AbcObject | undefined)[][]
     _.zip(list, list); // $ExpectType (AbcObject | undefined)[][]
     _.zip(list, list, list, list, list, list); // $ExpectType (AbcObject | undefined)[][]
@@ -1691,9 +1567,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.at
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
     const abcObject: AbcObject | null | undefined = anything;
 
     _.at(list, 0, "1", [2], ["3"], [4, "5"]); // $ExpectType AbcObject[]
@@ -1719,13 +1592,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.countBy
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
-
-    const stringIterator = (value: string) => 1;
-    const valueIterator = (value: AbcObject) => 1;
-
     _.countBy(""); // $ExpectType Dictionary<number>
     _.countBy("", stringIterator); // $ExpectType Dictionary<number>
 
@@ -1793,15 +1659,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.every
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
-
-    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
-    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => true;
-    const numericDictionaryIterator = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => true;
-    const valueIterator = (value: AbcObject) => true;
-
     _.every(list); // $ExpectType boolean
     _.every(list, listIterator); // $ExpectType boolean
     _.every(list, "a"); // $ExpectType boolean
@@ -1874,13 +1731,7 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.filter
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-
     const stringIterator = (char: string, index: number, string: string) => true;
-    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
-    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => true;
-    const valueIterator = (value: AbcObject) => true;
 
     _.filter("", stringIterator); // $ExpectType string[]
     _.filter(list, listIterator); // $ExpectType AbcObject[]
@@ -1942,13 +1793,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 // _.find
 // _.findLast
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-
-    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
-    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => true;
-    const valueIterator = (value: AbcObject) => true;
-
     _.find(list); // $ExpectType AbcObject | undefined
     _.find(list, listIterator); // $ExpectType AbcObject | undefined
     _.find(list, listIterator, 1); // $ExpectType AbcObject | undefined
@@ -2138,7 +1982,7 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     fp.flatMap(["a", 42], objNumericDictionary); // $ExpectType boolean[]
 }
 
-// _.flatMapDeep
+// _.flatMapDeep, _.flatMapDepth
 {
     const numList: _.List<number|number[]> | null | undefined = anything;
     const objList: _.List<{a: number}|Array<{a: number}>> | null | undefined = anything;
@@ -2206,22 +2050,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     fp.flatMapDeep("a", objNumericDictionary); // $ExpectType any[]
     fp.flatMapDeep({ a: 42 }, objNumericDictionary); // $ExpectType boolean[]
     fp.flatMapDeep(["a", 42], objNumericDictionary); // $ExpectType boolean[]
-}
-
-// _.flatMapDepth
-{
-    const numList: _.List<number|number[]> | null | undefined = anything;
-    const objList: _.List<{a: number}|Array<{a: number}>> | null | undefined = anything;
-    const numDictionary: _.Dictionary<number|number[]> | null | undefined = anything;
-    const objDictionary: _.Dictionary<{a: number}|Array<{a: number}>> | null | undefined = anything;
-    const numNumericDictionary: _.NumericDictionary<number|number[]> | null | undefined = anything;
-    const objNumericDictionary: _.NumericDictionary<{a: number}|Array<{a: number}>> | null | undefined = anything;
-
-    const stringIterator = (value: string, index: number, collection: _.List<string>): _.ListOfRecursiveArraysOrValues<string> | string => "";
-    const listIterator = (value: number | number[], index: number, collection: _.List<number | number[]>): _.ListOfRecursiveArraysOrValues<number> | number => 1;
-    const dictionaryIterator = (value: number | number[], key: string, collection: _.Dictionary<number | number[]>): _.ListOfRecursiveArraysOrValues<number> | number => 1;
-    const numericDictionaryIterator = (value: number | number[], key: string, collection: _.NumericDictionary<number | number[]>): _.ListOfRecursiveArraysOrValues<number> | number => 1;
-    const valueIterator = (value: number | number[]): _.ListOfRecursiveArraysOrValues<number> | number => 1;
 
     _.flatMapDepth("abc"); // $ExpectType string[]
     _.flatMapDepth("abc", stringIterator); // $ExpectType string[]
@@ -2289,7 +2117,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     const nilList: _.List<AbcObject> | null | undefined = anything;
     const nilDictionary: _.Dictionary<AbcObject> | null | undefined = anything;
     const nilNumericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
-    const abcObject: AbcObject = anything;
     const nilAbcObject: AbcObject | null | undefined = anything;
 
     // $ExpectType string
@@ -2516,16 +2343,14 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
         collection; // $ExpectType NumericDictionary<AbcObject>
     });
 
-    const stringIterator2 = (char: string) => 1;
-    const listIterator2 = (value: AbcObject) => 1;
-    fp.forEach(stringIterator2, ""); // $ExpectType string
-    fp.forEach(listIterator2, array); // $ExpectType AbcObject[]
-    fp.forEach(listIterator2)(array); // $ExpectType AbcObject[]
-    fp.forEach(listIterator2, list); // $ExpectType ArrayLike<AbcObject>
-    fp.forEach(listIterator2, dictionary); // $ExpectType Dictionary<AbcObject>
-    fp.forEach(listIterator2, nilArray); // $ExpectType AbcObject[] | null | undefined
-    fp.forEach(listIterator2, nilList); // $ExpectType ArrayLike<AbcObject> | null | undefined
-    fp.forEach(listIterator2, nilDictionary); // $ExpectType Dictionary<AbcObject> | null | undefined
+    fp.forEach(stringIterator, ""); // $ExpectType string
+    fp.forEach(valueIterator, array); // $ExpectType AbcObject[]
+    fp.forEach(valueIterator)(array); // $ExpectType AbcObject[]
+    fp.forEach(valueIterator, list); // $ExpectType ArrayLike<AbcObject>
+    fp.forEach(valueIterator, dictionary); // $ExpectType Dictionary<AbcObject>
+    fp.forEach(valueIterator, nilArray); // $ExpectType AbcObject[] | null | undefined
+    fp.forEach(valueIterator, nilList); // $ExpectType ArrayLike<AbcObject> | null | undefined
+    fp.forEach(valueIterator, nilDictionary); // $ExpectType Dictionary<AbcObject> | null | undefined
 
     // $ExpectType AbcObject[]
     _.forEachRight(array, (value, index, collection) => {
@@ -2563,8 +2388,8 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
         index; // $ExpectType number
         collection; // $ExpectType ArrayLike<AbcObject>
     });
-    fp.forEachRight(listIterator2, array); // $ExpectType AbcObject[]
-    fp.forEachRight(listIterator2)(array); // $ExpectType AbcObject[]
+    fp.forEachRight(valueIterator, array); // $ExpectType AbcObject[]
+    fp.forEachRight(valueIterator)(array); // $ExpectType AbcObject[]
 
     // $ExpectType AbcObject[]
     _.each(array, (value, index, collection) => {
@@ -2602,8 +2427,8 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
         index; // $ExpectType number
         collection; // $ExpectType ArrayLike<AbcObject>
     });
-    fp.each(listIterator2, array); // $ExpectType AbcObject[]
-    fp.each(listIterator2)(array); // $ExpectType AbcObject[]
+    fp.each(valueIterator, array); // $ExpectType AbcObject[]
+    fp.each(valueIterator)(array); // $ExpectType AbcObject[]
 
     // $ExpectType AbcObject[]
     _.eachRight(array, (value, index, collection) => {
@@ -2641,18 +2466,12 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
         index; // $ExpectType number
         collection; // $ExpectType ArrayLike<AbcObject>
     });
-    fp.eachRight(listIterator2, array); // $ExpectType AbcObject[]
-    fp.eachRight(listIterator2)(array); // $ExpectType AbcObject[]
+    fp.eachRight(valueIterator, array); // $ExpectType AbcObject[]
+    fp.eachRight(valueIterator)(array); // $ExpectType AbcObject[]
 }
 
 // _.groupBy
 {
-    const list: _.List<AbcObject> | null | undefined = [] as any;
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-
-    const stringIterator = (char: string) => 0;
-    const valueIterator = (value: AbcObject) => 0;
-
     _.groupBy(""); // $ExpectType Dictionary<string[]>
     _.groupBy("", stringIterator); // $ExpectType Dictionary<string[]>
     _.groupBy(list); // $ExpectType Dictionary<AbcObject[]>
@@ -2699,42 +2518,33 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.includes
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-    const target: AbcObject = { a: 42, b: "", c: true };
+    _.includes(list, abcObject); // $ExpectType boolean
+    _.includes(list, abcObject, 42); // $ExpectType boolean
+    _.includes(dictionary, abcObject); // $ExpectType boolean
+    _.includes(dictionary, abcObject, 42); // $ExpectType boolean
 
-    _.includes(list, target); // $ExpectType boolean
-    _.includes(list, target, 42); // $ExpectType boolean
-    _.includes(dictionary, target); // $ExpectType boolean
-    _.includes(dictionary, target, 42); // $ExpectType boolean
+    _(list).includes(abcObject); // $ExpectType boolean
+    _(list).includes(abcObject, 42); // $ExpectType boolean
+    _(dictionary).includes(abcObject); // $ExpectType boolean
+    _(dictionary).includes(abcObject, 42); // $ExpectType boolean
 
-    _(list).includes(target); // $ExpectType boolean
-    _(list).includes(target, 42); // $ExpectType boolean
-    _(dictionary).includes(target); // $ExpectType boolean
-    _(dictionary).includes(target, 42); // $ExpectType boolean
+    _.chain(list).includes(abcObject); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(list).includes(abcObject, 42); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(dictionary).includes(abcObject); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(dictionary).includes(abcObject, 42); // $ExpectType LoDashExplicitWrapper<boolean>
 
-    _.chain(list).includes(target); // $ExpectType LoDashExplicitWrapper<boolean>
-    _.chain(list).includes(target, 42); // $ExpectType LoDashExplicitWrapper<boolean>
-    _.chain(dictionary).includes(target); // $ExpectType LoDashExplicitWrapper<boolean>
-    _.chain(dictionary).includes(target, 42); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.includes(abcObject, list); // $ExpectType boolean
+    fp.includes(abcObject)(list); // $ExpectType boolean
+    fp.includes(abcObject, dictionary); // $ExpectType boolean
 
-    fp.includes(target, list); // $ExpectType boolean
-    fp.includes(target)(list); // $ExpectType boolean
-    fp.includes(target, dictionary); // $ExpectType boolean
-
-    fp.includesFrom(target, 42, list); // $ExpectType boolean
-    fp.includesFrom(target)(42)(list); // $ExpectType boolean
-    fp.includesFrom(target, 42, dictionary); // $ExpectType boolean
+    fp.includesFrom(abcObject, 42, list); // $ExpectType boolean
+    fp.includesFrom(abcObject)(42)(list); // $ExpectType boolean
+    fp.includesFrom(abcObject, 42, dictionary); // $ExpectType boolean
 }
 
 // _.keyBy
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
-
-    const stringIterator = (value: string) => "a";
-    const valueIterator = (value: AbcObject) => 1;
+    const valueIterator = (value: AbcObject) => "";
 
     _.keyBy("abcd"); // $ExpectType Dictionary<string>
     _.keyBy("abcd", stringIterator); // $ExpectType Dictionary<string>
@@ -2878,11 +2688,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.map
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
-    const abcObject: AbcObject = anything;
-
     _.map(list);  // $ExpectType AbcObject[]
     // $ExpectType number[]
     _.map(list, (value, index, collection) => {
@@ -2995,8 +2800,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.partition
 {
-    const list: ArrayLike<AbcObject> | null | undefined = anything;
-
     // $ExpectType [any[], any[]]
     _.partition(anything, (value) => {
         value; // $ExpectType any
@@ -3110,13 +2913,7 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.reject
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-
     const stringIterator = (char: string, index: number, string: string) => true;
-    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
-    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => true;
-    const valueIterator = (value: AbcObject) => true;
 
     _.reject("", stringIterator); // $ExpectType string[]
     _.reject(list, listIterator); // $ExpectType AbcObject[]
@@ -3207,9 +3004,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.shuffle
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-
     _.shuffle("abc"); // $ExpectType string[]
     _.shuffle(list); // $ExpectType AbcObject[]
     _.shuffle(dictionary); // $ExpectType AbcObject[]
@@ -3226,9 +3020,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.size
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-
     _.size(list); // $ExpectType number
     _.size(dictionary); // $ExpectType number
     _.size(""); // $ExpectType number
@@ -3245,15 +3036,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.some
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
-
-    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
-    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => true;
-    const numericDictionaryIterator = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => true;
-    const valueIterator = (value: AbcObject) => true;
-
     _.some(list); // $ExpectType boolean
     _.some(list, listIterator); // $ExpectType boolean
     _.some(list, "a"); // $ExpectType boolean
@@ -3326,13 +3108,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.sortBy
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-
-    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => 0;
-    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => 0;
-    const valueIterator = (value: AbcObject) => 0;
-
     _.sortBy(list); // $ExpectType AbcObject[]
     _.sortBy(list, listIterator); // $ExpectType AbcObject[]
     _.sortBy(list, listIterator, listIterator); // $ExpectType AbcObject[]
@@ -3380,10 +3155,6 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.orderBy
 {
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-
     _.orderBy("acbd", (value) => 1); // $ExpectType string[]
     _.orderBy("acbd", (value) => 1, true); // $ExpectType string[]
     _.orderBy("acbd", [(value) => 1, (value) => 2], [true, false]); // $ExpectType string[]
@@ -4882,8 +4653,6 @@ fp.now(); // $ExpectType number
 {
     const list: ArrayLike<AbcObject> = anything;
 
-    const valueIterator = (value: AbcObject) => 0;
-
     _.maxBy(list, valueIterator); // $ExpectType AbcObject | undefined
     _.maxBy(list, "a"); // $ExpectType AbcObject | undefined
     _.maxBy(list, { a: 42 }); // $ExpectType AbcObject | undefined
@@ -4976,7 +4745,6 @@ fp.now(); // $ExpectType number
 
 // _.sumBy
 {
-    const list: ArrayLike<AbcObject> | null | undefined = anything;
     const listIterator = (value: AbcObject) => 0;
 
     _.sumBy(list, listIterator); // $ExpectType number
@@ -5235,7 +5003,6 @@ fp.now(); // $ExpectType number
 {
     const dictionary: _.Dictionary<number> = anything;
     const numericDictionary: _.NumericDictionary<number> = anything;
-    const abcObject: AbcObject = anything;
 
     _.entries(dictionary); // $ExpectType [string, number][]
     _.entries(numericDictionary); // $ExpectType [string, number][]
@@ -5362,17 +5129,15 @@ fp.now(); // $ExpectType number
 // _.functions
 // _.functionsIn
 {
-    const object: AbcObject = anything;
+    _.functions(abcObject); // $ExpectType string[]
+    _(abcObject).functions(); // $ExpectType LoDashImplicitWrapper<string[]>
+    _.chain(abcObject).functions(); // $ExpectType LoDashExplicitWrapper<string[]>
+    fp.functions(abcObject); // $ExpectType string[]
 
-    _.functions(object); // $ExpectType string[]
-    _(object).functions(); // $ExpectType LoDashImplicitWrapper<string[]>
-    _.chain(object).functions(); // $ExpectType LoDashExplicitWrapper<string[]>
-    fp.functions(object); // $ExpectType string[]
-
-    _.functionsIn(object); // $ExpectType string[]
-    _(object).functionsIn(); // $ExpectType LoDashImplicitWrapper<string[]>
-    _.chain(object).functionsIn(); // $ExpectType LoDashExplicitWrapper<string[]>
-    fp.functionsIn(object); // $ExpectType string[]
+    _.functionsIn(abcObject); // $ExpectType string[]
+    _(abcObject).functionsIn(); // $ExpectType LoDashImplicitWrapper<string[]>
+    _.chain(abcObject).functionsIn(); // $ExpectType LoDashExplicitWrapper<string[]>
+    fp.functionsIn(abcObject); // $ExpectType string[]
 }
 
 // _.get
@@ -5419,33 +5184,31 @@ fp.now(); // $ExpectType number
 // _.has
 // _.hasIn
 {
-    const object: AbcObject = anything;
+    _.has(abcObject, ""); // $ExpectType boolean
+    _.has(abcObject, 42); // $ExpectType boolean
+    _.has(abcObject, ["", 42]); // $ExpectType boolean
+    _(abcObject).has(""); // $ExpectType boolean
+    _(abcObject).has(42); // $ExpectType boolean
+    _(abcObject).has(["", 42]); // $ExpectType boolean
+    _.chain(abcObject).has(""); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(abcObject).has(42); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(abcObject).has(["", 42]); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.has("a", abcObject); // $ExpectType boolean
+    fp.has("a")(abcObject); // $ExpectType boolean
+    fp.has(["a", 42])(abcObject); // $ExpectType boolean
 
-    _.has(object, ""); // $ExpectType boolean
-    _.has(object, 42); // $ExpectType boolean
-    _.has(object, ["", 42]); // $ExpectType boolean
-    _(object).has(""); // $ExpectType boolean
-    _(object).has(42); // $ExpectType boolean
-    _(object).has(["", 42]); // $ExpectType boolean
-    _.chain(object).has(""); // $ExpectType LoDashExplicitWrapper<boolean>
-    _.chain(object).has(42); // $ExpectType LoDashExplicitWrapper<boolean>
-    _.chain(object).has(["", 42]); // $ExpectType LoDashExplicitWrapper<boolean>
-    fp.has("a", object); // $ExpectType boolean
-    fp.has("a")(object); // $ExpectType boolean
-    fp.has(["a", 42])(object); // $ExpectType boolean
-
-    _.hasIn(object, ""); // $ExpectType boolean
-    _.hasIn(object, 42); // $ExpectType boolean
-    _.hasIn(object, ["", 42]); // $ExpectType boolean
-    _(object).hasIn(""); // $ExpectType boolean
-    _(object).hasIn(42); // $ExpectType boolean
-    _(object).hasIn(["", 42]); // $ExpectType boolean
-    _.chain(object).hasIn(""); // $ExpectType LoDashExplicitWrapper<boolean>
-    _.chain(object).hasIn(42); // $ExpectType LoDashExplicitWrapper<boolean>
-    _.chain(object).hasIn(["", 42]); // $ExpectType LoDashExplicitWrapper<boolean>
-    fp.hasIn("a", object); // $ExpectType boolean
-    fp.hasIn("a")(object); // $ExpectType boolean
-    fp.hasIn(["a", 42])(object); // $ExpectType boolean
+    _.hasIn(abcObject, ""); // $ExpectType boolean
+    _.hasIn(abcObject, 42); // $ExpectType boolean
+    _.hasIn(abcObject, ["", 42]); // $ExpectType boolean
+    _(abcObject).hasIn(""); // $ExpectType boolean
+    _(abcObject).hasIn(42); // $ExpectType boolean
+    _(abcObject).hasIn(["", 42]); // $ExpectType boolean
+    _.chain(abcObject).hasIn(""); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(abcObject).hasIn(42); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(abcObject).hasIn(["", 42]); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.hasIn("a", abcObject); // $ExpectType boolean
+    fp.hasIn("a")(abcObject); // $ExpectType boolean
+    fp.hasIn(["a", 42])(abcObject); // $ExpectType boolean
 }
 
 // _.invert
@@ -5462,7 +5225,6 @@ fp.now(); // $ExpectType number
     const dictionary: _.Dictionary<{ a: number }> = {};
     const numericDictionary: _.NumericDictionary<{ a: number }> = {};
 
-    const stringIterator = (value: string) => 1;
     const valueIterator = (value: {a: number }) => 1;
 
     _.invertBy("foo"); // $ExpectType Dictionary<string[]>
@@ -5523,14 +5285,6 @@ fp.now(); // $ExpectType number
 
 // _.mapKeys
 {
-    const list: _.List<AbcObject>| null | undefined = [] as any;
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
-    const abcObject: AbcObject = anything;
-
-    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => "";
-    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => "";
-    const numericDictionaryIterator = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => "";
     const abcObjectIterator = (value: AbcObject[keyof AbcObject], key: string, collection: AbcObject) => "";
 
     _.mapKeys(list); // $ExpectType Dictionary<AbcObject>
@@ -5605,9 +5359,6 @@ fp.now(); // $ExpectType number
 
 // _.mapValues
 {
-    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
-    const abcObject: AbcObject = anything;
     const abcObjectOrNull: AbcObject | null = anything;
     const key: string = anything;
 
@@ -5774,10 +5525,9 @@ fp.now(); // $ExpectType number
     _.chain(abcObject).mapValues(); // $ExpectType LoDashExplicitWrapper<AbcObject>
     _.chain(abcObjectOrNull).mapValues(); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
 
-    const valueIterator = (value: AbcObject) => "";
-    fp.mapValues(valueIterator)(dictionary); // $ExpectType Dictionary<string>
+    fp.mapValues(valueIterator)(dictionary); // $ExpectType Dictionary<boolean>
     fp.mapValues("a", dictionary); // $ExpectType Dictionary<number>
-    fp.mapValues(valueIterator)(numericDictionary); // $ExpectType Dictionary<string>
+    fp.mapValues(valueIterator)(numericDictionary); // $ExpectType Dictionary<boolean>
     fp.mapValues({ a: 42 })(numericDictionary); // $ExpectType Dictionary<boolean>
     fp.mapValues(value => "", abcObjectOrNull); // $ExpectType { a: string; b: string; c: string; }
 }
@@ -5953,7 +5703,6 @@ fp.now(); // $ExpectType number
 {
     const dictionary: _.Dictionary<number> = {};
     const numericDictionary: _.NumericDictionary<number> = {};
-    const abcObject: AbcObject = anything;
 
     _.toPairs(dictionary); // $ExpectType [string, number][]
     _.toPairs(numericDictionary); // $ExpectType [string, number][]
@@ -6108,8 +5857,6 @@ fp.now(); // $ExpectType number
 {
     const dict: _.Dictionary<AbcObject> = {};
     const numDict: _.NumericDictionary<AbcObject> = {};
-    const list: _.List<AbcObject> | null | undefined = anything;
-    const object: AbcObject = anything;
 
     _.values(123); // $ExpectType any[]
     _.values(true); // $ExpectType any[]
@@ -6119,7 +5866,7 @@ fp.now(); // $ExpectType number
     _.values(dict); // $ExpectType AbcObject[]
     _.values(numDict); // $ExpectType AbcObject[]
     _.values(list); // $ExpectType AbcObject[]
-    _.values(object); // $ExpectType (string | number | boolean)[]
+    _.values(abcObject); // $ExpectType (string | number | boolean)[]
 
     _(true).values(); // $ExpectType LoDashImplicitWrapper<any[]>
     _("hi").values(); // $ExpectType LoDashImplicitWrapper<string[]>
@@ -6135,13 +5882,13 @@ fp.now(); // $ExpectType number
     fp.values(dict); // $ExpectType AbcObject[]
     fp.values(numDict); // $ExpectType AbcObject[]
     fp.values(list); // $ExpectType AbcObject[]
-    fp.values(object); // $ExpectType (string | number | boolean)[]
+    fp.values(abcObject); // $ExpectType (string | number | boolean)[]
 
     _.valuesIn([true, false]); // $ExpectType boolean[]
     _.valuesIn(dict); // $ExpectType AbcObject[]
     _.valuesIn(numDict); // $ExpectType AbcObject[]
     _.valuesIn(list); // $ExpectType AbcObject[]
-    _.valuesIn(object); // $ExpectType (string | number | boolean)[]
+    _.valuesIn(abcObject); // $ExpectType (string | number | boolean)[]
 
     _(dict).valuesIn(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _.chain(dict).valuesIn(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
@@ -6149,7 +5896,7 @@ fp.now(); // $ExpectType number
     fp.valuesIn(dict); // $ExpectType AbcObject[]
     fp.valuesIn(numDict); // $ExpectType AbcObject[]
     fp.valuesIn(list); // $ExpectType AbcObject[]
-    fp.valuesIn(object); // $ExpectType (string | number | boolean)[]
+    fp.valuesIn(abcObject); // $ExpectType (string | number | boolean)[]
 }
 
 /*******
@@ -6163,16 +5910,7 @@ fp.now(); // $ExpectType number
     _(true); // $ExpectType LoDashImplicitWrapper<boolean>
     _([""]); // $ExpectType LoDashImplicitWrapper<string[]>
     _({ a: "" }); // $ExpectType LoDashImplicitWrapper<{ a: string; }>
-
-    {
-        const a: AbcObject[] = [];
-        _(a); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    }
-
-    {
-        const a: AbcObject[] | null | undefined = anything;
-        _(a); // $ExpectType LoDashImplicitWrapper<AbcObject[] | null | undefined>
-    }
+    _(array); // $ExpectType LoDashImplicitWrapper<AbcObject[] | null | undefined>
 }
 
 // _.chain
@@ -6319,7 +6057,6 @@ fp.now(); // $ExpectType number
     _.chain(numberROA).concat(numberROA); // $ExpectType LoDashExplicitWrapper<number[]>
     _.chain(numberROA).concat(numberROA, numberROA); // $ExpectType LoDashExplicitWrapper<number[]>
 
-    const abcObject: AbcObject = { a: 1, b: 'foo', c: true };
     const objectROA: AbcObject[] = [{ a: 1, b: 'foo', c: true }]; // TODO: Should be ReadonlyArray, but see comment on type Many<T>
 
     _.concat(abcObject, abcObject); // $ExpectType AbcObject[]
@@ -6889,28 +6626,25 @@ fp.now(); // $ExpectType number
 
 // _.matches
 {
-    const source: AbcObject = { a: 1, b: "", c: true };
+    _.matches(abcObject); // $ExpectType (value: any) => boolean
+    _.matches<AbcObject, AbcObject>(abcObject); // $ExpectType (value: AbcObject) => boolean
+    _(abcObject).matches<AbcObject>(); // $ExpectType LoDashImplicitWrapper<(value: AbcObject) => boolean>
+    _.chain(abcObject).matches<AbcObject>(); // $ExpectType LoDashExplicitWrapper<(value: AbcObject) => boolean>
 
-    _.matches(source); // $ExpectType (value: any) => boolean
-    _.matches<AbcObject, AbcObject>(source); // $ExpectType (value: AbcObject) => boolean
-    _(source).matches<AbcObject>(); // $ExpectType LoDashImplicitWrapper<(value: AbcObject) => boolean>
-    _.chain(source).matches<AbcObject>(); // $ExpectType LoDashExplicitWrapper<(value: AbcObject) => boolean>
-
-    fp.matches(source, {}); // $ExpectType boolean
-    fp.matches(source)({}); // $ExpectType boolean
+    fp.matches(abcObject, {}); // $ExpectType boolean
+    fp.matches(abcObject)({}); // $ExpectType boolean
 }
 
 // _.matchesProperty
 {
     const path: string | string[] = anything;
-    const source: AbcObject = { a: 1, b: "", c: true };
 
-    _.matchesProperty(path, source); // $ExpectType (value: any) => boolean
-    _.matchesProperty<AbcObject, AbcObject>(path, source); // $ExpectType (value: AbcObject) => boolean
-    _(path).matchesProperty(source); // $ExpectType LoDashImplicitWrapper<(value: any) => boolean>
-    _(path).matchesProperty<AbcObject, AbcObject>(source);
-    _.chain(path).matchesProperty(source); // $ExpectType LoDashExplicitWrapper<(value: any) => boolean>
-    fp.matchesProperty(path, source); // $ExpectType (value: any) => boolean
+    _.matchesProperty(path, abcObject); // $ExpectType (value: any) => boolean
+    _.matchesProperty<AbcObject, AbcObject>(path, abcObject); // $ExpectType (value: AbcObject) => boolean
+    _(path).matchesProperty(abcObject); // $ExpectType LoDashImplicitWrapper<(value: any) => boolean>
+    _(path).matchesProperty<AbcObject, AbcObject>(abcObject);
+    _.chain(path).matchesProperty(abcObject); // $ExpectType LoDashExplicitWrapper<(value: any) => boolean>
+    fp.matchesProperty(path, abcObject); // $ExpectType (value: any) => boolean
 }
 
 // _.method
@@ -6937,15 +6671,13 @@ fp.now(); // $ExpectType number
 
 // _.methodOf
 {
-    const object: AbcObject = anything;
-
-    _.methodOf(object) as (path: _.Many<_.PropertyName>) => any;
-    _.methodOf(object, anything, anything, anything) as (path: _.Many<_.PropertyName>) => any;
-    _(object).methodOf() as _.LoDashImplicitWrapper<(path: _.Many<_.PropertyName>) => any>;
-    _(object).methodOf(anything, anything, anything) as _.LoDashImplicitWrapper<(path: _.Many<_.PropertyName>) => any>;
-    _.chain(object).methodOf() as _.LoDashExplicitWrapper<(path: _.Many<_.PropertyName>) => any>;
-    _.chain(object).methodOf(anything, anything, anything) as _.LoDashExplicitWrapper<(path: _.Many<_.PropertyName>) => any>;
-    fp.methodOf(object) as (path: _.Many<_.PropertyName>) => any;
+    _.methodOf(abcObject) as (path: _.Many<_.PropertyName>) => any;
+    _.methodOf(abcObject, anything, anything, anything) as (path: _.Many<_.PropertyName>) => any;
+    _(abcObject).methodOf() as _.LoDashImplicitWrapper<(path: _.Many<_.PropertyName>) => any>;
+    _(abcObject).methodOf(anything, anything, anything) as _.LoDashImplicitWrapper<(path: _.Many<_.PropertyName>) => any>;
+    _.chain(abcObject).methodOf() as _.LoDashExplicitWrapper<(path: _.Many<_.PropertyName>) => any>;
+    _.chain(abcObject).methodOf(anything, anything, anything) as _.LoDashExplicitWrapper<(path: _.Many<_.PropertyName>) => any>;
+    fp.methodOf(abcObject) as (path: _.Many<_.PropertyName>) => any;
 }
 
 // _.mixin
diff --git a/types/lodash/tsconfig.json b/types/lodash/tsconfig.json
index 5a160103d4..60a2e8323c 100644
--- a/types/lodash/tsconfig.json
+++ b/types/lodash/tsconfig.json
@@ -20,7 +20,305 @@
     "files": [
         "index.d.ts",
         "lodash-tests.ts",
+        "add.d.ts",
+        "after.d.ts",
+        "ary.d.ts",
+        "assign.d.ts",
+        "assignIn.d.ts",
+        "assignInWith.d.ts",
+        "assignWith.d.ts",
+        "at.d.ts",
+        "attempt.d.ts",
+        "before.d.ts",
+        "bind.d.ts",
+        "bindAll.d.ts",
+        "bindKey.d.ts",
+        "camelCase.d.ts",
+        "capitalize.d.ts",
+        "castArray.d.ts",
+        "ceil.d.ts",
+        "chain.d.ts",
+        "chunk.d.ts",
+        "clamp.d.ts",
+        "clone.d.ts",
+        "cloneDeep.d.ts",
+        "cloneDeepWith.d.ts",
+        "cloneWith.d.ts",
+        "compact.d.ts",
+        "concat.d.ts",
+        "cond.d.ts",
+        "conformsTo.d.ts",
+        "constant.d.ts",
+        "countBy.d.ts",
+        "create.d.ts",
+        "curry.d.ts",
+        "curryRight.d.ts",
+        "debounce.d.ts",
+        "deburr.d.ts",
+        "defaults.d.ts",
+        "defaultsDeep.d.ts",
+        "defaultTo.d.ts",
+        "defer.d.ts",
+        "delay.d.ts",
+        "difference.d.ts",
+        "differenceBy.d.ts",
+        "differenceWith.d.ts",
+        "divide.d.ts",
+        "drop.d.ts",
+        "dropRight.d.ts",
+        "dropRightWhile.d.ts",
+        "dropWhile.d.ts",
+        "each.d.ts",
+        "eachRight.d.ts",
+        "endsWith.d.ts",
+        "entries.d.ts",
+        "entriesIn.d.ts",
+        "eq.d.ts",
+        "escape.d.ts",
+        "escapeRegExp.d.ts",
+        "every.d.ts",
+        "extend.d.ts",
+        "extendWith.d.ts",
+        "fill.d.ts",
+        "filter.d.ts",
+        "find.d.ts",
+        "findIndex.d.ts",
+        "findKey.d.ts",
+        "findLast.d.ts",
+        "findLastIndex.d.ts",
+        "findLastKey.d.ts",
+        "first.d.ts",
+        "flatMap.d.ts",
+        "flatMapDeep.d.ts",
+        "flatMapDepth.d.ts",
+        "flatten.d.ts",
+        "flattenDeep.d.ts",
+        "flattenDepth.d.ts",
+        "flip.d.ts",
+        "floor.d.ts",
+        "flow.d.ts",
+        "flowRight.d.ts",
+        "forEach.d.ts",
+        "forEachRight.d.ts",
+        "forIn.d.ts",
+        "forInRight.d.ts",
+        "forOwn.d.ts",
+        "forOwnRight.d.ts",
         "fp.d.ts",
+        "fromPairs.d.ts",
+        "functions.d.ts",
+        "functionsIn.d.ts",
+        "get.d.ts",
+        "groupBy.d.ts",
+        "gt.d.ts",
+        "gte.d.ts",
+        "has.d.ts",
+        "hasIn.d.ts",
+        "head.d.ts",
+        "identity.d.ts",
+        "includes.d.ts",
+        "indexOf.d.ts",
+        "initial.d.ts",
+        "inRange.d.ts",
+        "intersection.d.ts",
+        "intersectionBy.d.ts",
+        "intersectionWith.d.ts",
+        "invert.d.ts",
+        "invertBy.d.ts",
+        "invoke.d.ts",
+        "invokeMap.d.ts",
+        "isArguments.d.ts",
+        "isArray.d.ts",
+        "isArrayBuffer.d.ts",
+        "isArrayLike.d.ts",
+        "isArrayLikeObject.d.ts",
+        "isBoolean.d.ts",
+        "isBuffer.d.ts",
+        "isDate.d.ts",
+        "isElement.d.ts",
+        "isEmpty.d.ts",
+        "isEqual.d.ts",
+        "isEqualWith.d.ts",
+        "isError.d.ts",
+        "isFinite.d.ts",
+        "isFunction.d.ts",
+        "isInteger.d.ts",
+        "isLength.d.ts",
+        "isMap.d.ts",
+        "isMatch.d.ts",
+        "isMatchWith.d.ts",
+        "isNaN.d.ts",
+        "isNative.d.ts",
+        "isNil.d.ts",
+        "isNull.d.ts",
+        "isNumber.d.ts",
+        "isObject.d.ts",
+        "isObjectLike.d.ts",
+        "isPlainObject.d.ts",
+        "isRegExp.d.ts",
+        "isSafeInteger.d.ts",
+        "isSet.d.ts",
+        "isString.d.ts",
+        "isSymbol.d.ts",
+        "isTypedArray.d.ts",
+        "isUndefined.d.ts",
+        "isWeakMap.d.ts",
+        "isWeakSet.d.ts",
+        "iteratee.d.ts",
+        "join.d.ts",
+        "kebabCase.d.ts",
+        "keyBy.d.ts",
+        "keys.d.ts",
+        "keysIn.d.ts",
+        "last.d.ts",
+        "lastIndexOf.d.ts",
+        "lowerCase.d.ts",
+        "lowerFirst.d.ts",
+        "lt.d.ts",
+        "lte.d.ts",
+        "map.d.ts",
+        "mapKeys.d.ts",
+        "mapValues.d.ts",
+        "matches.d.ts",
+        "matchesProperty.d.ts",
+        "max.d.ts",
+        "maxBy.d.ts",
+        "mean.d.ts",
+        "meanBy.d.ts",
+        "memoize.d.ts",
+        "merge.d.ts",
+        "mergeWith.d.ts",
+        "method.d.ts",
+        "methodOf.d.ts",
+        "min.d.ts",
+        "minBy.d.ts",
+        "mixin.d.ts",
+        "negate.d.ts",
+        "noConflict.d.ts",
+        "noop.d.ts",
+        "now.d.ts",
+        "nth.d.ts",
+        "nthArg.d.ts",
+        "omit.d.ts",
+        "omitBy.d.ts",
+        "once.d.ts",
+        "orderBy.d.ts",
+        "over.d.ts",
+        "overArgs.d.ts",
+        "overEvery.d.ts",
+        "overSome.d.ts",
+        "pad.d.ts",
+        "padEnd.d.ts",
+        "padStart.d.ts",
+        "parseInt.d.ts",
+        "partial.d.ts",
+        "partialRight.d.ts",
+        "partition.d.ts",
+        "pick.d.ts",
+        "pickBy.d.ts",
+        "property.d.ts",
+        "propertyOf.d.ts",
+        "pull.d.ts",
+        "pullAll.d.ts",
+        "pullAllBy.d.ts",
+        "pullAllWith.d.ts",
+        "pullAt.d.ts",
+        "random.d.ts",
+        "range.d.ts",
+        "rangeRight.d.ts",
+        "rearg.d.ts",
+        "reduce.d.ts",
+        "reduceRight.d.ts",
+        "reject.d.ts",
+        "remove.d.ts",
+        "repeat.d.ts",
+        "replace.d.ts",
+        "rest.d.ts",
+        "result.d.ts",
+        "reverse.d.ts",
+        "round.d.ts",
+        "runInContext.d.ts",
+        "sample.d.ts",
+        "sampleSize.d.ts",
+        "set.d.ts",
+        "setWith.d.ts",
+        "shuffle.d.ts",
+        "size.d.ts",
+        "slice.d.ts",
+        "snakeCase.d.ts",
+        "some.d.ts",
+        "sortBy.d.ts",
+        "sortedIndex.d.ts",
+        "sortedIndexBy.d.ts",
+        "sortedIndexOf.d.ts",
+        "sortedLastIndex.d.ts",
+        "sortedLastIndexBy.d.ts",
+        "sortedLastIndexOf.d.ts",
+        "sortedUniq.d.ts",
+        "sortedUniqBy.d.ts",
+        "split.d.ts",
+        "spread.d.ts",
+        "startCase.d.ts",
+        "startsWith.d.ts",
+        "subtract.d.ts",
+        "sum.d.ts",
+        "sumBy.d.ts",
+        "tail.d.ts",
+        "take.d.ts",
+        "takeRight.d.ts",
+        "takeRightWhile.d.ts",
+        "takeWhile.d.ts",
+        "tap.d.ts",
+        "template.d.ts",
+        "throttle.d.ts",
+        "thru.d.ts",
+        "times.d.ts",
+        "toArray.d.ts",
+        "toFinite.d.ts",
+        "toInteger.d.ts",
+        "toLength.d.ts",
+        "toLower.d.ts",
+        "toNumber.d.ts",
+        "toPairs.d.ts",
+        "toPairsIn.d.ts",
+        "toPath.d.ts",
+        "toPlainObject.d.ts",
+        "toSafeInteger.d.ts",
+        "toString.d.ts",
+        "toUpper.d.ts",
+        "transform.d.ts",
+        "trim.d.ts",
+        "trimEnd.d.ts",
+        "trimStart.d.ts",
+        "truncate.d.ts",
+        "unary.d.ts",
+        "unescape.d.ts",
+        "union.d.ts",
+        "unionBy.d.ts",
+        "unionWith.d.ts",
+        "uniq.d.ts",
+        "uniqBy.d.ts",
+        "uniqueId.d.ts",
+        "uniqWith.d.ts",
+        "unset.d.ts",
+        "unzip.d.ts",
+        "unzipWith.d.ts",
+        "update.d.ts",
+        "updateWith.d.ts",
+        "upperCase.d.ts",
+        "upperFirst.d.ts",
+        "values.d.ts",
+        "valuesIn.d.ts",
+        "without.d.ts",
+        "words.d.ts",
+        "wrap.d.ts",
+        "xor.d.ts",
+        "xorBy.d.ts",
+        "xorWith.d.ts",
+        "zip.d.ts",
+        "zipObject.d.ts",
+        "zipObjectDeep.d.ts",
+        "zipWith.d.ts",
         "common/array.d.ts",
         "common/collection.d.ts",
         "common/common.d.ts",
@@ -32,6 +330,392 @@
         "common/object.d.ts",
         "common/seq.d.ts",
         "common/string.d.ts",
-        "common/util.d.ts"
+        "common/util.d.ts",
+        "fp/convert.d.ts",
+        "fp/add.d.ts",
+        "fp/after.d.ts",
+        "fp/all.d.ts",
+        "fp/allPass.d.ts",
+        "fp/always.d.ts",
+        "fp/any.d.ts",
+        "fp/anyPass.d.ts",
+        "fp/apply.d.ts",
+        "fp/ary.d.ts",
+        "fp/assign.d.ts",
+        "fp/assignAll.d.ts",
+        "fp/assignAllWith.d.ts",
+        "fp/assignIn.d.ts",
+        "fp/assignInAll.d.ts",
+        "fp/assignInAllWith.d.ts",
+        "fp/assignInWith.d.ts",
+        "fp/assignWith.d.ts",
+        "fp/assoc.d.ts",
+        "fp/assocPath.d.ts",
+        "fp/at.d.ts",
+        "fp/attempt.d.ts",
+        "fp/before.d.ts",
+        "fp/bind.d.ts",
+        "fp/bindAll.d.ts",
+        "fp/bindKey.d.ts",
+        "fp/camelCase.d.ts",
+        "fp/capitalize.d.ts",
+        "fp/castArray.d.ts",
+        "fp/ceil.d.ts",
+        "fp/chunk.d.ts",
+        "fp/clamp.d.ts",
+        "fp/clone.d.ts",
+        "fp/cloneDeep.d.ts",
+        "fp/cloneDeepWith.d.ts",
+        "fp/cloneWith.d.ts",
+        "fp/compact.d.ts",
+        "fp/complement.d.ts",
+        "fp/compose.d.ts",
+        "fp/concat.d.ts",
+        "fp/cond.d.ts",
+        "fp/conforms.d.ts",
+        "fp/conformsTo.d.ts",
+        "fp/constant.d.ts",
+        "fp/contains.d.ts",
+        "fp/countBy.d.ts",
+        "fp/create.d.ts",
+        "fp/curry.d.ts",
+        "fp/curryN.d.ts",
+        "fp/curryRight.d.ts",
+        "fp/curryRightN.d.ts",
+        "fp/debounce.d.ts",
+        "fp/deburr.d.ts",
+        "fp/defaults.d.ts",
+        "fp/defaultsAll.d.ts",
+        "fp/defaultsDeep.d.ts",
+        "fp/defaultsDeepAll.d.ts",
+        "fp/defaultTo.d.ts",
+        "fp/defer.d.ts",
+        "fp/delay.d.ts",
+        "fp/difference.d.ts",
+        "fp/differenceBy.d.ts",
+        "fp/differenceWith.d.ts",
+        "fp/dissoc.d.ts",
+        "fp/dissocPath.d.ts",
+        "fp/divide.d.ts",
+        "fp/drop.d.ts",
+        "fp/dropLast.d.ts",
+        "fp/dropLastWhile.d.ts",
+        "fp/dropRight.d.ts",
+        "fp/dropRightWhile.d.ts",
+        "fp/dropWhile.d.ts",
+        "fp/each.d.ts",
+        "fp/eachRight.d.ts",
+        "fp/endsWith.d.ts",
+        "fp/entries.d.ts",
+        "fp/entriesIn.d.ts",
+        "fp/eq.d.ts",
+        "fp/equals.d.ts",
+        "fp/escape.d.ts",
+        "fp/escapeRegExp.d.ts",
+        "fp/every.d.ts",
+        "fp/extend.d.ts",
+        "fp/extendAll.d.ts",
+        "fp/extendAllWith.d.ts",
+        "fp/extendWith.d.ts",
+        "fp/F.d.ts",
+        "fp/fill.d.ts",
+        "fp/filter.d.ts",
+        "fp/find.d.ts",
+        "fp/findFrom.d.ts",
+        "fp/findIndex.d.ts",
+        "fp/findIndexFrom.d.ts",
+        "fp/findKey.d.ts",
+        "fp/findLast.d.ts",
+        "fp/findLastFrom.d.ts",
+        "fp/findLastIndex.d.ts",
+        "fp/findLastIndexFrom.d.ts",
+        "fp/findLastKey.d.ts",
+        "fp/first.d.ts",
+        "fp/flatMap.d.ts",
+        "fp/flatMapDeep.d.ts",
+        "fp/flatMapDepth.d.ts",
+        "fp/flatten.d.ts",
+        "fp/flattenDeep.d.ts",
+        "fp/flattenDepth.d.ts",
+        "fp/flip.d.ts",
+        "fp/floor.d.ts",
+        "fp/flow.d.ts",
+        "fp/flowRight.d.ts",
+        "fp/forEach.d.ts",
+        "fp/forEachRight.d.ts",
+        "fp/forIn.d.ts",
+        "fp/forInRight.d.ts",
+        "fp/forOwn.d.ts",
+        "fp/forOwnRight.d.ts",
+        "fp/fromPairs.d.ts",
+        "fp/functions.d.ts",
+        "fp/functionsIn.d.ts",
+        "fp/get.d.ts",
+        "fp/getOr.d.ts",
+        "fp/groupBy.d.ts",
+        "fp/gt.d.ts",
+        "fp/gte.d.ts",
+        "fp/has.d.ts",
+        "fp/hasIn.d.ts",
+        "fp/head.d.ts",
+        "fp/identical.d.ts",
+        "fp/identity.d.ts",
+        "fp/includes.d.ts",
+        "fp/includesFrom.d.ts",
+        "fp/indexBy.d.ts",
+        "fp/indexOf.d.ts",
+        "fp/indexOfFrom.d.ts",
+        "fp/init.d.ts",
+        "fp/initial.d.ts",
+        "fp/inRange.d.ts",
+        "fp/intersection.d.ts",
+        "fp/intersectionBy.d.ts",
+        "fp/intersectionWith.d.ts",
+        "fp/invert.d.ts",
+        "fp/invertBy.d.ts",
+        "fp/invertObj.d.ts",
+        "fp/invoke.d.ts",
+        "fp/invokeArgs.d.ts",
+        "fp/invokeArgsMap.d.ts",
+        "fp/invokeMap.d.ts",
+        "fp/isArguments.d.ts",
+        "fp/isArray.d.ts",
+        "fp/isArrayBuffer.d.ts",
+        "fp/isArrayLike.d.ts",
+        "fp/isArrayLikeObject.d.ts",
+        "fp/isBoolean.d.ts",
+        "fp/isBuffer.d.ts",
+        "fp/isDate.d.ts",
+        "fp/isElement.d.ts",
+        "fp/isEmpty.d.ts",
+        "fp/isEqual.d.ts",
+        "fp/isEqualWith.d.ts",
+        "fp/isError.d.ts",
+        "fp/isFinite.d.ts",
+        "fp/isFunction.d.ts",
+        "fp/isInteger.d.ts",
+        "fp/isLength.d.ts",
+        "fp/isMap.d.ts",
+        "fp/isMatch.d.ts",
+        "fp/isMatchWith.d.ts",
+        "fp/isNaN.d.ts",
+        "fp/isNative.d.ts",
+        "fp/isNil.d.ts",
+        "fp/isNull.d.ts",
+        "fp/isNumber.d.ts",
+        "fp/isObject.d.ts",
+        "fp/isObjectLike.d.ts",
+        "fp/isPlainObject.d.ts",
+        "fp/isRegExp.d.ts",
+        "fp/isSafeInteger.d.ts",
+        "fp/isSet.d.ts",
+        "fp/isString.d.ts",
+        "fp/isSymbol.d.ts",
+        "fp/isTypedArray.d.ts",
+        "fp/isUndefined.d.ts",
+        "fp/isWeakMap.d.ts",
+        "fp/isWeakSet.d.ts",
+        "fp/iteratee.d.ts",
+        "fp/join.d.ts",
+        "fp/juxt.d.ts",
+        "fp/kebabCase.d.ts",
+        "fp/keyBy.d.ts",
+        "fp/keys.d.ts",
+        "fp/keysIn.d.ts",
+        "fp/last.d.ts",
+        "fp/lastIndexOf.d.ts",
+        "fp/lastIndexOfFrom.d.ts",
+        "fp/lowerCase.d.ts",
+        "fp/lowerFirst.d.ts",
+        "fp/lt.d.ts",
+        "fp/lte.d.ts",
+        "fp/map.d.ts",
+        "fp/mapKeys.d.ts",
+        "fp/mapValues.d.ts",
+        "fp/matches.d.ts",
+        "fp/matchesProperty.d.ts",
+        "fp/max.d.ts",
+        "fp/maxBy.d.ts",
+        "fp/mean.d.ts",
+        "fp/meanBy.d.ts",
+        "fp/memoize.d.ts",
+        "fp/merge.d.ts",
+        "fp/mergeAll.d.ts",
+        "fp/mergeAllWith.d.ts",
+        "fp/mergeWith.d.ts",
+        "fp/method.d.ts",
+        "fp/methodOf.d.ts",
+        "fp/min.d.ts",
+        "fp/minBy.d.ts",
+        "fp/multiply.d.ts",
+        "fp/nAry.d.ts",
+        "fp/negate.d.ts",
+        "fp/noConflict.d.ts",
+        "fp/noop.d.ts",
+        "fp/now.d.ts",
+        "fp/nth.d.ts",
+        "fp/nthArg.d.ts",
+        "fp/omit.d.ts",
+        "fp/omitAll.d.ts",
+        "fp/omitBy.d.ts",
+        "fp/once.d.ts",
+        "fp/orderBy.d.ts",
+        "fp/over.d.ts",
+        "fp/overArgs.d.ts",
+        "fp/overEvery.d.ts",
+        "fp/overSome.d.ts",
+        "fp/pad.d.ts",
+        "fp/padChars.d.ts",
+        "fp/padCharsEnd.d.ts",
+        "fp/padCharsStart.d.ts",
+        "fp/padEnd.d.ts",
+        "fp/padStart.d.ts",
+        "fp/parseInt.d.ts",
+        "fp/partial.d.ts",
+        "fp/partialRight.d.ts",
+        "fp/partition.d.ts",
+        "fp/path.d.ts",
+        "fp/pathEq.d.ts",
+        "fp/pathOr.d.ts",
+        "fp/paths.d.ts",
+        "fp/pick.d.ts",
+        "fp/pickAll.d.ts",
+        "fp/pickBy.d.ts",
+        "fp/pipe.d.ts",
+        "fp/pluck.d.ts",
+        "fp/prop.d.ts",
+        "fp/propEq.d.ts",
+        "fp/property.d.ts",
+        "fp/propertyOf.d.ts",
+        "fp/propOr.d.ts",
+        "fp/props.d.ts",
+        "fp/pull.d.ts",
+        "fp/pullAll.d.ts",
+        "fp/pullAllBy.d.ts",
+        "fp/pullAllWith.d.ts",
+        "fp/pullAt.d.ts",
+        "fp/random.d.ts",
+        "fp/range.d.ts",
+        "fp/rangeRight.d.ts",
+        "fp/rangeStep.d.ts",
+        "fp/rangeStepRight.d.ts",
+        "fp/rearg.d.ts",
+        "fp/reduce.d.ts",
+        "fp/reduceRight.d.ts",
+        "fp/reject.d.ts",
+        "fp/remove.d.ts",
+        "fp/repeat.d.ts",
+        "fp/replace.d.ts",
+        "fp/rest.d.ts",
+        "fp/restFrom.d.ts",
+        "fp/result.d.ts",
+        "fp/reverse.d.ts",
+        "fp/round.d.ts",
+        "fp/runInContext.d.ts",
+        "fp/sample.d.ts",
+        "fp/sampleSize.d.ts",
+        "fp/set.d.ts",
+        "fp/setWith.d.ts",
+        "fp/shuffle.d.ts",
+        "fp/size.d.ts",
+        "fp/slice.d.ts",
+        "fp/snakeCase.d.ts",
+        "fp/some.d.ts",
+        "fp/sortBy.d.ts",
+        "fp/sortedIndex.d.ts",
+        "fp/sortedIndexBy.d.ts",
+        "fp/sortedIndexOf.d.ts",
+        "fp/sortedLastIndex.d.ts",
+        "fp/sortedLastIndexBy.d.ts",
+        "fp/sortedLastIndexOf.d.ts",
+        "fp/sortedUniq.d.ts",
+        "fp/sortedUniqBy.d.ts",
+        "fp/split.d.ts",
+        "fp/spread.d.ts",
+        "fp/spreadFrom.d.ts",
+        "fp/startCase.d.ts",
+        "fp/startsWith.d.ts",
+        "fp/stubArray.d.ts",
+        "fp/stubFalse.d.ts",
+        "fp/stubObject.d.ts",
+        "fp/stubString.d.ts",
+        "fp/stubTrue.d.ts",
+        "fp/subtract.d.ts",
+        "fp/sum.d.ts",
+        "fp/sumBy.d.ts",
+        "fp/symmetricDifference.d.ts",
+        "fp/symmetricDifferenceBy.d.ts",
+        "fp/symmetricDifferenceWith.d.ts",
+        "fp/T.d.ts",
+        "fp/tail.d.ts",
+        "fp/take.d.ts",
+        "fp/takeLast.d.ts",
+        "fp/takeLastWhile.d.ts",
+        "fp/takeRight.d.ts",
+        "fp/takeRightWhile.d.ts",
+        "fp/takeWhile.d.ts",
+        "fp/tap.d.ts",
+        "fp/template.d.ts",
+        "fp/throttle.d.ts",
+        "fp/thru.d.ts",
+        "fp/times.d.ts",
+        "fp/toArray.d.ts",
+        "fp/toFinite.d.ts",
+        "fp/toInteger.d.ts",
+        "fp/toLength.d.ts",
+        "fp/toLower.d.ts",
+        "fp/toNumber.d.ts",
+        "fp/toPairs.d.ts",
+        "fp/toPairsIn.d.ts",
+        "fp/toPath.d.ts",
+        "fp/toPlainObject.d.ts",
+        "fp/toSafeInteger.d.ts",
+        "fp/toString.d.ts",
+        "fp/toUpper.d.ts",
+        "fp/transform.d.ts",
+        "fp/trim.d.ts",
+        "fp/trimChars.d.ts",
+        "fp/trimCharsEnd.d.ts",
+        "fp/trimCharsStart.d.ts",
+        "fp/trimEnd.d.ts",
+        "fp/trimStart.d.ts",
+        "fp/truncate.d.ts",
+        "fp/unapply.d.ts",
+        "fp/unary.d.ts",
+        "fp/unescape.d.ts",
+        "fp/union.d.ts",
+        "fp/unionBy.d.ts",
+        "fp/unionWith.d.ts",
+        "fp/uniq.d.ts",
+        "fp/uniqBy.d.ts",
+        "fp/uniqueId.d.ts",
+        "fp/uniqWith.d.ts",
+        "fp/unnest.d.ts",
+        "fp/unset.d.ts",
+        "fp/unzip.d.ts",
+        "fp/unzipWith.d.ts",
+        "fp/update.d.ts",
+        "fp/updateWith.d.ts",
+        "fp/upperCase.d.ts",
+        "fp/upperFirst.d.ts",
+        "fp/useWith.d.ts",
+        "fp/values.d.ts",
+        "fp/valuesIn.d.ts",
+        "fp/where.d.ts",
+        "fp/whereEq.d.ts",
+        "fp/without.d.ts",
+        "fp/words.d.ts",
+        "fp/wrap.d.ts",
+        "fp/xor.d.ts",
+        "fp/xorBy.d.ts",
+        "fp/xorWith.d.ts",
+        "fp/zip.d.ts",
+        "fp/zipAll.d.ts",
+        "fp/zipObj.d.ts",
+        "fp/zipObject.d.ts",
+        "fp/zipObjectDeep.d.ts",
+        "fp/zipWith.d.ts",
+        "fp/__.d.ts",
+        "fp/placeholder.d.ts"
     ]
 }
\ No newline at end of file

From cef224b43ff060c8f5192aae022079c1a0841f66 Mon Sep 17 00:00:00 2001
From: Eugene Arshinov <earshinov@gmail.com>
Date: Sat, 12 May 2018 18:55:15 +0300
Subject: [PATCH 068/575] Fix return type of `CKEDITOR.dom.element.getBogus`

Dcoumentation link:
https://docs.ckeditor.com/ckeditor4/latest/api/CKEDITOR_dom_element.html#method-getBogus
---
 types/ckeditor/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/ckeditor/index.d.ts b/types/ckeditor/index.d.ts
index 3370479bff..ccc58b7f71 100644
--- a/types/ckeditor/index.d.ts
+++ b/types/ckeditor/index.d.ts
@@ -224,7 +224,7 @@ declare namespace CKEDITOR {
             focusPrevious(ignoreChildren?: boolean, indexToUse?: number): void;
             forEach(callback: (node: node) => void, type?: number, skipRoot?: boolean): void;
             getAttribute(name: string): string;
-            getBogus(): Object;
+            getBogus(): node|false;
             getChild(indices: number): node;
             getChild(indices: number[]): node;
             getChildCount(): number;

From 96f741e68e340519255615c75b208f4a201fb729 Mon Sep 17 00:00:00 2001
From: Bruno Lemos <brunohplemos@gmail.com>
Date: Sat, 12 May 2018 16:25:32 -0300
Subject: [PATCH 069/575] [react-native] Add missing fields on ViewStyle

---
 types/react-native/index.d.ts | 62 +++++++++++++----------------------
 1 file changed, 23 insertions(+), 39 deletions(-)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 756ef2b340..47b256089b 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -542,7 +542,7 @@ type FlexAlignType = "flex-start" | "flex-end" | "center" | "stretch" | "baselin
  * Flex Prop Types
  * @see https://facebook.github.io/react-native/docs/flexbox.html#proptypes
  * @see https://facebook.github.io/react-native/docs/layout-props.html
- * @see LayoutPropTypes.js
+ * @see https://github.com/facebook/react-native/blob/master/Libraries/StyleSheet/LayoutPropTypes.js
  */
 export interface FlexStyle {
     alignContent?: "flex-start" | "flex-end" | "center" | "stretch" | "space-between" | "space-around";
@@ -608,7 +608,7 @@ export interface FlexStyle {
 /**
  * Layout Prop Types
  * @see https://facebook.github.io/react-native/docs/layout-props.html
- * @see LayoutPropTypes.js
+ * @see https://github.com/facebook/react-native/blob/master/Libraries/StyleSheet/LayoutPropTypes.js
  */
 export interface LayoutProps extends FlexStyle {}
 
@@ -1578,32 +1578,43 @@ export interface GestureResponderHandlers {
 }
 
 // @see https://facebook.github.io/react-native/docs/view.html#style
-export interface ViewStyle extends FlexStyle, TransformsStyle {
+export interface ViewStyle extends FlexStyle, ShadowStyleIOS, TransformsStyle {
     backfaceVisibility?: "visible" | "hidden";
     backgroundColor?: string;
     borderBottomColor?: string;
+    borderBottomEndRadius?: number;
     borderBottomLeftRadius?: number;
     borderBottomRightRadius?: number;
+    borderBottomStartRadius?: number;
     borderBottomWidth?: number;
     borderColor?: string;
+    borderEndColor?: string;
     borderLeftColor?: string;
+    borderLeftWidth?: number;
     borderRadius?: number;
     borderRightColor?: string;
     borderRightWidth?: number;
+    borderStartColor?: string;
     borderStyle?: "solid" | "dotted" | "dashed";
     borderTopColor?: string;
+    borderTopEndRadius?: number;
     borderTopLeftRadius?: number;
     borderTopRightRadius?: number;
+    borderTopStartRadius?: number;
     borderTopWidth?: number;
-    display?: "none" | "flex";
+    borderWidth?: number;
     opacity?: number;
     overflow?: "visible" | "hidden";
-    shadowColor?: string;
-    shadowOffset?: { width: number; height: number };
-    shadowOpacity?: number;
-    shadowRadius?: number;
-    elevation?: number;
     testID?: string;
+    /**
+      * Sets the elevation of a view, using Android's underlying
+      * [elevation API](https://developer.android.com/training/material/shadows-clipping.html#Elevation).
+      * This adds a drop shadow to the item and affects z-order for overlapping views.
+      * Only supported on Android 5.0+, has no effect on earlier versions.
+      *
+      * @platform android
+      */
+    elevation?: number;
 }
 
 export interface ViewPropsIOS {
@@ -3230,8 +3241,9 @@ export interface ShadowStyleIOS {
 /**
  * Image style
  * @see https://facebook.github.io/react-native/docs/image.html#style
+ * @see https://github.com/facebook/react-native/blob/master/Libraries/Image/ImageStylePropTypes.js
  */
-export interface ImageStyle extends FlexStyle, TransformsStyle, ShadowStyleIOS {
+export interface ImageStyle extends FlexStyle, ShadowStyleIOS, TransformsStyle {
     resizeMode?: ImageResizeMode;
     backfaceVisibility?: "visible" | "hidden";
     borderBottomLeftRadius?: number;
@@ -5462,34 +5474,6 @@ export interface InteractionManagerStatic extends EventEmitterListener {
     setDeadline(deadline: number): void;
 }
 
-export interface ScrollViewStyle extends FlexStyle, TransformsStyle {
-    backfaceVisibility?: "visible" | "hidden";
-    backgroundColor?: string;
-    borderColor?: string;
-    borderTopColor?: string;
-    borderRightColor?: string;
-    borderBottomColor?: string;
-    borderLeftColor?: string;
-    borderRadius?: number;
-    borderTopLeftRadius?: number;
-    borderTopRightRadius?: number;
-    borderBottomLeftRadius?: number;
-    borderBottomRightRadius?: number;
-    borderStyle?: "solid" | "dotted" | "dashed";
-    borderWidth?: number;
-    borderTopWidth?: number;
-    borderRightWidth?: number;
-    borderBottomWidth?: number;
-    borderLeftWidth?: number;
-    opacity?: number;
-    overflow?: "visible" | "hidden";
-    shadowColor?: string;
-    shadowOffset?: { width: number; height: number };
-    shadowOpacity?: number;
-    shadowRadius?: number;
-    elevation?: number;
-}
-
 export interface ScrollResponderEvent extends NativeSyntheticEvent<NativeTouchEvent> {}
 
 interface ScrollResponderMixin extends SubscribableMixin {
@@ -6058,7 +6042,7 @@ export interface ScrollViewProps
     /**
      * Style
      */
-    style?: StyleProp<ScrollViewStyle>;
+    style?: StyleProp<ViewStyle>;
 
     /**
      * A RefreshControl component, used to provide pull-to-refresh

From 8cc6c8d931150740b3b8c0a1f446ad03f506521f Mon Sep 17 00:00:00 2001
From: Bruno Lemos <brunohplemos@gmail.com>
Date: Sat, 12 May 2018 16:36:41 -0300
Subject: [PATCH 070/575] [react-native] Make ViewProps extends ViewStyle

https://github.com/facebook/react-native/blob/master/Libraries/Components/View/ViewStylePropTypes.js
---
 types/react-native/index.d.ts | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 47b256089b..61f15c086c 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -604,14 +604,6 @@ export interface FlexStyle {
     direction?: "inherit" | "ltr" | "rtl";
 }
 
-
-/**
- * Layout Prop Types
- * @see https://facebook.github.io/react-native/docs/layout-props.html
- * @see https://github.com/facebook/react-native/blob/master/Libraries/StyleSheet/LayoutPropTypes.js
- */
-export interface LayoutProps extends FlexStyle {}
-
 /**
  * @see ShadowPropTypesIOS.js
  */
@@ -1577,7 +1569,10 @@ export interface GestureResponderHandlers {
     onMoveShouldSetResponderCapture?: (event: GestureResponderEvent) => boolean;
 }
 
-// @see https://facebook.github.io/react-native/docs/view.html#style
+/**
+ * @see https://facebook.github.io/react-native/docs/view.html#style
+ * @see https://github.com/facebook/react-native/blob/master/Libraries/Components/View/ViewStylePropTypes.js
+ */
 export interface ViewStyle extends FlexStyle, ShadowStyleIOS, TransformsStyle {
     backfaceVisibility?: "visible" | "hidden";
     backgroundColor?: string;
@@ -1684,6 +1679,7 @@ export interface ViewPropsAndroid {
     renderToHardwareTextureAndroid?: boolean;
 }
 
+
 type Falsy = undefined | null | false;
 interface RecursiveArray<T> extends Array<T | RecursiveArray<T>> {}
 /** Keep a brand of 'T' so that calls to `StyleSheet.flatten` can take `RegisteredStyle<T>` and return `T`. */
@@ -1783,7 +1779,7 @@ type AccessibilityTraits =
  * @see https://facebook.github.io/react-native/docs/view.html#props
  */
 export interface ViewProps
-    extends ViewPropsAndroid, ViewPropsIOS, GestureResponderHandlers, Touchable, AccessibilityProps, LayoutProps {
+    extends ViewPropsAndroid, ViewPropsIOS, GestureResponderHandlers, Touchable, AccessibilityProps, ViewStyle {
     /**
      * This defines how far a touch event can start away from the view.
      * Typical interface guidelines recommend touch targets that are at least
@@ -3390,7 +3386,7 @@ export type ImageSourcePropType = ImageURISource | ImageURISource[] | ImageRequi
 /**
  * @see https://facebook.github.io/react-native/docs/image.html
  */
-export interface ImageProps extends ImagePropsIOS, ImagePropsAndroid, AccessibilityProps, LayoutProps {
+export interface ImageProps extends ImagePropsIOS, ImagePropsAndroid, AccessibilityProps, ViewStyle {
     /**
      * onLayout function
      *

From 27646c6d509b78b2813dd631d20ab48afebe46ff Mon Sep 17 00:00:00 2001
From: Bruno Lemos <brunohplemos@gmail.com>
Date: Sat, 12 May 2018 17:20:09 -0300
Subject: [PATCH 071/575] [react-native] Remove references of ScrollViewStyle

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

diff --git a/types/react-native-snap-carousel/index.d.ts b/types/react-native-snap-carousel/index.d.ts
index 4b54a480f6..5b5406f6fa 100644
--- a/types/react-native-snap-carousel/index.d.ts
+++ b/types/react-native-snap-carousel/index.d.ts
@@ -14,7 +14,6 @@ import {
     NativeScrollEvent,
     StyleProp,
     ScrollViewProps,
-    ScrollViewStyle,
     ViewStyle,
     ImageProps,
     FlatListProps
@@ -180,11 +179,11 @@ export interface CarouselProps<T> extends React.Props<ScrollViewProps> {
     /**
      * Optional styles for Scrollview's global wrapper
      */
-    containerCustomStyle?: StyleProp<ScrollViewStyle>;
+    containerCustomStyle?: StyleProp<ViewStyle>;
     /**
      * Optional styles for Scrollview's items container
      */
-    contentContainerCustomStyle?: StyleProp<ScrollViewStyle>;
+    contentContainerCustomStyle?: StyleProp<ViewStyle>;
     /**
      * Value of the opacity effect applied to inactive slides
      */

From 3d7e710e5f770db12ceadd1b2ca8f43956f0b4c8 Mon Sep 17 00:00:00 2001
From: Bruno Lemos <brunohplemos@gmail.com>
Date: Sat, 12 May 2018 17:37:19 -0300
Subject: [PATCH 072/575] [react-native] Make View overflow support scroll
 value

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 61f15c086c..63f3157dfc 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -1599,7 +1599,6 @@ export interface ViewStyle extends FlexStyle, ShadowStyleIOS, TransformsStyle {
     borderTopWidth?: number;
     borderWidth?: number;
     opacity?: number;
-    overflow?: "visible" | "hidden";
     testID?: string;
     /**
       * Sets the elevation of a view, using Android's underlying
@@ -3386,7 +3385,7 @@ export type ImageSourcePropType = ImageURISource | ImageURISource[] | ImageRequi
 /**
  * @see https://facebook.github.io/react-native/docs/image.html
  */
-export interface ImageProps extends ImagePropsIOS, ImagePropsAndroid, AccessibilityProps, ViewStyle {
+export interface ImagePropsBase extends ImagePropsIOS, ImagePropsAndroid, AccessibilityProps, ViewStyle {
     /**
      * onLayout function
      *
@@ -3491,16 +3490,18 @@ export interface ImageProps extends ImagePropsIOS, ImagePropsAndroid, Accessibil
      */
     loadingIndicatorSource?: ImageURISource;
 
+    /**
+     * A unique identifier for this element to be used in UI Automation testing scripts.
+     */
+    testID?: string;
+}
+
+export interface ImageProps extends ImagePropsBase {
     /**
      *
      * Style
      */
     style?: StyleProp<ImageStyle>;
-
-    /**
-     * A unique identifier for this element to be used in UI Automation testing scripts.
-     */
-    testID?: string;
 }
 
 declare class ImageComponent extends React.Component<ImageProps> {}
@@ -3513,7 +3514,7 @@ export class Image extends ImageBase {
     queryCache?(urls: string[]): Promise<Map<string, "memory" | "disk">>;
 }
 
-export interface ImageBackgroundProps extends ImageProps {
+export interface ImageBackgroundProps extends ImagePropsBase {
     style?: StyleProp<ViewStyle>;
     imageStyle?: StyleProp<ImageStyle>;
 }

From a72c9959063eb9c62d39d99cb8e81809f7d046ed Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentl@theodo.fr>
Date: Sun, 13 May 2018 01:05:59 +0200
Subject: [PATCH 073/575] Add GlobalFetch / RequestInfo definitions

---
 types/react-native/globals.d.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/types/react-native/globals.d.ts b/types/react-native/globals.d.ts
index 92ae988ecb..2110ab7278 100644
--- a/types/react-native/globals.d.ts
+++ b/types/react-native/globals.d.ts
@@ -25,7 +25,11 @@ declare function fetchBundle(bundleId: number, callback: (error?: Error | null)
 // Fetch API
 //
 
-declare function fetch(input: Request | string, init?: RequestInit): Promise<Response>;
+declare interface GlobalFetch {
+  fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
+}
+
+declare function fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
 
 interface Blob {}
 
@@ -85,6 +89,8 @@ declare var Request: {
   new(input: Request | string, init?: RequestInit): Request;
 };
 
+declare type RequestInfo = Request | string;
+
 declare interface ResponseInit {
   headers?: HeadersInit_;
   status?: number;

From a11ee4ecf413c54cf7250d5ddab07e8bf10095c1 Mon Sep 17 00:00:00 2001
From: Seth Kingsley <sethk@meowfishies.com>
Date: Sun, 13 May 2018 01:18:33 -0700
Subject: [PATCH 074/575] Update some three.js types

---
 types/three/index.d.ts           |  1 +
 types/three/three-core.d.ts      | 44 +++++++++++++++++++-------------
 types/three/three-tgaloader.d.ts | 11 ++++++++
 3 files changed, 38 insertions(+), 18 deletions(-)
 create mode 100644 types/three/three-tgaloader.d.ts

diff --git a/types/three/index.d.ts b/types/three/index.d.ts
index 50450fd793..2c8d006589 100644
--- a/types/three/index.d.ts
+++ b/types/three/index.d.ts
@@ -28,6 +28,7 @@ export * from "./three-renderpass";
 export * from "./three-shaderpass";
 export * from "./three-smaapass";
 export * from "./three-filmpass";
+export * from "./three-tgaloader";
 export * from "./three-trackballcontrols";
 export * from "./three-transformcontrols";
 export * from "./three-vrcontrols";
diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 2487b117b1..c9b67f5c36 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -1015,8 +1015,8 @@ export class DirectGeometry extends EventDispatcher {
     uvs2: Vector2[];
     groups: {start: number, materialIndex: number}[];
     morphTargets: MorphTarget[];
-    skinWeights: number[];
-    skinIndices: number[];
+    skinWeights: Vector4[];
+    skinIndices: Vector4[];
     boundingBox: Box3;
     boundingSphere: Sphere;
     verticesNeedUpdate: boolean;
@@ -1270,12 +1270,12 @@ export class Geometry extends EventDispatcher {
     /**
      * Array of skinning weights, matching number and order of vertices.
      */
-    skinWeights: number[];
+    skinWeights: Vector4[];
 
     /**
      * Array of skinning indices, matching number and order of vertices.
      */
-    skinIndices: number[];
+    skinIndices: Vector4[];
 
     /**
      *
@@ -2151,7 +2151,7 @@ export class FileLoader {
     responseType: string;
     withCredentials: string;
 
-    load(url: string, onLoad?: (responseText: string) => void, onProgress?: (request: ProgressEvent) => void, onError?:(event: ErrorEvent) => void): any;
+    load(url: string, onLoad?: (response: string | ArrayBuffer) => void, onProgress?: (request: ProgressEvent) => void, onError?:(event: ErrorEvent) => void): any;
     setMimeType(mimeType: MimeType): FileLoader;
     setPath(path: string) : FileLoader;
     setResponseType(responseType: string) : FileLoader;
@@ -2209,7 +2209,7 @@ export class JSONLoader extends Loader {
 export class LoadingManager {
     constructor(onLoad?: () => void, onProgress?: (url: string, loaded: number, total: number) => void, onError?: () => void);
 
-    onStart: () => void;
+    onStart: (url: string, loaded: number, total: number) => void;
 
     /**
      * Will be called when load starts.
@@ -2227,7 +2227,9 @@ export class LoadingManager {
      * Will be called when each element in the scene completes loading.
      * The default is a function with empty body.
      */
-    onError: () => void;
+    onError: (url: string) => void;
+
+    setURLModifier(callback : (url: string) => string): void;
 
     itemStart(url: string): void;
     itemEnd(url: string): void;
@@ -2350,6 +2352,11 @@ export namespace Cache {
     export function clear(): void;
 }
 
+export class LoaderUtils {
+    static decodeText(array: Uint8Array): string;
+    static extractUrlBase(url: string): string;
+}
+
 // Materials //////////////////////////////////////////////////////////////////////////////////
 export let MaterialIdCount: number;
 
@@ -2900,24 +2907,24 @@ export class MeshPhongMaterial extends Material {
     color: Color;
     specular: Color;
     shininess: number;
-    map: Texture;
+    map?: Texture;
     lightMap: Texture;
     lightMapIntensity: number;
-    aoMap: Texture;
+    aoMap?: Texture;
     aoMapIntensity: number;
     emissive: Color;
     emissiveIntensity: number;
     emissiveMap: Texture;
-    bumpMap: Texture;
+    bumpMap?: Texture;
     bumpScale: number;
-    normalMap: Texture;
+    normalMap?: Texture;
     normalScale: Vector2;
     displacementMap: Texture;
     displacementScale: number;
     displacementBias: number;
-    specularMap: Texture;
-    alphaMap: Texture;
-    envMap: Texture;
+    specularMap?: Texture;
+    alphaMap?: Texture;
+    envMap?: Texture;
     combine: Combine;
     reflectivity: number;
     refractionRatio: number;
@@ -5020,9 +5027,7 @@ export class QuaternionLinearInterpolant extends Interpolant {
 // Objects //////////////////////////////////////////////////////////////////////////////////
 
 export class Bone extends Object3D {
-    constructor(skin: SkinnedMesh);
-
-    skin: SkinnedMesh;
+    constructor();
 }
 
 export class Group extends Object3D {
@@ -6132,6 +6137,9 @@ export class WebGLState {
     };
 
     init(): void;
+    texImage2D(target: number, level: number, internalformat: number,
+        width: number, height: number, border: number, format: number,
+        type: number, pixels?: ArrayBufferView | null): void;
     initAttributes(): void;
     enableAttribute(attribute: string): void;
     enableAttributeAndDivisor(attribute: string, meshPerAttribute: any, extension: any): void;
@@ -6139,7 +6147,7 @@ export class WebGLState {
     enable(id: string): void;
     disable(id: string): void;
     getCompressedTextureFormats(): any[];
-    setBlending(blending: number, blendEquation: number, blendSrc: number, blendDst: number, blendEquationAlpha: number, blendSrcAlpha: number, blendDstAlpha: number): void;
+    setBlending(blending: number, blendEquation?: number, blendSrc?: number, blendDst?: number, blendEquationAlpha?: number, blendSrcAlpha?: number, blendDstAlpha?: number, premultiplyAlpha?: boolean): void;
     setColorWrite(colorWrite: number): void;
     setDepthTest(depthTest: number): void;
     setDepthWrite(depthWrite: number): void;
diff --git a/types/three/three-tgaloader.d.ts b/types/three/three-tgaloader.d.ts
new file mode 100644
index 0000000000..cf25bad8dd
--- /dev/null
+++ b/types/three/three-tgaloader.d.ts
@@ -0,0 +1,11 @@
+// https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/TGALoader.js
+
+import { LoadingManager, Texture } from "./three-core";
+
+export class TGALoader {
+    constructor(manager?: LoadingManager);
+
+    manager: LoadingManager;
+
+    load(url: string, onLoad?: (texture: Texture) => void, onProgress?: (event: ProgressEvent) => void, onError?: (event: ErrorEvent) => void): Texture;
+}

From 72ade1444e92dfca78d412c4465d171e214e449b Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Sun, 13 May 2018 12:14:28 +0200
Subject: [PATCH 075/575] d3-color : moved hex at Color interface level

---
 types/d3-color/index.d.ts | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/types/d3-color/index.d.ts b/types/d3-color/index.d.ts
index 68dcf9e358..a616543bfe 100644
--- a/types/d3-color/index.d.ts
+++ b/types/d3-color/index.d.ts
@@ -38,6 +38,11 @@ export interface ColorCommonInstance {
 export interface Color {
     displayable(): boolean; // Note: While this method is used in prototyping for colors of specific colorspaces, it should not be called directly, as 'this.rgb' would not be implemented on Color
     toString(): string; // Note: While this method is used in prototyping for colors of specific colorspaces, it should not be called directly, as 'this.rgb' would not be implemented on Color
+    /**
+     * Returns a hexadecimal string representing this color.
+     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+     */
+    hex(): string;
 }
 
 export interface ColorFactory extends Function {
@@ -57,11 +62,6 @@ export interface RGBColor extends Color {
      * Returns the RGB equivalent of this color.
      */
     rgb(): this;
-    /**
-     * Returns a hexadecimal string representing this color.
-     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-     */
-    hex(): string;
 }
 
 export interface RGBColorFactory extends Function {
@@ -79,11 +79,6 @@ export interface HSLColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-    /**
-     * Returns a hexadecimal string representing this color.
-     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-     */
-    hex(): string;
 }
 
 export interface HSLColorFactory extends Function {
@@ -101,11 +96,6 @@ export interface LabColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-    /**
-     * Returns a hexadecimal string representing this color.
-     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-     */
-    hex(): string;
 }
 
 export interface LabColorFactory extends Function {
@@ -118,12 +108,13 @@ export interface LabColorFactory extends Function {
 /**
  * Constructs a new Lab color with the specified l value and a = b = 0.
  */
+export type GrayColorFactory = (l: number, opacity?: number) => LabColor;
+
+// Using the interface creates an error
 // export interface GrayColorFactory extends Function {
 //     (l: number, opacity?: number): LabColor;
 // }
 
-export type GrayColorFactory = (l: number, opacity?: number) => LabColor;
-
 export interface HCLColor extends Color {
     h: number;
     c: number;
@@ -132,11 +123,6 @@ export interface HCLColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-    /**
-     * Returns a hexadecimal string representing this color.
-     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-     */
-    hex(): string;
 }
 
 export interface HCLColorFactory extends Function {
@@ -160,11 +146,6 @@ export interface CubehelixColor extends Color {
     brighter(k?: number): this;
     darker(k?: number): this;
     rgb(): RGBColor;
-    /**
-     * Returns a hexadecimal string representing this color.
-     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-     */
-    hex(): string;
 }
 
 export interface CubehelixColorFactory extends Function {

From a1fca63f40c5c99b317c7600d4c45bcaf8cacd23 Mon Sep 17 00:00:00 2001
From: Karol Majewski <karol-majewski@users.noreply.github.com>
Date: Sun, 13 May 2018 12:21:06 +0200
Subject: [PATCH 076/575] Create definitions for memoize-one

---
 types/memoize-one/index.d.ts           | 12 ++++++++++
 types/memoize-one/memoize-one-tests.ts | 33 ++++++++++++++++++++++++++
 types/memoize-one/tsconfig.json        | 23 ++++++++++++++++++
 types/memoize-one/tslint.json          |  1 +
 4 files changed, 69 insertions(+)
 create mode 100644 types/memoize-one/index.d.ts
 create mode 100644 types/memoize-one/memoize-one-tests.ts
 create mode 100644 types/memoize-one/tsconfig.json
 create mode 100644 types/memoize-one/tslint.json

diff --git a/types/memoize-one/index.d.ts b/types/memoize-one/index.d.ts
new file mode 100644
index 0000000000..caac3a4429
--- /dev/null
+++ b/types/memoize-one/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for memoize-one 3.1
+// Project: https://github.com/alexreardon/memoize-one#readme
+// Definitions by: Karol Majewski <https://github.com/karol-majewski>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = memoizeOne;
+
+declare function memoizeOne<T extends (...args: any[]) => any>(resultFn: T, isEqual?: memoizeOne.EqualityFn): T;
+
+declare namespace memoizeOne {
+    type EqualityFn = (a: any, b: any) => boolean;
+}
diff --git a/types/memoize-one/memoize-one-tests.ts b/types/memoize-one/memoize-one-tests.ts
new file mode 100644
index 0000000000..7ab20ac891
--- /dev/null
+++ b/types/memoize-one/memoize-one-tests.ts
@@ -0,0 +1,33 @@
+import memoizeOne = require('memoize-one');
+
+declare function add(a: number, b: number): number ;
+declare function lousyEqualityFn(a: any, b: any): boolean;
+declare function strictEqualityFn<T>(a: T, b: T): boolean;
+
+/**
+ * Accepts a second argument.
+ */
+memoizeOne(add); // $ExpectType (a: number, b: number) => number
+memoizeOne(add, lousyEqualityFn); // $ExpectType (a: number, b: number) => number
+memoizeOne(add, strictEqualityFn); // $ExpectType (a: number, b: number) => number
+
+/**
+ * The second argument can be, but doesn't have to be stritly typed.
+ */
+memoizeOne(add, (a, b) => a === b); // $ExpectType (a: number, b: number) => number
+memoizeOne(add, (a: string, b: string) => a === b); // $ExpectType (a: number, b: number) => number
+
+/**
+ * Function passed as the second argument accepts exactly two arguments.
+ */
+memoizeOne(add, (a: number, b: number, c: number) => a === b || c); // $ExpectError
+
+/**
+ * Function passed as the second argument returns a boolean.
+ */
+memoizeOne(add, (a: string, b: string) => 0); // $ExpectError
+
+/**
+ * The `EqualityFn` type is publicly accessible.
+ */
+const simpleIsEqual: memoizeOne.EqualityFn = (x: number, y: number): boolean => (x === y);
diff --git a/types/memoize-one/tsconfig.json b/types/memoize-one/tsconfig.json
new file mode 100644
index 0000000000..af1c249358
--- /dev/null
+++ b/types/memoize-one/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",
+        "memoize-one-tests.ts"
+    ]
+}
diff --git a/types/memoize-one/tslint.json b/types/memoize-one/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/memoize-one/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 4354ee8e6d45e737a92a7ad7358c7ec143920489 Mon Sep 17 00:00:00 2001
From: bglee <deptno@gmail.com>
Date: Sun, 13 May 2018 23:59:37 +0900
Subject: [PATCH 077/575] fix bind definition & test code

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

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 9849ee48b1..65e291c27e 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -293,7 +293,7 @@ declare namespace R {
          * Creates a function that is bound to a context. Note: R.bind does not provide the additional argument-binding
          * capabilities of Function.prototype.bind.
          */
-        bind<T>(thisObj: T, fn: (...args: any[]) => any): (...args: any[]) => any;
+        bind<T>(fn: (...args: any[]) => any, thisObj: T): (...args: any[]) => any;
 
         /**
          * A function wrapping calls to the two functions in an && operation, returning the result of the first function
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 8cbbf9ceac..e7aacb34c2 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -2417,3 +2417,7 @@ class Why {
     R.intersection([1, 2, 3], [2, 3, 3, 4]); // => [2, 3]
     R.intersection([1, 2, 3])([2, 3, 3, 4]); // => [2, 3]
 };
+
+() => {
+    R.bind(console.log, console);
+};

From 38f44407b141d05a8f533cc152836db3e874bdfb Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Sun, 13 May 2018 17:28:16 +0200
Subject: [PATCH 078/575] Switch dependency on lib.scripthost.d.ts to
 activex-interop

---
 types/activex-access/index.d.ts                        | 2 +-
 types/activex-access/tsconfig.json                     | 3 +--
 types/activex-adodb/activex-adodb-tests.ts             | 7 +++++--
 types/activex-adodb/index.d.ts                         | 3 ++-
 types/activex-adodb/tsconfig.json                      | 3 +--
 types/activex-adox/activex-adox-tests.ts               | 2 ++
 types/activex-adox/index.d.ts                          | 5 +----
 types/activex-adox/tsconfig.json                       | 5 +++--
 types/activex-dao/activex-dao-tests.ts                 | 2 ++
 types/activex-dao/index.d.ts                           | 6 ++----
 types/activex-dao/tsconfig.json                        | 3 +--
 types/activex-diskquota/index.d.ts                     | 7 ++-----
 types/activex-diskquota/tsconfig.json                  | 3 +--
 types/activex-excel/activex-excel-tests.ts             | 5 +++--
 types/activex-excel/index.d.ts                         | 1 -
 types/activex-excel/tsconfig.json                      | 3 +--
 types/activex-faxcomexlib/activex-faxcomexlib-tests.ts | 7 ++++---
 types/activex-faxcomexlib/index.d.ts                   | 1 -
 types/activex-faxcomexlib/tsconfig.json                | 3 +--
 types/activex-infopath/index.d.ts                      | 1 -
 types/activex-infopath/tsconfig.json                   | 3 +--
 types/activex-libreoffice/activex-libreoffice-tests.ts | 2 ++
 types/activex-libreoffice/index.d.ts                   | 5 ++---
 types/activex-libreoffice/tsconfig.json                | 3 +--
 types/activex-msforms/index.d.ts                       | 1 -
 types/activex-msforms/tsconfig.json                    | 3 +--
 types/activex-mshtml/activex-mshtml-tests.ts           | 2 ++
 types/activex-mshtml/index.d.ts                        | 1 -
 types/activex-mshtml/tsconfig.json                     | 3 +--
 types/activex-msxml2/activex-msxml2-tests.ts           | 2 ++
 types/activex-msxml2/index.d.ts                        | 3 ++-
 types/activex-msxml2/tsconfig.json                     | 3 +--
 types/activex-office/activex-office-tests.ts           | 1 +
 types/activex-office/tsconfig.json                     | 3 +--
 types/activex-outlook/index.d.ts                       | 2 +-
 types/activex-outlook/tsconfig.json                    | 3 +--
 types/activex-powerpoint/activex-powerpoint-tests.ts   | 6 +++---
 types/activex-powerpoint/index.d.ts                    | 1 -
 types/activex-powerpoint/tsconfig.json                 | 3 +--
 types/activex-scripting/activex-scripting-tests.ts     | 2 ++
 types/activex-scripting/index.d.ts                     | 3 ++-
 types/activex-scripting/tsconfig.json                  | 3 +--
 types/activex-shdocvw/index.d.ts                       | 7 ++-----
 types/activex-shdocvw/tsconfig.json                    | 3 +--
 types/activex-shell/activex-shell-tests.ts             | 2 +-
 types/activex-shell/index.d.ts                         | 1 -
 types/activex-shell/tsconfig.json                      | 3 +--
 types/activex-stdole/index.d.ts                        | 3 ++-
 types/activex-stdole/tsconfig.json                     | 3 +--
 types/activex-vbide/activex-vbide-tests.ts             | 1 +
 types/activex-vbide/tsconfig.json                      | 3 +--
 types/activex-wia/activex-wia-tests.ts                 | 2 ++
 types/activex-wia/index.d.ts                           | 3 ++-
 types/activex-wia/tsconfig.json                        | 3 +--
 types/activex-word/activex-word-tests.ts               | 6 ++++--
 types/activex-word/index.d.ts                          | 2 +-
 types/activex-word/tsconfig.json                       | 5 +----
 57 files changed, 82 insertions(+), 95 deletions(-)

diff --git a/types/activex-access/index.d.ts b/types/activex-access/index.d.ts
index 2529538cad..4c531ea3ce 100644
--- a/types/activex-access/index.d.ts
+++ b/types/activex-access/index.d.ts
@@ -4,6 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
+/// <reference types="activex-interop" />
 /// <reference types="activex-office" />
 /// <reference types="activex-dao" />
 /// <reference types="activex-vbide" />
@@ -8882,7 +8883,6 @@ interface ActiveXObject {
         Access.OptionButton | Access.OptionGroup | Access.Page | Access.SubForm | Access.TabControl | Access.TextBox | Access.ToggleButton | Access.WebBrowserControl,
         propertyName: 'accName' | 'accValue', parameterTypes: [any], newValue: string): void;
     set(obj: Access._ControlInReportEvents | Access.ComboBox | Access.Control | Access.ListBox, propertyName: 'Selected', parameterTypes: [number], newValue: number): void;
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }
 
 interface ActiveXObjectNameMap {
diff --git a/types/activex-access/tsconfig.json b/types/activex-access/tsconfig.json
index a376fcb722..867c1e2970 100644
--- a/types/activex-access/tsconfig.json
+++ b/types/activex-access/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-adodb/activex-adodb-tests.ts b/types/activex-adodb/activex-adodb-tests.ts
index 347e1d9c9f..eecc7e9bdc 100644
--- a/types/activex-adodb/activex-adodb-tests.ts
+++ b/types/activex-adodb/activex-adodb-tests.ts
@@ -1,5 +1,8 @@
 // Note -- running these tests under cscript requires some ES5 polyfills
 
+/// <reference types="windows-script-host" />
+/// <reference types="activex-scripting" />
+
 const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
     const results: T[] = [];
     const enumerator = new Enumerator<T>(col);
@@ -12,9 +15,9 @@ const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
 };
 
 const toSafeArray = <T>(...items: T[]): SafeArray<T> => {
-    const dict = new ActiveXObject('Scripting.Dictionary');
+    const dict: Scripting.Dictionary<number, T> = new ActiveXObject('Scripting.Dictionary');
     items.forEach((x, index) => dict.Add(index, x));
-    return dict.Items() as SafeArray<T>;
+    return dict.Items();
 };
 
 const toConnectionString = (o: { [index: string]: any }) => {
diff --git a/types/activex-adodb/index.d.ts b/types/activex-adodb/index.d.ts
index 1879891b2d..580042cfa6 100644
--- a/types/activex-adodb/index.d.ts
+++ b/types/activex-adodb/index.d.ts
@@ -4,6 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
+/// <reference types="activex-interop" />
+
 declare namespace ADODB {
     const enum ADCPROP_ASYNCTHREADPRIORITY_ENUM {
         adPriorityAboveNormal = 4,
@@ -1094,7 +1096,6 @@ declare namespace ADODB {
 }
 
 interface ActiveXObject {
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
     on(obj: ADODB.Connection, event: 'BeginTransComplete', argNames: ['TransactionLevel', 'pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {readonly TransactionLevel: number, readonly pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, readonly pConnection: ADODB.Connection}) => void): void;
     on(obj: ADODB.Connection, event: 'CommitTransComplete' | 'ConnectComplete' | 'InfoMessage' | 'RollbackTransComplete', argNames: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {readonly pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, readonly pConnection: ADODB.Connection}) => void): void;
     on(obj: ADODB.Connection, event: 'Disconnect', argNames: ['adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {adStatus: ADODB.EventStatusEnum, readonly pConnection: ADODB.Connection}) => void): void;
diff --git a/types/activex-adodb/tsconfig.json b/types/activex-adodb/tsconfig.json
index 5cb32f94c9..abf5b79a00 100644
--- a/types/activex-adodb/tsconfig.json
+++ b/types/activex-adodb/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-adox/activex-adox-tests.ts b/types/activex-adox/activex-adox-tests.ts
index 1b6ec21d1f..df5c75ef12 100644
--- a/types/activex-adox/activex-adox-tests.ts
+++ b/types/activex-adox/activex-adox-tests.ts
@@ -1,3 +1,5 @@
+/// <reference types="windows-script-host" />
+
 const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
     const results: T[] = [];
     const enumerator = new Enumerator<T>(col);
diff --git a/types/activex-adox/index.d.ts b/types/activex-adox/index.d.ts
index 8960dd0a31..fd502684e4 100644
--- a/types/activex-adox/index.d.ts
+++ b/types/activex-adox/index.d.ts
@@ -4,6 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
+/// <reference types="activex-interop" />
 /// <reference types="activex-adodb" />
 
 declare namespace ADOX {
@@ -320,10 +321,6 @@ declare namespace ADOX {
     }
 }
 
-interface ActiveXObject {
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
-}
-
 interface ActiveXObjectNameMap {
     'ADOX.Catalog': ADOX.Catalog;
     'ADOX.Column': ADOX.Column;
diff --git a/types/activex-adox/tsconfig.json b/types/activex-adox/tsconfig.json
index 7aaa955db5..30b6288e6a 100644
--- a/types/activex-adox/tsconfig.json
+++ b/types/activex-adox/tsconfig.json
@@ -1,8 +1,9 @@
-
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es5", "scripthost"],
+        "lib": [
+            "es5"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
diff --git a/types/activex-dao/activex-dao-tests.ts b/types/activex-dao/activex-dao-tests.ts
index 7e8c2bef22..6eea19f8e6 100644
--- a/types/activex-dao/activex-dao-tests.ts
+++ b/types/activex-dao/activex-dao-tests.ts
@@ -1,3 +1,5 @@
+/// <reference types="windows-script-host" />
+
 const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
     const results: T[] = [];
     const enumerator = new Enumerator<T>(col);
diff --git a/types/activex-dao/index.d.ts b/types/activex-dao/index.d.ts
index a2a159e324..0a13747514 100644
--- a/types/activex-dao/index.d.ts
+++ b/types/activex-dao/index.d.ts
@@ -4,6 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
+/// <reference types="activex-interop" />
+
 declare namespace DAO {
     const enum _DAOSuppHelp {
         KeepLocal = 0,
@@ -883,10 +885,6 @@ declare namespace DAO {
     }
 }
 
-interface ActiveXObject {
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
-}
-
 interface ActiveXObjectNameMap {
     'DAO.DBEngine': DAO.DBEngine;
     'DAO.Field': DAO.Field;
diff --git a/types/activex-dao/tsconfig.json b/types/activex-dao/tsconfig.json
index 2ddea247b9..e9d00e61e1 100644
--- a/types/activex-dao/tsconfig.json
+++ b/types/activex-dao/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-diskquota/index.d.ts b/types/activex-diskquota/index.d.ts
index d27863de3c..da7457e066 100644
--- a/types/activex-diskquota/index.d.ts
+++ b/types/activex-diskquota/index.d.ts
@@ -4,6 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.5
 
+/// <reference types="activex-interop" />
+
 declare namespace DiskQuotaTypeLibrary {
     // tslint:disable-next-line no-const-enum
     const enum AccountStatusConstants {
@@ -136,7 +138,6 @@ interface ActiveXObject {
     on(
         obj: DiskQuotaTypeLibrary.DiskQuotaControl, event: 'OnUserNameChanged', argNames: ['pUser'], handler: (
             this: DiskQuotaTypeLibrary.DiskQuotaControl, parameter: {readonly pUser: DiskQuotaTypeLibrary.DIDiskQuotaUser}) => void): void;
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }
 
 interface ActiveXObjectNameMap {
@@ -146,7 +147,3 @@ interface ActiveXObjectNameMap {
 interface EnumeratorConstructor {
     new(col: DiskQuotaTypeLibrary.DiskQuotaControl): Enumerator<DiskQuotaTypeLibrary.DIDiskQuotaUser>;
 }
-
-interface SafeArray<T = any> {
-    _brand: SafeArray<T>;
-}
diff --git a/types/activex-diskquota/tsconfig.json b/types/activex-diskquota/tsconfig.json
index 597d998a96..ce9b55800d 100644
--- a/types/activex-diskquota/tsconfig.json
+++ b/types/activex-diskquota/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-excel/activex-excel-tests.ts b/types/activex-excel/activex-excel-tests.ts
index 4e577300e5..78291d57b5 100644
--- a/types/activex-excel/activex-excel-tests.ts
+++ b/types/activex-excel/activex-excel-tests.ts
@@ -1,11 +1,12 @@
+/// <reference types="windows-script-host" />
 /// <reference types="activex-msforms" />
 /// <reference types="activex-scripting" />
 
 // some helpers
 const toSafeArray = <T>(...items: T[]): SafeArray<T> => {
-    const dict = new ActiveXObject('Scripting.Dictionary');
+    const dict: Scripting.Dictionary<number, T> = new ActiveXObject('Scripting.Dictionary');
     items.forEach((x, index) => dict.Add(index, x));
-    return dict.Items() as SafeArray<T>;
+    return dict.Items();
 };
 const inCollection = <T = any>(collection: { Item(index: any): T }, index: string | number): T | undefined => {
     let item: T | undefined;
diff --git a/types/activex-excel/index.d.ts b/types/activex-excel/index.d.ts
index cdf2a79551..c55bfe1c42 100644
--- a/types/activex-excel/index.d.ts
+++ b/types/activex-excel/index.d.ts
@@ -9723,7 +9723,6 @@ interface ActiveXObject {
     set(obj: Excel.Workbook, propertyName: 'Colors', parameterTypes: [any], newValue: any): void;
     set(obj: Excel.Range, propertyName: 'Value', parameterTypes: [Excel.XlRangeValueDataType], newValue: any): void;
     set(obj: Excel.Range, propertyName: 'Value', newValue: any): void; // because Value is defined on the type as a method, not a property
-    new <K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }
 
 interface ActiveXObjectNameMap {
diff --git a/types/activex-excel/tsconfig.json b/types/activex-excel/tsconfig.json
index 244ab1d0ef..0b346a4a25 100644
--- a/types/activex-excel/tsconfig.json
+++ b/types/activex-excel/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-faxcomexlib/activex-faxcomexlib-tests.ts b/types/activex-faxcomexlib/activex-faxcomexlib-tests.ts
index ef3e403998..478e816eb7 100644
--- a/types/activex-faxcomexlib/activex-faxcomexlib-tests.ts
+++ b/types/activex-faxcomexlib/activex-faxcomexlib-tests.ts
@@ -1,4 +1,5 @@
-/// <reference types="activex-iwshruntimelibrary" />
+/// <reference types="windows-script-host" />
+/// <reference types="activex-scripting" />
 
 const collectionToArray = <T>(col: { Item(index: any): T } | SafeArray<T>) => {
     const results: T[] = [];
@@ -12,9 +13,9 @@ const collectionToArray = <T>(col: { Item(index: any): T } | SafeArray<T>) => {
 };
 
 const toSafeArray = <T>(...items: T[]): SafeArray<T> => {
-    const dict = new ActiveXObject('Scripting.Dictionary');
+    const dict: Scripting.Dictionary<number, T> = new ActiveXObject('Scripting.Dictionary');
     items.forEach((x, index) => dict.Add(index, x));
-    return dict.Items() as SafeArray<T>;
+    return dict.Items();
 };
 
 const VB = {
diff --git a/types/activex-faxcomexlib/index.d.ts b/types/activex-faxcomexlib/index.d.ts
index d4078061f7..ffd2412ef3 100644
--- a/types/activex-faxcomexlib/index.d.ts
+++ b/types/activex-faxcomexlib/index.d.ts
@@ -2011,7 +2011,6 @@ interface ActiveXObject {
             this: FAXCOMEXLib.FaxServer, parameter: {readonly riid: stdole.GUID, ppvObj: undefined}) => void): void;
     on(obj: FAXCOMEXLib.FaxAccount, event: 'AddRef' | 'Release', handler: (this: FAXCOMEXLib.FaxAccount, parameter: {}) => void): void;
     on(obj: FAXCOMEXLib.FaxServer, event: 'AddRef' | 'Release', handler: (this: FAXCOMEXLib.FaxServer, parameter: {}) => void): void;
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }
 
 interface ActiveXObjectNameMap {
diff --git a/types/activex-faxcomexlib/tsconfig.json b/types/activex-faxcomexlib/tsconfig.json
index 6509ab4701..8443d46f26 100644
--- a/types/activex-faxcomexlib/tsconfig.json
+++ b/types/activex-faxcomexlib/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-infopath/index.d.ts b/types/activex-infopath/index.d.ts
index c00c67e197..9cace4ec2e 100644
--- a/types/activex-infopath/index.d.ts
+++ b/types/activex-infopath/index.d.ts
@@ -1168,7 +1168,6 @@ interface ActiveXObject {
     on(obj: InfoPath.Button, event: 'AddRef' | 'Release', handler: (this: InfoPath.Button, parameter: {}) => void): void;
     on(obj: InfoPath.DataDOM, event: 'AddRef' | 'Release', handler: (this: InfoPath.DataDOM, parameter: {}) => void): void;
     on(obj: InfoPath.XDocument, event: 'AddRef' | 'Release', handler: (this: InfoPath.XDocument, parameter: {}) => void): void;
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }
 
 interface ActiveXObjectNameMap {
diff --git a/types/activex-infopath/tsconfig.json b/types/activex-infopath/tsconfig.json
index 6feef8496c..db2712e264 100644
--- a/types/activex-infopath/tsconfig.json
+++ b/types/activex-infopath/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-libreoffice/activex-libreoffice-tests.ts b/types/activex-libreoffice/activex-libreoffice-tests.ts
index bafe014f59..87cf55eb8c 100644
--- a/types/activex-libreoffice/activex-libreoffice-tests.ts
+++ b/types/activex-libreoffice/activex-libreoffice-tests.ts
@@ -1,3 +1,5 @@
+/// <reference types="windows-script-host" />
+
 (() => {
     // https://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Bridge/Automation_Bridge
 
diff --git a/types/activex-libreoffice/index.d.ts b/types/activex-libreoffice/index.d.ts
index 1698317e8f..3459215083 100644
--- a/types/activex-libreoffice/index.d.ts
+++ b/types/activex-libreoffice/index.d.ts
@@ -4,6 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
+/// <reference types="activex-interop" />
+
 declare class type {
     private typekey: type;
 }
@@ -12,9 +14,6 @@ declare class sequence<T = any> {
     private typekey: sequence<T>;
 }
 
-// tslint:disable-next-line no-empty-interface
-interface SafeArray<T = any> {}
-
 declare namespace com.sun.star {
     namespace accessibility {
         /**
diff --git a/types/activex-libreoffice/tsconfig.json b/types/activex-libreoffice/tsconfig.json
index 712ea46ca1..b6e9a7be63 100644
--- a/types/activex-libreoffice/tsconfig.json
+++ b/types/activex-libreoffice/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-msforms/index.d.ts b/types/activex-msforms/index.d.ts
index c896cc4bf5..a9b5e8f8ac 100644
--- a/types/activex-msforms/index.d.ts
+++ b/types/activex-msforms/index.d.ts
@@ -1564,7 +1564,6 @@ interface ActiveXObject {
     set(obj: MSForms.ComboBox | MSForms.ListBox, propertyName: 'Column' | 'List', parameterTypes: [number, number] | [number], newValue: any): void;
     set(obj: MSForms.ComboBox | MSForms.ListBox, propertyName: 'Column' | 'List', parameterTypes: number[], newValue: SafeArray): void;
     set(obj: MSForms.ListBox, propertyName: 'Selected', parameterTypes: [any], newValue: boolean): void;
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }
 
 interface ActiveXObjectNameMap {
diff --git a/types/activex-msforms/tsconfig.json b/types/activex-msforms/tsconfig.json
index 38f907552d..074a493c66 100644
--- a/types/activex-msforms/tsconfig.json
+++ b/types/activex-msforms/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-mshtml/activex-mshtml-tests.ts b/types/activex-mshtml/activex-mshtml-tests.ts
index 324d3d09e2..bdf7f3dec3 100644
--- a/types/activex-mshtml/activex-mshtml-tests.ts
+++ b/types/activex-mshtml/activex-mshtml-tests.ts
@@ -1,3 +1,5 @@
+/// <reference types="windows-script-host" />
+
 let htmlfile = new ActiveXObject('htmlfile');
 let htmldoc = htmlfile.createDocumentFromUrl('https://msdn.microsoft.com/en-us/library/aa741317(v=vs.85).aspx', 'null');
 let length = htmldoc.all.length;
diff --git a/types/activex-mshtml/index.d.ts b/types/activex-mshtml/index.d.ts
index 94466927d7..b2f8a92883 100644
--- a/types/activex-mshtml/index.d.ts
+++ b/types/activex-mshtml/index.d.ts
@@ -35570,7 +35570,6 @@ interface ActiveXObject {
     on(obj: MSHTML.SVGTSpanElement, event: 'onactivate' | 'onafterupdate' | 'onbeforeactivate' | 'onbeforecopy' | 'onbeforecut' | 'onbeforedeactivate' | 'onbeforeeditfocus' | 'onbeforepaste' | 'onbeforeupdate' | 'onblur' | 'oncellchange' | 'onclick' | 'oncontextmenu' | 'oncontrolselect' | 'oncopy' | 'oncut' | 'ondataavailable' | 'ondatasetchanged' | 'ondatasetcomplete' | 'ondblclick' | 'ondeactivate' | 'ondrag' | 'ondragend' | 'ondragenter' | 'ondragleave' | 'ondragover' | 'ondragstart' | 'ondrop' | 'onerrorupdate' | 'onfilterchange' | 'onfocus' | 'onfocusin' | 'onfocusout' | 'onhelp' | 'onkeydown' | 'onkeypress' | 'onkeyup' | 'onlayoutcomplete' | 'onlosecapture' | 'onmousedown' | 'onmouseenter' | 'onmouseleave' | 'onmousemove' | 'onmouseout' | 'onmouseover' | 'onmouseup' | 'onmousewheel' | 'onmove' | 'onmoveend' | 'onmovestart' | 'onpage' | 'onpaste' | 'onpropertychange' | 'onreadystatechange' | 'onresize' | 'onresizeend' | 'onresizestart' | 'onrowenter' | 'onrowexit' | 'onrowsdelete' | 'onrowsinserted' | 'onscroll' | 'onselectstart', handler: (this: MSHTML.SVGTSpanElement, parameter: {}) => void): void;
     on(obj: MSHTML.SVGUseElement, event: 'onactivate' | 'onafterupdate' | 'onbeforeactivate' | 'onbeforecopy' | 'onbeforecut' | 'onbeforedeactivate' | 'onbeforeeditfocus' | 'onbeforepaste' | 'onbeforeupdate' | 'onblur' | 'oncellchange' | 'onclick' | 'oncontextmenu' | 'oncontrolselect' | 'oncopy' | 'oncut' | 'ondataavailable' | 'ondatasetchanged' | 'ondatasetcomplete' | 'ondblclick' | 'ondeactivate' | 'ondrag' | 'ondragend' | 'ondragenter' | 'ondragleave' | 'ondragover' | 'ondragstart' | 'ondrop' | 'onerrorupdate' | 'onfilterchange' | 'onfocus' | 'onfocusin' | 'onfocusout' | 'onhelp' | 'onkeydown' | 'onkeypress' | 'onkeyup' | 'onlayoutcomplete' | 'onlosecapture' | 'onmousedown' | 'onmouseenter' | 'onmouseleave' | 'onmousemove' | 'onmouseout' | 'onmouseover' | 'onmouseup' | 'onmousewheel' | 'onmove' | 'onmoveend' | 'onmovestart' | 'onpage' | 'onpaste' | 'onpropertychange' | 'onreadystatechange' | 'onresize' | 'onresizeend' | 'onresizestart' | 'onrowenter' | 'onrowexit' | 'onrowsdelete' | 'onrowsinserted' | 'onscroll' | 'onselectstart', handler: (this: MSHTML.SVGUseElement, parameter: {}) => void): void;
     on(obj: MSHTML.SVGViewElement, event: 'onactivate' | 'onafterupdate' | 'onbeforeactivate' | 'onbeforecopy' | 'onbeforecut' | 'onbeforedeactivate' | 'onbeforeeditfocus' | 'onbeforepaste' | 'onbeforeupdate' | 'onblur' | 'oncellchange' | 'onclick' | 'oncontextmenu' | 'oncontrolselect' | 'oncopy' | 'oncut' | 'ondataavailable' | 'ondatasetchanged' | 'ondatasetcomplete' | 'ondblclick' | 'ondeactivate' | 'ondrag' | 'ondragend' | 'ondragenter' | 'ondragleave' | 'ondragover' | 'ondragstart' | 'ondrop' | 'onerrorupdate' | 'onfilterchange' | 'onfocus' | 'onfocusin' | 'onfocusout' | 'onhelp' | 'onkeydown' | 'onkeypress' | 'onkeyup' | 'onlayoutcomplete' | 'onlosecapture' | 'onmousedown' | 'onmouseenter' | 'onmouseleave' | 'onmousemove' | 'onmouseout' | 'onmouseover' | 'onmouseup' | 'onmousewheel' | 'onmove' | 'onmoveend' | 'onmovestart' | 'onpage' | 'onpaste' | 'onpropertychange' | 'onreadystatechange' | 'onresize' | 'onresizeend' | 'onresizestart' | 'onrowenter' | 'onrowexit' | 'onrowsdelete' | 'onrowsinserted' | 'onscroll' | 'onselectstart', handler: (this: MSHTML.SVGViewElement, parameter: {}) => void): void;
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }
 
 interface ActiveXObjectNameMap {
diff --git a/types/activex-mshtml/tsconfig.json b/types/activex-mshtml/tsconfig.json
index deba2b6ba3..1ef33423ee 100644
--- a/types/activex-mshtml/tsconfig.json
+++ b/types/activex-mshtml/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-msxml2/activex-msxml2-tests.ts b/types/activex-msxml2/activex-msxml2-tests.ts
index 470f35d785..01ef12802e 100644
--- a/types/activex-msxml2/activex-msxml2-tests.ts
+++ b/types/activex-msxml2/activex-msxml2-tests.ts
@@ -1,3 +1,5 @@
+/// <reference types="windows-script-host" />
+
 // https://msdn.microsoft.com/en-us/library/ms764708(v=vs.85).aspx
 {
     const dom = new ActiveXObject('Msxml2.DOMDocument.6.0');
diff --git a/types/activex-msxml2/index.d.ts b/types/activex-msxml2/index.d.ts
index 6f43ba02c5..5353864443 100644
--- a/types/activex-msxml2/index.d.ts
+++ b/types/activex-msxml2/index.d.ts
@@ -4,6 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
+/// <reference types="activex-interop" />
+
 declare namespace MSXML2 {
     /** Schema Object Model Content Types */
     const enum _SCHEMACONTENTTYPE {
@@ -2775,7 +2777,6 @@ declare namespace MSXML2 {
 interface ActiveXObject {
     on(obj: MSXML2.DOMDocument60, event: 'ondataavailable' | 'onreadystatechange', handler: (this: MSXML2.DOMDocument60, parameter: {}) => void): void;
     on(obj: MSXML2.FreeThreadedDOMDocument60, event: 'ondataavailable' | 'onreadystatechange', handler: (this: MSXML2.FreeThreadedDOMDocument60, parameter: {}) => void): void;
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }
 
 interface ActiveXObjectNameMap {
diff --git a/types/activex-msxml2/tsconfig.json b/types/activex-msxml2/tsconfig.json
index 49c53f71ca..fe55b33d3c 100644
--- a/types/activex-msxml2/tsconfig.json
+++ b/types/activex-msxml2/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-office/activex-office-tests.ts b/types/activex-office/activex-office-tests.ts
index 7aab0b4521..4dd24fd547 100644
--- a/types/activex-office/activex-office-tests.ts
+++ b/types/activex-office/activex-office-tests.ts
@@ -1,3 +1,4 @@
+/// <reference types="windows-script-host" />
 /// <reference types="activex-word" />
 
 const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
diff --git a/types/activex-office/tsconfig.json b/types/activex-office/tsconfig.json
index 729657e813..6ded50cfda 100644
--- a/types/activex-office/tsconfig.json
+++ b/types/activex-office/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-outlook/index.d.ts b/types/activex-outlook/index.d.ts
index 37628722b5..2b316d80bd 100644
--- a/types/activex-outlook/index.d.ts
+++ b/types/activex-outlook/index.d.ts
@@ -4,6 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
+/// <reference types="activex-interop" />
 /// <reference types="activex-stdole" />
 /// <reference types="activex-office" />
 
@@ -5855,7 +5856,6 @@ interface ActiveXObject {
     on(obj: Outlook.TaskRequestDeclineItem, event: 'AfterWrite' | 'BeforeRead' | 'Read' | 'Unload', handler: (this: Outlook.TaskRequestDeclineItem, parameter: {}) => void): void;
     on(obj: Outlook.TaskRequestItem, event: 'AfterWrite' | 'BeforeRead' | 'Read' | 'Unload', handler: (this: Outlook.TaskRequestItem, parameter: {}) => void): void;
     on(obj: Outlook.TaskRequestUpdateItem, event: 'AfterWrite' | 'BeforeRead' | 'Read' | 'Unload', handler: (this: Outlook.TaskRequestUpdateItem, parameter: {}) => void): void;
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }
 
 interface ActiveXObjectNameMap {
diff --git a/types/activex-outlook/tsconfig.json b/types/activex-outlook/tsconfig.json
index 1a9fddc714..1a7c466608 100644
--- a/types/activex-outlook/tsconfig.json
+++ b/types/activex-outlook/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-powerpoint/activex-powerpoint-tests.ts b/types/activex-powerpoint/activex-powerpoint-tests.ts
index 3f2bedf8cd..eb5a2e4c05 100644
--- a/types/activex-powerpoint/activex-powerpoint-tests.ts
+++ b/types/activex-powerpoint/activex-powerpoint-tests.ts
@@ -1,5 +1,5 @@
 // tslint:disable-next-line no-unnecessary-generics
-const collectionToArray = <T>(col: any): T[] => {
+const collectionToArray = <T>(col: {Item(index: any): T}): T[] => {
     const results: T[] = [];
     const enumerator = new Enumerator<T>(col);
     enumerator.moveFirst();
@@ -13,8 +13,8 @@ const collectionToArray = <T>(col: any): T[] => {
 const app = new ActiveXObject('PowerPoint.Application');
 (() => {
     // delete empty textboxes in PowerPoint
-    collectionToArray<PowerPoint.Slide>(app.ActivePresentation.Slides).forEach(slide => {
-        collectionToArray<PowerPoint.Shape>(slide.Shapes).filter(shape =>
+    collectionToArray(app.ActivePresentation.Slides).forEach(slide => {
+        collectionToArray(slide.Shapes).filter(shape =>
             shape.Type === Office.MsoShapeType.msoTextBox
             && shape.TextFrame.TextRange.Text.trim() === ''
         ).forEach(shape => shape.Delete());
diff --git a/types/activex-powerpoint/index.d.ts b/types/activex-powerpoint/index.d.ts
index ee59fd0be4..34e722a8a0 100644
--- a/types/activex-powerpoint/index.d.ts
+++ b/types/activex-powerpoint/index.d.ts
@@ -5374,7 +5374,6 @@ interface ActiveXObject {
             this: PowerPoint.Application, parameter: {readonly Sel: PowerPoint.Selection, Cancel: boolean}) => void): void;
     on(obj: PowerPoint.Application, event: 'WindowSelectionChange', argNames: ['Sel'], handler: (this: PowerPoint.Application, parameter: {readonly Sel: PowerPoint.Selection}) => void): void;
     on(obj: PowerPoint.OLEControl, event: 'GotFocus' | 'LostFocus', handler: (this: PowerPoint.OLEControl, parameter: {}) => void): void;
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }
 
 interface ActiveXObjectNameMap {
diff --git a/types/activex-powerpoint/tsconfig.json b/types/activex-powerpoint/tsconfig.json
index 8a0392da3f..25bcee9fa3 100644
--- a/types/activex-powerpoint/tsconfig.json
+++ b/types/activex-powerpoint/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-scripting/activex-scripting-tests.ts b/types/activex-scripting/activex-scripting-tests.ts
index 313e480cb5..f3ee3218ca 100644
--- a/types/activex-scripting/activex-scripting-tests.ts
+++ b/types/activex-scripting/activex-scripting-tests.ts
@@ -1,3 +1,5 @@
+/// <reference types="windows-script-host" />
+
 // Note -- running these tests under cscript requires some ES5 polyfills
 
 const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
diff --git a/types/activex-scripting/index.d.ts b/types/activex-scripting/index.d.ts
index 42e4f0c9e0..e0f8ba306d 100644
--- a/types/activex-scripting/index.d.ts
+++ b/types/activex-scripting/index.d.ts
@@ -4,6 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
+/// <reference types="activex-interop" />
+
 declare namespace Scripting {
     // tslint:disable-next-line:no-const-enum
     const enum CompareMethod {
@@ -489,7 +491,6 @@ declare namespace Scripting {
 }
 
 interface ActiveXObject {
-    new <K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
     set(obj: Scripting.Dictionary, propertyName: 'Item', parameterTypes: [any], newValue: any): void;
 }
 
diff --git a/types/activex-scripting/tsconfig.json b/types/activex-scripting/tsconfig.json
index e2008551fd..11cfcc44a4 100644
--- a/types/activex-scripting/tsconfig.json
+++ b/types/activex-scripting/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-shdocvw/index.d.ts b/types/activex-shdocvw/index.d.ts
index 86568f6c5d..f450ea6112 100644
--- a/types/activex-shdocvw/index.d.ts
+++ b/types/activex-shdocvw/index.d.ts
@@ -4,6 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
+/// <reference types="activex-interop" />
+
 declare namespace SHDocVw {
     // tslint:disable-next-line no-const-enum
     const enum BrowserBarConstants {
@@ -1562,7 +1564,6 @@ interface ActiveXObject {
     on(obj: SHDocVw.ShellNameSpace, event: 'DoubleClick' | 'Initialized' | 'SelectionChange', handler: (this: SHDocVw.ShellNameSpace, parameter: {}) => void): void;
     on(obj: SHDocVw.WebBrowser, event: 'DownloadBegin' | 'DownloadComplete' | 'OnQuit', handler: (this: SHDocVw.WebBrowser, parameter: {}) => void): void;
     on(obj: SHDocVw.WebBrowser_V1, event: 'DownloadBegin' | 'DownloadComplete' | 'WindowActivate' | 'WindowMove' | 'WindowResize', handler: (this: SHDocVw.WebBrowser_V1, parameter: {}) => void): void;
-    new <K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }
 
 interface ActiveXObjectNameMap {
@@ -1571,7 +1572,3 @@ interface ActiveXObjectNameMap {
     'Shell.UIHelper': SHDocVw.ShellUIHelper;
     'ShellNameSpace.ShellNameSpace': SHDocVw.ShellNameSpace;
 }
-
-interface EnumeratorConstructor {
-    new(col: SHDocVw.ShellWindows): Enumerator<SHDocVw.InternetExplorer>;
-}
diff --git a/types/activex-shdocvw/tsconfig.json b/types/activex-shdocvw/tsconfig.json
index 1907cb1ef6..2a388d4c7d 100644
--- a/types/activex-shdocvw/tsconfig.json
+++ b/types/activex-shdocvw/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-shell/activex-shell-tests.ts b/types/activex-shell/activex-shell-tests.ts
index f236f6e592..b9fd3b18fd 100644
--- a/types/activex-shell/activex-shell-tests.ts
+++ b/types/activex-shell/activex-shell-tests.ts
@@ -1,4 +1,4 @@
-/// <reference types="activex-iwshruntimelibrary" />
+/// <reference types="windows-script-host" />
 
 const shell = new ActiveXObject('Shell.Application');
 
diff --git a/types/activex-shell/index.d.ts b/types/activex-shell/index.d.ts
index cb59a11c5e..f12d135979 100644
--- a/types/activex-shell/index.d.ts
+++ b/types/activex-shell/index.d.ts
@@ -1001,7 +1001,6 @@ interface ActiveXObject {
     on(
         obj: Shell32.ShellFolderViewOC, event: 'BeginDrag' | 'DefaultVerbInvoked' | 'EnumDone' | 'SelectionChanged' | 'VerbInvoked',
         handler: (this: Shell32.ShellFolderViewOC, parameter: {}) => void): void;
-    new <K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }
 
 interface ActiveXObjectNameMap {
diff --git a/types/activex-shell/tsconfig.json b/types/activex-shell/tsconfig.json
index f4b549f649..364b5716de 100644
--- a/types/activex-shell/tsconfig.json
+++ b/types/activex-shell/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-stdole/index.d.ts b/types/activex-stdole/index.d.ts
index e738e4f03d..34b12e4219 100644
--- a/types/activex-stdole/index.d.ts
+++ b/types/activex-stdole/index.d.ts
@@ -4,6 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
+/// <reference types="activex-interop" />
+
 declare namespace stdole {
     type IPictureDisp = StdPicture;
 
@@ -79,7 +81,6 @@ declare namespace stdole {
 
 interface ActiveXObject {
     on(obj: stdole.StdFont, event: 'FontChanged', argNames: ['PropertyName'], handler: (this: stdole.StdFont, parameter: {readonly PropertyName: string}) => void): void;
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }
 
 interface ActiveXObjectNameMap {
diff --git a/types/activex-stdole/tsconfig.json b/types/activex-stdole/tsconfig.json
index cbe3ce7aae..24ea6a5417 100644
--- a/types/activex-stdole/tsconfig.json
+++ b/types/activex-stdole/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-vbide/activex-vbide-tests.ts b/types/activex-vbide/activex-vbide-tests.ts
index 02209ec9bd..5780d36b1a 100644
--- a/types/activex-vbide/activex-vbide-tests.ts
+++ b/types/activex-vbide/activex-vbide-tests.ts
@@ -1,3 +1,4 @@
+/// <reference types="windows-script-host" />
 /// <reference types="activex-word" />
 
 const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
diff --git a/types/activex-vbide/tsconfig.json b/types/activex-vbide/tsconfig.json
index 6fb205a3c4..5d27488056 100644
--- a/types/activex-vbide/tsconfig.json
+++ b/types/activex-vbide/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-wia/activex-wia-tests.ts b/types/activex-wia/activex-wia-tests.ts
index 8fc7dcfd2e..25d025cc90 100644
--- a/types/activex-wia/activex-wia-tests.ts
+++ b/types/activex-wia/activex-wia-tests.ts
@@ -1,3 +1,5 @@
+/// <reference types="windows-script-host" />
+
 // Note -- running these tests under cscript requires some ES5 polyfills
 
 const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
diff --git a/types/activex-wia/index.d.ts b/types/activex-wia/index.d.ts
index 18e474e09c..5a06471ff8 100644
--- a/types/activex-wia/index.d.ts
+++ b/types/activex-wia/index.d.ts
@@ -4,6 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
+/// <reference types="activex-interop" />
+
 declare namespace WIA {
     /** String versions of globally unique identifiers (GUIDs) that identify common Device and Item commands. */
     const enum CommandID {
@@ -791,7 +793,6 @@ declare namespace WIA {
 }
 
 interface ActiveXObject {
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
     on(obj: WIA.DeviceManager, event: 'OnEvent', argNames: ['EventID', 'DeviceID', 'ItemID'], handler: (
         this: WIA.DeviceManager, parameter: { readonly EventID: string, readonly DeviceID: string, readonly ItemID: string }) => void): void;
     set<TItem>(obj: WIA.Vector<TItem>, propertyName: 'Item', parameterTypes: [number], newValue: TItem): void;
diff --git a/types/activex-wia/tsconfig.json b/types/activex-wia/tsconfig.json
index e77b3d1b66..48ed56e82e 100644
--- a/types/activex-wia/tsconfig.json
+++ b/types/activex-wia/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/activex-word/activex-word-tests.ts b/types/activex-word/activex-word-tests.ts
index 4a0000e6fa..2b44a5ba22 100644
--- a/types/activex-word/activex-word-tests.ts
+++ b/types/activex-word/activex-word-tests.ts
@@ -1,5 +1,7 @@
+/// <reference types="windows-script-host" />
+
 // tslint:disable-next-line no-unnecessary-generics
-const collectionToArray = <T>(col: any): T[] => {
+const collectionToArray = <T>(col: {Item(index: any): T}): T[] => {
     const results: T[] = [];
     const enumerator = new Enumerator<T>(col);
     enumerator.moveFirst();
@@ -233,7 +235,7 @@ const activeDoc = app.ActiveDocument;
 
 // looping through a collection -- https://msdn.microsoft.com/en-us/vba/word-vba/articles/looping-through-a-collection
 (() => {
-    collectionToArray<Word.Document>(app.Documents)
+    collectionToArray(app.Documents)
         .forEach(openDocument => WScript.Echo(openDocument.Name));
 
     const strMarks = collectionToArray<Word.Bookmark>(activeDoc.Bookmarks)
diff --git a/types/activex-word/index.d.ts b/types/activex-word/index.d.ts
index 879af9021d..f6f559ae16 100644
--- a/types/activex-word/index.d.ts
+++ b/types/activex-word/index.d.ts
@@ -4,6 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
+/// <reference types="activex-interop" />
 /// <reference types="activex-office" />
 /// <reference types="activex-vbide" />
 /// <reference types="activex-stdole" />
@@ -12496,7 +12497,6 @@ interface ActiveXObject {
     set(obj: Word.Document, propertyName: 'ActiveWritingStyle', parameterTypes: [any], newValue: string): void;
     set(obj: Word.Document, propertyName: 'Compatibility', parameterTypes: [Word.WdCompatibility], newValue: boolean): void;
     set(obj: Word.System, propertyName: 'PrivateProfileString', parameterTypes: [string, string, string], newValue: string): void;
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }
 
 interface ActiveXObjectNameMap {
diff --git a/types/activex-word/tsconfig.json b/types/activex-word/tsconfig.json
index c62626ca52..c5316c83c4 100644
--- a/types/activex-word/tsconfig.json
+++ b/types/activex-word/tsconfig.json
@@ -1,10 +1,7 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es5",
-            "scripthost"
-        ],
+        "lib": ["es5"],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,

From b03e1bbecb1dceb757b45da340f4348e2477698c Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Sun, 13 May 2018 17:39:41 +0200
Subject: [PATCH 079/575] Split types that are usable out of WScript to
 activex-iwshruntimelibrary

---
 .../activex-iwshruntimelibrary-tests.ts       |  62 +++
 types/activex-iwshruntimelibrary/index.d.ts   | 437 +++++++++++++++
 .../activex-iwshruntimelibrary/tsconfig.json  |  21 +
 types/activex-iwshruntimelibrary/tslint.json  |   6 +
 types/windows-script-host/index.d.ts          | 497 ++----------------
 .../windows-script-host-tests.ts              |  50 --
 6 files changed, 559 insertions(+), 514 deletions(-)
 create mode 100644 types/activex-iwshruntimelibrary/activex-iwshruntimelibrary-tests.ts
 create mode 100644 types/activex-iwshruntimelibrary/index.d.ts
 create mode 100644 types/activex-iwshruntimelibrary/tsconfig.json
 create mode 100644 types/activex-iwshruntimelibrary/tslint.json

diff --git a/types/activex-iwshruntimelibrary/activex-iwshruntimelibrary-tests.ts b/types/activex-iwshruntimelibrary/activex-iwshruntimelibrary-tests.ts
new file mode 100644
index 0000000000..67efbd3eca
--- /dev/null
+++ b/types/activex-iwshruntimelibrary/activex-iwshruntimelibrary-tests.ts
@@ -0,0 +1,62 @@
+/// <reference types="windows-script-host" />
+
+const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
+    const results: T[] = [];
+    const enumerator = new Enumerator<T>(col);
+    enumerator.moveFirst();
+    while (!enumerator.atEnd()) {
+        results.push(enumerator.item());
+        enumerator.moveNext();
+    }
+    return results;
+};
+
+const wshn = new ActiveXObject('WScript.Network');
+
+// https://msdn.microsoft.com/en-us/library/s6wt333f(v=vs.84).aspx
+// https://msdn.microsoft.com/en-us/library/wck0hkd7(v=vs.84).aspx
+// https://msdn.microsoft.com/en-us/library/tte130y1(v=vs.84).aspx
+// https://msdn.microsoft.com/en-us/library/3fxhka75(v=vs.84).aspx
+{
+    WScript.Echo('Domain = ' + wshn.UserDomain);
+    WScript.Echo('Computer Name = ' + wshn.ComputerName);
+    WScript.Echo('User Name = ' + wshn.UserName);
+}
+
+// https://msdn.microsoft.com/en-us/library/zsdh7hkb(v=vs.84).aspx
+wshn.AddWindowsPrinterConnection('\\\\printserv\\DefaultPrinter');
+
+// https://msdn.microsoft.com/en-us/library/kxsdca3c(v=vs.84).aspx
+wshn.AddPrinterConnection("LPT1", "\\\\Server\\Print1");
+
+// https://msdn.microsoft.com/en-us/library/t9zt39at(v=vs.84).aspx
+// https://msdn.microsoft.com/en-us/library/zhds6k80(v=vs.84).aspx
+{
+    const drives = wshn.EnumNetworkDrives();
+    const printers = wshn.EnumPrinterConnections();
+    WScript.Echo("Network drive mappings:");
+    for (let i = 0; i < drives.length; i += 2) {
+        WScript.Echo(`Drive ${drives.Item(i)} = ${drives.Item(i + 1)}`);
+    }
+    WScript.Echo('');
+    WScript.Echo("Network printer mappings:");
+    for (let i = 0; i < printers.length; i += 2) {
+        WScript.Echo(`Port ${printers.Item(i)} = ${printers.Item(i + 1)}`);
+    }
+}
+
+// https://msdn.microsoft.com/en-us/library/8kst88h6(v=vs.84).aspx
+wshn.MapNetworkDrive('E:', '\\\\Server\\Public');
+
+// https://msdn.microsoft.com/en-us/library/d16d7wbf(v=vs.84).aspx
+wshn.RemoveNetworkDrive('E:');
+
+// https://msdn.microsoft.com/en-us/library/tsbh2yy7(v=vs.84).aspx
+wshn.RemovePrinterConnection('\\\\PRN-CORP1\\B41-4523-A', true, true);
+
+// https://msdn.microsoft.com/en-us/library/2ccwwdct(v=vs.84).aspx
+{
+    const printerPath = "\\\\research\\library1";
+    wshn.AddWindowsPrinterConnection(printerPath);
+    wshn.SetDefaultPrinter(printerPath);
+}
diff --git a/types/activex-iwshruntimelibrary/index.d.ts b/types/activex-iwshruntimelibrary/index.d.ts
new file mode 100644
index 0000000000..1f89c2b84a
--- /dev/null
+++ b/types/activex-iwshruntimelibrary/index.d.ts
@@ -0,0 +1,437 @@
+// Type definitions for Windows Script Host Runtime Object Model 0.0
+// Project: https://msdn.microsoft.com/en-us/library/9bbdkx3k.aspx
+// Definitions by: Zev Spitz <https://github.com/zspitz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="activex-interop" />
+
+declare namespace IWshRuntimeLibrary {
+    type WindowStyle = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
+    type ShortcutWindowStyle = 1 | 3 | 7;
+
+    const enum ButtonType {
+        OK,
+        OKCancel,
+        AbortRetryIgnore,
+        YesNoCancel,
+        YesNo,
+        RetryCancel,
+        CancelTryagainContinue
+    }
+
+    const enum EventType {
+        AuditFailure = 5,
+        AuditSuccess = 4,
+        Error = 1,
+        Information = 3,
+        Success = 0,
+        Warning = 2
+    }
+
+    const enum IconType {
+        Stop = 16,
+        QuestionMark = 32,
+        ExclamationMakr = 48,
+        InformationMark = 64,
+    }
+
+    const enum PopupType {
+        SecondButtonDefault = 256,
+        ThirdButtonDefault = 512,
+        Modal = 4096,
+        RightJustified = 524288,
+        RTL = 1048576,
+    }
+
+    const enum PopupSelection {
+        NoButton = -1,
+        OK = 1,
+        Cancel = 2,
+        Abort = 3,
+        Retry = 4,
+        Ignore = 5,
+        Yes = 6,
+        No = 7,
+        TryAgain = 10,
+        Continue = 11,
+    }
+
+    const enum WshExecStatus {
+        WshFailed = 2,
+        WshFinished = 1,
+        WshRunning = 0,
+    }
+
+    const enum WshWindowStyle {
+        WshHide = 0,
+        WshMaximizedFocus = 3,
+        WshMinimizedFocus = 2,
+        WshMinimizedNoFocus = 6,
+        WshNormalFocus = 1,
+        WshNormalNoFocus = 4,
+    }
+
+    class TextStreamBase {
+        /**
+         * The column number of the current character position in an input stream.
+         */
+        Column: number;
+
+        /**
+         * The current line number in an input stream.
+         */
+        Line: number;
+
+        /**
+         * Closes a text stream.
+         * It is not necessary to close standard streams; they close automatically when the process ends. If
+         * you close a standard stream, be aware that any other pointers to that standard stream become invalid.
+         */
+        Close(): void;
+    }
+
+    class TextStreamWriter extends TextStreamBase {
+        private 'IWshRuntimeLibrary.TextStreamWriter_typekey': TextStreamWriter;
+        private constructor();
+
+        /**
+         * Sends a string to an output stream.
+         */
+        Write(s: string): void;
+
+        /**
+         * Sends a specified number of blank lines (newline characters) to an output stream.
+         */
+        WriteBlankLines(intLines: number): void;
+
+        /**
+         * Sends a string followed by a newline character to an output stream.
+         */
+        WriteLine(s: string): void;
+    }
+
+    class TextStreamReader extends TextStreamBase {
+        private 'IWshRuntimeLibrary.TextStreamReader_typekey': TextStreamReader;
+        private constructor();
+
+        /**
+         * Returns a specified number of characters from an input stream, starting at the current pointer position.
+         * Does not return until the ENTER key is pressed.
+         * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
+         */
+        Read(characters: number): string;
+
+        /**
+         * Returns all characters from an input stream.
+         * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
+         */
+        ReadAll(): string;
+
+        /**
+         * Returns an entire line from an input stream.
+         * Although this method extracts the newline character, it does not add it to the returned string.
+         * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
+         */
+        ReadLine(): string;
+
+        /**
+         * Skips a specified number of characters when reading from an input text stream.
+         * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
+         * @param characters Positive number of characters to skip forward. (Backward skipping is not supported.)
+         */
+        Skip(characters: number): void;
+
+        /**
+         * Skips the next line when reading from an input text stream.
+         * Can only be used on a stream in reading mode, not writing or appending mode.
+         */
+        SkipLine(): void;
+
+        /**
+         * Indicates whether the stream pointer position is at the end of a line.
+         */
+        AtEndOfLine: boolean;
+
+        /**
+         * Indicates whether the stream pointer position is at the end of a stream.
+         */
+        AtEndOfStream: boolean;
+    }
+
+    /** Generic Collection Object */
+    interface WshCollection {
+        Count(): number;
+        Item(Index: any): any;
+        readonly length: number;
+        (Index: any): any;
+    }
+
+    /** Environment Variables Collection Object */
+    interface WshEnvironment {
+        Count(): number;
+        Item(Name: string): string;
+        readonly Length: number;
+        Remove(Name: string): void;
+        (Name: string): string;
+    }
+
+    /** WSHExec object */
+    class WshExec {
+        private 'IWshRuntimeLibrary.WshExec_typekey': WshExec;
+        private constructor();
+        readonly ExitCode: number;
+        readonly ProcessID: number;
+        readonly Status: WshExecStatus;
+        readonly StdErr: TextStreamWriter;
+        readonly StdIn: TextStreamReader;
+        readonly StdOut: TextStreamWriter;
+        Terminate(): void;
+    }
+
+    /** Network Object */
+    class WshNetwork {
+        private 'IWshRuntimeLibrary.WshNetwork_typekey': WshNetwork;
+        private constructor();
+
+        /**
+         * Adds a remote MS-DOS-based printer connection to your computer system.
+         * @param LocalName Local name to assign to the connected printer.
+         * @param RemoteName Name of the remote printer.
+         * @param UpdateProfile [false] Whether the printer mapping is stored in the current user's profile.
+         *
+         * If you are mapping a remote printer using the profile of someone other than current user, you can specify _UserName_ and _Password_.
+         */
+        AddPrinterConnection(LocalName: string, RemoteName: string, UpdateProfile?: boolean, UserName?: string, Password?: string): void;
+
+        /**
+         * @param string Path to printer connection
+         * @param string [DriverName='']
+         * @param string [Port='LPT1']
+         *
+         * Unlike the **AddPrinterConnection** method, this method allows you to create a printer connection without directing it to a specific port, such as LPT1.
+         */
+        AddWindowsPrinterConnection(PrinterName: string, DriverName?: string, Port?: string): void;
+        readonly ComputerName: string;
+        EnumNetworkDrives(): WshCollection;
+        EnumPrinterConnections(): WshCollection;
+
+        /**
+         * Adds a remote MS-DOS-based printer connection to your computer system.
+         * @param LocalName Name by which the mapped drive will be known locally
+         * @param RemoteName Share's UNC name (\\xxx\yyy)
+         * @param UpdateProfile [false] Whether the printer mapping is stored in the current user's profile.
+         *
+         * If you are mapping a network drive using the profile of someone other than current user, you can specify _UserName_ and _Password_.
+         */
+        MapNetworkDrive(LocalName: string, RemoteName: string, UpdateProfile?: boolean, UserName?: string, Password?: string): void;
+        readonly Organization: string;
+
+        /**
+         * Removes a shared network drive from your computer system
+         * @param Name Name of the mapped drive you want to remove. This will be the drive letter if the drive has a mapping between a local name (drive letter) and a remote name (UNC name);
+         * it will be the UNC path if there is no such mapping
+         * @param Force [false] Remove the connections even if the resource is in use
+         * @param UpdateProfile [false] Remove the mapping from the user's profile
+         */
+        RemoveNetworkDrive(Name: string, Force?: boolean, UpdateProfile?: boolean): void;
+
+        /**
+         * Removes a shared network printer connection from your computer system
+         * @param Name Name that identifies the printer. Can be a UNC name (in the form `\\xxx\yyy`) or a local name (such as `LPT1`)
+         * @param Force [false] Remove printer connection even if a user is still connected
+         * @param UpdateProfile [false] Remove the printer connection from the user's profile
+         *
+         * The **RemovePrinterConnection** method removes both Windows and MS-DOS based printer connections. If the printer was connected using the method **AddPrinterConnection**,
+         * _Name_ must be the printer's local name. If the printer was connected using the **AddWindowsPrinterConnection** method or was added manually (using the Add Printer wizard),
+         * then _Name_ must be the printer's UNC name.
+         */
+        RemovePrinterConnection(Name: string, Force?: true, UpdateProfile?: true): void;
+        SetDefaultPrinter(Name: string): void;
+        readonly Site: string;
+        readonly UserDomain: string;
+        readonly UserName: string;
+        readonly UserProfile: string;
+    }
+
+    /** Shell Object */
+    class WshShell {
+        private 'IWshRuntimeLibrary.WshShell_typekey': WshShell;
+        private constructor();
+
+        /**
+         * Activates an application window
+         * @param App Title of application as it appears in the title bar, or the process ID
+         * @param Wait
+         *
+         * This method changes the focus to the named application or window. The window must be attached to the calling thread's message queue. It does not affect whether it is maximized or
+         * minimized. Focus moves from the activated application window when the user takes action to change the focus (or closes the window).
+         *
+         * In determining which application to activate, the specified title is compared to the title string of each running application. If no exact match exists, any application whose title
+         * string begins with title is activated. If an application still cannot be found, any application whose title string ends with title is activated. If more than one instance of the
+         * application named by title exists, one instance is arbitrarily activated.
+         *
+         * The method might return `false` under the following conditions:
+         *
+         * * The window is not brought to the foreground.
+         * * The window is brought to the foreground but is not given keyboard focus.
+         * * A Command Prompt window (`cmd.exe`) is brought to the foreground and is given keyboard focus.
+         */
+        AppActivate(App: string | number, Wait?: any): boolean;
+
+        /**
+         * Creates a shortcut
+         * @param PathLink Path where the shortcut should be created
+         *
+         * The shortcut object exists in memory until you save it to disk with the **Save** method.
+         */
+        CreateShortcut(PathLink: string): WshShortcut | WshURLShortcut;
+        CurrentDirectory: string;
+
+        /**
+         * Note that **Environment** doesn't actually return a callable object; the call is only usable in the context of the **Environment** property. The following:
+         *
+         *     let env = new ActiveXObject('WScript.Shell').Environment;
+         *     WScript.Echo(env('System'));
+         *
+         * will return an empty string, unless there is an environment variable named `System`
+         */
+        Environment: WshEnvironment & ((Type: 'System' | 'User' | 'Process' | 'Volatile') => WshEnvironment);
+        Exec(Command: string): WshExec;
+        ExpandEnvironmentStrings(Src: string): string;
+
+        /** @param string [Target=''] Name of the computer system where the event should be logged; default is the local computer system */
+        LogEvent(Type: EventType, Message: string, Target?: string): boolean;
+        Popup(Text: string, SecondsToWait?: number, Title?: string, Type?: ButtonType | IconType | PopupType): PopupSelection;
+        RegDelete(Name: string): void;
+
+        /**
+         * Returns the value of a key or value-name from the registry
+         * @param Name Key (ends with a final `\`) or value-name (doesn't end with a final `\`)
+         *
+         * Returns one of the following, based on the registry value type:
+         *
+         * * **REG_SZ** -- a string
+         * * **REG_DWORD** -- a number
+         * * **REG_SBINARY** -- a binary value, as a COM SafeArray containing integers
+         * * **REG_EXPAND_SZ** -- an expandable string
+         * * **REG_MULTI_SZ** -- an array of srings, as a COM SafeArray
+         */
+        RegRead(Name: string): string | number | SafeArray<string> | SafeArray<number>;
+
+        /**
+         * Creates a new key, adds another value-name to an existing key and assigns it a value, or changes the value of an existing value-name
+         * @param Name Key (ends with a final `\`) or value-name (doesn't end with a final `\`)
+         * @param Value Will be coerced to `string` or `integer` based on the value-name type:
+         * `REG_SZ | REG_EXPAND_SZ` will be converted to `string`;
+         * `REG_DWORD | REG_BINARY` will be converted to `integer`
+         * @param Type
+         */
+        RegWrite(Name: string, Value: any, Type?: 'REG_SZ' | 'REG_DWORD' | 'REG_BINARY' | 'REG_EXPAND_SZ'): void;
+
+        /**
+         * Runs a program in a new process.
+         * @param Command Command-line, including any parameters you want to pass to the executable file.
+         * @param WindowStyle Appearance of the program window. Not all programs make use of this information.
+         * @param WaitOnReturn Block script until program finishes executing.
+         *
+         * If `false` is passed into **WaitOnReturn**, the **Run** method will return 0 immediately. If `true` is passed in, **Run** will return the program's error code, if any.
+         *
+         * Environment variables will be expanded within the command line.
+         *
+         * Passing a registered file type will automatically open the program registered to the file type.
+         *
+         * Possible values for **WindowStyle**:
+         *
+         * * **0** -- Hides the window and activates another window.
+         * * **1** -- Activates and displays a window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag
+         * when displaying the window for the first time.
+         * * **2** -- Activates the window and displays it as a minimized window.
+         * * **3** -- Activates the window and displays it as a maximized window.
+         * * **4** -- Displays a window in its most recent size and position. The active window remains active.
+         * * **5** -- Activates the window and displays it in its current size and position.
+         * * **6** -- Minimizes the specified window and activates the next top-level window in the Z order.
+         * * **7** -- Displays the window as a minimized window. The active window remains active.
+         * * **8** -- Displays the window in its current state. The active window remains active.
+         * * **9** -- Activates and displays the window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag
+         * when restoring a minimized window.
+         * * **10** -- Sets the show-state based on the state of the program that started the application.
+         */
+        Run(Command: string, WindowStyle?: WindowStyle, WaitOnReturn?: boolean): number;
+        SendKeys(Keys: string, Wait?: boolean): void;
+        readonly SpecialFolders: WshCollection;
+    }
+
+    /** Shortcut Object */
+    class WshShortcut {
+        private 'IWshRuntimeLibrary.WshShortcut_typekey': WshShortcut;
+        private constructor();
+        Arguments: string;
+        Description: string;
+        readonly FullName: string;
+        Hotkey: string;
+        IconLocation: string;
+        Load(PathLink: string): void;
+        readonly RelativePath: string;
+        Save(): void;
+        TargetPath: string;
+
+        /**
+         * Possible values:
+         *
+         * * **1** -- Activates and displays a window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag
+         * when displaying the window for the first time.
+         * * **3** -- Activates the window and displays it as a maximized window.
+         * * **7** -- Displays the window as a minimized window. The active window remains active.
+         */
+        WindowStyle: ShortcutWindowStyle;
+        WorkingDirectory: string;
+    }
+
+    /** URLShortcut Object */
+    class WshURLShortcut {
+        private 'IWshRuntimeLibrary.WshURLShortcut_typekey': WshURLShortcut;
+        private constructor();
+        readonly FullName: string;
+        Load(PathLink: string): void;
+        Save(): void;
+        TargetPath: string;
+    }
+}
+declare namespace WSHControllerLibrary {
+    class WSHController {
+        private 'WSHControllerLibrary.WSHController_typekey': WSHController;
+        private constructor();
+        CreateScript(Command: string, Server?: any): any;
+    }
+}
+
+declare namespace ScriptSigner {
+    class Signer {
+        private 'ScriptSigner.Signer_typekey': Signer;
+        private constructor();
+
+        /** @param Store [Store='my'] */
+        Sign(FileExtension: string, Text: string, Certificate: string, Store?: string): string;
+
+        /** @param Store [Store='my'] */
+        SignFile(FileName: string, Certificate: string, Store?: string): void;
+
+        /** @param ShowUI [ShowUI=false] */
+        Verify(FileExtension: string, Text: string, ShowUI?: boolean): boolean;
+
+        /** @param ShowUI [ShowUI=false] */
+        VerifyFile(FileName: string, ShowUI?: boolean): boolean;
+    }
+}
+
+interface ActiveXObjectNameMap {
+    'WSHController': WSHControllerLibrary.WSHController;
+    'Scripting.Signer': ScriptSigner.Signer;
+    'WScript.Network': IWshRuntimeLibrary.WshNetwork;
+    'WScript.Shell': IWshRuntimeLibrary.WshShell;
+}
+
+interface ActiveXObject {
+    set(obj: IWshRuntimeLibrary.WshEnvironment, propertyName: 'Item', parameterTypes: [string], newValue: string): void;
+}
diff --git a/types/activex-iwshruntimelibrary/tsconfig.json b/types/activex-iwshruntimelibrary/tsconfig.json
new file mode 100644
index 0000000000..20c2a630c3
--- /dev/null
+++ b/types/activex-iwshruntimelibrary/tsconfig.json
@@ -0,0 +1,21 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es5"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [ "../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "activex-iwshruntimelibrary-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/activex-iwshruntimelibrary/tslint.json b/types/activex-iwshruntimelibrary/tslint.json
new file mode 100644
index 0000000000..ed91c31f9c
--- /dev/null
+++ b/types/activex-iwshruntimelibrary/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-const-enum": false
+    }
+}
\ No newline at end of file
diff --git a/types/windows-script-host/index.d.ts b/types/windows-script-host/index.d.ts
index 50f0c52216..47f11e4d39 100644
--- a/types/windows-script-host/index.d.ts
+++ b/types/windows-script-host/index.d.ts
@@ -4,437 +4,44 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-/// <reference types="activex-interop" />
+/// <reference types="activex-iwshruntimelibrary" />
 
-declare namespace IWshRuntimeLibrary {
-    type WindowStyle = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
-    type ShortcutWindowStyle = 1 | 3 | 7;
-
-    const enum ButtonType {
-        OK,
-        OKCancel,
-        AbortRetryIgnore,
-        YesNoCancel,
-        YesNo,
-        RetryCancel,
-        CancelTryagainContinue
-    }
-
-    const enum EventType {
-        AuditFailure = 5,
-        AuditSuccess = 4,
-        Error = 1,
-        Information = 3,
-        Success = 0,
-        Warning = 2
-    }
-
-    const enum IconType {
-        Stop = 16,
-        QuestionMark = 32,
-        ExclamationMakr = 48,
-        InformationMark = 64,
-    }
-
-    const enum PopupType {
-        SecondButtonDefault = 256,
-        ThirdButtonDefault = 512,
-        Modal = 4096,
-        RightJustified = 524288,
-        RTL = 1048576,
-    }
-
-    const enum PopupSelection {
-        NoButton = -1,
-        OK = 1,
-        Cancel = 2,
-        Abort = 3,
-        Retry = 4,
-        Ignore = 5,
-        Yes = 6,
-        No = 7,
-        TryAgain = 10,
-        Continue = 11,
-    }
-
-    const enum WshExecStatus {
-        WshFailed = 2,
-        WshFinished = 1,
-        WshRunning = 0,
-    }
-
-    const enum WshWindowStyle {
-        WshHide = 0,
-        WshMaximizedFocus = 3,
-        WshMinimizedFocus = 2,
-        WshMinimizedNoFocus = 6,
-        WshNormalFocus = 1,
-        WshNormalNoFocus = 4,
-    }
-
-    class TextStreamBase {
-        /**
-         * The column number of the current character position in an input stream.
-         */
-        Column: number;
-
-        /**
-         * The current line number in an input stream.
-         */
-        Line: number;
-
-        /**
-         * Closes a text stream.
-         * It is not necessary to close standard streams; they close automatically when the process ends. If
-         * you close a standard stream, be aware that any other pointers to that standard stream become invalid.
-         */
-        Close(): void;
-    }
-
-    class TextStreamWriter extends TextStreamBase {
-        private 'IWshRuntimeLibrary.TextStreamWriter_typekey': TextStreamWriter;
-        private constructor();
-
-        /**
-         * Sends a string to an output stream.
-         */
-        Write(s: string): void;
-
-        /**
-         * Sends a specified number of blank lines (newline characters) to an output stream.
-         */
-        WriteBlankLines(intLines: number): void;
-
-        /**
-         * Sends a string followed by a newline character to an output stream.
-         */
-        WriteLine(s: string): void;
-    }
-
-    class TextStreamReader extends TextStreamBase {
-        private 'IWshRuntimeLibrary.TextStreamReader_typekey': TextStreamReader;
-        private constructor();
-
-        /**
-         * Returns a specified number of characters from an input stream, starting at the current pointer position.
-         * Does not return until the ENTER key is pressed.
-         * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
-         */
-        Read(characters: number): string;
-
-        /**
-         * Returns all characters from an input stream.
-         * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
-         */
-        ReadAll(): string;
-
-        /**
-         * Returns an entire line from an input stream.
-         * Although this method extracts the newline character, it does not add it to the returned string.
-         * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
-         */
-        ReadLine(): string;
-
-        /**
-         * Skips a specified number of characters when reading from an input text stream.
-         * Can only be used on a stream in reading mode; causes an error in writing or appending mode.
-         * @param characters Positive number of characters to skip forward. (Backward skipping is not supported.)
-         */
-        Skip(characters: number): void;
-
-        /**
-         * Skips the next line when reading from an input text stream.
-         * Can only be used on a stream in reading mode, not writing or appending mode.
-         */
-        SkipLine(): void;
-
-        /**
-         * Indicates whether the stream pointer position is at the end of a line.
-         */
-        AtEndOfLine: boolean;
-
-        /**
-         * Indicates whether the stream pointer position is at the end of a stream.
-         */
-        AtEndOfStream: boolean;
-    }
-
-    /** Provides access to the entire collection of command-line parameters, in the order in which they were originally entered. */
-    interface WshArguments {
-        Count(): number;
-        Item(index: number): string;
-        Length: number;
-        Named: WshNamed;
-
-        /**
-         * When you run the **ShowUsage** method, a help screen (referred to as the usage) appears and displays details about the script's command line options.
-         * This information comes from the runtime section of the `*.WSF` file. Everything written between the `<runtime>` and `</runtime>` tags is pieced together
-         * to produce what is called a "usage statement." The usage statement tells the user how to use the script.
-         */
-        ShowUsage(): void;
-        Unnamed: WshUnnamed;
-        (index: number): string;
-    }
-
-    /** Generic Collection Object */
-    interface WshCollection {
-        Count(): number;
-        Item(Index: any): any;
-        readonly length: number;
-        (Index: any): any;
-    }
-
-    /** Environment Variables Collection Object */
-    interface WshEnvironment {
-        Count(): number;
-        Item(Name: string): string;
-        readonly Length: number;
-        Remove(Name: string): void;
-        (Name: string): string;
-    }
-
-    /** WSHExec object */
-    class WshExec {
-        private 'IWshRuntimeLibrary.WshExec_typekey': WshExec;
-        private constructor();
-        readonly ExitCode: number;
-        readonly ProcessID: number;
-        readonly Status: WshExecStatus;
-        readonly StdErr: TextStreamWriter;
-        readonly StdIn: TextStreamReader;
-        readonly StdOut: TextStreamWriter;
-        Terminate(): void;
-    }
+/** Provides access to the entire collection of command-line parameters, in the order in which they were originally entered. */
+interface WshArguments {
+    Count(): number;
+    Item(index: number): string;
+    Length: number;
+    Named: WshNamed;
 
     /**
-     * Provides access to the named command-line arguments
-     *
-     * Note that enumerating over this object returns the **names** of the arguments, not the values
+     * When you run the **ShowUsage** method, a help screen (referred to as the usage) appears and displays details about the script's command line options.
+     * This information comes from the runtime section of the `*.WSF` file. Everything written between the `<runtime>` and `</runtime>` tags is pieced together
+     * to produce what is called a "usage statement." The usage statement tells the user how to use the script.
      */
-    interface WshNamed {
-        Count(): number;
-        Exists(Key: string): boolean;
-        Item(name: string): string;
-        Length: number;
-        (name: string): string;
-    }
+    ShowUsage(): void;
+    Unnamed: WshUnnamed;
+    (index: number): string;
+}
 
-    /** Network Object */
-    class WshNetwork {
-        private 'IWshRuntimeLibrary.WshNetwork_typekey': WshNetwork;
-        private constructor();
+/**
+ * Provides access to the named command-line arguments
+ *
+ * Note that enumerating over this object returns the **names** of the arguments, not the values
+ */
+interface WshNamed {
+    Count(): number;
+    Exists(Key: string): boolean;
+    Item(name: string): string;
+    Length: number;
+    (name: string): string;
+}
 
-        /**
-         * Adds a remote MS-DOS-based printer connection to your computer system.
-         * @param LocalName Local name to assign to the connected printer.
-         * @param RemoteName Name of the remote printer.
-         * @param UpdateProfile [false] Whether the printer mapping is stored in the current user's profile.
-         *
-         * If you are mapping a remote printer using the profile of someone other than current user, you can specify _UserName_ and _Password_.
-         */
-        AddPrinterConnection(LocalName: string, RemoteName: string, UpdateProfile?: boolean, UserName?: string, Password?: string): void;
-
-        /**
-         * @param string Path to printer connection
-         * @param string [DriverName='']
-         * @param string [Port='LPT1']
-         *
-         * Unlike the **AddPrinterConnection** method, this method allows you to create a printer connection without directing it to a specific port, such as LPT1.
-         */
-        AddWindowsPrinterConnection(PrinterName: string, DriverName?: string, Port?: string): void;
-        readonly ComputerName: string;
-        EnumNetworkDrives(): WshCollection;
-        EnumPrinterConnections(): WshCollection;
-
-        /**
-         * Adds a remote MS-DOS-based printer connection to your computer system.
-         * @param LocalName Name by which the mapped drive will be known locally
-         * @param RemoteName Share's UNC name (\\xxx\yyy)
-         * @param UpdateProfile [false] Whether the printer mapping is stored in the current user's profile.
-         *
-         * If you are mapping a network drive using the profile of someone other than current user, you can specify _UserName_ and _Password_.
-         */
-        MapNetworkDrive(LocalName: string, RemoteName: string, UpdateProfile?: boolean, UserName?: string, Password?: string): void;
-        readonly Organization: string;
-
-        /**
-         * Removes a shared network drive from your computer system
-         * @param Name Name of the mapped drive you want to remove. This will be the drive letter if the drive has a mapping between a local name (drive letter) and a remote name (UNC name);
-         * it will be the UNC path if there is no such mapping
-         * @param Force [false] Remove the connections even if the resource is in use
-         * @param UpdateProfile [false] Remove the mapping from the user's profile
-         */
-        RemoveNetworkDrive(Name: string, Force?: boolean, UpdateProfile?: boolean): void;
-
-        /**
-         * Removes a shared network printer connection from your computer system
-         * @param Name Name that identifies the printer. Can be a UNC name (in the form `\\xxx\yyy`) or a local name (such as `LPT1`)
-         * @param Force [false] Remove printer connection even if a user is still connected
-         * @param UpdateProfile [false] Remove the printer connection from the user's profile
-         *
-         * The **RemovePrinterConnection** method removes both Windows and MS-DOS based printer connections. If the printer was connected using the method **AddPrinterConnection**,
-         * _Name_ must be the printer's local name. If the printer was connected using the **AddWindowsPrinterConnection** method or was added manually (using the Add Printer wizard),
-         * then _Name_ must be the printer's UNC name.
-         */
-        RemovePrinterConnection(Name: string, Force?: true, UpdateProfile?: true): void;
-        SetDefaultPrinter(Name: string): void;
-        readonly Site: string;
-        readonly UserDomain: string;
-        readonly UserName: string;
-        readonly UserProfile: string;
-    }
-
-    /** Shell Object */
-    class WshShell {
-        private 'IWshRuntimeLibrary.WshShell_typekey': WshShell;
-        private constructor();
-
-        /**
-         * Activates an application window
-         * @param App Title of application as it appears in the title bar, or the process ID
-         * @param Wait
-         *
-         * This method changes the focus to the named application or window. The window must be attached to the calling thread's message queue. It does not affect whether it is maximized or
-         * minimized. Focus moves from the activated application window when the user takes action to change the focus (or closes the window).
-         *
-         * In determining which application to activate, the specified title is compared to the title string of each running application. If no exact match exists, any application whose title
-         * string begins with title is activated. If an application still cannot be found, any application whose title string ends with title is activated. If more than one instance of the
-         * application named by title exists, one instance is arbitrarily activated.
-         *
-         * The method might return `false` under the following conditions:
-         *
-         * * The window is not brought to the foreground.
-         * * The window is brought to the foreground but is not given keyboard focus.
-         * * A Command Prompt window (`cmd.exe`) is brought to the foreground and is given keyboard focus.
-         */
-        AppActivate(App: string | number, Wait?: any): boolean;
-
-        /**
-         * Creates a shortcut
-         * @param PathLink Path where the shortcut should be created
-         *
-         * The shortcut object exists in memory until you save it to disk with the **Save** method.
-         */
-        CreateShortcut(PathLink: string): WshShortcut | WshURLShortcut;
-        CurrentDirectory: string;
-
-        /**
-         * Note that **Environment** doesn't actually return a callable object; the call is only usable in the context of the **Environment** property. The following:
-         *
-         *     let env = new ActiveXObject('WScript.Shell').Environment;
-         *     WScript.Echo(env('System'));
-         *
-         * will return an empty string, unless there is an environment variable named `System`
-         */
-        Environment: WshEnvironment & ((Type: 'System' | 'User' | 'Process' | 'Volatile') => WshEnvironment);
-        Exec(Command: string): WshExec;
-        ExpandEnvironmentStrings(Src: string): string;
-
-        /** @param string [Target=''] Name of the computer system where the event should be logged; default is the local computer system */
-        LogEvent(Type: EventType, Message: string, Target?: string): boolean;
-        Popup(Text: string, SecondsToWait?: number, Title?: string, Type?: ButtonType | IconType | PopupType): PopupSelection;
-        RegDelete(Name: string): void;
-
-        /**
-         * Returns the value of a key or value-name from the registry
-         * @param Name Key (ends with a final `\`) or value-name (doesn't end with a final `\`)
-         *
-         * Returns one of the following, based on the registry value type:
-         *
-         * * **REG_SZ** -- a string
-         * * **REG_DWORD** -- a number
-         * * **REG_SBINARY** -- a binary value, as a COM SafeArray containing integers
-         * * **REG_EXPAND_SZ** -- an expandable string
-         * * **REG_MULTI_SZ** -- an array of srings, as a COM SafeArray
-         */
-        RegRead(Name: string): string | number | SafeArray<string> | SafeArray<number>;
-
-        /**
-         * Creates a new key, adds another value-name to an existing key and assigns it a value, or changes the value of an existing value-name
-         * @param Name Key (ends with a final `\`) or value-name (doesn't end with a final `\`)
-         * @param Value Will be coerced to `string` or `integer` based on the value-name type:
-         * `REG_SZ | REG_EXPAND_SZ` will be converted to `string`;
-         * `REG_DWORD | REG_BINARY` will be converted to `integer`
-         * @param Type
-         */
-        RegWrite(Name: string, Value: any, Type?: 'REG_SZ' | 'REG_DWORD' | 'REG_BINARY' | 'REG_EXPAND_SZ'): void;
-
-        /**
-         * Runs a program in a new process.
-         * @param Command Command-line, including any parameters you want to pass to the executable file.
-         * @param WindowStyle Appearance of the program window. Not all programs make use of this information.
-         * @param WaitOnReturn Block script until program finishes executing.
-         *
-         * If `false` is passed into **WaitOnReturn**, the **Run** method will return 0 immediately. If `true` is passed in, **Run** will return the program's error code, if any.
-         *
-         * Environment variables will be expanded within the command line.
-         *
-         * Passing a registered file type will automatically open the program registered to the file type.
-         *
-         * Possible values for **WindowStyle**:
-         *
-         * * **0** -- Hides the window and activates another window.
-         * * **1** -- Activates and displays a window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag
-         * when displaying the window for the first time.
-         * * **2** -- Activates the window and displays it as a minimized window.
-         * * **3** -- Activates the window and displays it as a maximized window.
-         * * **4** -- Displays a window in its most recent size and position. The active window remains active.
-         * * **5** -- Activates the window and displays it in its current size and position.
-         * * **6** -- Minimizes the specified window and activates the next top-level window in the Z order.
-         * * **7** -- Displays the window as a minimized window. The active window remains active.
-         * * **8** -- Displays the window in its current state. The active window remains active.
-         * * **9** -- Activates and displays the window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag
-         * when restoring a minimized window.
-         * * **10** -- Sets the show-state based on the state of the program that started the application.
-         */
-        Run(Command: string, WindowStyle?: WindowStyle, WaitOnReturn?: boolean): number;
-        SendKeys(Keys: string, Wait?: boolean): void;
-        readonly SpecialFolders: WshCollection;
-    }
-
-    /** Shortcut Object */
-    class WshShortcut {
-        private 'IWshRuntimeLibrary.WshShortcut_typekey': WshShortcut;
-        private constructor();
-        Arguments: string;
-        Description: string;
-        readonly FullName: string;
-        Hotkey: string;
-        IconLocation: string;
-        Load(PathLink: string): void;
-        readonly RelativePath: string;
-        Save(): void;
-        TargetPath: string;
-
-        /**
-         * Possible values:
-         *
-         * * **1** -- Activates and displays a window. If the window is minimized or maximized, the system restores it to its original size and position. An application should specify this flag
-         * when displaying the window for the first time.
-         * * **3** -- Activates the window and displays it as a maximized window.
-         * * **7** -- Displays the window as a minimized window. The active window remains active.
-         */
-        WindowStyle: ShortcutWindowStyle;
-        WorkingDirectory: string;
-    }
-
-    /** Provides access to the unnamed command-line arguments */
-    interface WshUnnamed {
-        Count(): number;
-        Item(index: number): string;
-        Length: number;
-        (index: number): string;
-    }
-
-    /** URLShortcut Object */
-    class WshURLShortcut {
-        private 'IWshRuntimeLibrary.WshURLShortcut_typekey': WshURLShortcut;
-        private constructor();
-        readonly FullName: string;
-        Load(PathLink: string): void;
-        Save(): void;
-        TargetPath: string;
-    }
+/** Provides access to the unnamed command-line arguments */
+interface WshUnnamed {
+    Count(): number;
+    Item(index: number): string;
+    Length: number;
+    (index: number): string;
 }
 
 declare var WScript: {
@@ -455,7 +62,7 @@ declare var WScript: {
      * Can be accessed only while using CScript.exe.
      */
     StdOut: IWshRuntimeLibrary.TextStreamWriter;
-    Arguments: IWshRuntimeLibrary.WshArguments;
+    Arguments: WshArguments;
 
     /**
      *  The full path of the currently running script.
@@ -546,41 +153,3 @@ declare var WScript: {
  * WSH is an alias for WScript under Windows Script Host
  */
 declare var WSH: typeof WScript;
-
-declare namespace WSHControllerLibrary {
-    class WSHController {
-        private 'WSHControllerLibrary.WSHController_typekey': WSHController;
-        private constructor();
-        CreateScript(Command: string, Server?: any): any;
-    }
-}
-
-declare namespace ScriptSigner {
-    class Signer {
-        private 'ScriptSigner.Signer_typekey': Signer;
-        private constructor();
-
-        /** @param Store [Store='my'] */
-        Sign(FileExtension: string, Text: string, Certificate: string, Store?: string): string;
-
-        /** @param Store [Store='my'] */
-        SignFile(FileName: string, Certificate: string, Store?: string): void;
-
-        /** @param ShowUI [ShowUI=false] */
-        Verify(FileExtension: string, Text: string, ShowUI?: boolean): boolean;
-
-        /** @param ShowUI [ShowUI=false] */
-        VerifyFile(FileName: string, ShowUI?: boolean): boolean;
-    }
-}
-
-interface ActiveXObjectNameMap {
-    'WSHController': WSHControllerLibrary.WSHController;
-    'Scripting.Signer': ScriptSigner.Signer;
-    'WScript.Network': IWshRuntimeLibrary.WshNetwork;
-    'WScript.Shell': IWshRuntimeLibrary.WshShell;
-}
-
-interface ActiveXObject {
-    set(obj: IWshRuntimeLibrary.WshEnvironment, propertyName: 'Item', parameterTypes: [string], newValue: string): void;
-}
diff --git a/types/windows-script-host/windows-script-host-tests.ts b/types/windows-script-host/windows-script-host-tests.ts
index c6b3449482..d4851f2626 100644
--- a/types/windows-script-host/windows-script-host-tests.ts
+++ b/types/windows-script-host/windows-script-host-tests.ts
@@ -28,53 +28,3 @@ WScript.Echo(`${WScript.Arguments.Named.Length} named arguments`);
 for (const key of collectionToArray(WScript.Arguments.Named)) {
     WScript.Echo(`    ${key}=${WScript.Arguments.Named(key)}`);
 }
-
-const wshn = new ActiveXObject('WScript.Network');
-
-// https://msdn.microsoft.com/en-us/library/s6wt333f(v=vs.84).aspx
-// https://msdn.microsoft.com/en-us/library/wck0hkd7(v=vs.84).aspx
-// https://msdn.microsoft.com/en-us/library/tte130y1(v=vs.84).aspx
-// https://msdn.microsoft.com/en-us/library/3fxhka75(v=vs.84).aspx
-{
-    WScript.Echo('Domain = ' + wshn.UserDomain);
-    WScript.Echo('Computer Name = ' + wshn.ComputerName);
-    WScript.Echo('User Name = ' + wshn.UserName);
-}
-
-// https://msdn.microsoft.com/en-us/library/zsdh7hkb(v=vs.84).aspx
-wshn.AddWindowsPrinterConnection('\\\\printserv\\DefaultPrinter');
-
-// https://msdn.microsoft.com/en-us/library/kxsdca3c(v=vs.84).aspx
-wshn.AddPrinterConnection("LPT1", "\\\\Server\\Print1");
-
-// https://msdn.microsoft.com/en-us/library/t9zt39at(v=vs.84).aspx
-// https://msdn.microsoft.com/en-us/library/zhds6k80(v=vs.84).aspx
-{
-    const drives = wshn.EnumNetworkDrives();
-    const printers = wshn.EnumPrinterConnections();
-    WScript.Echo("Network drive mappings:");
-    for (let i = 0; i < drives.length; i += 2) {
-        WScript.Echo(`Drive ${drives.Item(i)} = ${drives.Item(i + 1)}`);
-    }
-    WScript.Echo('');
-    WScript.Echo("Network printer mappings:");
-    for (let i = 0; i < printers.length; i += 2) {
-        WScript.Echo(`Port ${printers.Item(i)} = ${printers.Item(i + 1)}`);
-    }
-}
-
-// https://msdn.microsoft.com/en-us/library/8kst88h6(v=vs.84).aspx
-wshn.MapNetworkDrive('E:', '\\\\Server\\Public');
-
-// https://msdn.microsoft.com/en-us/library/d16d7wbf(v=vs.84).aspx
-wshn.RemoveNetworkDrive('E:');
-
-// https://msdn.microsoft.com/en-us/library/tsbh2yy7(v=vs.84).aspx
-wshn.RemovePrinterConnection('\\\\PRN-CORP1\\B41-4523-A', true, true);
-
-// https://msdn.microsoft.com/en-us/library/2ccwwdct(v=vs.84).aspx
-{
-    const printerPath = "\\\\research\\library1";
-    wshn.AddWindowsPrinterConnection(printerPath);
-    wshn.SetDefaultPrinter(printerPath);
-}

From 57164febb2b91d52ae6a43ad6a0e829d88c5008f Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Sun, 13 May 2018 18:23:19 +0200
Subject: [PATCH 080/575] Cleanup

---
 .../activex-iwshruntimelibrary/tsconfig.json  |  23 +++
 types/windows-script-host/index.d.ts          |   4 +-
 types/windows-script-host/index.d.ts~HEAD     | 155 ------------------
 .../windows-script-host-tests.ts~HEAD         |  30 ----
 4 files changed, 25 insertions(+), 187 deletions(-)
 create mode 100644 types/activex-iwshruntimelibrary/tsconfig.json
 delete mode 100644 types/windows-script-host/index.d.ts~HEAD
 delete mode 100644 types/windows-script-host/windows-script-host-tests.ts~HEAD

diff --git a/types/activex-iwshruntimelibrary/tsconfig.json b/types/activex-iwshruntimelibrary/tsconfig.json
new file mode 100644
index 0000000000..885ca81980
--- /dev/null
+++ b/types/activex-iwshruntimelibrary/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es5"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "activex-iwshruntimelibrary-tests.ts"
+    ]
+}
diff --git a/types/windows-script-host/index.d.ts b/types/windows-script-host/index.d.ts
index 5627917e8c..47f11e4d39 100644
--- a/types/windows-script-host/index.d.ts
+++ b/types/windows-script-host/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-/// <reference types="activex-interop" />
+/// <reference types="activex-iwshruntimelibrary" />
 
 /** Provides access to the entire collection of command-line parameters, in the order in which they were originally entered. */
 interface WshArguments {
@@ -62,7 +62,7 @@ declare var WScript: {
      * Can be accessed only while using CScript.exe.
      */
     StdOut: IWshRuntimeLibrary.TextStreamWriter;
-    Arguments: IWshRuntimeLibrary.WshArguments;
+    Arguments: WshArguments;
 
     /**
      *  The full path of the currently running script.
diff --git a/types/windows-script-host/index.d.ts~HEAD b/types/windows-script-host/index.d.ts~HEAD
deleted file mode 100644
index 47f11e4d39..0000000000
--- a/types/windows-script-host/index.d.ts~HEAD
+++ /dev/null
@@ -1,155 +0,0 @@
-// Type definitions for Windows Script Host 5.8
-// Project: https://msdn.microsoft.com/en-us/library/9bbdkx3k.aspx
-// Definitions by: Zev Spitz <https://github.com/zspitz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="activex-iwshruntimelibrary" />
-
-/** Provides access to the entire collection of command-line parameters, in the order in which they were originally entered. */
-interface WshArguments {
-    Count(): number;
-    Item(index: number): string;
-    Length: number;
-    Named: WshNamed;
-
-    /**
-     * When you run the **ShowUsage** method, a help screen (referred to as the usage) appears and displays details about the script's command line options.
-     * This information comes from the runtime section of the `*.WSF` file. Everything written between the `<runtime>` and `</runtime>` tags is pieced together
-     * to produce what is called a "usage statement." The usage statement tells the user how to use the script.
-     */
-    ShowUsage(): void;
-    Unnamed: WshUnnamed;
-    (index: number): string;
-}
-
-/**
- * Provides access to the named command-line arguments
- *
- * Note that enumerating over this object returns the **names** of the arguments, not the values
- */
-interface WshNamed {
-    Count(): number;
-    Exists(Key: string): boolean;
-    Item(name: string): string;
-    Length: number;
-    (name: string): string;
-}
-
-/** Provides access to the unnamed command-line arguments */
-interface WshUnnamed {
-    Count(): number;
-    Item(index: number): string;
-    Length: number;
-    (index: number): string;
-}
-
-declare var WScript: {
-    /**
-     * Outputs text to either a message box (under WScript.exe) or the command console window followed by
-     * a newline (under CScript.exe).
-     */
-    Echo(s?: any): void;
-
-    /**
-     * Exposes the write-only error output stream for the current script.
-     * Can be accessed only while using CScript.exe.
-     */
-    StdErr: IWshRuntimeLibrary.TextStreamWriter;
-
-    /**
-     * Exposes the write-only output stream for the current script.
-     * Can be accessed only while using CScript.exe.
-     */
-    StdOut: IWshRuntimeLibrary.TextStreamWriter;
-    Arguments: WshArguments;
-
-    /**
-     *  The full path of the currently running script.
-     */
-    ScriptFullName: string;
-
-    /**
-     * Forces the script to stop immediately, with an optional exit code.
-     */
-    Quit(exitCode?: number): number;
-
-    /**
-     * The Windows Script Host build version number.
-     */
-    BuildVersion: number;
-
-    /**
-     * Fully qualified path of the host executable.
-     */
-    FullName: string;
-
-    /**
-     * Gets/sets the script mode - interactive(true) or batch(false).
-     */
-    Interactive: boolean;
-
-    /**
-     * The name of the host executable (WScript.exe or CScript.exe).
-     */
-    Name: string;
-
-    /**
-     * Path of the directory containing the host executable.
-     */
-    Path: string;
-
-    /**
-     * The filename of the currently running script.
-     */
-    ScriptName: string;
-
-    /**
-     * Exposes the read-only input stream for the current script.
-     * Can be accessed only while using CScript.exe.
-     */
-    StdIn: IWshRuntimeLibrary.TextStreamReader;
-
-    /**
-     * Windows Script Host version
-     */
-    Version: string;
-
-    /**
-     * Connects a COM object's event sources to functions named with a given prefix, in the form prefix_event.
-     */
-    ConnectObject(objEventSource: any, strPrefix: string): void;
-
-    /**
-     * Creates a COM object.
-     * @param strProgiID
-     * @param strPrefix Function names in the form prefix_event will be bound to this object's COM events.
-     */
-    CreateObject<K extends keyof ActiveXObjectNameMap = any>(strProgID: K, strPrefix?: string): ActiveXObjectNameMap[K];
-
-    /**
-     * Disconnects a COM object from its event sources.
-     */
-    DisconnectObject(obj: any): void;
-
-    /**
-     * Retrieves an existing object with the specified ProgID from memory, or creates a new one from a file.
-     * @param strPathname Fully qualified path to the file containing the object persisted to disk.
-     *                       For objects in memory, pass a zero-length string.
-     * @param strProgID
-     * @param strPrefix Function names in the form prefix_event will be bound to this object's COM events.
-     */
-    GetObject<K extends keyof ActiveXObjectNameMap>(strPathname: string, strProgID: K, strPrefix?: string): ActiveXObjectNameMap[K];
-    GetObject(strPathname: string, strProgID?: string, strPrefix?: string): any;
-
-    /**
-     * Suspends script execution for a specified length of time, then continues execution.
-     * @param intTime Interval (in milliseconds) to suspend script execution.
-     */
-    Sleep(intTime: number): void;
-};
-
-/**
- * WSH is an alias for WScript under Windows Script Host
- */
-declare var WSH: typeof WScript;
diff --git a/types/windows-script-host/windows-script-host-tests.ts~HEAD b/types/windows-script-host/windows-script-host-tests.ts~HEAD
deleted file mode 100644
index d4851f2626..0000000000
--- a/types/windows-script-host/windows-script-host-tests.ts~HEAD
+++ /dev/null
@@ -1,30 +0,0 @@
-const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
-    const results: T[] = [];
-    const enumerator = new Enumerator<T>(col);
-    enumerator.moveFirst();
-    while (!enumerator.atEnd()) {
-        results.push(enumerator.item());
-        enumerator.moveNext();
-    }
-    return results;
-};
-
-// Show all of the arguments.
-WScript.Echo(`${WScript.Arguments.Length} arguments`);
-
-for (const arg of collectionToArray(WScript.Arguments)) {
-    WScript.Echo(`    ${arg}`);
-}
-
-// Show the unnamed arguments.
-WScript.Echo(`${WScript.Arguments.Unnamed.Length} unnamed arguments`);
-
-for (const unnamed of collectionToArray(WScript.Arguments.Unnamed)) {
-    WScript.Echo(`    ${unnamed}`);
-}
-
-// Show the named arguments.
-WScript.Echo(`${WScript.Arguments.Named.Length} named arguments`);
-for (const key of collectionToArray(WScript.Arguments.Named)) {
-    WScript.Echo(`    ${key}=${WScript.Arguments.Named(key)}`);
-}

From 0f8551f40f4053501f287e1f4bd1d5d713e48d45 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Sun, 13 May 2018 18:32:38 +0200
Subject: [PATCH 081/575] Remove unneeded scripthost dependencies

---
 types/firebird/tsconfig.json | 3 +--
 types/mfiles/tsconfig.json   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/types/firebird/tsconfig.json b/types/firebird/tsconfig.json
index e5e2d1b6ac..ad3f26314d 100644
--- a/types/firebird/tsconfig.json
+++ b/types/firebird/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6",
-            "scripthost"
+            "es6"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
diff --git a/types/mfiles/tsconfig.json b/types/mfiles/tsconfig.json
index 295542875a..0b95d12fb9 100644
--- a/types/mfiles/tsconfig.json
+++ b/types/mfiles/tsconfig.json
@@ -2,8 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es5",
-            "scripthost"
+            "es5"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,

From 7c4f5bedba21a7c97649aa0eee38b00c06ba8260 Mon Sep 17 00:00:00 2001
From: "a.kalin" <a@web-deploy.ru>
Date: Sun, 13 May 2018 20:27:51 +0300
Subject: [PATCH 082/575] @type/chrome discard method & properties

---
 types/chrome/index.d.ts | 48 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/types/chrome/index.d.ts b/types/chrome/index.d.ts
index d2b92e4b22..3553daada1 100644
--- a/types/chrome/index.d.ts
+++ b/types/chrome/index.d.ts
@@ -5989,6 +5989,16 @@ declare namespace chrome.tabs {
          * @since Chrome 45.
          */
         audible?: boolean;
+        /**
+         * Whether the tab is discarded. A discarded tab is one whose content has been unloaded from memory, but is still visible in the tab strip. Its content gets reloaded the next time it's activated.
+         * @since Chrome 54.
+         */
+        discarded: boolean;
+        /**
+         * Whether the tab can be discarded automatically by the browser when resources are low.
+         * @since Chrome 54.
+         */
+        autoDiscardable: boolean;
         /**
          * Optional.
          * Current tab muted state and the reason for the last state change.
@@ -6153,6 +6163,11 @@ declare namespace chrome.tabs {
          * @since Chrome 45.
          */
         muted?: boolean;
+        /**
+         * Optional. Whether the tab should be discarded automatically by the browser when resources are low.
+         * @since Chrome 54.
+         */
+        autoDiscardable?: boolean;
     }
 
     export interface CaptureVisibleTabOptions {
@@ -6200,7 +6215,7 @@ declare namespace chrome.tabs {
          * Optional. Whether the tabs have completed loading.
          * One of: "loading", or "complete"
          */
-        status?: string;
+        status?: 'loading' | 'complete';
         /**
          * Optional. Whether the tabs are in the last focused window.
          * @since Chrome 19.
@@ -6212,7 +6227,7 @@ declare namespace chrome.tabs {
          * Optional. The type of window the tabs are in.
          * One of: "normal", "popup", "panel", "app", or "devtools"
          */
-        windowType?: string;
+        windowType?: 'normal' | 'popup' | 'panel' | 'app' | 'devtools';
         /** Optional. Whether the tabs are active in their windows. */
         active?: boolean;
         /**
@@ -6231,6 +6246,18 @@ declare namespace chrome.tabs {
         currentWindow?: boolean;
         /** Optional. Whether the tabs are highlighted. */
         highlighted?: boolean;
+        /**
+         * Optional.
+         * Whether the tabs are discarded. A discarded tab is one whose content has been unloaded from memory, but is still visible in the tab strip. Its content gets reloaded the next time it's activated.
+         * @since Chrome 54.
+         */
+        discarded?: boolean;
+        /**
+         * Optional.
+         * Whether the tabs can be discarded automatically by the browser when resources are low.
+         * @since Chrome 54.
+         */
+        autoDiscardable?: boolean;
         /** Optional. Whether the tabs are pinned. */
         pinned?: boolean;
         /**
@@ -6280,6 +6307,16 @@ declare namespace chrome.tabs {
          * @since Chrome 45.
          */
         audible?: boolean;
+        /**
+         * The tab's new discarded state.
+         * @since Chrome 54.
+         */
+        discarded?: boolean;
+        /**
+         * The tab's new auto-discardable
+         * @since Chrome 54.
+         */
+        autoDiscardable?: boolean;
         /**
          * The tab's new muted state and the reason for the change.
          * @since Chrome 46. Warning: this is the current Beta channel.
@@ -6604,6 +6641,13 @@ declare namespace chrome.tabs {
      * Paramater zoomSettings: The tab's current zoom settings.
      */
     export function getZoomSettings(tabId: number, callback: (zoomSettings: ZoomSettings) => void): void;
+    /**
+     * Discards a tab from memory. Discarded tabs are still visible on the tab strip and are reloaded when activated.
+     * @since Chrome 54.
+     * @param tabId Optional. The ID of the tab to be discarded. If specified, the tab will be discarded unless it's active or already discarded. If omitted, the browser will discard the least important tab. This can fail if no discardable tabs exist.
+     * @param callback Called after the operation is completed.
+     */
+    export function discard(tabId: number, callback: (tab: Tab) => void): void;
 
     /**
      * Fired when the highlighted or selected tabs in a window changes.

From e51b5c893c4eed575ca897be2366bfbe9742f3af Mon Sep 17 00:00:00 2001
From: Seth Kingsley <sethk@meowfishies.com>
Date: Sun, 13 May 2018 15:49:42 -0700
Subject: [PATCH 083/575] PATCH 1

Update version number and CC myself
---
 types/three/index.d.ts | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/types/three/index.d.ts b/types/three/index.d.ts
index 2c8d006589..1361128b20 100644
--- a/types/three/index.d.ts
+++ b/types/three/index.d.ts
@@ -1,6 +1,22 @@
-// Type definitions for three.js 0.91
+// Type definitions for three.js 0.92
 // Project: https://threejs.org
-// Definitions by: Kon <http://phyzkit.net/>, Satoru Kimura <https://github.com/gyohk>, Florent Poujol <https://github.com/florentpoujol>, SereznoKot <https://github.com/SereznoKot>, HouChunlei <https://github.com/omni360>, Ivo <https://github.com/ivoisbelongtous>, David Asmuth <https://github.com/piranha771>, Brandon Roberge, Qinsi ZHU <https://github.com/qszhusightp>, Toshiya Nakakura <https://github.com/nakakura>, Poul Kjeldager Sørensen <https://github.com/s093294>, Stefan Profanter <https://github.com/Pro>, Edmund Fokschaner <https://github.com/efokschaner>, Roelof Jooste <https://github.com/PsychoSTS>, Daniel Hritzkiv <https://github.com/dhritzkiv>, Apurva Ojas <https://github.com/apurvaojas>
+// Definitions by: Kon <http://phyzkit.net/>,
+//                 Satoru Kimura <https://github.com/gyohk>,
+//                 Florent Poujol <https://github.com/florentpoujol>,
+//                 SereznoKot <https://github.com/SereznoKot>,
+//                 HouChunlei <https://github.com/omni360>,
+//                 Ivo <https://github.com/ivoisbelongtous>,
+//                 David Asmuth <https://github.com/piranha771>,
+//                 Brandon Roberge,
+//                 Qinsi ZHU <https://github.com/qszhusightp>,
+//                 Toshiya Nakakura <https://github.com/nakakura>,
+//                 Poul Kjeldager Sørensen <https://github.com/s093294>,
+//                 Stefan Profanter <https://github.com/Pro>,
+//                 Edmund Fokschaner <https://github.com/efokschaner>,
+//                 Roelof Jooste <https://github.com/PsychoSTS>,
+//                 Daniel Hritzkiv <https://github.com/dhritzkiv>,
+//                 Apurva Ojas <https://github.com/apurvaojas>,
+//                 Seth Kingsley <https://github.com/sethk>
 // Definitions: https://github.com//DefinitelyTyped
 
 export * from "./three-core";

From 4c25d57e2f63b31991a2832b990bb0feddf8bce7 Mon Sep 17 00:00:00 2001
From: "FUJI Goro (gfx)" <gfuji@cpan.org>
Date: Mon, 14 May 2018 11:52:54 +0900
Subject: [PATCH 084/575] the original classname() accepts boolean, as well as
 falsy values

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

diff --git a/types/classnames/classnames-tests.ts b/types/classnames/classnames-tests.ts
index b2b8c9eba4..55b801eb40 100644
--- a/types/classnames/classnames-tests.ts
+++ b/types/classnames/classnames-tests.ts
@@ -38,3 +38,6 @@ const className = cx('foo', ['bar'], { baz: true }); // => "abc def xyz"
 
 // falsey values are just ignored
 cx(null, 'bar', undefined, 0, 1, { baz: null }, ''); // => 'bar 1'
+
+// true is just ignored
+cx(true || "foo");
diff --git a/types/classnames/index.d.ts b/types/classnames/index.d.ts
index ce2abb5ee3..40e3ce835c 100644
--- a/types/classnames/index.d.ts
+++ b/types/classnames/index.d.ts
@@ -9,7 +9,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-type ClassValue = string | number | ClassDictionary | ClassArray | undefined | null | false;
+type ClassValue = string | number | ClassDictionary | ClassArray | undefined | null | boolean;
 
 interface ClassDictionary {
 	[id: string]: boolean | undefined | null;

From b92f5af5a1eeb100d1adf1bb2b0bd95bf689811b Mon Sep 17 00:00:00 2001
From: kento1218 <kento@bht-tech.net>
Date: Mon, 14 May 2018 12:32:41 +0900
Subject: [PATCH 085/575] fix(bitcoinjs-lib): script templates

* encodeStack should return Buffer[]
* Signatures are assumed as Buffer, not ECSignature
---
 types/bitcoinjs-lib/bitcoinjs-lib-tests.ts | 19 +++++++++++++++++
 types/bitcoinjs-lib/index.d.ts             | 24 +++++++++++-----------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/types/bitcoinjs-lib/bitcoinjs-lib-tests.ts b/types/bitcoinjs-lib/bitcoinjs-lib-tests.ts
index 669c00d77a..9576ba7289 100644
--- a/types/bitcoinjs-lib/bitcoinjs-lib-tests.ts
+++ b/types/bitcoinjs-lib/bitcoinjs-lib-tests.ts
@@ -41,3 +41,22 @@ bitcoin.address.toBase58Check(rsBase58Check.hash, rsBase58Check.version);
 bitcoin.address.toBech32(rsBech32.data, rsBech32.version, rsBech32.prefix);
 bitcoin.address.toOutputScript(address);
 bitcoin.address.toOutputScript(address, network);
+
+const redeemScript = bitcoin.script.multisig.output.encode(
+	2,
+	[
+		new Buffer('12345678901234567890123456789012'),
+		new Buffer('12345678901234567890123456789012'),
+		new Buffer('12345678901234567890123456789012'),
+	]
+);
+bitcoin.script.scriptHash.input.encode(
+	bitcoin.script.multisig.input.encodeStack(
+		[
+			new Buffer('12345678901234567890123456789012'),
+			new Buffer('12345678901234567890123456789012'),
+		],
+		redeemScript,
+	),
+	redeemScript,
+);
diff --git a/types/bitcoinjs-lib/index.d.ts b/types/bitcoinjs-lib/index.d.ts
index 920df43d6e..a05c3532b6 100644
--- a/types/bitcoinjs-lib/index.d.ts
+++ b/types/bitcoinjs-lib/index.d.ts
@@ -467,8 +467,8 @@ export namespace script {
             check(script: Buffer, allowIncomplete: boolean): boolean;
             decode(buffer: Buffer): Array<Buffer | number>;
             decodeStack(stack: Buffer[], allowIncomplete: boolean): Array<Buffer | number>;
-            encode(signatures: ECSignature[], scriptPubKey: Buffer): Buffer;
-            encodeStack(signatures: ECSignature[], scriptPubKey: Buffer): ECSignature[];
+            encode(signatures: Buffer[], scriptPubKey: Buffer): Buffer;
+            encodeStack(signatures: Buffer[], scriptPubKey: Buffer): Buffer[];
         };
         output: {
             check(script: Buffer, allowIncomplete: boolean): boolean;
@@ -482,8 +482,8 @@ export namespace script {
             check(script: Buffer): boolean;
             decode(buffer: Buffer): Array<Buffer | number>;
             decodeStack(stack: Buffer[]): Array<Buffer | number>;
-            encode(signature: ECSignature): Buffer;
-            encodeStack(signature: ECSignature): ECSignature[];
+            encode(signature: Buffer): Buffer;
+            encodeStack(signature: Buffer): Buffer[];
         };
 
         output: {
@@ -496,10 +496,10 @@ export namespace script {
     const pubKeyHash: {
         input: {
             check(script: Buffer): boolean;
-            decode(buffer: Buffer): { signature: ECSignature; pubKey: Buffer };
-            decodeStack(stack: Buffer[]): { signature: ECSignature; pubKey: Buffer };
-            encode(signature: ECSignature, pubKey: Buffer): Buffer;
-            encodeStack(signature: ECSignature, pubKey: Buffer): [ECSignature, Buffer];
+            decode(buffer: Buffer): { signature: Buffer; pubKey: Buffer };
+            decodeStack(stack: Buffer[]): { signature: Buffer; pubKey: Buffer };
+            encode(signature: Buffer, pubKey: Buffer): Buffer;
+            encodeStack(signature: Buffer, pubKey: Buffer): [Buffer, Buffer];
         };
 
         output: {
@@ -515,7 +515,7 @@ export namespace script {
             decode(buffer: Buffer): { redeemScriptStack: Buffer[]; redeemScript: Buffer };
             decodeStack(stack: Buffer[]): { redeemScriptStack: Buffer[]; redeemScript: Buffer };
             encode(redeemScriptSig: Array<Buffer | number>, redeemScript: Buffer): Buffer;
-            encodeStack(redeemScriptStack: Buffer[], redeemScript: Buffer): Buffer;
+            encodeStack(redeemScriptStack: Buffer[], redeemScript: Buffer): Buffer[];
         };
 
         output: {
@@ -536,8 +536,8 @@ export namespace script {
     const witnessPubKeyHash: {
         input: {
             check(script: Buffer): boolean;
-            decodeStack(stack: Buffer[]): { signature: ECSignature; pubKey: Buffer };
-            encodeStack(signature: ECSignature, pubKey: Buffer): [ECSignature, Buffer];
+            decodeStack(stack: Buffer[]): { signature: Buffer; pubKey: Buffer };
+            encodeStack(signature: Buffer, pubKey: Buffer): [Buffer, Buffer];
         };
 
         output: {
@@ -551,7 +551,7 @@ export namespace script {
         input: {
             check(script: Buffer, allowIncomplete: boolean): boolean;
             decodeStack(stack: Buffer[]): { redeemScriptStack: Buffer[]; redeemScript: Buffer };
-            encodeStack(redeemScriptStack: Buffer[], redeemScript: Buffer): Buffer;
+            encodeStack(redeemScriptStack: Buffer[], redeemScript: Buffer): Buffer[];
         };
 
         output: {

From 0ecc4bfaf6674f48ec495b630ea4d8d115eabcf8 Mon Sep 17 00:00:00 2001
From: kento1218 <kento@bht-tech.net>
Date: Mon, 14 May 2018 15:30:33 +0900
Subject: [PATCH 086/575] fix(bitcoinjs-lib): bump. add author

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

diff --git a/types/bitcoinjs-lib/index.d.ts b/types/bitcoinjs-lib/index.d.ts
index a05c3532b6..4efca7bd94 100644
--- a/types/bitcoinjs-lib/index.d.ts
+++ b/types/bitcoinjs-lib/index.d.ts
@@ -1,10 +1,11 @@
-// Type definitions for bitcoinjs-lib 3.3
+// Type definitions for bitcoinjs-lib 3.4
 // Project: https://github.com/bitcoinjs/bitcoinjs-lib
 // Definitions by:  Mohamed Hegazy <https://github.com/mhegazy>
 //                  Daniel <https://github.com/dlebrecht>
 //                  Ron Buckton <https://github.com/rbuckton>
 //                  Satana Charuwichitratana <https://github.com/micksatana>
 //                  Youssef GHOUBACH <https://github.com/youssefgh>
+//                  Kento <https://github.com/kento1218>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Declaration file initially generated by dts-gen for bitcoinjs-lib 3.0.3
 // based on the flow version found at https://github.com/flowtype/flow-typed/blob/master/definitions/npm/bitcoinjs-lib_v2.x.x/flow_v0.17.x-/bitcoinjs-lib_v2.x.x.js

From 27763ecbb2e5883cc047d48b157cb5ee73b566a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Sopy=C5=82o?= <maciej.sopylo@softwarehut.com>
Date: Mon, 14 May 2018 10:50:50 +0200
Subject: [PATCH 087/575] [@types/socket.io] fix: socket.use (#24574)

---
 types/socket.io/index.d.ts         | 22 ++++++++++++++++++++++
 types/socket.io/socket.io-tests.ts |  9 +++++++++
 2 files changed, 31 insertions(+)

diff --git a/types/socket.io/index.d.ts b/types/socket.io/index.d.ts
index d63effe544..6f7c0ef321 100644
--- a/types/socket.io/index.d.ts
+++ b/types/socket.io/index.d.ts
@@ -474,6 +474,21 @@ declare namespace SocketIO {
 		compress( compress: boolean ): Namespace;
 	}
 
+	interface Packet extends Array<any> {
+		/**
+		 * Event name
+		 */
+		[0]: string;
+		/**
+		 * Packet data
+		 */
+		[1]: any;
+		/**
+		 * Ack function
+		 */
+		[2]: (...args: any[]) => void;
+	}
+
 	/**
 	 * The socket, which handles our connection for a namespace. NOTE: while
 	 * we technically extend NodeJS.EventEmitter, we're not putting it here
@@ -612,6 +627,13 @@ declare namespace SocketIO {
 		 */
 		in( room: string ): Socket;
 
+		/**
+		 * Registers a middleware, which is a function that gets executed for every incoming Packet and receives as parameter the packet and a function to optionally defer execution to the next registered middleware.
+		 * 
+		 * Errors passed to middleware callbacks are sent as special error packets to clients.
+		 */
+		use( fn: ( packet: Packet, next: (err?: any) => void ) => void ): Socket;
+
 		/**
 		 * Sends a 'message' event
 		 * @see emit( event, ...args )
diff --git a/types/socket.io/socket.io-tests.ts b/types/socket.io/socket.io-tests.ts
index 7bfddb1271..60f0d70551 100644
--- a/types/socket.io/socket.io-tests.ts
+++ b/types/socket.io/socket.io-tests.ts
@@ -180,3 +180,12 @@ function testVolatileServerMessages() {
     var io = socketIO.listen(80);
     io.volatile.emit('volatile', 'Lost data');
 }
+
+function testSocketUse() {
+    var io = socketIO.listen(80);
+    io.on('connection', (socket) => {
+        socket.use((packet, next) => {
+            console.log(packet);
+        });
+    });
+}
\ No newline at end of file

From 3fbd854b913a1c7ccfde5956eee3cb2a4962846b Mon Sep 17 00:00:00 2001
From: bladegun <bladegun@gmail.com>
Date: Mon, 14 May 2018 17:21:40 +0800
Subject: [PATCH 088/575] Added exports of ol.proj object

---
 types/ol/ol-tests.ts     | 2 ++
 types/ol/proj/index.d.ts | 3 +++
 types/ol/tsconfig.json   | 1 +
 3 files changed, 6 insertions(+)
 create mode 100644 types/ol/proj/index.d.ts

diff --git a/types/ol/ol-tests.ts b/types/ol/ol-tests.ts
index 13a36df6f3..fbfed7e90f 100644
--- a/types/ol/ol-tests.ts
+++ b/types/ol/ol-tests.ts
@@ -148,6 +148,8 @@ 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';
diff --git a/types/ol/proj/index.d.ts b/types/ol/proj/index.d.ts
new file mode 100644
index 0000000000..dc8d1a7f95
--- /dev/null
+++ b/types/ol/proj/index.d.ts
@@ -0,0 +1,3 @@
+import * as ol from 'openlayers';
+
+export default ol.proj;
diff --git a/types/ol/tsconfig.json b/types/ol/tsconfig.json
index 6402adb0f7..79e135476e 100644
--- a/types/ol/tsconfig.json
+++ b/types/ol/tsconfig.json
@@ -95,6 +95,7 @@
         "layer/vector.d.ts",
         "layer/vectortile.d.ts",
         "pointer/pointerevent.d.ts",
+        "proj/index.d.ts",
         "proj/projection.d.ts",
         "render/canvas.d.ts",
         "render/event.d.ts",

From d976f29dbd1675d5080f40204bc9494aad908d86 Mon Sep 17 00:00:00 2001
From: Vladimir <vzh.inbox@gmail.com>
Date: Mon, 14 May 2018 16:42:34 +0600
Subject: [PATCH 089/575] Add exports namespace with all declared types

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

diff --git a/types/react-input-mask/index.d.ts b/types/react-input-mask/index.d.ts
index 8716cda0e6..e8fadc2739 100644
--- a/types/react-input-mask/index.d.ts
+++ b/types/react-input-mask/index.d.ts
@@ -6,8 +6,11 @@
 
 import * as React from "react";
 
-declare namespace reactInputMask {
-    interface ReactInputMaskProps extends React.InputHTMLAttributes<HTMLInputElement> {
+export = ReactInputMask;
+export as namespace ReactInputMask;
+
+declare namespace ReactInputMask {
+    interface Props extends React.InputHTMLAttributes<HTMLInputElement> {
         /**
          * Mask string. Format characters are:
          * * `9`: `0-9`
@@ -41,8 +44,7 @@ declare namespace reactInputMask {
          */
         inputRef?: React.Ref<HTMLInputElement>;
     }
-    class ReactInputMask extends React.Component<ReactInputMaskProps> {
-    }
 }
-declare var ReactInputMask: typeof reactInputMask.ReactInputMask;
-export default ReactInputMask;
+
+declare class ReactInputMask extends React.Component<ReactInputMask.Props> {
+}

From 57ccc9996a9405589d5db3e22d93bb06f789ee57 Mon Sep 17 00:00:00 2001
From: Vladimir <vzh.inbox@gmail.com>
Date: Mon, 14 May 2018 17:15:11 +0600
Subject: [PATCH 090/575] Add default export

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

diff --git a/types/react-input-mask/index.d.ts b/types/react-input-mask/index.d.ts
index e8fadc2739..5bacb3561a 100644
--- a/types/react-input-mask/index.d.ts
+++ b/types/react-input-mask/index.d.ts
@@ -6,7 +6,7 @@
 
 import * as React from "react";
 
-export = ReactInputMask;
+export default ReactInputMask;
 export as namespace ReactInputMask;
 
 declare namespace ReactInputMask {

From a745364a494192e2c6d89ba3cd0b837e41e1fea4 Mon Sep 17 00:00:00 2001
From: Vince Maiuri <vince.maiuri@directsupply.com>
Date: Mon, 14 May 2018 07:57:12 -0500
Subject: [PATCH 091/575] Added remaining propTypes for sortable-list

---
 types/react-native-sortable-list/index.d.ts | 67 +++++++++++++++++++--
 1 file changed, 63 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 types/react-native-sortable-list/index.d.ts

diff --git a/types/react-native-sortable-list/index.d.ts b/types/react-native-sortable-list/index.d.ts
old mode 100644
new mode 100755
index 9b8e547b85..354176860f
--- a/types/react-native-sortable-list/index.d.ts
+++ b/types/react-native-sortable-list/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for react-native-sortable-list
 // Project: https://github.com/gitim/react-native-sortable-list
-// Definitions by: Michael Sivolobov <https://github.com/sivolobov>
+// Definitions by: Michael Sivolobov <https://github.com/sivolobov>,Vince Maiuri <https://github.com/RookY2K>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -51,6 +51,27 @@ interface SortableListProps {
      */
     contentContainerStyle?: ViewStyle
 
+    /**
+     * these styles will be applied to the inner scroll view content container, excluding the header and footer
+     */
+    innerContainerStyle?: ViewStyle
+
+    /**
+     * when true, the SortableList's children are arranged horizontally in a row instead of vertically in a column.
+     * The default value is false.
+     */
+    horizontal?: boolean
+
+    /**
+     * when false, the vertical scroll indicator will not be visible. The default value is true.
+     */
+    showsVerticalScrollIndicator?: boolean
+
+    /**
+     * when false, the horizontal scroll indicator will not be visible. The default value is true.
+     */
+    showsHorizontalScrollIndicator?: boolean
+
     /**
      * when false, rows are not sortable. The default value is true.
      */
@@ -62,11 +83,44 @@ interface SortableListProps {
     scrollEnabled?: boolean
 
     /**
-     * Takes a row key, row index, data entry from the data source and its statuses disabled,
-     *  active and should return a renderable component to be rendered as the row.
+     * whether you intend to use the toggleRowActive method to activate a row or use the out of box solution.
+     */
+    manuallyActivateRows?: boolean
+
+    /**
+     * determines the height for vertical list and the width for horizontal list of the area at the begining and
+     * the end of the list that will trigger autoscrolling. Defaults to 60.
+     */
+    autoscrollAreaSize?: number
+
+    /**
+     * determines time delay in ms before pressed row becomes active. Defaults to 200 ms.
+     */
+    rowActivationTime?: number
+
+    /**
+     * A RefreshControl that works the same way as a ScrollView's refreshControl.
+     */
+    refreshControl?: JSX.Element
+
+    /**
+     * Takes a row key, row index, data entry from the data source and its statuses disabled, active and should
+     * return a renderable component to be rendered as the row. The child component will receive a method called
+     * toggleRowActive (only if manuallyActivateRows={true}) to manually activate the row. Useful if you have
+     * multiple touch responders in your view.
      */
     renderRow: (props: RowProps) => JSX.Element
 
+    /**
+     * Renders returned component at the top of the list.
+     */
+    renderHeader?: () => JSX.Element
+
+    /**
+     * Renders returned component at the bottom of the list.
+     */
+    renderFooter?: () => JSX.Element
+
     /**
      * Called when rows were reordered, takes an array of rows keys of the next rows order.
      */
@@ -81,6 +135,11 @@ interface SortableListProps {
      * Called when the active row was released.
      */
     onReleaseRow?: (key: DataKey) => void
+
+    /**
+     * Called when a row was pressed.
+     */
+    onPressRow?: (key: DataKey) => void
 }
 
 interface SortableListStatic extends React.ClassicComponentClass<SortableListProps> {}
@@ -88,4 +147,4 @@ interface SortableListStatic extends React.ClassicComponentClass<SortableListPro
 declare var SortableList: SortableListStatic;
 declare type SortableList = SortableListStatic;
 
-export default SortableList;
\ No newline at end of file
+export default SortableList;

From 3949ddb99430758144735b84ea36a127eaab2b55 Mon Sep 17 00:00:00 2001
From: Vince Maiuri <vince.maiuri@directsupply.com>
Date: Mon, 14 May 2018 08:25:25 -0500
Subject: [PATCH 092/575] test updates

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

diff --git a/types/react-native-sortable-list/index.d.ts b/types/react-native-sortable-list/index.d.ts
index 354176860f..d5466c8f68 100755
--- a/types/react-native-sortable-list/index.d.ts
+++ b/types/react-native-sortable-list/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for react-native-sortable-list
+// Type definitions for react-native-sortable-list 0.0.22
 // Project: https://github.com/gitim/react-native-sortable-list
-// Definitions by: Michael Sivolobov <https://github.com/sivolobov>,Vince Maiuri <https://github.com/RookY2K>
+// Definitions by: Michael Sivolobov <https://github.com/sivolobov>, Vince Maiuri <https://github.com/RookY2K>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 

From 0c236faad38151973ac0829a142e3dc4d3abb83f Mon Sep 17 00:00:00 2001
From: Paul Huynh <paul.viet.huynh@gmail.com>
Date: Tue, 15 May 2018 00:43:50 +1000
Subject: [PATCH 093/575] Update shelljs typings for v0.8

---
 types/shelljs/index.d.ts       | 82 +++++++++++++++++++++++++++++-----
 types/shelljs/shelljs-tests.ts | 15 +++++++
 2 files changed, 87 insertions(+), 10 deletions(-)

diff --git a/types/shelljs/index.d.ts b/types/shelljs/index.d.ts
index 601668f65f..1f1eb5c375 100644
--- a/types/shelljs/index.d.ts
+++ b/types/shelljs/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for ShellJS 0.7
+// Type definitions for ShellJS 0.8
 // Project: http://shelljs.org
 // Definitions by: Niklas Mollenhauer <https://github.com/nikeee>
 //                 Vojtech Jasny <https://github.com/voy>
 //                 George Kalpakas <https://github.com/gkalpak>
+//                 Paul Huynh <https://github.com/pheromonez>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>
@@ -11,10 +12,10 @@ import child = require("child_process");
 import glob = require("glob");
 
 /**
- * Changes to directory dir for the duration of the script
+ * Changes to directory dir for the duration of the script. Changes to home directory if no argument is supplied.
  * @param dir Directory to change in.
  */
-export function cd(dir: string): void;
+export function cd(dir?: string): void;
 
 /**
  * Returns the current directory.
@@ -31,7 +32,7 @@ export function ls(...paths: Array<string | string[]>): ShellArray;
 
 /**
  * Returns array of files in the given path, or in current directory if no path provided.
- * @param    options  Available options: -R (recursive), -A (all files, include files beginning with ., except for . and ..)
+ * @param    options  Available options:  -R: recursive -A: all files (include files beginning with ., except for . and ..) -L: follow symlinks -d: list directories themselves, not their contents -l: list objects representing each file, each with fields containing ls -l output fields. See fs.Stats for more info
  * @param  ...paths Paths to search.
  * @return          An array of files in the given path(s).
  */
@@ -53,7 +54,7 @@ export function cp(source: string | string[], dest: string): void;
 
 /**
  * Copies files. The wildcard * is accepted.
- * @param options Available options: -f (force), -r, -R (recursive)
+ * @param options Available options: -f: force (default behavior) -n: no-clobber -u: only copy if source is newer than dest -r, -R: recursive -L: follow symlinks -P: don't follow symlinks
  * @param source  The source.
  * @param dest    The destination.
  */
@@ -79,6 +80,14 @@ export function rm(options: string, ...files: Array<string | string[]>): void;
  */
 export function mv(source: string | string[], dest: string): void;
 
+/**
+ * Moves files. The wildcard * is accepted.
+ * @param options Available options: -f: force (default behavior) -n: no-clobber
+ * @param source The source.
+ * @param dest   The destination.
+ */
+export function mv(options: string, source: string | string[], dest: string): void;
+
 /**
  * Creates directories.
  * @param ...dir Directories to create.
@@ -138,7 +147,7 @@ export function grep(regex_filter: string | RegExp, ...files: Array<string | str
 
 /**
  * Reads input string from given files and returns a string containing all lines of the file that match the given regex_filter. Wildcard * accepted.
- * @param    options      Available options: -v (Inverse the sense of the regex and print the lines not matching the criteria.)
+ * @param    options      Available options: -v (Inverse the sense of the regex and print the lines not matching the criteria.) -l: Print only filenames of matching files
  * @param    regex_filter The regular expression to use.
  * @param  ...files     The files to process.
  * @return                Returns a string containing all lines of the file that match the given regex_filter.
@@ -159,6 +168,14 @@ export function which(command: string): ShellString;
  */
 export function echo(...text: string[]): ShellString;
 
+/**
+ * Prints string to stdout, and returns string with additional utility methods like .to().
+ * @param options Available options: -e: interpret backslash escapes (default) -n: remove trailing newline from output
+ * @param  ...text The text to print.
+ * @return           Returns the string that was passed as argument.
+ */
+export function echo(options: string, ...text: string[]): ShellString;
+
 /**
  * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
  * @param      dir Brings the Nth directory (counting from the left of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
@@ -182,7 +199,7 @@ export function pushd(dir: string): ShellArray;
 
 /**
  * Save the current directory on the top of the directory stack and then cd to dir. With no arguments, pushd exchanges the top two directories. Returns an array of paths in the stack.
- * @param    options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated)
+ * @param    options Available options: -n (Suppresses the normal change of directory when adding directories to the stack, so that only the stack is manipulated) -q: Supresses output to the console.
  * @param      dir Brings the Nth directory (counting from the left of the list printed by dirs, starting with zero) to the top of the list by rotating the stack.
  * @return     Returns an array of paths in the stack.
  */
@@ -233,7 +250,7 @@ export function popd(dir: string): ShellArray;
 
 /**
  * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
- * @param    options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
+ * @param    options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated) -q: Supresses output to the console.
  * @param      dir     Removes the Nth directory (counting from the left of the list printed by dirs), starting with zero.
  * @return         Returns an array of paths in the stack.
  */
@@ -241,7 +258,7 @@ export function popd(options: string, dir: "+N"): ShellArray;
 
 /**
  * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
- * @param    options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
+ * @param    options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated) -q: Supresses output to the console.
  * @param      dir     Removes the Nth directory (counting from the right of the list printed by dirs), starting with zero.
  * @return         Returns an array of paths in the stack.
  */
@@ -249,7 +266,7 @@ export function popd(options: string, dir: "-N"): ShellArray;
 
 /**
  * When no arguments are given, popd removes the top directory from the stack and performs a cd to the new top directory. The elements are numbered from 0 starting at the first directory listed with dirs; i.e., popd is equivalent to popd +0. Returns an array of paths in the stack.
- * @param    options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated)
+ * @param    options Available options: -n (Suppresses the normal change of directory when removing directories from the stack, so that only the stack is manipulated) -q: Supresses output to the console.
  * @param    dir     You can only use -N and +N.
  * @return         Returns an array of paths in the stack.
  */
@@ -339,8 +356,12 @@ export function exec(command: string, callback: ExecCallback): child.ChildProces
 export type ExecCallback = (code: number, stdout: string, stderr: string) => any;
 
 export interface ExecOptions extends child.ExecOptions {
+    /** Do not echo program output to console (default: false). */
     silent?: boolean;
+    /** Asynchronous execution. If a callback is provided, it will be set to true, regardless of the passed value (default: false). */
     async?: boolean;
+    /** Character encoding to use. Affects the values returned to stdout and stderr, and what is written to stdout and stderr when not in silent mode (default: 'utf8'). */
+    encoding?: string;
 }
 
 export interface ExecOutputReturnValue {
@@ -440,6 +461,47 @@ export function touch(files: string[]): void;
 export function touch(options: TouchOptionsLiteral, ...files: Array<string | string[]>): void;
 export function touch(options: TouchOptionsArray, ...files: Array<string | string[]>): void;
 
+export interface HeadOptions {
+    /** Show the first <num> lines of the files. */
+    '-n': number;
+}
+
+/** Read the start of a file. */
+export function head(...files: Array<string | string[]>): ShellString;
+/** Read the start of a file. */
+export function head(options: HeadOptions, ...files: Array<string | string[]>): ShellString;
+
+/**
+ * Return the contents of the files, sorted line-by-line. Sorting multiple files mixes their content (just as unix sort does).
+ */
+export function sort(...files: Array<string | string[]>): ShellString;
+
+/**
+ * Return the contents of the files, sorted line-by-line. Sorting multiple files mixes their content (just as unix sort does).
+ * @param options Available options: -r: Reverse the results -n: Compare according to numerical value
+ */
+export function sort(options: string, ...files: Array<string | string[]>): ShellString;
+
+export interface TailOptions {
+    /** Show the last <num> lines of files. */
+    '-n': number;
+}
+
+/** Read the end of a file. */
+export function tail(...files: Array<string | string[]>): ShellString;
+/** Read the end of a file. */
+export function tail(options: TailOptions, ...files: Array<string | string[]>): ShellString;
+
+/**
+ * Filter adjacent matching lines from input.
+ */
+export function uniq(input: string, output?: string): ShellString;
+/**
+ * Filter adjacent matching lines from input.
+ * @param options Available options: -i: Ignore case while comparing -c: Prefix lines by the number of occurrences -d: Only print duplicate lines, one for each group of identical lines
+ */
+export function uniq(options: string, input: string, output?: string): ShellString;
+
 /**
  * Sets global configuration variables
  * @param options Available options: `+/-e`: exit upon error (`config.fatal`), `+/-v`: verbose: show all commands (`config.verbose`), `+/-f`: disable filename expansion (globbing)
diff --git a/types/shelljs/shelljs-tests.ts b/types/shelljs/shelljs-tests.ts
index da3175f5c6..37dccddff6 100644
--- a/types/shelljs/shelljs-tests.ts
+++ b/types/shelljs/shelljs-tests.ts
@@ -135,6 +135,21 @@ shell.touch({ '-r': '/some/file.txt' }, '/Users/brandom/test1');
 shell.touch({ '-r': '/some/file.txt' }, '/Users/brandom/test1', '/Users/brandom/test2');
 shell.touch({ '-r': '/oome/file.txt' }, ['/Users/brandom/test1', '/Users/brandom/test2']);
 
+shell.head({'-n': 1}, 'file*.txt');
+shell.head('file1', 'file2');
+shell.head(['file1', 'file2']); // same as above
+
+shell.sort('foo.txt', 'bar.txt');
+shell.sort('-r', 'foo.txt');
+
+shell.tail({'-n': 1}, 'file*.txt');
+shell.tail('file1', 'file2');
+shell.tail(['file1', 'file2']); // same as above
+
+shell.uniq('foo.txt');
+shell.uniq('-i', 'foo.txt');
+shell.uniq('-cd', 'foo.txt', 'bar.txt');
+
 const tmp = shell.tempdir(); // "/tmp" for most *nix platforms
 
 const errorlol = shell.error();

From 09c94e3e87efc06f5c8b95ff1761298408edb4d5 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Mon, 14 May 2018 00:29:46 +0200
Subject: [PATCH 094/575] Spelling correction

---
 types/d3-brush/index.d.ts                    |  6 +-
 types/d3-chord/d3-chord-tests.ts             |  2 +-
 types/d3-chord/index.d.ts                    |  6 +-
 types/d3-collection/index.d.ts               | 14 ++--
 types/d3-drag/d3-drag-tests.ts               |  4 +-
 types/d3-drag/index.d.ts                     |  2 +-
 types/d3-dsv/d3-dsv-tests.ts                 |  2 +-
 types/d3-dsv/index.d.ts                      | 12 +--
 types/d3-dsv/v0/index.d.ts                   |  2 +-
 types/d3-fetch/index.d.ts                    | 12 +--
 types/d3-force/index.d.ts                    |  6 +-
 types/d3-geo/d3-geo-tests.ts                 | 16 ++--
 types/d3-geo/index.d.ts                      | 15 ++--
 types/d3-hierarchy/d3-hierarchy-tests.ts     |  4 +-
 types/d3-hierarchy/index.d.ts                |  2 +-
 types/d3-hsv/d3-hsv-tests.ts                 |  4 +-
 types/d3-interpolate/d3-interpolate-tests.ts |  4 +-
 types/d3-path/index.d.ts                     |  2 +-
 types/d3-queue/d3-queue-tests.ts             |  4 +-
 types/d3-queue/index.d.ts                    |  4 +-
 types/d3-random/index.d.ts                   |  2 +-
 types/d3-sankey/index.d.ts                   |  4 +-
 types/d3-scale/index.d.ts                    | 84 ++++++++++----------
 types/d3-scale/v1/index.d.ts                 | 84 ++++++++++----------
 types/d3-selection/d3-selection-tests.ts     | 30 +++----
 types/d3-selection/index.d.ts                |  4 +-
 types/d3-shape/index.d.ts                    | 24 +++---
 types/d3-time/index.d.ts                     | 36 ++++-----
 types/d3-transition/d3-transition-tests.ts   | 16 ++--
 types/d3-zoom/d3-zoom-tests.ts               | 28 +++----
 types/d3-zoom/index.d.ts                     |  4 +-
 types/d3/d3-tests.ts                         |  2 +-
 32 files changed, 223 insertions(+), 218 deletions(-)

diff --git a/types/d3-brush/index.d.ts b/types/d3-brush/index.d.ts
index 644e6c06f7..e3d11d8f11 100644
--- a/types/d3-brush/index.d.ts
+++ b/types/d3-brush/index.d.ts
@@ -195,21 +195,21 @@ export interface BrushBehavior<Datum> {
  * Create a new two-dimensional brush.
  *
  * The generic "Datum" refers to the type of the data of the selected svg:g element to
- * which the returned BrushBEhavoir will be applied.
+ * which the returned BrushBehavior will be applied.
  */
 export function brush<Datum>(): BrushBehavior<Datum>;
 /**
  * Creates a new one-dimensional brush along the x-dimension.
  *
  * The generic "Datum" refers to the type of the data of the selected svg:g element to
- * which the returned BrushBEhavoir will be applied.
+ * which the returned BrushBehavior will be applied.
  */
 export function brushX<Datum>(): BrushBehavior<Datum>;
 /**
  * Creates a new one-dimensional brush along the y-dimension.
  *
  * The generic "Datum" refers to the type of the data of the selected svg:g element to
- * which the returned BrushBEhavoir will be applied.
+ * which the returned BrushBehavior will be applied.
  */
 export function brushY<Datum>(): BrushBehavior<Datum>;
 
diff --git a/types/d3-chord/d3-chord-tests.ts b/types/d3-chord/d3-chord-tests.ts
index b66f39787a..284e307024 100644
--- a/types/d3-chord/d3-chord-tests.ts
+++ b/types/d3-chord/d3-chord-tests.ts
@@ -180,7 +180,7 @@ canvasRibbon(ribbon); // render ribbon for first chord
 
 // The below fails explicitly, as standard ChordSubgroup objects for source and target are missing "radius" property assumed in default
 // radius accessor. Given the internals of d3 this would lead to a "NaN" radius. So using static typing to raise this to
-// awareness seems appropriate. The alternative, is to create RibbonGenerator using the generics to explictly set the types and
+// awareness seems appropriate. The alternative, is to create RibbonGenerator using the generics to explicitly set the types and
 // then set the radius. Or, one could map a radius property into the Chords returned by the ChordLayout.
 
 // canvasRibbon(chords[0]); // fails, see above
diff --git a/types/d3-chord/index.d.ts b/types/d3-chord/index.d.ts
index b4865c962c..176cfe7af8 100644
--- a/types/d3-chord/index.d.ts
+++ b/types/d3-chord/index.d.ts
@@ -44,7 +44,7 @@ export interface ChordSubgroup {
  */
 export interface Chord {
     /**
-     * Chord subgroup constituting the sodurce of Chord
+     * Chord subgroup constituting the source of Chord
      */
     source: ChordSubgroup;
     /**
@@ -122,7 +122,7 @@ export interface ChordLayout {
      *
      * The default is zero.
      *
-     * @param angle Pad angle between adjecent groups in radians.
+     * @param angle Pad angle between adjacent groups in radians.
      */
     padAngle(angle: number): this;
 
@@ -233,7 +233,7 @@ export interface Ribbon {
 
 /**
  *
- * A ribbon generator to suport rendering of chords in a chord diagram.
+ * A ribbon generator to support rendering of chords in a chord diagram.
  *
  * The first generic corresponds to the type of the "this" context within which the ribbon generator and its accessor functions will be invoked.
  *
diff --git a/types/d3-collection/index.d.ts b/types/d3-collection/index.d.ts
index 5e7973e03b..89ac8d6153 100644
--- a/types/d3-collection/index.d.ts
+++ b/types/d3-collection/index.d.ts
@@ -7,7 +7,7 @@
 // Last module patch version validated against: 1.0.4
 
 /**
- * Reference type things that can be coerced to string implicitely
+ * Reference type things that can be coerced to string implicitly
  */
 export interface Stringifiable {
     toString(): string;
@@ -64,7 +64,7 @@ export function entries(obj: object): Array<{ key: string, value: any }>;
 // ---------------------------------------------------------------------
 
 /**
- * A datastructure similar to ES6 Maps, but with a few differences:
+ * A data structure similar to ES6 Maps, but with a few differences:
  * - Keys are coerced to strings.
  * - map.each, not map.forEach. (Also, no thisArg.)
  * - map.remove, not map.delete.
@@ -194,7 +194,7 @@ export function map(obj: object): Map<any>;
 // ---------------------------------------------------------------------
 
 /**
- * A datastructure similar to ES6 Sets, but with a few differences:
+ * A data structure similar to ES6 Sets, but with a few differences:
  *
  * - Values are coerced to strings.
  * - set.each, not set.forEach. (Also, no thisArg.)
@@ -282,11 +282,11 @@ export function set<T>(array: T[], key: (value: T, index: number, array: T[]) =>
 // ---------------------------------------------------------------------
 
 /**
- * A more formal defintion of the nested array returned by Nest.entries(...). This data structure is intended as a reference only.
+ * A more formal definition of the nested array returned by Nest.entries(...). This data structure is intended as a reference only.
  *
  * As the union types cannot be ex ante simplified without knowledge
  * of the nesting level (number of key(...) operations) and whether the data were rolled-up, this data structure becomes cumbersome
- * to use in practice. This is particularly true for discrimiation of array element types.
+ * to use in practice. This is particularly true for discrimination of array element types.
  * The use of the rollup function, or lack thereof, also determines whether NestedArray has the 'values' property
  * with an array of type Datum at leaf level, or has a rolled-up 'value' property.
  */
@@ -294,7 +294,7 @@ export function set<T>(array: T[], key: (value: T, index: number, array: T[]) =>
 export interface NestedArray<Datum, RollupType> extends Array<{ key: string, values: NestedArray<Datum, RollupType> | Datum[] | undefined, value: RollupType | undefined }> { }
 
 /**
- * A more formal defintion of the nested array returned by Nest.map(...). This data structure is intended as a reference only.
+ * A more formal definition of the nested array returned by Nest.map(...). This data structure is intended as a reference only.
  *
  * As the union types cannot be ex ante simplified without knowledge
  * of the nesting level (number of key(...) operations) and whether the data were rolled-up, this data structure becomes cumbersome
@@ -304,7 +304,7 @@ export interface NestedArray<Datum, RollupType> extends Array<{ key: string, val
 export interface NestedMap<Datum, RollupType> extends Map<NestedMap<Datum, RollupType> | Datum[] | RollupType> { }
 
 /**
- * A more formal defintion of the nested array returned by Nest.object(...). This data structure is intended as a reference only.
+ * A more formal definition of the nested array returned by Nest.object(...). This data structure is intended as a reference only.
  *
  * As the union types cannot be ex ante simplified without knowledge
  * of the nesting level (number of key(...) operations) and whether the data were rolled-up, this data structure becomes cumbersome
diff --git a/types/d3-drag/d3-drag-tests.ts b/types/d3-drag/d3-drag-tests.ts
index 3bc7e6f851..9a8012606b 100644
--- a/types/d3-drag/d3-drag-tests.ts
+++ b/types/d3-drag/d3-drag-tests.ts
@@ -9,7 +9,7 @@
 import * as d3Drag from 'd3-drag';
 import { event, select, Selection } from 'd3-selection';
 
-// NB: Consider alternative approachto getting live event-binding
+// NB: Consider alternative approach to getting live event-binding
 // when using webpack as suggested by @ocombe in response to
 // event binding question https://github.com/d3/d3-zoom/issues/32#issuecomment-229889310
 // d3.getEvent = () => require("d3-selection").event;
@@ -234,7 +234,7 @@ const sourceEvent: any = e.sourceEvent;
 // As always, the below tests are for signature only, no functional purpose
 
 // remove event listeners for a given event type
-e = e.on('start.tmp', null); // chainability test through reassigment
+e = e.on('start.tmp', null); // chainability test through reassignment
 
 e = e.on('drag', dragged);
 // e = e.on('drag', wrongDragHandler1); // fails, wrong datum type in handler
diff --git a/types/d3-drag/index.d.ts b/types/d3-drag/index.d.ts
index b930081d15..9aa1ccf8d2 100644
--- a/types/d3-drag/index.d.ts
+++ b/types/d3-drag/index.d.ts
@@ -199,7 +199,7 @@ export interface DragBehavior<GElement extends DraggedElementBaseType, Datum, Su
     /**
      * Set the maximum distance that the mouse can move between mousedown and mouseup that will trigger
      * a subsequent click event. If at any point between mousedown and mouseup the mouse is greater than or equal to
-     * distance from its position on mousedown, the click event follwing mouseup will be suppressed.
+     * distance from its position on mousedown, the click event following mouseup will be suppressed.
      *
      * @param distance The distance threshold between mousedown and mouseup measured in client coordinates (event.clientX and event.clientY).
      * The default is zero.
diff --git a/types/d3-dsv/d3-dsv-tests.ts b/types/d3-dsv/d3-dsv-tests.ts
index 459fa7291b..2221b0d7b2 100644
--- a/types/d3-dsv/d3-dsv-tests.ts
+++ b/types/d3-dsv/d3-dsv-tests.ts
@@ -9,7 +9,7 @@
 import * as d3Dsv from 'd3-dsv';
 
 // ------------------------------------------------------------------------------------------
-// Preperatory Steps
+// Preparatory Steps
 // ------------------------------------------------------------------------------------------
 
 const csvTestString = '1997,Ford,E350,2.34\n2000,Mercury,Cougar,2.38';
diff --git a/types/d3-dsv/index.d.ts b/types/d3-dsv/index.d.ts
index 80b2ebc54e..b07d22edce 100644
--- a/types/d3-dsv/index.d.ts
+++ b/types/d3-dsv/index.d.ts
@@ -67,7 +67,7 @@ export function csvParse(csvString: string): DSVParsedArray<DSVRowString>;
  * @param csvString A string, which must be in the comma-separated values format.
  * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
  * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
- * the row is skipped and will be ommitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
+ * the row is skipped and will be omitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
  * In effect, row is similar to applying a map and filter operator to the returned rows.
  */
 export function csvParse<ParsedRow extends DSVRowAny>(
@@ -102,7 +102,7 @@ export function csvParseRows(csvString: string): string[][];
  * @param csvString A string, which must be in the comma-separated values format.
  * @param row A row conversion function which is invoked for each row, being passed an array representing the current row (d), the index (i)
  * starting at zero for the first row, and the array of column names. If the returned value is null or undefined,
- * the row is skipped and will be ommitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
+ * the row is skipped and will be omitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
  * In effect, row is similar to applying a map and filter operator to the returned rows.
  */
 export function csvParseRows<ParsedRow extends DSVRowAny>(
@@ -177,7 +177,7 @@ export function tsvParse(tsvString: string): DSVParsedArray<DSVRowString>;
  * @param tsvString A string, which must be in the tab-separated values format.
  * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
  * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
- * the row is skipped and will be ommitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
+ * the row is skipped and will be omitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
  * In effect, row is similar to applying a map and filter operator to the returned rows.
  */
 export function tsvParse<MappedRow extends DSVRowAny>(
@@ -212,7 +212,7 @@ export function tsvParseRows(tsvString: string): string[][];
  * @param tsvString A string, which must be in the tab-separated values format.
  * @param row A row conversion function which is invoked for each row, being passed an array representing the current row (d), the index (i)
  * starting at zero for the first row, and the array of column names. If the returned value is null or undefined,
- * the row is skipped and will be ommitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
+ * the row is skipped and will be omitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
  * In effect, row is similar to applying a map and filter operator to the returned rows.
  */
 export function tsvParseRows<MappedRow extends DSVRowAny>(
@@ -285,7 +285,7 @@ export interface DSV {
      * @param dsvString A string, which must be in the delimiter-separated values format with the appropriate delimiter.
      * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
      * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
-     * the row is skipped and will be ommitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
+     * the row is skipped and will be omitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
      * In effect, row is similar to applying a map and filter operator to the returned rows.
      */
     parse<ParsedRow extends DSVRowAny>(
@@ -314,7 +314,7 @@ export interface DSV {
      * @param dsvString A string, which must be in the delimiter-separated values format with the appropriate delimiter.
      * @param row A row conversion function which is invoked for each row, being passed an array representing the current row (d), the index (i)
      * starting at zero for the first row, and the array of column names. If the returned value is null or undefined,
-     * the row is skipped and will be ommitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
+     * the row is skipped and will be omitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
      * In effect, row is similar to applying a map and filter operator to the returned rows.
      */
     parseRows<ParsedRow extends DSVRowAny>(
diff --git a/types/d3-dsv/v0/index.d.ts b/types/d3-dsv/v0/index.d.ts
index 18701f64ea..94ddbef579 100644
--- a/types/d3-dsv/v0/index.d.ts
+++ b/types/d3-dsv/v0/index.d.ts
@@ -5,7 +5,7 @@
 
 /** A parser and formatter for DSV (CSV and TSV) files. Extracted from D3. */
 declare function loader(
-    /** the symbol used to seperate cells in the row. */
+    /** the symbol used to separate cells in the row. */
     delimiter: string,
     /** example: "text/plain" */
     encoding?: string): D3Dsv;
diff --git a/types/d3-fetch/index.d.ts b/types/d3-fetch/index.d.ts
index 6e31d70a76..25343d1bf5 100644
--- a/types/d3-fetch/index.d.ts
+++ b/types/d3-fetch/index.d.ts
@@ -52,7 +52,7 @@ export function csv(
  * @param url A valid URL string.
  * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
  * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
- * the row is skipped and will be ommitted from the array returned by dsv.csvParse; otherwise, the returned value defines the corresponding row object.
+ * the row is skipped and will be omitted from the array returned by dsv.csvParse; otherwise, the returned value defines the corresponding row object.
  * In effect, row is similar to applying a map and filter operator to the returned rows.
  */
 export function csv<ParsedRow extends DSVRowAny>(
@@ -74,7 +74,7 @@ export function csv<ParsedRow extends DSVRowAny>(
  * @param init An request initialization object.
  * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
  * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
- * the row is skipped and will be ommitted from the array returned by dsv.csvParse; otherwise, the returned value defines the corresponding row object.
+ * the row is skipped and will be omitted from the array returned by dsv.csvParse; otherwise, the returned value defines the corresponding row object.
  * In effect, row is similar to applying a map and filter operator to the returned rows.
  */
 export function csv<ParsedRow extends DSVRowAny>(
@@ -112,7 +112,7 @@ export function dsv(
  * @param url A valid URL string.
  * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
  * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
- * the row is skipped and will be ommitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
+ * the row is skipped and will be omitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
  * In effect, row is similar to applying a map and filter operator to the returned rows.
  */
 export function dsv<ParsedRow extends DSVRowAny>(
@@ -136,7 +136,7 @@ export function dsv<ParsedRow extends DSVRowAny>(
  * @param init An request initialization object.
  * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
  * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
- * the row is skipped and will be ommitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
+ * the row is skipped and will be omitted from the array returned by dsv.parse; otherwise, the returned value defines the corresponding row object.
  * In effect, row is similar to applying a map and filter operator to the returned rows.
  */
 export function dsv<ParsedRow extends DSVRowAny>(
@@ -224,7 +224,7 @@ export function tsv(
  * @param url A valid URL string.
  * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
  * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
- * the row is skipped and will be ommitted from the array returned by dsv.tsvParse; otherwise, the returned value defines the corresponding row object.
+ * the row is skipped and will be omitted from the array returned by dsv.tsvParse; otherwise, the returned value defines the corresponding row object.
  * In effect, row is similar to applying a map and filter operator to the returned rows.
  */
 export function tsv<ParsedRow extends DSVRowAny>(
@@ -246,7 +246,7 @@ export function tsv<ParsedRow extends DSVRowAny>(
  * @param init An request initialization object.
  * @param row A row conversion function which is invoked for each row, being passed an object representing the current row (d),
  * the index (i) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined,
- * the row is skipped and will be ommitted from the array returned by dsv.tsvParse; otherwise, the returned value defines the corresponding row object.
+ * the row is skipped and will be omitted from the array returned by dsv.tsvParse; otherwise, the returned value defines the corresponding row object.
  * In effect, row is similar to applying a map and filter operator to the returned rows.
  */
 export function tsv<ParsedRow extends DSVRowAny>(
diff --git a/types/d3-force/index.d.ts b/types/d3-force/index.d.ts
index 1736a1ac78..35f4d06657 100644
--- a/types/d3-force/index.d.ts
+++ b/types/d3-force/index.d.ts
@@ -55,7 +55,7 @@ export interface SimulationNodeDatum {
 /**
  * The base data structure for the datum of a Simulation Link, as used by ForceLink.
  * The optional properties contained in this data structure are internally assigned
- * by when initializating with ForceLink.links(...)
+ * by when initializing with ForceLink.links(...)
  *
  *
  * IMPORTANT: The source and target properties may be internally mutated in type during the
@@ -634,7 +634,7 @@ export interface ForceLink<NodeDatum extends SimulationNodeDatum, LinkDatum exte
      */
     strength(): (link: LinkDatum, i: number, links: LinkDatum[]) => number;
     /**
-     * Set the strenght accessor to use the specified constant number for all links,
+     * Set the strength accessor to use the specified constant number for all links,
      * re-evaluates the strength accessor for each link, and returns this force.
      *
      * The constant is internally wrapped into a strength accessor function.
@@ -647,7 +647,7 @@ export interface ForceLink<NodeDatum extends SimulationNodeDatum, LinkDatum exte
      */
     strength(strength: number): this;
     /**
-     * Set the strenght accessor to use the specified function,
+     * Set the strength accessor to use the specified function,
      * re-evaluates the strength accessor for each link, and returns this force.
      *
      * The strength accessor is invoked for each link, being passed the link, its zero-based index and the complete array of links.
diff --git a/types/d3-geo/d3-geo-tests.ts b/types/d3-geo/d3-geo-tests.ts
index 51ddb93d89..6e824e8e69 100644
--- a/types/d3-geo/d3-geo-tests.ts
+++ b/types/d3-geo/d3-geo-tests.ts
@@ -372,7 +372,7 @@ const mercatorRaw: d3Geo.GeoRawProjection = d3Geo.geoMercatorRaw();
 const orthographicRaw: d3Geo.GeoRawProjection = d3Geo.geoOrthographicRaw();
 const stereographicRaw: d3Geo.GeoRawProjection = d3Geo.geoStereographicRaw();
 const transverseMercatorRaw: d3Geo.GeoRawProjection = d3Geo.geoTransverseMercatorRaw();
-const naturalEart1Raw: d3Geo.GeoRawProjection = d3Geo.geoNaturalEarth1Raw();
+const naturalEarth1Raw: d3Geo.GeoRawProjection = d3Geo.geoNaturalEarth1Raw();
 
 // Use Raw Projection =====================================================
 
@@ -393,13 +393,13 @@ const azimuthalEquidistant: d3Geo.GeoProjection = d3Geo.geoAzimuthalEquidistant(
 let conicConformal: d3Geo.GeoConicProjection = d3Geo.geoConicConformal();
 const conicEqualArea: d3Geo.GeoConicProjection = d3Geo.geoConicEqualArea();
 const conicEquidistant: d3Geo.GeoConicProjection = d3Geo.geoConicEquidistant();
-const cquirectangular: d3Geo.GeoProjection = d3Geo.geoEquirectangular();
+const equirectangular: d3Geo.GeoProjection = d3Geo.geoEquirectangular();
 const gnomonic: d3Geo.GeoProjection = d3Geo.geoGnomonic();
 const mercator: d3Geo.GeoProjection = d3Geo.geoMercator();
 const orthographic: d3Geo.GeoProjection = d3Geo.geoOrthographic();
 const stereographic: d3Geo.GeoProjection = d3Geo.geoStereographic();
 const transverseMercator: d3Geo.GeoProjection = d3Geo.geoTransverseMercator();
-const natualEarth1: d3Geo.GeoProjection = d3Geo.geoNaturalEarth1();
+const naturalEarth1: d3Geo.GeoProjection = d3Geo.geoNaturalEarth1();
 
 // ----------------------------------------------------------------------
 // Create New Projections
@@ -558,7 +558,7 @@ const geoPathProjection: d3Geo.GeoProjection = geoPathCanvas.projection<d3Geo.Ge
 
 geoPathSVG = geoPathSVG.projection(conicConformal);
 const geoPathConicProjection: d3Geo.GeoConicProjection = geoPathSVG.projection<d3Geo.GeoConicProjection>();
-// geoPathConicProjection = geoPathSVG.projection(); // fails without casting to GeoConicProjection, or alternatively custom typeguard
+// geoPathConicProjection = geoPathSVG.projection(); // fails without casting to GeoConicProjection, or alternatively custom type guard
 // geoPathConicProjection = geoPathSVG.projection<SampleProperties1>(); // fails as SampleProperties does not extend minimal interface
 
 // context(...) ------------------------------------------------------
@@ -719,11 +719,11 @@ const context: d3Geo.GeoContext = {
 
 const transformFunction: { stream(s: d3Geo.GeoStream): {} } = d3Geo.geoTransform({});
 
-interface CustomTranformProto extends d3Geo.GeoTransformPrototype {
+interface CustomTransformProto extends d3Geo.GeoTransformPrototype {
     a: number;
 }
 
-let customTransformProto: CustomTranformProto;
+let customTransformProto: CustomTransformProto;
 
 customTransformProto = {
     point(x, y) {
@@ -732,11 +732,11 @@ customTransformProto = {
     a: 10
 };
 
-const t: { stream(s: d3Geo.GeoStream): CustomTranformProto & d3Geo.GeoStream } = d3Geo.geoTransform(customTransformProto);
+const t: { stream(s: d3Geo.GeoStream): CustomTransformProto & d3Geo.GeoStream } = d3Geo.geoTransform(customTransformProto);
 
 // geoIdentity() ========================================================
 
-let identityTransform: d3Geo.GeoIdentityTranform;
+let identityTransform: d3Geo.GeoIdentityTransform;
 
 identityTransform = d3Geo.geoIdentity();
 
diff --git a/types/d3-geo/index.d.ts b/types/d3-geo/index.d.ts
index a41f67618a..d1e45090c0 100644
--- a/types/d3-geo/index.d.ts
+++ b/types/d3-geo/index.d.ts
@@ -976,7 +976,7 @@ export interface GeoConicProjection extends GeoProjection {
 export interface GeoContext {
     /**
      * Adds an arc to the path with center point (x, y) and radius r starting at startAngle and ending at endAngle.
-     * The arc is drawn in clockwise directio by default.
+     * The arc is drawn in clockwise direction by default.
      *
      * @param x x-coordinate of arc center point.
      * @param y y-coordinate of arc center point.
@@ -1046,7 +1046,7 @@ export interface GeoPath<This = any, DatumObject extends GeoPermissibleObjects =
      * IMPORTANT: If the rendering context of the geoPath generator is null,
      * then the geoPath is returned as an SVG path data string.
      *
-     * Separate path elements are typically slower than a single path element. However, distinct path elements are useful for styling and interation (e.g., click or mouseover).
+     * Separate path elements are typically slower than a single path element. However, distinct path elements are useful for styling and interaction (e.g., click or mouseover).
      * Canvas rendering (see path.context) is typically faster than SVG, but requires more effort to implement styling and interaction.
      *
      * The first generic type of the GeoPath generator used, must correspond to the "this" context bound to the function upon invocation.
@@ -1075,7 +1075,7 @@ export interface GeoPath<This = any, DatumObject extends GeoPermissibleObjects =
      * IMPORTANT: If the geoPath generator has been configured with a rendering context,
      * then the geoPath is rendered to this context as a sequence of path method calls and this function returns void.
      *
-     * Separate path elements are typically slower than a single path element. However, distinct path elements are useful for styling and interation (e.g., click or mouseover).
+     * Separate path elements are typically slower than a single path element. However, distinct path elements are useful for styling and interaction (e.g., click or mouseover).
      * Canvas rendering (see path.context) is typically faster than SVG, but requires more effort to implement styling and interaction.
      *
      * The first generic type of the GeoPath generator used, must correspond to the "this" context bound to the function upon invocation.
@@ -1501,10 +1501,15 @@ export function geoTransform<T extends GeoTransformPrototype>(methods: T): { str
 
 // geoIdentity() =================================================================
 
+/**
+ * @deprecated Misspelled name. Use GeoIdentityTransform.
+ */
+export type GeoIdentityTranform = GeoIdentityTransform;
+
 /**
  * Geo Identity Transform
  */
-export interface GeoIdentityTranform extends GeoStreamWrapper {
+export interface GeoIdentityTransform extends GeoStreamWrapper {
     /**
      * Returns the current viewport clip extent which defaults to null.
      */
@@ -1667,7 +1672,7 @@ export interface GeoIdentityTranform extends GeoStreamWrapper {
 /**
  * Returns the identity transform which can be used to scale, translate and clip planar geometry.
  */
-export function geoIdentity(): GeoIdentityTranform;
+export function geoIdentity(): GeoIdentityTransform;
 
 // ----------------------------------------------------------------------
 // Clipping Functions
diff --git a/types/d3-hierarchy/d3-hierarchy-tests.ts b/types/d3-hierarchy/d3-hierarchy-tests.ts
index 4e35f02ff9..65b1f5c392 100644
--- a/types/d3-hierarchy/d3-hierarchy-tests.ts
+++ b/types/d3-hierarchy/d3-hierarchy-tests.ts
@@ -568,7 +568,7 @@ hierarchyRectangularNode = rectangularNodeDescendants[rectangularNodeDescendants
 
 const treemapPath: Array<d3Hierarchy.HierarchyRectangularNode<HierarchyDatumWithParentId>> = treemapRootNode.path(hierarchyRectangularNode);
 
-// links() and HierarchyRectangulerLink<...> ------------------------------------------
+// links() and HierarchyRectangularLink<...> ------------------------------------------
 
 let rectangularLinks: Array<d3Hierarchy.HierarchyRectangularLink<HierarchyDatumWithParentId>>;
 
@@ -747,7 +747,7 @@ hierarchyCircularNode = circularNodeDescendants[circularNodeDescendants.length -
 
 const packPath: Array<d3Hierarchy.HierarchyCircularNode<HierarchyDatumWithParentId>> = packRootNode.path(hierarchyCircularNode);
 
-// links() and HierarchyRectangulerLink<...> ------------------------------------------
+// links() and HierarchyRectangularLink<...> ------------------------------------------
 
 let circularLinks: Array<d3Hierarchy.HierarchyCircularLink<HierarchyDatumWithParentId>>;
 
diff --git a/types/d3-hierarchy/index.d.ts b/types/d3-hierarchy/index.d.ts
index a72dfa0aba..440a779217 100644
--- a/types/d3-hierarchy/index.d.ts
+++ b/types/d3-hierarchy/index.d.ts
@@ -50,7 +50,7 @@ export function hierarchy<Datum>(data: Datum, children?: (d: Datum) => (Datum[]
 // Stratify
 // -----------------------------------------------------------------------
 
-// TODO: Review the comment in the API documentation related to 'reserved properties': id, parentId, children. If this is refering to the element on node, it should be 'parent'?
+// TODO: Review the comment in the API documentation related to 'reserved properties': id, parentId, children. If this is referring to the element on node, it should be 'parent'?
 
 export interface StratifyOperator<Datum> {
     (data: Datum[]): HierarchyNode<Datum>;
diff --git a/types/d3-hsv/d3-hsv-tests.ts b/types/d3-hsv/d3-hsv-tests.ts
index 7aa6fb7817..780f584c7c 100644
--- a/types/d3-hsv/d3-hsv-tests.ts
+++ b/types/d3-hsv/d3-hsv-tests.ts
@@ -51,7 +51,7 @@ cString = cHSV.toString();
 console.log('Channels = (h : %d, s: %d, v: %d)', cHSV.h, cHSV.s, cHSV.v);
 console.log('Opacity = %d', cHSV.opacity);
 
-// Interpolater
+// Interpolator
 
 iString = interpolateHsv('seagreen', 'steelblue');
 iString = interpolateHsv(rgb('seagreen'), hcl('steelblue'));
@@ -61,7 +61,7 @@ iString = interpolateHsvLong('seagreen', 'steelblue');
 iString = interpolateHsvLong(rgb('seagreen'), hcl('steelblue'));
 iString = interpolateHsvLong(rgb('seagreen'), hsv('steelblue'));
 
-// Prototype, instanceof and typeguard
+// Prototype, instanceof and type guard
 
 declare let color: RGBColor | HSVColor | null;
 
diff --git a/types/d3-interpolate/d3-interpolate-tests.ts b/types/d3-interpolate/d3-interpolate-tests.ts
index 6baaf06092..e88ad79cfe 100644
--- a/types/d3-interpolate/d3-interpolate-tests.ts
+++ b/types/d3-interpolate/d3-interpolate-tests.ts
@@ -123,7 +123,7 @@ arrNum = iArrayNum(0.5);
 iArrayStr = d3Interpolate.interpolateArray<string[]>(['1', '2'], ['4', '8']); // explicit typing
 arrStr = iArrayStr(0.5);
 
-iArrayStr = d3Interpolate.interpolateArray([1, 2], ['4', '8']); // infered typing <string>
+iArrayStr = d3Interpolate.interpolateArray([1, 2], ['4', '8']); // inferred typing <string>
 arrStr = iArrayStr(0.5);
 
 // two element array with first element date and second element string
@@ -156,7 +156,7 @@ console.log('Recommended transition duration = %d', iZoom.duration);
 
 // test quantize(interpolator, n) signature ------------------------------------------------
 
-arrNum = d3Interpolate.quantize(d3Interpolate.interpolateRound(-1, 2), 4); // infered template parameter type
+arrNum = d3Interpolate.quantize(d3Interpolate.interpolateRound(-1, 2), 4); // inferred template parameter type
 arrStr = d3Interpolate.quantize<string>(d3Interpolate.interpolateString('-1', '2'), 4); // explicit template parameter typing
 
 // arrStr = d3Interpolate.quantize<string>(d3Interpolate.interpolateRound(-1, 2), 4); // test fails, due to explicit typing v argument type mismatch
diff --git a/types/d3-path/index.d.ts b/types/d3-path/index.d.ts
index 7c0f662018..4c1f124962 100644
--- a/types/d3-path/index.d.ts
+++ b/types/d3-path/index.d.ts
@@ -95,7 +95,7 @@ export interface Path {
     rect(x: number, y: number, w: number, h: number): void;
 
     /**
-     * Returns the string representation of this path according to SVG’s path data specficiation.
+     * Returns the string representation of this path according to SVG’s path data specification.
      */
     toString(): string;
 }
diff --git a/types/d3-queue/d3-queue-tests.ts b/types/d3-queue/d3-queue-tests.ts
index f387ea990a..08c195d9bd 100644
--- a/types/d3-queue/d3-queue-tests.ts
+++ b/types/d3-queue/d3-queue-tests.ts
@@ -38,7 +38,7 @@ qNoResult = qNoResult.defer(delayedHello, 'Alice', 250);
 
 qNoResult.defer(delayedHello, 'Bob', 500);
 
-// Task with Reuslts -------------------------------------------------
+// Task with Results -------------------------------------------------
 
 function getFileStats(path: string, callback: (error: any | null, stats?: any) => void) {
     // magically get file stats and behave like fs.stat when invoking the callback
@@ -57,7 +57,7 @@ qNoResult = qNoResult.await((error) => {
     console.log('Goodbye!');
 });
 
-// Task with Reuslts -------------------------------------------------
+// Task with Results -------------------------------------------------
 
 // await
 qWithResults
diff --git a/types/d3-queue/index.d.ts b/types/d3-queue/index.d.ts
index d672849622..5ad38d8d74 100644
--- a/types/d3-queue/index.d.ts
+++ b/types/d3-queue/index.d.ts
@@ -29,7 +29,7 @@ export interface Queue {
     /**
      * Sets the callback to be invoked when all deferred tasks have finished (individual result arguments).
      *
-     * @param callback Callback function to be executed, when error occured or all deferred tasks
+     * @param callback Callback function to be executed, when error occurred or all deferred tasks
      * have completed. The first argument to the callback is the first error that occurred, or null if no error occurred.
      * If an error occurred, there are no additional arguments to the callback. Otherwise,
      * the callback is passed each result as an additional argument.
@@ -38,7 +38,7 @@ export interface Queue {
     /**
      * Sets the callback to be invoked when all deferred tasks have finished (results array).
      *
-     * @param callback Callback function to be executed, when error occured or all deferred tasks
+     * @param callback Callback function to be executed, when error occurred or all deferred tasks
      * have completed. The first argument to the callback is the first error that occurred,
      * or null if no error occurred. If an error occurred, there are no additional arguments to the callback.
      * Otherwise, the callback is also passed an array of results as the second argument.
diff --git a/types/d3-random/index.d.ts b/types/d3-random/index.d.ts
index 41b6034215..c6335a694b 100644
--- a/types/d3-random/index.d.ts
+++ b/types/d3-random/index.d.ts
@@ -57,7 +57,7 @@ export const randomNormal: RandomNormal;
  */
 export interface RandomLogNormal extends RandomNumberGenerationSource {
     /**
-     * Returns a function for generating random numbers with a log-normal distribution. The expected value of the random variable’s natural logrithm is mu,
+     * Returns a function for generating random numbers with a log-normal distribution. The expected value of the random variable’s natural logarithm is mu,
      * with the given standard deviation sigma. If mu is not specified, it defaults to 0; if sigma is not specified, it defaults to 1.
      *
      * @param mu Expected value, defaults to 0.
diff --git a/types/d3-sankey/index.d.ts b/types/d3-sankey/index.d.ts
index 237eb60f15..c619b5c8c3 100644
--- a/types/d3-sankey/index.d.ts
+++ b/types/d3-sankey/index.d.ts
@@ -333,7 +333,7 @@ export interface SankeyLayout<Data, N extends SankeyExtraProperties, L extends S
     /**
      * Set the number of relaxation iterations when generating the layout and return this Sankey layout generator.
      *
-     * @param iterations Number of relaxation iterations, which defaluts to 32.
+     * @param iterations Number of relaxation iterations, which defaults to 32.
      */
     iterations(iterations: number): this;
 }
@@ -365,7 +365,7 @@ export function sankey<N extends SankeyExtraProperties, L extends SankeyExtraPro
  * Get a Sankey layout generator.
  *
  * The nodes/links accessors need to be configured to work with the data type of the first argument passed
- * in when invoking the Sankey lyout generator.
+ * in when invoking the Sankey layout generator.
  *
  * The first generic corresponds to the data type of the first argument passed in when invoking the Sankey layout generator,
  * and its nodes/links accessors.
diff --git a/types/d3-scale/index.d.ts b/types/d3-scale/index.d.ts
index b3ca4114e2..074cb69b95 100644
--- a/types/d3-scale/index.d.ts
+++ b/types/d3-scale/index.d.ts
@@ -14,7 +14,7 @@ import { CountableTimeInterval, TimeInterval } from 'd3-time';
 /**
  * An Interpolator factory returns an interpolator function.
  *
- * The first generic correponds to the data type of the interpolation boundaries.
+ * The first generic corresponds to the data type of the interpolation boundaries.
  * The second generic corresponds to the data type of the return type of the interpolator.
  */
 export interface InterpolatorFactory<T, U> {
@@ -180,7 +180,7 @@ export interface ScaleContinuousNumeric<Range, Output> {
  *
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  */
 export interface ScaleLinear<Range, Output> extends ScaleContinuousNumeric<Range, Output> {
@@ -197,9 +197,9 @@ export interface ScaleLinear<Range, Output> extends ScaleContinuousNumeric<Range
      * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
      * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
      *
-     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     * As part of the interpolation process the interpolated value from the range may be converted to a corresponding output value.
      *
-     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correspond to the interpolation factory applied to the scale.
      */
     interpolate(interpolate: InterpolatorFactory<Range, Output>): this;
     /**
@@ -210,11 +210,11 @@ export interface ScaleLinear<Range, Output> extends ScaleContinuousNumeric<Range
      * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
      * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
      *
-     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     * As part of the interpolation process the interpolated value from the range may be converted to a corresponding output value.
      *
      * The generic "NewOutput" can be used to change the scale to have a different output element type corresponding to the new interpolation factory.
      *
-     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correspond to the interpolation factory applied to the scale.
      */
     interpolate<NewOutput>(interpolate: InterpolatorFactory<Range, NewOutput>): ScaleLinear<Range, NewOutput>;
 }
@@ -228,9 +228,9 @@ export function scaleLinear(): ScaleLinear<number, number>;
 /**
  * Constructs a new continuous linear scale with the unit domain [0, 1], the default interpolator and clamping disabled.
  *
- * The generic correponds to the data type of the range and output elements to be used.
+ * The generic corresponds to the data type of the range and output elements to be used.
  *
- * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behavior.
  * The range must be set in accordance with the range element type.
  *
  * The interpolator factory may be set using the interpolate(...) method of the scale.
@@ -242,7 +242,7 @@ export function scaleLinear<Output>(): ScaleLinear<Output, Output>;
  * The first generic corresponds to the data type of the range elements.
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  *
  * The range must be set in accordance with the range element type.
@@ -271,7 +271,7 @@ export function scaleLinear<Range, Output>(): ScaleLinear<Range, Output>;
  *
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  */
 export interface ScalePower<Range, Output> extends ScaleContinuousNumeric<Range, Output> {
@@ -288,9 +288,9 @@ export interface ScalePower<Range, Output> extends ScaleContinuousNumeric<Range,
      * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
      * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
      *
-     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     * As part of the interpolation process the interpolated value from the range may be converted to a corresponding output value.
      *
-     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correspond to the interpolation factory applied to the scale.
      */
     interpolate(interpolate: InterpolatorFactory<Range, Output>): this;
     /**
@@ -301,11 +301,11 @@ export interface ScalePower<Range, Output> extends ScaleContinuousNumeric<Range,
      * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
      * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
      *
-     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     * As part of the interpolation process the interpolated value from the range may be converted to a corresponding output value.
      *
      * The generic "NewOutput" can be used to change the scale to have a different output element type corresponding to the new interpolation factory.
      *
-     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correspond to the interpolation factory applied to the scale.
      */
     interpolate<NewOutput>(interpolate: InterpolatorFactory<Range, NewOutput>): ScalePower<Range, NewOutput>;
 
@@ -332,9 +332,9 @@ export function scalePow(): ScalePower<number, number>;
  * Constructs a new continuous power scale with the unit domain [0, 1], the exponent 1, the default interpolator and clamping disabled.
  * (Note that this is effectively a linear scale until you set a different exponent.)
  *
- * The generic correponds to the data type of the range and output elements to be used.
+ * The generic corresponds to the data type of the range and output elements to be used.
  *
- * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behavior.
  *
  * The range must be set in accordance with the range element type.
  *
@@ -348,7 +348,7 @@ export function scalePow<Output>(): ScalePower<Output, Output>;
  * The first generic corresponds to the data type of the range elements.
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  *
  * The range must be set in accordance with the range element type.
@@ -368,9 +368,9 @@ export function scaleSqrt(): ScalePower<number, number>;
  * Constructs a new continuous power scale with the unit domain [0, 1], the exponent 0.5, the default interpolator and clamping disabled.
  * This is a convenience method equivalent to d3.scalePow().exponent(0.5).
  *
- * The generic correponds to the data type of the range and output elements to be used.
+ * The generic corresponds to the data type of the range and output elements to be used.
  *
- * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behavior.
  *
  * The range must be set in accordance with the range element type.
  *
@@ -384,7 +384,7 @@ export function scaleSqrt<Output>(): ScalePower<Output, Output>;
  * The first generic corresponds to the data type of the range elements.
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  *
  * The range must be set in accordance with the range element type.
@@ -417,7 +417,7 @@ export function scaleSqrt<Range, Output>(): ScalePower<Range, Output>;
  *
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  */
 export interface ScaleLogarithmic<Range, Output> extends ScaleContinuousNumeric<Range, Output> {
@@ -456,9 +456,9 @@ export interface ScaleLogarithmic<Range, Output> extends ScaleContinuousNumeric<
      * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
      * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
      *
-     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     * As part of the interpolation process the interpolated value from the range may be converted to a corresponding output value.
      *
-     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correspond to the interpolation factory applied to the scale.
      */
     interpolate(interpolate: InterpolatorFactory<Range, Output>): this;
     /**
@@ -469,11 +469,11 @@ export interface ScaleLogarithmic<Range, Output> extends ScaleContinuousNumeric<
      * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
      * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
      *
-     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     * As part of the interpolation process the interpolated value from the range may be converted to a corresponding output value.
      *
      * The generic "NewOutput" can be used to change the scale to have a different output element type corresponding to the new interpolation factory.
      *
-     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correspond to the interpolation factory applied to the scale.
      */
     interpolate<NewOutput>(interpolate: InterpolatorFactory<Range, NewOutput>): ScaleLogarithmic<Range, NewOutput>;
 
@@ -537,9 +537,9 @@ export function scaleLog(): ScaleLogarithmic<number, number>;
 /**
  * Constructs a new continuous logarithmic scale with the domain [1, 10], the base 10, the default interpolator and clamping disabled.
  *
- * The generic correponds to the data type of the range and output elements to be used.
+ * The generic corresponds to the data type of the range and output elements to be used.
  *
- * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behavior.
  *
  * The range must be set in accordance with the range element type.
  *
@@ -552,7 +552,7 @@ export function scaleLog<Output>(): ScaleLogarithmic<Output, Output>;
  * The first generic corresponds to the data type of the range elements.
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  *
  * The range must be set in accordance with the range element type.
@@ -696,7 +696,7 @@ export function scaleIdentity(): ScaleIdentity;
  *
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  */
 export interface ScaleTime<Range, Output> {
@@ -798,9 +798,9 @@ export interface ScaleTime<Range, Output> {
      * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
      * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
      *
-     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     * As part of the interpolation process the interpolated value from the range may be converted to a corresponding output value.
      *
-     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correspond to the interpolation factory applied to the scale.
      */
     interpolate(interpolate: InterpolatorFactory<Range, Output>): this;
     /**
@@ -811,11 +811,11 @@ export interface ScaleTime<Range, Output> {
      * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
      * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
      *
-     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     * As part of the interpolation process the interpolated value from the range may be converted to a corresponding output value.
      *
      * The generic "NewOutput" can be used to change the scale to have a different output element type corresponding to the new interpolation factory.
      *
-     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correspond to the interpolation factory applied to the scale.
      */
     interpolate<NewOutput>(interpolate: InterpolatorFactory<Range, NewOutput>): ScaleTime<Range, NewOutput>;
 
@@ -942,9 +942,9 @@ export function scaleTime(): ScaleTime<number, number>;
 /**
  * Constructs a new time scale using local time with the domain [2000-01-01, 2000-01-02], the default interpolator and clamping disabled.
  *
- * The generic correponds to the data type of the range and output elements to be used.
+ * The generic corresponds to the data type of the range and output elements to be used.
  *
- * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behavior.
  *
  * The range must be set in accordance with the range element type.
  *
@@ -957,7 +957,7 @@ export function scaleTime<Output>(): ScaleTime<Output, Output>;
  * The first generic corresponds to the data type of the range elements.
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  *
  * The range must be set in accordance with the range element type.
@@ -975,9 +975,9 @@ export function scaleUtc(): ScaleTime<number, number>;
 /**
  * Constructs a new time scale using Coordinated Universal Time (UTC) with the domain [2000-01-01, 2000-01-02], the default interpolator and clamping disabled.
  *
- * The generic correponds to the data type of the range and output elements to be used.
+ * The generic corresponds to the data type of the range and output elements to be used.
  *
- * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behavior.
  *
  * The range must be set in accordance with the range element type.
  *
@@ -990,7 +990,7 @@ export function scaleUtc<Output>(): ScaleTime<Output, Output>;
  * The first generic corresponds to the data type of the range elements.
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  *
  * The range must be set in accordance with the range element type.
@@ -1202,7 +1202,7 @@ export function scaleQuantize<Range>(): ScaleQuantize<Range>;
  * The number of values in (the cardinality of) the output range determines the number of quantiles that will be computed from the domain.
  * To compute the quantiles, the domain is sorted, and treated as a population of discrete values; see d3-array’s quantile.
  *
- * The generic correponds to the data type of range elements.
+ * The generic corresponds to the data type of range elements.
  */
 export interface ScaleQuantile<Range> {
     /**
@@ -1272,7 +1272,7 @@ export function scaleQuantile(): ScaleQuantile<number>;
  * Constructs a new quantile scale with an empty domain and an empty range.
  * The quantile scale is invalid until both a domain and range are specified.
  *
- * The generic correponds to the data type of range elements.
+ * The generic corresponds to the data type of range elements.
  */
 export function scaleQuantile<Range>(): ScaleQuantile<Range>;
 
@@ -1613,7 +1613,7 @@ export function scaleBand(): ScaleBand<string>;
 /**
  * Constructs a new band scale with the empty domain, the unit range [0, 1], no padding, no rounding and center alignment.
  *
- * The generic correponds to the data type of domain elements.
+ * The generic corresponds to the data type of domain elements.
  */
 export function scaleBand<Domain extends { toString(): string }>(): ScaleBand<Domain>;
 
diff --git a/types/d3-scale/v1/index.d.ts b/types/d3-scale/v1/index.d.ts
index a9843d9547..46fe6c2a12 100644
--- a/types/d3-scale/v1/index.d.ts
+++ b/types/d3-scale/v1/index.d.ts
@@ -14,7 +14,7 @@ import { CountableTimeInterval, TimeInterval } from 'd3-time';
 /**
  * An Interpolator factory returns an interpolator function.
  *
- * The first generic correponds to the data type of the interpolation boundaries.
+ * The first generic corresponds to the data type of the interpolation boundaries.
  * The second generic corresponds to the data type of the return type of the interpolator.
  */
 export interface InterpolatorFactory<T, U> {
@@ -180,7 +180,7 @@ export interface ScaleContinuousNumeric<Range, Output> {
  *
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  */
 export interface ScaleLinear<Range, Output> extends ScaleContinuousNumeric<Range, Output> {
@@ -197,9 +197,9 @@ export interface ScaleLinear<Range, Output> extends ScaleContinuousNumeric<Range
      * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
      * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
      *
-     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     * As part of the interpolation process the interpolated value from the range may be converted to a corresponding output value.
      *
-     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correspond to the interpolation factory applied to the scale.
      */
     interpolate(interpolate: InterpolatorFactory<Range, Output>): this;
     /**
@@ -210,11 +210,11 @@ export interface ScaleLinear<Range, Output> extends ScaleContinuousNumeric<Range
      * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
      * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
      *
-     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     * As part of the interpolation process the interpolated value from the range may be converted to a corresponding output value.
      *
      * The generic "NewOutput" can be used to change the scale to have a different output element type corresponding to the new interpolation factory.
      *
-     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correspond to the interpolation factory applied to the scale.
      */
     interpolate<NewOutput>(interpolate: InterpolatorFactory<Range, NewOutput>): ScaleLinear<Range, NewOutput>;
 }
@@ -228,9 +228,9 @@ export function scaleLinear(): ScaleLinear<number, number>;
 /**
  * Constructs a new continuous linear scale with the unit domain [0, 1], the default interpolator and clamping disabled.
  *
- * The generic correponds to the data type of the range and output elements to be used.
+ * The generic corresponds to the data type of the range and output elements to be used.
  *
- * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behavior.
  * The range must be set in accordance with the range element type.
  *
  * The interpolator factory may be set using the interpolate(...) method of the scale.
@@ -242,7 +242,7 @@ export function scaleLinear<Output>(): ScaleLinear<Output, Output>;
  * The first generic corresponds to the data type of the range elements.
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  *
  * The range must be set in accordance with the range element type.
@@ -271,7 +271,7 @@ export function scaleLinear<Range, Output>(): ScaleLinear<Range, Output>;
  *
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  */
 export interface ScalePower<Range, Output> extends ScaleContinuousNumeric<Range, Output> {
@@ -288,9 +288,9 @@ export interface ScalePower<Range, Output> extends ScaleContinuousNumeric<Range,
      * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
      * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
      *
-     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     * As part of the interpolation process the interpolated value from the range may be converted to a corresponding output value.
      *
-     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correspond to the interpolation factory applied to the scale.
      */
     interpolate(interpolate: InterpolatorFactory<Range, Output>): this;
     /**
@@ -301,11 +301,11 @@ export interface ScalePower<Range, Output> extends ScaleContinuousNumeric<Range,
      * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
      * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
      *
-     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     * As part of the interpolation process the interpolated value from the range may be converted to a corresponding output value.
      *
      * The generic "NewOutput" can be used to change the scale to have a different output element type corresponding to the new interpolation factory.
      *
-     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correspond to the interpolation factory applied to the scale.
      */
     interpolate<NewOutput>(interpolate: InterpolatorFactory<Range, NewOutput>): ScalePower<Range, NewOutput>;
 
@@ -332,9 +332,9 @@ export function scalePow(): ScalePower<number, number>;
  * Constructs a new continuous power scale with the unit domain [0, 1], the exponent 1, the default interpolator and clamping disabled.
  * (Note that this is effectively a linear scale until you set a different exponent.)
  *
- * The generic correponds to the data type of the range and output elements to be used.
+ * The generic corresponds to the data type of the range and output elements to be used.
  *
- * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behavior.
  *
  * The range must be set in accordance with the range element type.
  *
@@ -348,7 +348,7 @@ export function scalePow<Output>(): ScalePower<Output, Output>;
  * The first generic corresponds to the data type of the range elements.
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  *
  * The range must be set in accordance with the range element type.
@@ -368,9 +368,9 @@ export function scaleSqrt(): ScalePower<number, number>;
  * Constructs a new continuous power scale with the unit domain [0, 1], the exponent 0.5, the default interpolator and clamping disabled.
  * This is a convenience method equivalent to d3.scalePow().exponent(0.5).
  *
- * The generic correponds to the data type of the range and output elements to be used.
+ * The generic corresponds to the data type of the range and output elements to be used.
  *
- * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behavior.
  *
  * The range must be set in accordance with the range element type.
  *
@@ -384,7 +384,7 @@ export function scaleSqrt<Output>(): ScalePower<Output, Output>;
  * The first generic corresponds to the data type of the range elements.
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  *
  * The range must be set in accordance with the range element type.
@@ -417,7 +417,7 @@ export function scaleSqrt<Range, Output>(): ScalePower<Range, Output>;
  *
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  */
 export interface ScaleLogarithmic<Range, Output> extends ScaleContinuousNumeric<Range, Output> {
@@ -456,9 +456,9 @@ export interface ScaleLogarithmic<Range, Output> extends ScaleContinuousNumeric<
      * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
      * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
      *
-     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     * As part of the interpolation process the interpolated value from the range may be converted to a corresponding output value.
      *
-     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correspond to the interpolation factory applied to the scale.
      */
     interpolate(interpolate: InterpolatorFactory<Range, Output>): this;
     /**
@@ -469,11 +469,11 @@ export interface ScaleLogarithmic<Range, Output> extends ScaleContinuousNumeric<
      * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
      * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
      *
-     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     * As part of the interpolation process the interpolated value from the range may be converted to a corresponding output value.
      *
      * The generic "NewOutput" can be used to change the scale to have a different output element type corresponding to the new interpolation factory.
      *
-     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correspond to the interpolation factory applied to the scale.
      */
     interpolate<NewOutput>(interpolate: InterpolatorFactory<Range, NewOutput>): ScaleLogarithmic<Range, NewOutput>;
 
@@ -537,9 +537,9 @@ export function scaleLog(): ScaleLogarithmic<number, number>;
 /**
  * Constructs a new continuous logarithmic scale with the domain [1, 10], the base 10, the default interpolator and clamping disabled.
  *
- * The generic correponds to the data type of the range and output elements to be used.
+ * The generic corresponds to the data type of the range and output elements to be used.
  *
- * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behavior.
  *
  * The range must be set in accordance with the range element type.
  *
@@ -552,7 +552,7 @@ export function scaleLog<Output>(): ScaleLogarithmic<Output, Output>;
  * The first generic corresponds to the data type of the range elements.
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  *
  * The range must be set in accordance with the range element type.
@@ -696,7 +696,7 @@ export function scaleIdentity(): ScaleIdentity;
  *
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  */
 export interface ScaleTime<Range, Output> {
@@ -798,9 +798,9 @@ export interface ScaleTime<Range, Output> {
      * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
      * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
      *
-     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     * As part of the interpolation process the interpolated value from the range may be converted to a corresponding output value.
      *
-     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correspond to the interpolation factory applied to the scale.
      */
     interpolate(interpolate: InterpolatorFactory<Range, Output>): this;
     /**
@@ -811,11 +811,11 @@ export interface ScaleTime<Range, Output> {
      * If the scale is used to set an attribute or style, this is typically acceptable (and desirable for performance);
      * however, if you need to store the scale’s return value, you must specify your own interpolator or make a copy as appropriate.
      *
-     * As part of the interpolation process the interpotaled value from the range may be converted to a corresponding output value.
+     * As part of the interpolation process the interpolated value from the range may be converted to a corresponding output value.
      *
      * The generic "NewOutput" can be used to change the scale to have a different output element type corresponding to the new interpolation factory.
      *
-     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correpond to the interpolation factory applied to the scale.
+     * @param interpolate An interpolation factory. The generics for Range and Output of the scale must correspond to the interpolation factory applied to the scale.
      */
     interpolate<NewOutput>(interpolate: InterpolatorFactory<Range, NewOutput>): ScaleTime<Range, NewOutput>;
 
@@ -942,9 +942,9 @@ export function scaleTime(): ScaleTime<number, number>;
 /**
  * Constructs a new time scale using local time with the domain [2000-01-01, 2000-01-02], the default interpolator and clamping disabled.
  *
- * The generic correponds to the data type of the range and output elements to be used.
+ * The generic corresponds to the data type of the range and output elements to be used.
  *
- * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behavior.
  *
  * The range must be set in accordance with the range element type.
  *
@@ -957,7 +957,7 @@ export function scaleTime<Output>(): ScaleTime<Output, Output>;
  * The first generic corresponds to the data type of the range elements.
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  *
  * The range must be set in accordance with the range element type.
@@ -975,9 +975,9 @@ export function scaleUtc(): ScaleTime<number, number>;
 /**
  * Constructs a new time scale using Coordinated Universal Time (UTC) with the domain [2000-01-01, 2000-01-02], the default interpolator and clamping disabled.
  *
- * The generic correponds to the data type of the range and output elements to be used.
+ * The generic corresponds to the data type of the range and output elements to be used.
  *
- * As range type and output type are the same, the interpolator factory used with the scale must match this behaviour.
+ * As range type and output type are the same, the interpolator factory used with the scale must match this behavior.
  *
  * The range must be set in accordance with the range element type.
  *
@@ -990,7 +990,7 @@ export function scaleUtc<Output>(): ScaleTime<Output, Output>;
  * The first generic corresponds to the data type of the range elements.
  * The second generic corresponds to the data type of the output elements generated by the scale.
  *
- * If range element and output element type differ, the interpolator factory used with the scale must match this behaviour and
+ * If range element and output element type differ, the interpolator factory used with the scale must match this behavior and
  * convert the interpolated range element to a corresponding output element.
  *
  * The range must be set in accordance with the range element type.
@@ -1267,7 +1267,7 @@ export function scaleQuantize<Range>(): ScaleQuantize<Range>;
  * The number of values in (the cardinality of) the output range determines the number of quantiles that will be computed from the domain.
  * To compute the quantiles, the domain is sorted, and treated as a population of discrete values; see d3-array’s quantile.
  *
- * The generic correponds to the data type of range elements.
+ * The generic corresponds to the data type of range elements.
  */
 export interface ScaleQuantile<Range> {
     /**
@@ -1337,7 +1337,7 @@ export function scaleQuantile(): ScaleQuantile<number>;
  * Constructs a new quantile scale with an empty domain and an empty range.
  * The quantile scale is invalid until both a domain and range are specified.
  *
- * The generic correponds to the data type of range elements.
+ * The generic corresponds to the data type of range elements.
  */
 export function scaleQuantile<Range>(): ScaleQuantile<Range>;
 
@@ -1678,7 +1678,7 @@ export function scaleBand(): ScaleBand<string>;
 /**
  * Constructs a new band scale with the empty domain, the unit range [0, 1], no padding, no rounding and center alignment.
  *
- * The generic correponds to the data type of domain elements.
+ * The generic corresponds to the data type of domain elements.
  */
 export function scaleBand<Domain extends { toString(): string }>(): ScaleBand<Domain>;
 
diff --git a/types/d3-selection/d3-selection-tests.ts b/types/d3-selection/d3-selection-tests.ts
index e4f50c89e4..54ddb5ea11 100644
--- a/types/d3-selection/d3-selection-tests.ts
+++ b/types/d3-selection/d3-selection-tests.ts
@@ -162,8 +162,8 @@ const svgEl: d3Selection.Selection<SVGSVGElement, SVGDatum, HTMLElement, any> =
 
 let firstG: d3Selection.Selection<SVGGElement, SVGDatum, HTMLElement, any> = svgEl.select<SVGGElement>('g');
 // let firstG_2: d3Selection.Selection<SVGGElement, SVGDatum, SVGSVGElement, any> = svgEl.select<SVGGElement>('g'); // fails, parent element of selection does not change with .select(...)
-// firstG = svgEl.select('g'); // fails, element type defaults to 'BaseType', but SVGGElement expexted on left-hand side
-// firstG = svgEl.select<SVGSVGElement>('svg'); // fails, element type of SVGSVGElement provided, but SVGGElement expexted on left-hand side (silly test to begin with)
+// firstG = svgEl.select('g'); // fails, element type defaults to 'BaseType', but SVGGElement expected on left-hand side
+// firstG = svgEl.select<SVGSVGElement>('svg'); // fails, element type of SVGSVGElement provided, but SVGGElement expected on left-hand side (silly test to begin with)
 
 // test, when it is not certain, whether an element of the type to be selected exists
 let maybeG: d3Selection.Selection<SVGGElement | null, SVGDatum, HTMLElement, any>;
@@ -173,7 +173,7 @@ maybeG = svgEl.select<SVGGElement | null>('g');
 // Using select(...) sub-selection with a selector function argument.
 
 function svgGroupSelector(this: SVGSVGElement, d: SVGDatum, i: number, groups: SVGSVGElement[] | ArrayLike<SVGSVGElement>): SVGGElement {
-    return this.querySelector('g')!; // this-type compatible with group element-type to which the selector function will be appplied
+    return this.querySelector('g')!; // this-type compatible with group element-type to which the selector function will be applied
 }
 
 firstG = svgEl.select(svgGroupSelector);
@@ -224,7 +224,7 @@ let gElementsOldData: d3Selection.Selection<SVGGElement, CircleDatum, SVGSVGElem
 // Using selectAll(...) sub-selection with a selector function argument.
 
 function svgGroupSelectorAll(this: SVGSVGElement, d: SVGDatum, i: number, groups: SVGSVGElement[] | d3Selection.ArrayLike<SVGSVGElement>): NodeListOf<SVGGElement> {
-    return this.querySelectorAll('g'); // this-type compatible with group element-type to which the selector function will be appplied
+    return this.querySelectorAll('g'); // this-type compatible with group element-type to which the selector function will be applied
 }
 
 gElementsOldData = svgEl.selectAll<SVGGElement, CircleDatum>(svgGroupSelectorAll);
@@ -302,11 +302,11 @@ gElementsOldData = svgEl.selectAll<SVGGElement, CircleDatum>(d3Selection.selecto
 
 // Scenario 1: Filter retaining the element type of the select group (i.e. no type narrowing during filtering)
 
-let filterdGElements: d3Selection.Selection<SVGGElement, CircleDatum, SVGSVGElement, SVGDatum>;
+let filteredGElements: d3Selection.Selection<SVGGElement, CircleDatum, SVGSVGElement, SVGDatum>;
 
-filterdGElements = gElementsOldData.filter('.top-level');
+filteredGElements = gElementsOldData.filter('.top-level');
 
-filterdGElements = gElementsOldData.filter(function(d, i, g) {
+filteredGElements = gElementsOldData.filter(function(d, i, g) {
     const that: SVGGElement = this;
     // const that2: HTMLElement  = this; // fails, type mismatch
     const datum: CircleDatum = d;
@@ -322,23 +322,23 @@ filterdGElements = gElementsOldData.filter(function(d, i, g) {
 // Scenario 2: Filtering narrows the type of selected elements in a known way
 
 // assume the class ".any-svg-type" can only be assigned to SVGElements in the DOM
-let filterdGElements2: d3Selection.Selection<SVGGElement, any, HTMLElement, any>;
+let filteredGElements2: d3Selection.Selection<SVGGElement, any, HTMLElement, any>;
 
-filterdGElements2 = d3Selection.selectAll<SVGElement, any>('.any-svg-type').filter<SVGGElement>('g');
-// filterdGElements2 = d3Selection.selectAll('.any-type').filter('g'); // fails without using narrowing generic on filter method
+filteredGElements2 = d3Selection.selectAll<SVGElement, any>('.any-svg-type').filter<SVGGElement>('g');
+// filteredGElements2 = d3Selection.selectAll('.any-type').filter('g'); // fails without using narrowing generic on filter method
 
-filterdGElements2 = d3Selection.selectAll<SVGElement, any>('.any-svg-type').filter<SVGGElement>(function() {
+filteredGElements2 = d3Selection.selectAll<SVGElement, any>('.any-svg-type').filter<SVGGElement>(function() {
     const that: SVGElement = this;
     return that.tagName === 'g' || that.tagName === 'G';
 });
-// filterdGElements2 = d3Selection.selectAll<SVGElement, any>('.any-svg-type').filter(function(){
+// filteredGElements2 = d3Selection.selectAll<SVGElement, any>('.any-svg-type').filter(function(){
 //     const that: SVGElement = this;
 //     return that.tagName === 'g'|| that.tagName === 'G';
 // }); // fails without using narrowing generic on filter method
 
 // matcher() -----------------------------------------------------------------------------
 
-filterdGElements = gElementsOldData.filter(d3Selection.matcher('.top-level'));
+filteredGElements = gElementsOldData.filter(d3Selection.matcher('.top-level'));
 
 // ---------------------------------------------------------------------------------------
 // Tests of Modification
@@ -644,7 +644,7 @@ let circles2: d3Selection.Selection<SVGCircleElement, CircleDatumAlternative, SV
 
 // Test creating initial data-driven circle selection
 // and append materialized SVGCircleElement per enter() selection element
-// - use data(...) with array-signature and infer data type from arrray type passed into data(...)
+// - use data(...) with array-signature and infer data type from array type passed into data(...)
 // - use enter() to obtain enter selection
 // - materialize svg circles using append(...) with type-parameter and string argument
 
@@ -699,7 +699,7 @@ exitCircles
     })
     .remove();
 
-// Note: the alternative using only .exit() without typing, will fail, if access to datum properties is attemped.
+// Note: the alternative using only .exit() without typing, will fail, if access to datum properties is attempted.
 // If access to d is not required, the short-hand is acceptable e.g. circles2.exit().remove();
 
 // let exitCircles2 = circles2.exit(); // Note: Without explicit re-typing to the old data type, the data type default to '{}'
diff --git a/types/d3-selection/index.d.ts b/types/d3-selection/index.d.ts
index 7e23c4aaeb..d1e127dfdf 100644
--- a/types/d3-selection/index.d.ts
+++ b/types/d3-selection/index.d.ts
@@ -78,7 +78,7 @@ export type ValueFn<T extends BaseType, Datum, Result> = (this: T, datum: Datum,
 
 /**
  * TransitionLike is a helper interface to represent a quasi-Transition, without specifying the full Transition  interface in this file.
- * For example, whereever d3-zoom allows a Transition to be passed in as an argument, it internally immediately invokes its `selection()`
+ * For example, wherever d3-zoom allows a Transition to be passed in as an argument, it internally immediately invokes its `selection()`
  * method to retrieve the underlying Selection object before proceeding.
  * d3-brush uses a subset of Transition methods internally.
  * The use of this interface instead of the full imported Transition interface is [referred] to achieve
@@ -480,7 +480,7 @@ export interface Selection<GElement extends BaseType, Datum, PElement extends Ba
      */
     append<ChildElement extends BaseType>(type: string): Selection<ChildElement, Datum, PElement, PDatum>;
     /**
-     * Appends a new element of the type provided by the element creator functionas the last child of each selected element,
+     * Appends a new element of the type provided by the element creator function as the last child of each selected element,
      * or before the next following sibling in the update selection if this is an enter selection.
      * The latter behavior for enter selections allows you to insert elements into the DOM in an order consistent with the new bound data;
      * however, note that selection.order may still be required if updating elements change order
diff --git a/types/d3-shape/index.d.ts b/types/d3-shape/index.d.ts
index 5408508683..47e5c10feb 100644
--- a/types/d3-shape/index.d.ts
+++ b/types/d3-shape/index.d.ts
@@ -32,7 +32,7 @@ export interface DefaultArcObject {
      */
     endAngle: number;
     /**
-     * Optional. Pad angle of arcin radians.
+     * Optional. Pad angle of arc in radians.
      */
     padAngle?: number;
 }
@@ -741,7 +741,7 @@ export interface Line<Datum> {
     /**
      * Returns the current curve factory, which defaults to curveLinear.
      *
-     * The generic allows to cast the curve factory to a specifc type, if known.
+     * The generic allows to cast the curve factory to a specific type, if known.
      */
     curve<C extends CurveFactory | CurveFactoryLineOnly>(): C;
     /**
@@ -916,7 +916,7 @@ export interface LineRadial<Datum> {
     /**
      * Returns the current curve factory, which defaults to curveLinear.
      *
-     * The generic allows to cast the curve factory to a specifc type, if known.
+     * The generic allows to cast the curve factory to a specific type, if known.
      */
     curve<C extends CurveFactory | CurveFactoryLineOnly>(): C;
     /**
@@ -1213,7 +1213,7 @@ export interface Area<Datum> {
     /**
      * Returns the current curve factory, which defaults to curveLinear.
      *
-     * The generic allows to cast the curve factory to a specifc type, if known.
+     * The generic allows to cast the curve factory to a specific type, if known.
      */
     curve<C extends CurveFactory>(): C;
     /**
@@ -1518,7 +1518,7 @@ export interface AreaRadial<Datum> {
     /**
      * Returns the current curve factory, which defaults to curveLinear.
      *
-     * The generic allows to cast the curve factory to a specifc type, if known.
+     * The generic allows to cast the curve factory to a specific type, if known.
      */
     curve<C extends CurveFactory>(): C;
     /**
@@ -2280,7 +2280,7 @@ export interface SymbolType {
  * use a transform (see: SVG, Canvas) to move the arc to a different position.
  *
  * The first generic corresponds to the "this" context within which the symbol generator is invoked.
- * The second generic corrsponds to the data type of the datum underlying the symbol.
+ * The second generic corresponds to the data type of the datum underlying the symbol.
  */
 export interface Symbol<This, Datum> {
     /**
@@ -2382,7 +2382,7 @@ export function symbol(): Symbol<any, any>; // tslint:disable-line ban-types
 /**
  * Constructs a new symbol generator with the default settings.
  *
- * The generic corrsponds to the data type of the datum underlying the symbol.
+ * The generic corresponds to the data type of the datum underlying the symbol.
  */
 export function symbol<Datum>(): Symbol<any, Datum>; // tslint:disable-line ban-types
 
@@ -2390,7 +2390,7 @@ export function symbol<Datum>(): Symbol<any, Datum>; // tslint:disable-line ban-
  * Constructs a new symbol generator with the default settings.
  *
  * The first generic corresponds to the "this" context within which the symbol generator is invoked.
- * The second generic corrsponds to the data type of the datum underlying the symbol.
+ * The second generic corresponds to the data type of the datum underlying the symbol.
  */
 export function symbol<This, Datum>(): Symbol<This, Datum>; // tslint:disable-line ban-types
 
@@ -2460,11 +2460,11 @@ export function pointRadial(angle: number, radius: number): [number, number];
  */
 export interface SeriesPoint<Datum> extends Array<number> {
     /**
-     * Correponds to y0, the lower value (baseline).
+     * Corresponds to y0, the lower value (baseline).
      */
     0: number;
     /**
-     * Correponds to y1, the upper value (topline).
+     * Corresponds to y1, the upper value (topline).
      */
     1: number;
     /**
@@ -2565,7 +2565,7 @@ export interface Stack<This, Datum, Key> {
     value(value: (d: Datum, key: Key, j: number, data: Datum[]) => number): this;
 
     /**
-     * Returns the current order acccesor, which defaults to stackOrderNone; this uses the order given by the key accessor.
+     * Returns the current order accessor, which defaults to stackOrderNone; this uses the order given by the key accessor.
      */
     order(): (series: Series<Datum, Key>) => number[];
     /**
@@ -2596,7 +2596,7 @@ export interface Stack<This, Datum, Key> {
     order(order: (series: Series<Datum, Key>) => number[]): this;
 
     /**
-     * Returns the current offset acccesor, which defaults to stackOffsetNone; this uses a zero baseline.
+     * Returns the current offset accessor, which defaults to stackOffsetNone; this uses a zero baseline.
      */
     offset(): (series: Series<Datum, Key>, order: number[]) => void;
     /**
diff --git a/types/d3-time/index.d.ts b/types/d3-time/index.d.ts
index 3d88edbf27..b8aa2f12aa 100644
--- a/types/d3-time/index.d.ts
+++ b/types/d3-time/index.d.ts
@@ -22,7 +22,7 @@ export interface TimeInterval {
      * This function is idempotent: if the specified date is already floored to the current interval,
      * a new date with an identical time is returned.
      * Furthermore, the returned date is the minimum expressible value of the associated interval,
-     * such that interval.floor(interval.floor(date) - 1) returns the preceeding interval boundary date.
+     * such that interval.floor(interval.floor(date) - 1) returns the preceding interval boundary date.
      *
      * Note that the == and === operators do not compare by value with Date objects,
      * and thus you cannot use them to tell whether the specified date has already been floored.
@@ -42,7 +42,7 @@ export interface TimeInterval {
      * This method is idempotent: if the specified date is already floored to the current interval,
      * a new date with an identical time is returned.
      * Furthermore, the returned date is the minimum expressible value of the associated interval,
-     * such that interval.floor(interval.floor(date) - 1) returns the preceeding interval boundary date.
+     * such that interval.floor(interval.floor(date) - 1) returns the preceding interval boundary date.
      *
      * Note that the == and === operators do not compare by value with Date objects,
      * and thus you cannot use them to tell whether the specified date has already been floored.
@@ -165,7 +165,7 @@ export interface CountableTimeInterval extends TimeInterval {
 /**
  * Constructs a new custom interval given the specified floor and offset functions.
  *
- * The returned custom interval is not countable, i.e. does not exposee the methods "count(..)" and "every(...)".
+ * The returned custom interval is not countable, i.e. does not expose the methods "count(..)" and "every(...)".
  *
  * @param floor A floor function which takes a single date as an argument and rounds it down to the nearest interval boundary.
  * @param offset An offset function which takes a date and an integer step as arguments and advances
@@ -447,12 +447,12 @@ export function timeYears(start: Date, stop: Date, step?: number): Date[];
 // utc Universal Coordinated Time ----------------------------------------------------------
 
 /**
- * Milliseconds Interval in Univarsal Coordinated Time (UTC); the shortest available time unit.
+ * Milliseconds Interval in Universal Coordinated Time (UTC); the shortest available time unit.
  */
 export const utcMillisecond: CountableTimeInterval;
 
 /**
- * This is a convenience alias for utcMilliesecond.range(...).
+ * This is a convenience alias for utcMillisecond.range(...).
  *
  * @param start A start date object for the range.
  * @param stop A stop date object for the range.
@@ -461,7 +461,7 @@ export const utcMillisecond: CountableTimeInterval;
 export function utcMilliseconds(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Seconds Interval in Univarsal Coordinated Time (UTC); seconds (e.g., 01:23:45.0000 AM); 1,000 milliseconds.
+ * Seconds Interval in Universal Coordinated Time (UTC); seconds (e.g., 01:23:45.0000 AM); 1,000 milliseconds.
  */
 export const utcSecond: CountableTimeInterval;
 
@@ -475,7 +475,7 @@ export const utcSecond: CountableTimeInterval;
 export function utcSeconds(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Minutes Interval in Univarsal Coordinated Time (UTC); minutes (e.g., 01:02:00 AM); 60 seconds.
+ * Minutes Interval in Universal Coordinated Time (UTC); minutes (e.g., 01:02:00 AM); 60 seconds.
  * Note that ECMAScript ignores leap seconds.
  */
 export const utcMinute: CountableTimeInterval;
@@ -490,7 +490,7 @@ export const utcMinute: CountableTimeInterval;
 export function utcMinutes(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Hours Interval in Univarsal Coordinated Time (UTC); Hours (e.g., 01:00 AM); 60 minutes.
+ * Hours Interval in Universal Coordinated Time (UTC); Hours (e.g., 01:00 AM); 60 minutes.
  */
 export const utcHour: CountableTimeInterval;
 
@@ -504,7 +504,7 @@ export const utcHour: CountableTimeInterval;
 export function utcHours(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Days Interval in Univarsal Coordinated Time (UTC); days (e.g., February 7, 2012 at 12:00 AM); 24 hours.
+ * Days Interval in Universal Coordinated Time (UTC); days (e.g., February 7, 2012 at 12:00 AM); 24 hours.
  */
 export const utcDay: CountableTimeInterval;
 
@@ -533,7 +533,7 @@ export const utcWeek: CountableTimeInterval;
 export function utcWeeks(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Week Interval for Sunday-based weeks in Univarsal Coordinated Time (UTC) (e.g., February 5, 2012 at 12:00 AM).
+ * Week Interval for Sunday-based weeks in Universal Coordinated Time (UTC) (e.g., February 5, 2012 at 12:00 AM).
  * 7 days and 168 hours.
  */
 export const utcSunday: CountableTimeInterval;
@@ -548,7 +548,7 @@ export const utcSunday: CountableTimeInterval;
 export function utcSundays(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Week Interval for Monday-based weeks in Univarsal Coordinated Time (UTC) (e.g., February 6, 2012 at 12:00 AM).
+ * Week Interval for Monday-based weeks in Universal Coordinated Time (UTC) (e.g., February 6, 2012 at 12:00 AM).
  * 7 days and 168 hours.
  */
 export const utcMonday: CountableTimeInterval;
@@ -563,7 +563,7 @@ export const utcMonday: CountableTimeInterval;
 export function utcMondays(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Week Interval for Tuesday-based weeks in Univarsal Coordinated Time (UTC) (e.g., February 7, 2012 at 12:00 AM).
+ * Week Interval for Tuesday-based weeks in Universal Coordinated Time (UTC) (e.g., February 7, 2012 at 12:00 AM).
  * 7 days and 168 hours.
  */
 export const utcTuesday: CountableTimeInterval;
@@ -578,7 +578,7 @@ export const utcTuesday: CountableTimeInterval;
 export function utcTuesdays(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Week Interval for Wednesday-based weeks in Univarsal Coordinated Time (UTC) (e.g., February 8, 2012 at 12:00 AM).
+ * Week Interval for Wednesday-based weeks in Universal Coordinated Time (UTC) (e.g., February 8, 2012 at 12:00 AM).
  * 7 days and 168 hours.
  */
 export const utcWednesday: CountableTimeInterval;
@@ -593,7 +593,7 @@ export const utcWednesday: CountableTimeInterval;
 export function utcWednesdays(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Week Interval for Thursday-based weeks in Univarsal Coordinated Time (UTC) (e.g., February 9, 2012 at 12:00 AM).
+ * Week Interval for Thursday-based weeks in Universal Coordinated Time (UTC) (e.g., February 9, 2012 at 12:00 AM).
  * 7 days and 168 hours.
  */
 export const utcThursday: CountableTimeInterval;
@@ -608,7 +608,7 @@ export const utcThursday: CountableTimeInterval;
 export function utcThursdays(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Week Interval for Friday-based weeks in Univarsal Coordinated Time (UTC) (e.g., February 10, 2012 at 12:00 AM).
+ * Week Interval for Friday-based weeks in Universal Coordinated Time (UTC) (e.g., February 10, 2012 at 12:00 AM).
  * 7 days and 168 hours.
  */
 export const utcFriday: CountableTimeInterval;
@@ -623,7 +623,7 @@ export const utcFriday: CountableTimeInterval;
 export function utcFridays(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Week Interval for Saturday-based weeks in Univarsal Coordinated Time (UTC) (e.g., February 11, 2012 at 12:00 AM).
+ * Week Interval for Saturday-based weeks in Universal Coordinated Time (UTC) (e.g., February 11, 2012 at 12:00 AM).
  * 7 days and 168 hours.
  */
 export const utcSaturday: CountableTimeInterval;
@@ -638,7 +638,7 @@ export const utcSaturday: CountableTimeInterval;
 export function utcSaturdays(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Month Interval in Univarsal Coordinated Time (UTC); months (e.g., February 1, 2012 at 12:00 AM); ranges from 28 to 31 days.
+ * Month Interval in Universal Coordinated Time (UTC); months (e.g., February 1, 2012 at 12:00 AM); ranges from 28 to 31 days.
  */
 export const utcMonth: CountableTimeInterval;
 
@@ -652,7 +652,7 @@ export const utcMonth: CountableTimeInterval;
 export function utcMonths(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Year Interval in Univarsal Coordinated Time (UTC); years (e.g., January 1, 2012 at 12:00 AM); ranges from 365 to 366 days.
+ * Year Interval in Universal Coordinated Time (UTC); years (e.g., January 1, 2012 at 12:00 AM); ranges from 365 to 366 days.
  */
 export const utcYear: CountableTimeInterval;
 
diff --git a/types/d3-transition/d3-transition-tests.ts b/types/d3-transition/d3-transition-tests.ts
index ba0ae99750..9ee4a8e43d 100644
--- a/types/d3-transition/d3-transition-tests.ts
+++ b/types/d3-transition/d3-transition-tests.ts
@@ -142,13 +142,13 @@ let newEnterTransition: d3Transition.Transition<SVGCircleElement, CircleDatum, S
 newEnterTransition = enterCircles.transition(enterTransition);
 
 let differentElementTypeTransition: d3Transition.Transition<SVGSVGElement, CircleDatum, HTMLBodyElement, any>;
-let differentDatumTypeTransition: d3Transition.Transition<SVGCircleElement, { differrent: string }, SVGSVGElement, any>;
+let differentDatumTypeTransition: d3Transition.Transition<SVGCircleElement, { different: string }, SVGSVGElement, any>;
 
 // Comparable use cases arise e.g. when using an existing transition to generate a new transition
 // on a different selection to synchronize them (see e.g. Mike Bostock's Brush & Zoom II Example https://bl.ocks.org/mbostock/f48fcdb929a620ed97877e4678ab15e6)
 differentElementTypeTransition = select<HTMLBodyElement, any>('body').selectAll<SVGSVGElement, CircleDatum>('svg').transition();
 newEnterTransition = enterCircles.transition(differentElementTypeTransition);
-differentDatumTypeTransition = select<SVGSVGElement, any>('svg').selectAll<SVGCircleElement, { differrent: string }>('circle').transition();
+differentDatumTypeTransition = select<SVGSVGElement, any>('svg').selectAll<SVGCircleElement, { different: string }>('circle').transition();
 newEnterTransition = enterCircles.transition(differentDatumTypeTransition);
 
 // --------------------------------------------------------------------------
@@ -234,18 +234,18 @@ exitTransition = exitTransition.filter(function(d, i, g) {
     const index: number = i;
     const group: SVGCircleElement[] | ArrayLike<SVGCircleElement> = g;
     // console.log(this.x) // fails, x property not defined on SVGCircleElement
-    return this.r.baseVal.value < i * d.r; // this-type SVGCircleElement, datum tpye CircleDatum
+    return this.r.baseVal.value < i * d.r; // this-type SVGCircleElement, datum type CircleDatum
 });
 
 // Scenario 2: Filtering narrows the type of selected elements in a known way
 
 // assume the class ".any-svg-type" can only be assigned to SVGElements in the DOM
-let filterdGElements2: d3Transition.Transition<SVGGElement, any, HTMLElement, any>;
+let filteredGElements2: d3Transition.Transition<SVGGElement, any, HTMLElement, any>;
 
-filterdGElements2 = selectAll<SVGElement, any>('.any-svg-type').transition().filter<SVGGElement>('g');
-// filterdGElements2 = selectAll('.any-type').transition().filter('g'); // fails without using narrowing generic on filter method
+filteredGElements2 = selectAll<SVGElement, any>('.any-svg-type').transition().filter<SVGGElement>('g');
+// filteredGElements2 = selectAll('.any-type').transition().filter('g'); // fails without using narrowing generic on filter method
 
-filterdGElements2 = selectAll<SVGElement, any>('.any-svg-type').transition().filter<SVGGElement>(function(d, i, g) {
+filteredGElements2 = selectAll<SVGElement, any>('.any-svg-type').transition().filter<SVGGElement>(function(d, i, g) {
     const that: SVGElement = this;
     // const that2: HTMLElement  = this; // fails, type mismatch
     const datum: CircleDatum = d;
@@ -253,7 +253,7 @@ filterdGElements2 = selectAll<SVGElement, any>('.any-svg-type').transition().fil
     const group: SVGElement[] | ArrayLike<SVGElement> = g;
     return that.tagName === 'g' || that.tagName === 'G';
 });
-// filterdGElements2 = selectAll<SVGElement, any>('.any-svg-type').transition().filter(function(){
+// filteredGElements2 = selectAll<SVGElement, any>('.any-svg-type').transition().filter(function(){
 //     const that: SVGElement = this;
 //     return that.tagName === 'g'|| that.tagName === 'G';
 // }); // fails without using narrowing generic on filter method
diff --git a/types/d3-zoom/d3-zoom-tests.ts b/types/d3-zoom/d3-zoom-tests.ts
index 669b4af8ff..8051898b8b 100644
--- a/types/d3-zoom/d3-zoom-tests.ts
+++ b/types/d3-zoom/d3-zoom-tests.ts
@@ -84,7 +84,7 @@ interface GroupDatum {
 }
 
 // --------------------------------------------------------------------------
-// Test Define ZoomBehaviour
+// Test Define ZoomBehavior
 // --------------------------------------------------------------------------
 
 // Canvas Example -----------------------------------------------------------
@@ -235,7 +235,7 @@ const duration: number = svgZoom.duration();
 
 // interpolate() --------------------------------------------------------------
 
-// chainable setter accepts interpoateZoom, interpolate and interpolateArray
+// chainable setter accepts interpolateZoom, interpolate and interpolateArray
 svgZoom = svgZoom.interpolate(interpolateZoom);
 svgZoom = svgZoom.interpolate(interpolate);
 svgZoom = svgZoom.interpolate(interpolateArray);
@@ -269,7 +269,7 @@ if (zoomHandler) {
     svgZoom.on('zoom', zoomHandler);
 }
 // --------------------------------------------------------------------------
-// Test Attach ZoomBehaviour
+// Test Attach ZoomBehavior
 // --------------------------------------------------------------------------
 
 // Canvas Example -----------------------------------------------------------
@@ -290,14 +290,14 @@ const svgOverlay: Selection<SVGRectElement, SVGDatum, HTMLElement, any> = svg.ap
 const svgOverlayTransition = svgOverlay.transition();
 
 // --------------------------------------------------------------------------
-// Test Use ZoomBehaviour
+// Test Use ZoomBehavior
 // --------------------------------------------------------------------------
 
 // transform() -------------------------------------------------------------------------------------
 
 // use on selection
 svgZoom.transform(svgOverlay, d3Zoom.zoomIdentity);
-// svgZoom.transform(groupsSelection, d3Zoom.zoomIdentity); // fails, as groupSelection mismachtes DOM Element type and datum type
+// svgZoom.transform(groupsSelection, d3Zoom.zoomIdentity); // fails, as groupSelection mismatches DOM Element type and datum type
 
 svgZoom.transform(svgOverlay, function(datum, index, groups) {
     const that: SVGRectElement = this;
@@ -310,7 +310,7 @@ svgZoom.transform(svgOverlay, function(datum, index, groups) {
 });
 // use on transition
 svgOverlayTransition.call(svgZoom.transform, d3Zoom.zoomIdentity);
-// svgZoom.transform(groupsTransition, d3Zoom.zoomIdentity); // fails, as groupTransition mismachtes DOM Element type and datum type
+// svgZoom.transform(groupsTransition, d3Zoom.zoomIdentity); // fails, as groupTransition mismatches DOM Element type and datum type
 
 svgZoom.transform(svgOverlayTransition, d3Zoom.zoomIdentity);
 svgZoom.transform(svgOverlayTransition, function(datum, index, groups) {
@@ -327,7 +327,7 @@ svgZoom.transform(svgOverlayTransition, function(datum, index, groups) {
 
 // use on selection
 svgZoom.translateBy(svgOverlay, 20, 50);
-// svgZoom.translateBy(groupsSelection, 20, 50); // fails, as groupSelection mismachtes DOM Element type and datum type
+// svgZoom.translateBy(groupsSelection, 20, 50); // fails, as groupSelection mismatches DOM Element type and datum type
 
 svgZoom.translateBy(
     svgOverlay,
@@ -376,7 +376,7 @@ svgZoom.translateBy(
 
 // use on transition
 svgZoom.translateBy(svgOverlayTransition, 20, 50);
-// svgZoom.translateBy(groupsTransition, 20, 50); // fails, as groupTransition mismachtes DOM Element type and datum type
+// svgZoom.translateBy(groupsTransition, 20, 50); // fails, as groupTransition mismatches DOM Element type and datum type
 
 svgZoom.translateBy(
     svgOverlayTransition,
@@ -427,7 +427,7 @@ svgZoom.translateBy(
 
 // use on selection
 svgZoom.translateTo(svgOverlay, 20, 50);
-// svgZoom.translateTo(groupsSelection, 20, 50); // fails, as groupSelection mismachtes DOM Element type and datum type
+// svgZoom.translateTo(groupsSelection, 20, 50); // fails, as groupSelection mismatches DOM Element type and datum type
 
 svgZoom.translateTo(
     svgOverlay,
@@ -476,7 +476,7 @@ svgZoom.translateTo(
 
 // use on transition
 svgZoom.translateTo(svgOverlayTransition, 20, 50);
-// svgZoom.translateTo(groupsTransition, 20, 50); // fails, as groupTransition mismachtes DOM Element type and datum type
+// svgZoom.translateTo(groupsTransition, 20, 50); // fails, as groupTransition mismatches DOM Element type and datum type
 
 svgZoom.translateTo(
     svgOverlayTransition,
@@ -527,7 +527,7 @@ svgZoom.translateTo(
 
 // use on selection
 svgZoom.scaleBy(svgOverlay, 3);
-// svgZoom.scaleBy(groupsSelection, 3); // fails, as groupSelection mismachtes DOM Element type and datum type
+// svgZoom.scaleBy(groupsSelection, 3); // fails, as groupSelection mismatches DOM Element type and datum type
 
 svgZoom.scaleBy(svgOverlay, function(datum, index, groups) {
     const that: SVGRectElement = this;
@@ -540,7 +540,7 @@ svgZoom.scaleBy(svgOverlay, function(datum, index, groups) {
 });
 // use on transition
 svgZoom.scaleBy(svgOverlayTransition, 3);
-// svgZoom.scaleBy(groupsTransition, 3); // fails, as groupTransition mismachtes DOM Element type and datum type
+// svgZoom.scaleBy(groupsTransition, 3); // fails, as groupTransition mismatches DOM Element type and datum type
 
 svgZoom.scaleBy(svgOverlayTransition, function(datum, index, groups) {
     const that: SVGRectElement = this;
@@ -556,7 +556,7 @@ svgZoom.scaleBy(svgOverlayTransition, function(datum, index, groups) {
 
 // use on selection
 svgZoom.scaleTo(svgOverlay, 3);
-// svgZoom.scaleBy(groupsSelection, 3); // fails, as groupSelection mismachtes DOM Element type and datum type
+// svgZoom.scaleBy(groupsSelection, 3); // fails, as groupSelection mismatches DOM Element type and datum type
 
 svgZoom.scaleTo(svgOverlay, function(datum, index, groups) {
     const that: SVGRectElement = this;
@@ -569,7 +569,7 @@ svgZoom.scaleTo(svgOverlay, function(datum, index, groups) {
 });
 // use on transition
 svgZoom.scaleTo(svgOverlayTransition, 3);
-// svgZoom.scaleBy(groupsTransition, 3); // fails, as groupTransition mismachtes DOM Element type and datum type
+// svgZoom.scaleBy(groupsTransition, 3); // fails, as groupTransition mismatches DOM Element type and datum type
 
 svgZoom.scaleTo(svgOverlayTransition, function(datum, index, groups) {
     const that: SVGRectElement = this;
diff --git a/types/d3-zoom/index.d.ts b/types/d3-zoom/index.d.ts
index cf9b1ac89d..5ba719d227 100644
--- a/types/d3-zoom/index.d.ts
+++ b/types/d3-zoom/index.d.ts
@@ -693,7 +693,7 @@ export interface ZoomBehavior<ZoomRefElement extends ZoomedElementBaseType, Datu
      * Each view is defined as an array of three numbers: cx, cy and width. The first two coordinates cx, cy represent the center of the viewport;
      * the last coordinate width represents the size of the viewport.
      *
-     * @param interpolatorFactory An interpolator factory to be used to generate interpolators beetween zooms for transitions.
+     * @param interpolatorFactory An interpolator factory to be used to generate interpolators between zooms for transitions.
      */
     interpolate(interpolatorFactory: (a: ZoomView, b: ZoomView) => ((t: number) => ZoomView)): this;
 
@@ -921,7 +921,7 @@ export interface ZoomTransform {
  *
  * For details see {@link https://github.com/d3/d3-zoom#zoom-transforms}
  *
- * @param node An element for which to retrieve its current zoomt transform.
+ * @param node An element for which to retrieve its current zoom transform.
  */
 export function zoomTransform(node: ZoomedElementBaseType): ZoomTransform;
 
diff --git a/types/d3/d3-tests.ts b/types/d3/d3-tests.ts
index 3942256a76..706c096968 100644
--- a/types/d3/d3-tests.ts
+++ b/types/d3/d3-tests.ts
@@ -2,6 +2,6 @@ import * as d3 from 'd3';
 
 const version: string = d3.version;
 
-// NOTE: Tests for all re-exports of consituent D3 modules are omitted as excessive.
+// NOTE: Tests for all re-exports of constituent D3 modules are omitted as excessive.
 // The standard bundle definition is a straightforward pass-through with the exception of the
 // above tested "version" property.

From 68c1ff3dc1a81123a248a51af9385ba29842c695 Mon Sep 17 00:00:00 2001
From: snaumets <snaumets@google.com>
Date: Mon, 14 May 2018 11:53:53 -0700
Subject: [PATCH 095/575] Fill in missing before* type definitions.

Fill in beforeAddClass, beforeRemoveClass, and beforeSetClass type definitions that are missing.

Reference to angular-1.5 externs: https://github.com/google/closure-compiler/blob/master/contrib/externs/angular-1.5.js#L220
Reference to ngAnimate/animateJs.js: https://github.com/angular/angular.js/blob/master/src/ngAnimate/animateJs.js#L232
---
 types/angular-animate/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/angular-animate/index.d.ts b/types/angular-animate/index.d.ts
index 6a51b368c8..f05ea66058 100644
--- a/types/angular-animate/index.d.ts
+++ b/types/angular-animate/index.d.ts
@@ -20,8 +20,11 @@ declare module 'angular' {
 
         interface IAnimateCallbackObject {
             eventFn?: (element: JQuery, doneFunction: Function, options: IAnimationOptions) => any;
+            beforeSetClass?: (element: JQuery, addedClasses: string, removedClasses: string, doneFunction: Function, options: IAnimationOptions) => any;
             setClass?: (element: JQuery, addedClasses: string, removedClasses: string, doneFunction: Function, options: IAnimationOptions) => any;
+            beforeAddClass?: (element: JQuery, addedClasses: string, doneFunction: Function, options: IAnimationOptions) => any;
             addClass?: (element: JQuery, addedClasses: string, doneFunction: Function, options: IAnimationOptions) => any;
+            beforeRemoveClass?: (element: JQuery, removedClasses: string, doneFunction: Function, options: IAnimationOptions) => any;
             removeClass?: (element: JQuery, removedClasses: string, doneFunction: Function, options: IAnimationOptions) => any;
             enter?: (element: JQuery, doneFunction: Function, options: IAnimationOptions) => any;
             leave?: (element: JQuery, doneFunction: Function, options: IAnimationOptions) => any;

From 2771408ff61c0c41808de2f1b671b3d615027374 Mon Sep 17 00:00:00 2001
From: Andy Chou <acchou2@gmail.com>
Date: Mon, 14 May 2018 11:56:39 -0700
Subject: [PATCH 096/575] memory-fs: Make options optional for
 createReadStream, createWriteStream

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

diff --git a/types/memory-fs/index.d.ts b/types/memory-fs/index.d.ts
index 9578bb3548..23b3f0aef9 100644
--- a/types/memory-fs/index.d.ts
+++ b/types/memory-fs/index.d.ts
@@ -43,13 +43,13 @@ declare class MemoryFileSystem {
     writeFileSync(_path: string, content: string | Buffer, encoding?: string): void;
 
     createReadStream(
-        path: string, options: {
+        path: string, options?: {
             start: number;
             end: number;
         }
     ): any;
 
-    createWriteStream(path: string, options: any): any;
+    createWriteStream(path: string, options?: any): any;
 
     exists(path: string, callback: (isExist: boolean) => any): any;
 

From c613604da564f02652fe511147c405af67d88696 Mon Sep 17 00:00:00 2001
From: Andy Chou <acchou2@gmail.com>
Date: Mon, 14 May 2018 11:58:48 -0700
Subject: [PATCH 097/575] memory-fs: create test for optional options

---
 types/memory-fs/test/index.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/memory-fs/test/index.ts b/types/memory-fs/test/index.ts
index 07abb3e3fe..16d477baf2 100644
--- a/types/memory-fs/test/index.ts
+++ b/types/memory-fs/test/index.ts
@@ -15,3 +15,7 @@ fs.writeFile('hello', 'hahahahah', 'utf-8', function (err) {
         console.log(err.message);
     }
 });
+
+fs.createReadStream('hello');
+
+fs.createWriteStream('hello');
\ No newline at end of file

From 2f1d5dc21fa486a29f141df9ca24721356c77047 Mon Sep 17 00:00:00 2001
From: Muhammad Fawwaz Orabi <mfawwaz93@gmail.com>
Date: Mon, 14 May 2018 23:00:21 +0300
Subject: [PATCH 098/575] Add types for p-memoize

---
 types/p-memoize/index.d.ts         | 43 ++++++++++++++++++++++++++++++
 types/p-memoize/p-memoize-tests.ts |  0
 types/p-memoize/tsconfig.json      | 22 +++++++++++++++
 types/p-memoize/tslint.json        |  1 +
 4 files changed, 66 insertions(+)
 create mode 100644 types/p-memoize/index.d.ts
 create mode 100644 types/p-memoize/p-memoize-tests.ts
 create mode 100644 types/p-memoize/tsconfig.json
 create mode 100644 types/p-memoize/tslint.json

diff --git a/types/p-memoize/index.d.ts b/types/p-memoize/index.d.ts
new file mode 100644
index 0000000000..a7bb1b129d
--- /dev/null
+++ b/types/p-memoize/index.d.ts
@@ -0,0 +1,43 @@
+// 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
+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?: Map<any, any> | WeakMap<any, any>;
+
+    /** Cache rejected promises. */
+    cachePromiseRejection?: boolean;
+}
+
+interface PMemoize {
+    <T extends (...args: any[]) => any>(f: T, memoizeOptions?: MemOptions): T;
+}
+
+declare const pMemoize: PMemoize;
+
+export = pMemoize;
diff --git a/types/p-memoize/p-memoize-tests.ts b/types/p-memoize/p-memoize-tests.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/types/p-memoize/tsconfig.json b/types/p-memoize/tsconfig.json
new file mode 100644
index 0000000000..de251f82a2
--- /dev/null
+++ b/types/p-memoize/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",
+        "p-memoize-tests.ts"
+    ]
+}
diff --git a/types/p-memoize/tslint.json b/types/p-memoize/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/p-memoize/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From d403c1c1d9bcdcf15c4ebfd0c85dbddb798a8c02 Mon Sep 17 00:00:00 2001
From: Atrahasis <coffre.a@gmail.com>
Date: Mon, 14 May 2018 22:03:58 +0200
Subject: [PATCH 099/575] Add WebGLInfo

---
 types/three/three-core.d.ts | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 351084f0d1..189584bbf7 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -5405,21 +5405,7 @@ export class WebGLRenderer implements Renderer {
      */
     maxMorphNormals: number;
 
-    /**
-     * An object with a series of statistical information about the graphics board memory and the rendering process. Useful for debugging or just for the sake of curiosity. The object contains the following fields:
-     */
-    info: {
-        memory: {
-            geometries: number;
-            textures: number;
-        };
-        render: {
-            calls: number;
-            faces: number;
-            points: number;
-        };
-        programs: number;
-    };
+    info: WebGLInfo;
 
     shadowMap: WebGLShadowMap;
 
@@ -6065,6 +6051,26 @@ export class WebGLLights {
     get(light: any): any;
 }
 
+/** 
+ * An object with a series of statistical information about the graphics board memory and the rendering process. 
+ */ 
+export class WebGLInfo { 
+    autoReset: boolean; 
+    memory: { 
+        geometries: number; 
+        textures: number; 
+    }; 
+    programs: number | null; 
+    render: { 
+        calls: number; 
+        lines: number; 
+        points: number; 
+        triangles: number; 
+    }; 
+    reset(): void; 
+    update(): void; 
+}
+
 export class WebGLIndexedBufferRenderer {
     constructor(gl: WebGLRenderingContext, properties: any, info: any);
 

From 7640f36d26142183ef124f3edd3505303829fb63 Mon Sep 17 00:00:00 2001
From: Muhammad Fawwaz Orabi <mfawwaz93@gmail.com>
Date: Mon, 14 May 2018 23:14:07 +0300
Subject: [PATCH 100/575] Fix issues

---
 types/p-memoize/index.d.ts         | 21 +++++++++++++++++----
 types/p-memoize/p-memoize-tests.ts | 13 +++++++++++++
 types/p-memoize/tsconfig.json      | 16 +++++-----------
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/types/p-memoize/index.d.ts b/types/p-memoize/index.d.ts
index a7bb1b129d..0b997b4b19 100644
--- a/types/p-memoize/index.d.ts
+++ b/types/p-memoize/index.d.ts
@@ -2,6 +2,8 @@
 // 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.
@@ -28,16 +30,27 @@ interface MemOptions {
      *
      * @default new Map()
      */
-    cache?: Map<any, any> | WeakMap<any, any>;
+    cache?: pMemoize.Cache;
 
     /** Cache rejected promises. */
     cachePromiseRejection?: boolean;
 }
 
-interface PMemoize {
-    <T extends (...args: any[]) => any>(f: T, memoizeOptions?: MemOptions): T;
-}
+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
index e69de29bb2..8626482dab 100644
--- a/types/p-memoize/p-memoize-tests.ts
+++ b/types/p-memoize/p-memoize-tests.ts
@@ -0,0 +1,13 @@
+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
index de251f82a2..0605de1be9 100644
--- a/types/p-memoize/tsconfig.json
+++ b/types/p-memoize/tsconfig.json
@@ -1,22 +1,16 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
+        "lib": ["es6"],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
     },
-    "files": [
-        "index.d.ts",
-        "p-memoize-tests.ts"
-    ]
+    "files": ["index.d.ts", "p-memoize-tests.ts"]
 }

From beb66996a4d85cf146e835d2afce19bc28518488 Mon Sep 17 00:00:00 2001
From: Jason Unger <jason@rocketrip.com>
Date: Mon, 14 May 2018 17:41:17 -0400
Subject: [PATCH 101/575] Create definitions for react-radio-group

---
 types/react-radio-group/index.d.ts            | 22 ++++++++++++++++
 .../react-radio-group-tests.tsx               | 24 ++++++++++++++++++
 types/react-radio-group/tsconfig.json         | 25 +++++++++++++++++++
 types/react-radio-group/tslint.json           |  1 +
 4 files changed, 72 insertions(+)
 create mode 100644 types/react-radio-group/index.d.ts
 create mode 100644 types/react-radio-group/react-radio-group-tests.tsx
 create mode 100644 types/react-radio-group/tsconfig.json
 create mode 100644 types/react-radio-group/tslint.json

diff --git a/types/react-radio-group/index.d.ts b/types/react-radio-group/index.d.ts
new file mode 100644
index 0000000000..9628561b61
--- /dev/null
+++ b/types/react-radio-group/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for react-radio-group 3.0
+// Project: https://github.com/chenglou/react-radio-group
+// Definitions by: Jason Unger <https://github.com/jsonunger>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from 'react';
+
+export type Value = React.InputHTMLAttributes<HTMLInputElement>['value'];
+
+export type RadioProps = React.InputHTMLAttributes<HTMLInputElement>;
+
+export const Radio: React.ComponentClass<RadioProps>;
+
+export interface RadioGroupProps {
+    name?: string;
+    selectedValue?: Value;
+    onChange?: (value: Value) => void;
+    Component?: string | React.ReactElement<React.HTMLProps<HTMLElement>>;
+}
+
+export const RadioGroup: React.ComponentClass<RadioGroupProps>;
diff --git a/types/react-radio-group/react-radio-group-tests.tsx b/types/react-radio-group/react-radio-group-tests.tsx
new file mode 100644
index 0000000000..65cd53fab3
--- /dev/null
+++ b/types/react-radio-group/react-radio-group-tests.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react';
+import { Radio, RadioGroup, RadioGroupProps, Value } from "react-radio-group";
+
+class ReactRadioGroup extends React.Component<RadioGroupProps> {
+    constructor(props: RadioGroupProps) {
+        super(props);
+    }
+
+    handleChange(value: Value) {
+        console.log(value);
+    }
+
+    render() {
+        return (
+            <div>
+                <RadioGroup name="radioGroup" onChange={this.handleChange} selectedValue={2}>
+                    <Radio id="Option A" value="a" />
+                    <Radio id="Option B" value={2} />
+                    <Radio id="Option C" value={["hello"]} disabled />
+                </RadioGroup>
+            </div>
+        );
+    }
+}
diff --git a/types/react-radio-group/tsconfig.json b/types/react-radio-group/tsconfig.json
new file mode 100644
index 0000000000..615f55eee3
--- /dev/null
+++ b/types/react-radio-group/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-radio-group-tests.tsx"
+    ]
+}
diff --git a/types/react-radio-group/tslint.json b/types/react-radio-group/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-radio-group/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From bcdd5baf8bcecc5e2775fd638e423faf876eaaf5 Mon Sep 17 00:00:00 2001
From: Jason Unger <jason@rocketrip.com>
Date: Mon, 14 May 2018 18:04:34 -0400
Subject: [PATCH 102/575] Use namespaces

---
 types/react-radio-group/index.d.ts            | 24 ++++++++++---------
 .../react-radio-group-tests.tsx               | 10 +++-----
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/types/react-radio-group/index.d.ts b/types/react-radio-group/index.d.ts
index 9628561b61..3dfa872527 100644
--- a/types/react-radio-group/index.d.ts
+++ b/types/react-radio-group/index.d.ts
@@ -6,17 +6,19 @@
 
 import * as React from 'react';
 
-export type Value = React.InputHTMLAttributes<HTMLInputElement>['value'];
+type Value = React.InputHTMLAttributes<HTMLInputElement>['value'];
 
-export type RadioProps = React.InputHTMLAttributes<HTMLInputElement>;
-
-export const Radio: React.ComponentClass<RadioProps>;
-
-export interface RadioGroupProps {
-    name?: string;
-    selectedValue?: Value;
-    onChange?: (value: Value) => void;
-    Component?: string | React.ReactElement<React.HTMLProps<HTMLElement>>;
+export namespace Radio {
+    export type RadioProps = React.InputHTMLAttributes<HTMLInputElement>;
 }
+export const Radio: React.ComponentClass<Radio.RadioProps>;
 
-export const RadioGroup: React.ComponentClass<RadioGroupProps>;
+export namespace RadioGroup {
+    export interface RadioGroupProps {
+        name?: string;
+        selectedValue?: Value;
+        onChange?: (value: Value) => void;
+        Component?: string | React.ReactElement<React.HTMLProps<HTMLElement>>;
+    }
+}
+export const RadioGroup: React.ComponentClass<RadioGroup.RadioGroupProps>;
diff --git a/types/react-radio-group/react-radio-group-tests.tsx b/types/react-radio-group/react-radio-group-tests.tsx
index 65cd53fab3..76e093059b 100644
--- a/types/react-radio-group/react-radio-group-tests.tsx
+++ b/types/react-radio-group/react-radio-group-tests.tsx
@@ -1,12 +1,8 @@
 import * as React from 'react';
-import { Radio, RadioGroup, RadioGroupProps, Value } from "react-radio-group";
+import { Radio, RadioGroup } from "react-radio-group";
 
-class ReactRadioGroup extends React.Component<RadioGroupProps> {
-    constructor(props: RadioGroupProps) {
-        super(props);
-    }
-
-    handleChange(value: Value) {
+class ReactRadioGroup extends React.Component<RadioGroup.RadioGroupProps> {
+    handleChange: RadioGroup.RadioGroupProps['onChange'] = value => {
         console.log(value);
     }
 

From 8b7bccf8a1145f2628e6fb4f0d8db1f0478868e4 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentl@theodo.fr>
Date: Tue, 15 May 2018 00:00:05 +0200
Subject: [PATCH 103/575] Add tests

---
 types/react-native/test/globals.tsx | 3 +++
 types/react-native/tsconfig.json    | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 types/react-native/test/globals.tsx

diff --git a/types/react-native/test/globals.tsx b/types/react-native/test/globals.tsx
new file mode 100644
index 0000000000..a6488cef82
--- /dev/null
+++ b/types/react-native/test/globals.tsx
@@ -0,0 +1,3 @@
+const fetchCopy: GlobalFetch['fetch'] = fetch;
+
+const requestInfoAsString: RequestInfo = 'request';
diff --git a/types/react-native/tsconfig.json b/types/react-native/tsconfig.json
index 16c6bf9275..c577fb0d8b 100644
--- a/types/react-native/tsconfig.json
+++ b/types/react-native/tsconfig.json
@@ -20,9 +20,10 @@
     "files": [
         "index.d.ts",
         "test/index.tsx",
+        "test/globals.tsx",
         "test/animated.tsx",
         "test/init-example.tsx",
         "test/ART.tsx",
         "test/legacy-properties.tsx"
     ]
-}
\ No newline at end of file
+}

From 7a2fa0a98e77583e9dde205a0c8c07f68e3f79ba Mon Sep 17 00:00:00 2001
From: Carson Howard <carsonh@axosoft.com>
Date: Mon, 14 May 2018 15:11:22 -0700
Subject: [PATCH 104/575] Update Rebass to have a provider and fix Tooltip

---
 types/rebass/index.d.ts | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/types/rebass/index.d.ts b/types/rebass/index.d.ts
index f50691e116..1f02aa2a92 100644
--- a/types/rebass/index.d.ts
+++ b/types/rebass/index.d.ts
@@ -505,7 +505,38 @@ type ToolbarClass = React.StatelessComponent<ToolbarProps>
 export declare const Toolbar: ToolbarClass;
 
 export interface TooltipProps extends BaseProps<TooltipClass> {
-    title?: string;
+    text?: string;
 }
 type TooltipClass = React.StatelessComponent<TooltipProps>
 export declare const Tooltip: TooltipClass;
+
+export interface FontWeights {
+    normal?: number;
+    bold?: number;
+}
+
+export interface Fonts {
+    [0]?: string;
+    sans?: string;
+    mono?: string;
+}
+
+export interface Colors {}
+
+export interface Theme {
+    breakpoints?: string[];
+    space?: number[];
+    fontSizes?: number[];
+    fontWeights?: FontWeights;
+    fonts?: Fonts;
+    shadows?: string[];
+    radii?: number[];
+    colors?: Colors;
+}
+
+export interface ProviderProps {
+    theme: Theme;
+}
+
+type ProviderClass = React.StatelessComponent<ProviderProps>;
+export const Provider: ProviderClass;
\ No newline at end of file

From 1990eb58c073aea51545c7209b2826f6e5397327 Mon Sep 17 00:00:00 2001
From: Carson Howard <carsonh@axosoft.com>
Date: Mon, 14 May 2018 15:16:07 -0700
Subject: [PATCH 105/575] Update Rebass to use fontSize on BaseProps

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

diff --git a/types/rebass/index.d.ts b/types/rebass/index.d.ts
index 1f02aa2a92..0cd6c151df 100644
--- a/types/rebass/index.d.ts
+++ b/types/rebass/index.d.ts
@@ -11,6 +11,7 @@ import * as React from "react";
 export interface BaseProps<C> extends React.Props<C> {
     tagName?: string;
     className?: string;
+    fontSize?: number | number[];
     baseStyle?: Object;
     style?: Object;
     m?: number;

From 7ebd1ec80e3ad0e92ff2a6b8b73909645c646157 Mon Sep 17 00:00:00 2001
From: Luis Stanley Jovel <stanley@generalui.com>
Date: Mon, 14 May 2018 16:17:53 -0600
Subject: [PATCH 106/575] Add missing property boolean `selfHandleResponse`

Add missing boolean property `selfHandleResponse` 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 fb7eb26abc..2560b0a38d 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;
+    /** 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 9ad6d029145bd16d582e017a5a5a70d9c90b4c42 Mon Sep 17 00:00:00 2001
From: Steve Hetzel <shetzel@salesforce.com>
Date: Mon, 14 May 2018 16:18:09 -0600
Subject: [PATCH 107/575] Adds 'success' and 'errors' properties to
 BatchResultInfo. Changes 'concurrencyMode' property to be optional since
 'Parallel' is the default. Adds 'body' property to RequestInfo. Adds the
 ExecuteAnonymousResult interface. Changes Job.prototype.list() to return a
 BatchInfo[]. Adds tests.

---
 types/jsforce/batch.d.ts       |  6 ++++--
 types/jsforce/bulk.d.ts        |  2 +-
 types/jsforce/connection.d.ts  | 15 +++++++++++++--
 types/jsforce/job.d.ts         |  2 +-
 types/jsforce/jsforce-tests.ts | 27 ++++++++++++++++++++++++++-
 5 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/types/jsforce/batch.d.ts b/types/jsforce/batch.d.ts
index 94a24fa2cd..3314dcd33d 100644
--- a/types/jsforce/batch.d.ts
+++ b/types/jsforce/batch.d.ts
@@ -12,8 +12,10 @@ export interface BatchInfo {
 
 export interface BatchResultInfo {
     id: string;
-    batchId: string;
-    jobId: string;
+    batchId?: string;
+    jobId?: string;
+    success?: boolean;
+    errors?: string[];
 }
 
 export class Batch extends Writable {
diff --git a/types/jsforce/bulk.d.ts b/types/jsforce/bulk.d.ts
index 51708f59f1..0356f1b9c6 100644
--- a/types/jsforce/bulk.d.ts
+++ b/types/jsforce/bulk.d.ts
@@ -8,7 +8,7 @@ import { Batch, BatchResultInfo } from './batch';
 
 export interface BulkOptions {
     extIdField: string;
-    concurrencyMode: 'Serial' | 'Parallel';
+    concurrencyMode?: 'Serial' | 'Parallel';
 }
 
 type BulkLoadOperation =
diff --git a/types/jsforce/connection.d.ts b/types/jsforce/connection.d.ts
index 2283320912..27d79fdd5b 100644
--- a/types/jsforce/connection.d.ts
+++ b/types/jsforce/connection.d.ts
@@ -22,9 +22,10 @@ export interface PartialOAuth2Options {
 }
 
 export interface RequestInfo {
+    body?: string;
+    headers?: object;
     method?: string;
     url?: string;
-    headers?: object;
 }
 
 export interface ConnectionOptions extends PartialOAuth2Options {
@@ -58,6 +59,16 @@ export abstract class RestApi {
     del(path: string, options: object, callback: () => object): Promise<object>;
 }
 
+export interface ExecuteAnonymousResult {
+    compiled: boolean;
+    compileProblem: string;
+    success: boolean;
+    line: number;
+    column: number;
+    exceptionMessage: string;
+    exceptionStackTrace: string;
+}
+
 export type ConnectionEvent = "refresh";
 
 /**
@@ -135,5 +146,5 @@ export class Tooling extends BaseConnection {
     _logger: any;
 
     // Specific to tooling
-    executeAnonymous(body: string, callback?: (err: Error, res: any) => void): Promise<any>;
+    executeAnonymous(body: string, callback?: (err: Error, res: any) => void): Promise<ExecuteAnonymousResult>;
 }
diff --git a/types/jsforce/job.d.ts b/types/jsforce/job.d.ts
index bdad4bf564..519b8b6c10 100644
--- a/types/jsforce/job.d.ts
+++ b/types/jsforce/job.d.ts
@@ -19,6 +19,6 @@ export class Job extends EventEmitter {
     close(callback?: (err: Error, jobInfo: JobInfo) => void): Promise<JobInfo>;
     createBatch(): Batch;
     info(callback?: (err: Error, jobInfo: JobInfo) => void): Promise<JobInfo>;
-    list(callback?: (err: Error, jobInfo: BatchInfo) => void): Promise<BatchInfo>;
+    list(callback?: (err: Error, jobInfo: BatchInfo) => void): Promise<BatchInfo[]>;
     open(callback?: (err: Error, jobInfo: JobInfo) => void): Promise<JobInfo>;
 }
diff --git a/types/jsforce/jsforce-tests.ts b/types/jsforce/jsforce-tests.ts
index 156b0d292b..0aa98d62d1 100644
--- a/types/jsforce/jsforce-tests.ts
+++ b/types/jsforce/jsforce-tests.ts
@@ -22,6 +22,14 @@ const salesforceConnection: sf.Connection = new sf.Connection({
 
 salesforceConnection.sobject<DummyRecord>("Dummy").select(["thing", "other"]);
 
+const requestInfo: sf.RequestInfo = {
+    body: '',
+    headers: {},
+    method: '',
+    url: ''
+};
+salesforceConnection.request(requestInfo);
+
 // note the following should never compile:
 // salesforceConnection.sobject<DummyRecord>("Dummy").select(["lol"]);
 
@@ -123,6 +131,17 @@ async function testAnalytics(conn: sf.Connection): Promise<void> {
     });
 }
 
+async function testExecuteAnonymous(conn: sf.Connection): Promise<void> {
+    const res: sf.ExecuteAnonymousResult = await salesforceConnection.tooling.executeAnonymous('');
+    console.log('ExecuteAnonymousResult column: ' + res.column);
+    console.log('ExecuteAnonymousResult compiled: ' + res.compiled);
+    console.log('ExecuteAnonymousResult compileProblem: ' + res.compileProblem);
+    console.log('ExecuteAnonymousResult exceptionMessage: ' + res.exceptionMessage);
+    console.log('ExecuteAnonymousResult exceptionStackTrace: ' + res.exceptionStackTrace);
+    console.log('ExecuteAnonymousResult line: ' + res.line);
+    console.log('ExecuteAnonymousResult success: ' + res.success);
+}
+
 async function testMetadata(conn: sf.Connection): Promise<void> {
     const md: sf.Metadata = conn.metadata;
     const m: sf.DescribeMetadataResult = await md.describe('34.0');
@@ -281,6 +300,7 @@ async function testChatter(conn: sf.Connection): Promise<void> {
     await testAnalytics(salesforceConnection);
     await testChatter(salesforceConnection);
     await testMetadata(salesforceConnection);
+    await testExecuteAnonymous(salesforceConnection);
 })();
 
 const oauth2 = new sf.OAuth2({
@@ -302,7 +322,7 @@ batch.on("queue", (batchInfo) => { // fired when batch request is queued in serv
 });
 job.batch("batchId");
 batch.poll(1000, 20000);
-batch.on("response", (rets) => {
+batch.on("response", (rets: sf.BatchResultInfo[]) => {
     for (let i = 0; i < rets.length; i++) {
         if (rets[i].success) {
             console.log(`# ${(i + 1)} loaded successfully, id = ${rets[i].id}`);
@@ -312,6 +332,11 @@ batch.on("response", (rets) => {
     }
 });
 
+(async () => {
+    const batchInfos: sf.BatchInfo[] = await job.list();
+    console.log('batchInfos:', batchInfos);
+});
+
 salesforceConnection.streaming.topic("InvoiceStatementUpdates").subscribe((message) => {
     console.log('Event Type : ' + message.event.type);
     console.log('Event Created : ' + message.event.createdDate);

From e79a26e4b5324b44a621ec15803732b24ed100f2 Mon Sep 17 00:00:00 2001
From: Carson Howard <carsonh@axosoft.com>
Date: Mon, 14 May 2018 15:33:45 -0700
Subject: [PATCH 108/575] Update tests and fix minor prop issue

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

diff --git a/types/rebass/index.d.ts b/types/rebass/index.d.ts
index 0cd6c151df..b69c6f7839 100644
--- a/types/rebass/index.d.ts
+++ b/types/rebass/index.d.ts
@@ -507,6 +507,7 @@ export declare const Toolbar: ToolbarClass;
 
 export interface TooltipProps extends BaseProps<TooltipClass> {
     text?: string;
+    title?: string;
 }
 type TooltipClass = React.StatelessComponent<TooltipProps>
 export declare const Tooltip: TooltipClass;
@@ -536,7 +537,7 @@ export interface Theme {
 }
 
 export interface ProviderProps {
-    theme: Theme;
+    theme?: Theme;
 }
 
 type ProviderClass = React.StatelessComponent<ProviderProps>;
diff --git a/types/rebass/rebass-tests.tsx b/types/rebass/rebass-tests.tsx
index 430e277541..814c11a523 100644
--- a/types/rebass/rebass-tests.tsx
+++ b/types/rebass/rebass-tests.tsx
@@ -42,6 +42,7 @@ import {
   , PanelHeader
   , Pre
   , Progress
+  , Provider
   , Radio
   , Rating
   , Section
@@ -156,6 +157,12 @@ class RebassTest extends React.Component {
           <Text>
             Generic box for containing things
           </Text>
+          <Text fontSize={32}>
+            This is a large font
+          </Text>
+          <Text fontSize={[14, 18, 24]}>
+            A set of fonts!
+          </Text>
         </Media>
       </Block>
 
@@ -618,6 +625,9 @@ class RebassTest extends React.Component {
           Tooltip
         </Heading>
       </Tooltip>
+      <Tooltip text="Whoa There!" />
+
+      <Provider />
     </div>;
   }
 }

From 91b98bfe0fc41aebcbef88cfb57a70684e1a6212 Mon Sep 17 00:00:00 2001
From: Carson Howard <carsonh@axosoft.com>
Date: Mon, 14 May 2018 15:37:09 -0700
Subject: [PATCH 109/575] Remove untyped color on theme

---
 types/rebass/index.d.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/types/rebass/index.d.ts b/types/rebass/index.d.ts
index b69c6f7839..e91be9e3a0 100644
--- a/types/rebass/index.d.ts
+++ b/types/rebass/index.d.ts
@@ -523,8 +523,6 @@ export interface Fonts {
     mono?: string;
 }
 
-export interface Colors {}
-
 export interface Theme {
     breakpoints?: string[];
     space?: number[];
@@ -533,7 +531,6 @@ export interface Theme {
     fonts?: Fonts;
     shadows?: string[];
     radii?: number[];
-    colors?: Colors;
 }
 
 export interface ProviderProps {

From 927c2f961145a183dfb48e578b462ed5002f86be Mon Sep 17 00:00:00 2001
From: Carson Howard <carsonh@axosoft.com>
Date: Mon, 14 May 2018 15:49:07 -0700
Subject: [PATCH 110/575] Bump version

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

diff --git a/types/rebass/index.d.ts b/types/rebass/index.d.ts
index e91be9e3a0..0c55b12240 100644
--- a/types/rebass/index.d.ts
+++ b/types/rebass/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Rebass 0.2.5
+// Type definitions for Rebass 0.2.6
 // Project: https://github.com/jxnblk/rebass
 // Definitions by: rhysd <https://rhysd.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From a351eaac271acd7f4f797d462a4555f4e780c28b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Machist=C3=A9=20Quintana?= <machiste@slack-corp.com>
Date: Mon, 14 May 2018 17:49:54 -0700
Subject: [PATCH 111/575] Add support for chunks filter function in
 SplitChunksPlugin

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

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 5be4abdcbd..4dcd7ce89e 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -560,7 +560,7 @@ declare namespace webpack {
             /** Assign modules to a cache group */
             test?: ((...args: any[]) => boolean) | string | RegExp;
             /** Select chunks for determining cache group content (defaults to \"initial\", \"initial\" and \"all\" requires adding these chunks to the HTML) */
-            chunks?: "initial" | "async" | "all";
+            chunks?: "initial" | "async" | "all" | ((chunk: any, index?: number, chunks?: any[]) => boolean);
             /** Ignore minimum size, minimum chunks and maximum requests and always create chunks for this cache group */
             enforce?: boolean;
             /** Priority of this cache group */
@@ -580,7 +580,7 @@ declare namespace webpack {
         }
         interface SplitChunksOptions {
             /** Select chunks for determining shared modules (defaults to \"async\", \"initial\" and \"all\" requires adding these chunks to the HTML) */
-            chunks?: "initial" | "async" | "all";
+            chunks?: "initial" | "async" | "all" | ((chunk: any, index?: number, chunks?: any[]) => boolean);
             /** Minimal size for the created chunk */
             minSize?: number;
             /** Minimum number of times a module has to be duplicated until it's considered for splitting */
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index b42d836c0c..d617c45a17 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -607,6 +607,27 @@ configuration = {
     },
 };
 
+configuration = {
+    mode: "production",
+    optimization: {
+        splitChunks: {
+            cacheGroups: {
+                common: {
+                    name: 'common',
+                    chunks(chunk: { name: string }) {
+                        const allowedChunks = [
+                            'renderer',
+                            'component-window',
+                        ];
+                        return allowedChunks.indexOf(chunk.name) >= 0;
+                    },
+                    minChunks: 2
+                }
+            }
+        }
+    },
+};
+
 plugin = new webpack.SplitChunksPlugin({ chunks: "async", minChunks: 2 });
 
 class SingleEntryDependency extends webpack.compilation.Dependency {}

From 815129e0bb65899edc696a619554700dbbcc990e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Machist=C3=A9=20Quintana?= <machiste@slack-corp.com>
Date: Mon, 14 May 2018 18:03:37 -0700
Subject: [PATCH 112/575] Use a less strict function type for chunks

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

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 4dcd7ce89e..fb8469dfa5 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -560,7 +560,7 @@ declare namespace webpack {
             /** Assign modules to a cache group */
             test?: ((...args: any[]) => boolean) | string | RegExp;
             /** Select chunks for determining cache group content (defaults to \"initial\", \"initial\" and \"all\" requires adding these chunks to the HTML) */
-            chunks?: "initial" | "async" | "all" | ((chunk: any, index?: number, chunks?: any[]) => boolean);
+            chunks?: "initial" | "async" | "all" | ((chunk: any) => boolean);
             /** Ignore minimum size, minimum chunks and maximum requests and always create chunks for this cache group */
             enforce?: boolean;
             /** Priority of this cache group */
@@ -580,7 +580,7 @@ declare namespace webpack {
         }
         interface SplitChunksOptions {
             /** Select chunks for determining shared modules (defaults to \"async\", \"initial\" and \"all\" requires adding these chunks to the HTML) */
-            chunks?: "initial" | "async" | "all" | ((chunk: any, index?: number, chunks?: any[]) => boolean);
+            chunks?: "initial" | "async" | "all" | ((chunk: any) => boolean);
             /** Minimal size for the created chunk */
             minSize?: number;
             /** Minimum number of times a module has to be duplicated until it's considered for splitting */

From 93f601347bd21596702c3f03a2a00ad78fa3d068 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Mon, 14 May 2018 18:35:26 -0700
Subject: [PATCH 113/575] Move 'fs/promises' to fs.promises

---
 types/node/index.d.ts | 871 +++++++++++++++++++++---------------------
 1 file changed, 435 insertions(+), 436 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 4e03c3f78b..360030d9f2 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Node.js 10.0.x
+// Type definitions for Node.js 10.1.x
 // Project: http://nodejs.org/
 // Definitions by: Microsoft TypeScript <http://typescriptlang.org>
 //                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
@@ -4663,125 +4663,431 @@ declare module "fs" {
      * @param flags An optional integer that specifies the behavior of the copy operation. The only supported flag is fs.constants.COPYFILE_EXCL, which causes the copy operation to fail if dest already exists.
      */
     export function copyFileSync(src: PathLike, dest: PathLike, flags?: number): void;
-}
 
-declare module "fs/promises" {
-    import { PathLike, Stats } from "fs";
-    interface FileHandle {
+    export namespace promises {
+        interface FileHandle {
+            /**
+             * Gets the file descriptor for this file handle.
+             */
+            readonly fd: number;
+
+            /**
+             * Asynchronously append data to a file, creating the file if it does not exist. The underlying file will _not_ be closed automatically.
+             * The `FileHandle` must have been opened for appending.
+             * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
+             * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+             * If `encoding` is not supplied, the default of `'utf8'` is used.
+             * If `mode` is not supplied, the default of `0o666` is used.
+             * If `mode` is a string, it is parsed as an octal integer.
+             * If `flag` is not supplied, the default of `'a'` is used.
+             */
+            appendFile(data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
+
+            /**
+             * Asynchronous fchown(2) - Change ownership of a file.
+             */
+            chown(uid: number, gid: number): Promise<void>;
+
+            /**
+             * Asynchronous fchmod(2) - Change permissions of a file.
+             * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+             */
+            chmod(mode: string | number): Promise<void>;
+
+            /**
+             * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+             */
+            datasync(): Promise<void>;
+
+            /**
+             * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+             */
+            sync(): Promise<void>;
+
+            /**
+             * Asynchronously reads data from the file.
+             * The `FileHandle` must have been opened for reading.
+             * @param buffer The buffer that the data will be written to.
+             * @param offset The offset in the buffer at which to start writing.
+             * @param length The number of bytes to read.
+             * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+             */
+            read<TBuffer extends Buffer | Uint8Array>(buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesRead: number, buffer: TBuffer }>;
+
+            /**
+             * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
+             * The `FileHandle` must have been opened for reading.
+             * @param options An object that may contain an optional flag.
+             * If a flag is not provided, it defaults to `'r'`.
+             */
+            readFile(options?: { encoding?: null, flag?: string | number } | null): Promise<Buffer>;
+
+            /**
+             * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
+             * The `FileHandle` must have been opened for reading.
+             * @param options An object that may contain an optional flag.
+             * If a flag is not provided, it defaults to `'r'`.
+             */
+            readFile(options: { encoding: BufferEncoding, flag?: string | number } | BufferEncoding): Promise<string>;
+
+            /**
+             * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
+             * The `FileHandle` must have been opened for reading.
+             * @param options An object that may contain an optional flag.
+             * If a flag is not provided, it defaults to `'r'`.
+             */
+            readFile(options?: { encoding?: string | null, flag?: string | number } | string | null): Promise<string | Buffer>;
+
+            /**
+             * Asynchronous fstat(2) - Get file status.
+             */
+            stat(): Promise<Stats>;
+
+            /**
+             * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+             * @param len If not specified, defaults to `0`.
+             */
+            truncate(len?: number): Promise<void>;
+
+            /**
+             * Asynchronously change file timestamps of the file.
+             * @param atime The last access time. If a string is provided, it will be coerced to number.
+             * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+             */
+            utimes(atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+
+            /**
+             * Asynchronously writes `buffer` to the file.
+             * The `FileHandle` must have been opened for writing.
+             * @param buffer The buffer that the data will be written to.
+             * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
+             * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
+             * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+             */
+            write<TBuffer extends Buffer | Uint8Array>(buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesWritten: number, buffer: TBuffer }>;
+
+            /**
+             * Asynchronously writes `string` to the file.
+             * The `FileHandle` must have been opened for writing.
+             * It is unsafe to call `write()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
+             * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
+             * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
+             * @param encoding The expected string encoding.
+             */
+            write(data: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
+
+            /**
+             * Asynchronously writes data to a file, replacing the file if it already exists. The underlying file will _not_ be closed automatically.
+             * The `FileHandle` must have been opened for writing.
+             * It is unsafe to call `writeFile()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected).
+             * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
+             * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+             * If `encoding` is not supplied, the default of `'utf8'` is used.
+             * If `mode` is not supplied, the default of `0o666` is used.
+             * If `mode` is a string, it is parsed as an octal integer.
+             * If `flag` is not supplied, the default of `'w'` is used.
+             */
+            writeFile(data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
+
+            /**
+             * Asynchronous close(2) - close a `FileHandle`.
+             */
+            close(): Promise<void>;
+        }
+
         /**
-         * Gets the file descriptor for this file handle.
+         * Asynchronously tests a user's permissions for the file specified by path.
+         * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
          */
-        readonly fd: number;
+        function access(path: PathLike, mode?: number): Promise<void>;
 
         /**
-         * Asynchronously append data to a file, creating the file if it does not exist. The underlying file will _not_ be closed automatically.
-         * The `FileHandle` must have been opened for appending.
-         * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
-         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-         * If `encoding` is not supplied, the default of `'utf8'` is used.
-         * If `mode` is not supplied, the default of `0o666` is used.
-         * If `mode` is a string, it is parsed as an octal integer.
-         * If `flag` is not supplied, the default of `'a'` is used.
+         * Asynchronously copies `src` to `dest`. By default, `dest` is overwritten if it already exists.
+         * Node.js makes no guarantees about the atomicity of the copy operation.
+         * If an error occurs after the destination file has been opened for writing, Node.js will attempt
+         * to remove the destination.
+         * @param src A path to the source file.
+         * @param dest A path to the destination file.
+         * @param flags An optional integer that specifies the behavior of the copy operation. The only
+         * supported flag is `fs.constants.COPYFILE_EXCL`, which causes the copy operation to fail if
+         * `dest` already exists.
          */
-        appendFile(data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
+        function copyFile(src: PathLike, dest: PathLike, flags?: number): Promise<void>;
 
         /**
-         * Asynchronous fchown(2) - Change ownership of a file.
+         * Asynchronous open(2) - open and possibly create a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not
+         * supplied, defaults to `0o666`.
          */
-        chown(uid: number, gid: number): Promise<void>;
+        function open(path: PathLike, flags: string | number, mode?: string | number): Promise<FileHandle>;
 
         /**
-         * Asynchronous fchmod(2) - Change permissions of a file.
-         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-         */
-        chmod(mode: string | number): Promise<void>;
-
-        /**
-         * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
-         */
-        datasync(): Promise<void>;
-
-        /**
-         * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
-         */
-        sync(): Promise<void>;
-
-        /**
-         * Asynchronously reads data from the file.
-         * The `FileHandle` must have been opened for reading.
+         * Asynchronously reads data from the file referenced by the supplied `FileHandle`.
+         * @param handle A `FileHandle`.
          * @param buffer The buffer that the data will be written to.
          * @param offset The offset in the buffer at which to start writing.
          * @param length The number of bytes to read.
-         * @param position The offset from the beginning of the file from which data should be read. If `null`, data will be read from the current position.
+         * @param position The offset from the beginning of the file from which data should be read. If
+         * `null`, data will be read from the current position.
          */
-        read<TBuffer extends Buffer | Uint8Array>(buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesRead: number, buffer: TBuffer }>;
+        function read<TBuffer extends Buffer | Uint8Array>(handle: FileHandle, buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesRead: number, buffer: TBuffer }>;
 
         /**
-         * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
-         * The `FileHandle` must have been opened for reading.
-         * @param options An object that may contain an optional flag.
-         * If a flag is not provided, it defaults to `'r'`.
-         */
-        readFile(options?: { encoding?: null, flag?: string | number } | null): Promise<Buffer>;
-
-        /**
-         * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
-         * The `FileHandle` must have been opened for reading.
-         * @param options An object that may contain an optional flag.
-         * If a flag is not provided, it defaults to `'r'`.
-         */
-        readFile(options: { encoding: BufferEncoding, flag?: string | number } | BufferEncoding): Promise<string>;
-
-        /**
-         * Asynchronously reads the entire contents of a file. The underlying file will _not_ be closed automatically.
-         * The `FileHandle` must have been opened for reading.
-         * @param options An object that may contain an optional flag.
-         * If a flag is not provided, it defaults to `'r'`.
-         */
-        readFile(options?: { encoding?: string | null, flag?: string | number } | string | null): Promise<string | Buffer>;
-
-        /**
-         * Asynchronous fstat(2) - Get file status.
-         */
-        stat(): Promise<Stats>;
-
-        /**
-         * Asynchronous ftruncate(2) - Truncate a file to a specified length.
-         * @param len If not specified, defaults to `0`.
-         */
-        truncate(len?: number): Promise<void>;
-
-        /**
-         * Asynchronously change file timestamps of the file.
-         * @param atime The last access time. If a string is provided, it will be coerced to number.
-         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
-         */
-        utimes(atime: string | number | Date, mtime: string | number | Date): Promise<void>;
-
-        /**
-         * Asynchronously writes `buffer` to the file.
-         * The `FileHandle` must have been opened for writing.
+         * Asynchronously writes `buffer` to the file referenced by the supplied `FileHandle`.
+         * It is unsafe to call `fsPromises.write()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
+         * @param handle A `FileHandle`.
          * @param buffer The buffer that the data will be written to.
          * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
          * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
          * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
          */
-        write<TBuffer extends Buffer | Uint8Array>(buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesWritten: number, buffer: TBuffer }>;
+        function write<TBuffer extends Buffer | Uint8Array>(handle: FileHandle, buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesWritten: number, buffer: TBuffer }>;
 
         /**
-         * Asynchronously writes `string` to the file.
-         * The `FileHandle` must have been opened for writing.
-         * It is unsafe to call `write()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
+         * Asynchronously writes `string` to the file referenced by the supplied `FileHandle`.
+         * It is unsafe to call `fsPromises.write()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
+         * @param handle A `FileHandle`.
          * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
          * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
          * @param encoding The expected string encoding.
          */
-        write(data: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
+        function write(handle: FileHandle, string: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
 
         /**
-         * Asynchronously writes data to a file, replacing the file if it already exists. The underlying file will _not_ be closed automatically.
-         * The `FileHandle` must have been opened for writing.
-         * It is unsafe to call `writeFile()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected).
+         * Asynchronous rename(2) - Change the name or location of a file or directory.
+         * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         */
+        function rename(oldPath: PathLike, newPath: PathLike): Promise<void>;
+
+        /**
+         * Asynchronous truncate(2) - Truncate a file to a specified length.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param len If not specified, defaults to `0`.
+         */
+        function truncate(path: PathLike, len?: number): Promise<void>;
+
+        /**
+         * Asynchronous ftruncate(2) - Truncate a file to a specified length.
+         * @param handle A `FileHandle`.
+         * @param len If not specified, defaults to `0`.
+         */
+        function ftruncate(handle: FileHandle, len?: number): Promise<void>;
+
+        /**
+         * Asynchronous rmdir(2) - delete a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function rmdir(path: PathLike): Promise<void>;
+
+        /**
+         * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
+         * @param handle A `FileHandle`.
+         */
+        function fdatasync(handle: FileHandle): Promise<void>;
+
+        /**
+         * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
+         * @param handle A `FileHandle`.
+         */
+        function fsync(handle: FileHandle): Promise<void>;
+
+        /**
+         * Asynchronous mkdir(2) - create a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
+         */
+        function mkdir(path: PathLike, mode?: string | number): Promise<void>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readdir(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readdir(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer[]>;
+
+        /**
+         * Asynchronous readdir(3) - read a directory.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readdir(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string[] | Buffer[]>;
+
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readlink(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readlink(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronous readlink(2) - read value of a symbolic link.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function readlink(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+
+        /**
+         * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
+         * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
+         * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
+         * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
+         * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
+         */
+        function symlink(target: PathLike, path: PathLike, type?: string | null): Promise<void>;
+
+        /**
+         * Asynchronous fstat(2) - Get file status.
+         * @param handle A `FileHandle`.
+         */
+        function fstat(handle: FileHandle): Promise<Stats>;
+
+        /**
+         * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function lstat(path: PathLike): Promise<Stats>;
+
+        /**
+         * Asynchronous stat(2) - Get file status.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function stat(path: PathLike): Promise<Stats>;
+
+        /**
+         * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
+         * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function link(existingPath: PathLike, newPath: PathLike): Promise<void>;
+
+        /**
+         * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function unlink(path: PathLike): Promise<void>;
+
+        /**
+         * Asynchronous fchmod(2) - Change permissions of a file.
+         * @param handle A `FileHandle`.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        function fchmod(handle: FileHandle, mode: string | number): Promise<void>;
+
+        /**
+         * Asynchronous chmod(2) - Change permissions of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        function chmod(path: PathLike, mode: string | number): Promise<void>;
+
+        /**
+         * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
+         */
+        function lchmod(path: PathLike, mode: string | number): Promise<void>;
+
+        /**
+         * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function lchown(path: PathLike, uid: number, gid: number): Promise<void>;
+
+        /**
+         * Asynchronous fchown(2) - Change ownership of a file.
+         * @param handle A `FileHandle`.
+         */
+        function fchown(handle: FileHandle, uid: number, gid: number): Promise<void>;
+
+        /**
+         * Asynchronous chown(2) - Change ownership of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         */
+        function chown(path: PathLike, uid: number, gid: number): Promise<void>;
+
+        /**
+         * Asynchronously change file timestamps of the file referenced by the supplied path.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param atime The last access time. If a string is provided, it will be coerced to number.
+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+         */
+        function utimes(path: PathLike, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+
+        /**
+         * Asynchronously change file timestamps of the file referenced by the supplied `FileHandle`.
+         * @param handle A `FileHandle`.
+         * @param atime The last access time. If a string is provided, it will be coerced to number.
+         * @param mtime The last modified time. If a string is provided, it will be coerced to number.
+         */
+        function futimes(handle: FileHandle, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
+
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function realpath(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function realpath(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronous realpath(3) - return the canonicalized absolute pathname.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function realpath(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function mkdtemp(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function mkdtemp(prefix: string, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
+
+        /**
+         * Asynchronously creates a unique temporary directory.
+         * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
+         * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
+         */
+        function mkdtemp(prefix: string, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
+
+        /**
+         * Asynchronously writes data to a file, replacing the file if it already exists.
+         * It is unsafe to call `fsPromises.writeFile()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected).
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
          * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
          * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
          * If `encoding` is not supplied, the default of `'utf8'` is used.
@@ -4789,356 +5095,49 @@ declare module "fs/promises" {
          * If `mode` is a string, it is parsed as an octal integer.
          * If `flag` is not supplied, the default of `'w'` is used.
          */
-        writeFile(data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
+        function writeFile(path: PathLike | FileHandle, data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
 
         /**
-         * Asynchronous close(2) - close a `FileHandle`.
+         * Asynchronously append data to a file, creating the file if it does not exist.
+         * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * URL support is _experimental_.
+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
+         * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
+         * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
+         * If `encoding` is not supplied, the default of `'utf8'` is used.
+         * If `mode` is not supplied, the default of `0o666` is used.
+         * If `mode` is a string, it is parsed as an octal integer.
+         * If `flag` is not supplied, the default of `'a'` is used.
          */
-        close(): Promise<void>;
+        function appendFile(path: PathLike | FileHandle, data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
+         * @param options An object that may contain an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        function readFile(path: PathLike | FileHandle, options?: { encoding?: null, flag?: string | number } | null): Promise<Buffer>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
+         * @param options An object that may contain an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        function readFile(path: PathLike | FileHandle, options: { encoding: BufferEncoding, flag?: string | number } | BufferEncoding): Promise<string>;
+
+        /**
+         * Asynchronously reads the entire contents of a file.
+         * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
+         * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
+         * @param options An object that may contain an optional flag.
+         * If a flag is not provided, it defaults to `'r'`.
+         */
+        function readFile(path: PathLike | FileHandle, options?: { encoding?: string | null, flag?: string | number } | string | null): Promise<string | Buffer>;
     }
-
-    /**
-     * Asynchronously tests a user's permissions for the file specified by path.
-     * @param path A path to a file or directory. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     */
-    function access(path: PathLike, mode?: number): Promise<void>;
-
-    /**
-     * Asynchronously copies `src` to `dest`. By default, `dest` is overwritten if it already exists.
-     * Node.js makes no guarantees about the atomicity of the copy operation.
-     * If an error occurs after the destination file has been opened for writing, Node.js will attempt
-     * to remove the destination.
-     * @param src A path to the source file.
-     * @param dest A path to the destination file.
-     * @param flags An optional integer that specifies the behavior of the copy operation. The only
-     * supported flag is `fs.constants.COPYFILE_EXCL`, which causes the copy operation to fail if
-     * `dest` already exists.
-     */
-    function copyFile(src: PathLike, dest: PathLike, flags?: number): Promise<void>;
-
-    /**
-     * Asynchronous open(2) - open and possibly create a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not
-     * supplied, defaults to `0o666`.
-     */
-    function open(path: PathLike, flags: string | number, mode?: string | number): Promise<FileHandle>;
-
-    /**
-     * Asynchronously reads data from the file referenced by the supplied `FileHandle`.
-     * @param handle A `FileHandle`.
-     * @param buffer The buffer that the data will be written to.
-     * @param offset The offset in the buffer at which to start writing.
-     * @param length The number of bytes to read.
-     * @param position The offset from the beginning of the file from which data should be read. If
-     * `null`, data will be read from the current position.
-     */
-    function read<TBuffer extends Buffer | Uint8Array>(handle: FileHandle, buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesRead: number, buffer: TBuffer }>;
-
-    /**
-     * Asynchronously writes `buffer` to the file referenced by the supplied `FileHandle`.
-     * It is unsafe to call `fsPromises.write()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
-     * @param handle A `FileHandle`.
-     * @param buffer The buffer that the data will be written to.
-     * @param offset The part of the buffer to be written. If not supplied, defaults to `0`.
-     * @param length The number of bytes to write. If not supplied, defaults to `buffer.length - offset`.
-     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-     */
-    function write<TBuffer extends Buffer | Uint8Array>(handle: FileHandle, buffer: TBuffer, offset?: number | null, length?: number | null, position?: number | null): Promise<{ bytesWritten: number, buffer: TBuffer }>;
-
-    /**
-     * Asynchronously writes `string` to the file referenced by the supplied `FileHandle`.
-     * It is unsafe to call `fsPromises.write()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected). For this scenario, `fs.createWriteStream` is strongly recommended.
-     * @param handle A `FileHandle`.
-     * @param string A string to write. If something other than a string is supplied it will be coerced to a string.
-     * @param position The offset from the beginning of the file where this data should be written. If not supplied, defaults to the current position.
-     * @param encoding The expected string encoding.
-     */
-    function write(handle: FileHandle, string: any, position?: number | null, encoding?: string | null): Promise<{ bytesWritten: number, buffer: string }>;
-
-    /**
-     * Asynchronous rename(2) - Change the name or location of a file or directory.
-     * @param oldPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     */
-    function rename(oldPath: PathLike, newPath: PathLike): Promise<void>;
-
-    /**
-     * Asynchronous truncate(2) - Truncate a file to a specified length.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param len If not specified, defaults to `0`.
-     */
-    function truncate(path: PathLike, len?: number): Promise<void>;
-
-    /**
-     * Asynchronous ftruncate(2) - Truncate a file to a specified length.
-     * @param handle A `FileHandle`.
-     * @param len If not specified, defaults to `0`.
-     */
-    function ftruncate(handle: FileHandle, len?: number): Promise<void>;
-
-    /**
-     * Asynchronous rmdir(2) - delete a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function rmdir(path: PathLike): Promise<void>;
-
-    /**
-     * Asynchronous fdatasync(2) - synchronize a file's in-core state with storage device.
-     * @param handle A `FileHandle`.
-     */
-    function fdatasync(handle: FileHandle): Promise<void>;
-
-    /**
-     * Asynchronous fsync(2) - synchronize a file's in-core state with the underlying storage device.
-     * @param handle A `FileHandle`.
-     */
-    function fsync(handle: FileHandle): Promise<void>;
-
-    /**
-     * Asynchronous mkdir(2) - create a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param mode A file mode. If a string is passed, it is parsed as an octal integer. If not specified, defaults to `0o777`.
-     */
-    function mkdir(path: PathLike, mode?: string | number): Promise<void>;
-
-    /**
-     * Asynchronous readdir(3) - read a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readdir(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string[]>;
-
-    /**
-     * Asynchronous readdir(3) - read a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readdir(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer[]>;
-
-    /**
-     * Asynchronous readdir(3) - read a directory.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readdir(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string[] | Buffer[]>;
-
-    /**
-     * Asynchronous readlink(2) - read value of a symbolic link.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readlink(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
-
-    /**
-     * Asynchronous readlink(2) - read value of a symbolic link.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readlink(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
-
-    /**
-     * Asynchronous readlink(2) - read value of a symbolic link.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function readlink(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
-
-    /**
-     * Asynchronous symlink(2) - Create a new symbolic link to an existing file.
-     * @param target A path to an existing file. If a URL is provided, it must use the `file:` protocol.
-     * @param path A path to the new symlink. If a URL is provided, it must use the `file:` protocol.
-     * @param type May be set to `'dir'`, `'file'`, or `'junction'` (default is `'file'`) and is only available on Windows (ignored on other platforms).
-     * When using `'junction'`, the `target` argument will automatically be normalized to an absolute path.
-     */
-    function symlink(target: PathLike, path: PathLike, type?: string | null): Promise<void>;
-
-    /**
-     * Asynchronous fstat(2) - Get file status.
-     * @param handle A `FileHandle`.
-     */
-    function fstat(handle: FileHandle): Promise<Stats>;
-
-    /**
-     * Asynchronous lstat(2) - Get file status. Does not dereference symbolic links.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function lstat(path: PathLike): Promise<Stats>;
-
-    /**
-     * Asynchronous stat(2) - Get file status.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function stat(path: PathLike): Promise<Stats>;
-
-    /**
-     * Asynchronous link(2) - Create a new link (also known as a hard link) to an existing file.
-     * @param existingPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param newPath A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function link(existingPath: PathLike, newPath: PathLike): Promise<void>;
-
-    /**
-     * Asynchronous unlink(2) - delete a name and possibly the file it refers to.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function unlink(path: PathLike): Promise<void>;
-
-    /**
-     * Asynchronous fchmod(2) - Change permissions of a file.
-     * @param handle A `FileHandle`.
-     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-     */
-    function fchmod(handle: FileHandle, mode: string | number): Promise<void>;
-
-    /**
-     * Asynchronous chmod(2) - Change permissions of a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-     */
-    function chmod(path: PathLike, mode: string | number): Promise<void>;
-
-    /**
-     * Asynchronous lchmod(2) - Change permissions of a file. Does not dereference symbolic links.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param mode A file mode. If a string is passed, it is parsed as an octal integer.
-     */
-    function lchmod(path: PathLike, mode: string | number): Promise<void>;
-
-    /**
-     * Asynchronous lchown(2) - Change ownership of a file. Does not dereference symbolic links.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function lchown(path: PathLike, uid: number, gid: number): Promise<void>;
-
-    /**
-     * Asynchronous fchown(2) - Change ownership of a file.
-     * @param handle A `FileHandle`.
-     */
-    function fchown(handle: FileHandle, uid: number, gid: number): Promise<void>;
-
-    /**
-     * Asynchronous chown(2) - Change ownership of a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     */
-    function chown(path: PathLike, uid: number, gid: number): Promise<void>;
-
-    /**
-     * Asynchronously change file timestamps of the file referenced by the supplied path.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param atime The last access time. If a string is provided, it will be coerced to number.
-     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
-     */
-    function utimes(path: PathLike, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
-
-    /**
-     * Asynchronously change file timestamps of the file referenced by the supplied `FileHandle`.
-     * @param handle A `FileHandle`.
-     * @param atime The last access time. If a string is provided, it will be coerced to number.
-     * @param mtime The last modified time. If a string is provided, it will be coerced to number.
-     */
-    function futimes(handle: FileHandle, atime: string | number | Date, mtime: string | number | Date): Promise<void>;
-
-    /**
-     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function realpath(path: PathLike, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
-
-    /**
-     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function realpath(path: PathLike, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
-
-    /**
-     * Asynchronous realpath(3) - return the canonicalized absolute pathname.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function realpath(path: PathLike, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
-
-    /**
-     * Asynchronously creates a unique temporary directory.
-     * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function mkdtemp(prefix: string, options?: { encoding?: BufferEncoding | null } | BufferEncoding | null): Promise<string>;
-
-    /**
-     * Asynchronously creates a unique temporary directory.
-     * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function mkdtemp(prefix: string, options: { encoding: "buffer" } | "buffer"): Promise<Buffer>;
-
-    /**
-     * Asynchronously creates a unique temporary directory.
-     * Generates six random characters to be appended behind a required `prefix` to create a unique temporary directory.
-     * @param options The encoding (or an object specifying the encoding), used as the encoding of the result. If not provided, `'utf8'` is used.
-     */
-    function mkdtemp(prefix: string, options?: { encoding?: string | null } | string | null): Promise<string | Buffer>;
-
-    /**
-     * Asynchronously writes data to a file, replacing the file if it already exists.
-     * It is unsafe to call `fsPromises.writeFile()` multiple times on the same file without waiting for the `Promise` to be resolved (or rejected).
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
-     * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
-     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-     * If `encoding` is not supplied, the default of `'utf8'` is used.
-     * If `mode` is not supplied, the default of `0o666` is used.
-     * If `mode` is a string, it is parsed as an octal integer.
-     * If `flag` is not supplied, the default of `'w'` is used.
-     */
-    function writeFile(path: PathLike | FileHandle, data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
-
-    /**
-     * Asynchronously append data to a file, creating the file if it does not exist.
-     * @param file A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * URL support is _experimental_.
-     * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
-     * @param data The data to write. If something other than a `Buffer` or `Uint8Array` is provided, the value is coerced to a string.
-     * @param options Either the encoding for the file, or an object optionally specifying the encoding, file mode, and flag.
-     * If `encoding` is not supplied, the default of `'utf8'` is used.
-     * If `mode` is not supplied, the default of `0o666` is used.
-     * If `mode` is a string, it is parsed as an octal integer.
-     * If `flag` is not supplied, the default of `'a'` is used.
-     */
-    function appendFile(path: PathLike | FileHandle, data: any, options?: { encoding?: string | null, mode?: string | number, flag?: string | number } | string | null): Promise<void>;
-
-    /**
-     * Asynchronously reads the entire contents of a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
-     * @param options An object that may contain an optional flag.
-     * If a flag is not provided, it defaults to `'r'`.
-     */
-    function readFile(path: PathLike | FileHandle, options?: { encoding?: null, flag?: string | number } | null): Promise<Buffer>;
-
-    /**
-     * Asynchronously reads the entire contents of a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
-     * @param options An object that may contain an optional flag.
-     * If a flag is not provided, it defaults to `'r'`.
-     */
-    function readFile(path: PathLike | FileHandle, options: { encoding: BufferEncoding, flag?: string | number } | BufferEncoding): Promise<string>;
-
-    /**
-     * Asynchronously reads the entire contents of a file.
-     * @param path A path to a file. If a URL is provided, it must use the `file:` protocol.
-     * If a `FileHandle` is provided, the underlying file will _not_ be closed automatically.
-     * @param options An object that may contain an optional flag.
-     * If a flag is not provided, it defaults to `'r'`.
-     */
-    function readFile(path: PathLike | FileHandle, options?: { encoding?: string | null, flag?: string | number } | string | null): Promise<string | Buffer>;
 }
 
 declare module "path" {

From 2d241ad3e1bbcdd96892f4029db730134ba0d67b Mon Sep 17 00:00:00 2001
From: Vladimir <vzh.inbox@gmail.com>
Date: Tue, 15 May 2018 08:20:24 +0600
Subject: [PATCH 114/575] Remove export namespace

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

diff --git a/types/react-input-mask/index.d.ts b/types/react-input-mask/index.d.ts
index 5bacb3561a..13140b1cad 100644
--- a/types/react-input-mask/index.d.ts
+++ b/types/react-input-mask/index.d.ts
@@ -6,9 +6,6 @@
 
 import * as React from "react";
 
-export default ReactInputMask;
-export as namespace ReactInputMask;
-
 declare namespace ReactInputMask {
     interface Props extends React.InputHTMLAttributes<HTMLInputElement> {
         /**
@@ -48,3 +45,5 @@ declare namespace ReactInputMask {
 
 declare class ReactInputMask extends React.Component<ReactInputMask.Props> {
 }
+
+export default ReactInputMask;

From ba1803634534f5d741a08bb944048fd1326d499a Mon Sep 17 00:00:00 2001
From: Seth Kingsley <sethk@meowfishies.com>
Date: Mon, 14 May 2018 21:45:15 -0700
Subject: [PATCH 115/575] PATCH 2

---
 types/three/three-core.d.ts | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index c9b67f5c36..70e550e5f8 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -218,6 +218,9 @@ export function warn(message?: any, ...optionalParams: any[]): void;
 export function error(message?: any, ...optionalParams: any[]): void;
 export function log(message?: any, ...optionalParams: any[]): void;
 
+// typed array parameters
+type TypedArray = Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array;
+
 // Animation ////////////////////////////////////////////////////////////////////////////////////////
 
 export class AnimationAction {
@@ -2209,7 +2212,7 @@ export class JSONLoader extends Loader {
 export class LoadingManager {
     constructor(onLoad?: () => void, onProgress?: (url: string, loaded: number, total: number) => void, onError?: () => void);
 
-    onStart: (url: string, loaded: number, total: number) => void;
+    onStart?: (url: string, loaded: number, total: number) => void;
 
     /**
      * Will be called when load starts.
@@ -2229,7 +2232,7 @@ export class LoadingManager {
      */
     onError: (url: string) => void;
 
-    setURLModifier(callback : (url: string) => string): void;
+    setURLModifier(callback?: (url: string) => string): void;
 
     itemStart(url: string): void;
     itemEnd(url: string): void;
@@ -2353,7 +2356,7 @@ export namespace Cache {
 }
 
 export class LoaderUtils {
-    static decodeText(array: Uint8Array): string;
+    static decodeText(array: TypedArray): string;
     static extractUrlBase(url: string): string;
 }
 
@@ -2907,24 +2910,24 @@ export class MeshPhongMaterial extends Material {
     color: Color;
     specular: Color;
     shininess: number;
-    map?: Texture;
-    lightMap: Texture;
+    map: Texture | null;
+    lightMap: Texture | null;
     lightMapIntensity: number;
-    aoMap?: Texture;
+    aoMap: Texture | null;
     aoMapIntensity: number;
     emissive: Color;
     emissiveIntensity: number;
-    emissiveMap: Texture;
-    bumpMap?: Texture;
+    emissiveMap: Texture | null;
+    bumpMap: Texture | null;
     bumpScale: number;
-    normalMap?: Texture;
+    normalMap: Texture | null;
     normalScale: Vector2;
-    displacementMap: Texture;
+    displacementMap: Texture | null;
     displacementScale: number;
     displacementBias: number;
-    specularMap?: Texture;
-    alphaMap?: Texture;
-    envMap?: Texture;
+    specularMap: Texture | null;
+    alphaMap: Texture | null;
+    envMap: Texture | null;
     combine: Combine;
     reflectivity: number;
     refractionRatio: number;
@@ -6137,9 +6140,6 @@ export class WebGLState {
     };
 
     init(): void;
-    texImage2D(target: number, level: number, internalformat: number,
-        width: number, height: number, border: number, format: number,
-        type: number, pixels?: ArrayBufferView | null): void;
     initAttributes(): void;
     enableAttribute(attribute: string): void;
     enableAttributeAndDivisor(attribute: string, meshPerAttribute: any, extension: any): void;
@@ -6164,7 +6164,9 @@ export class WebGLState {
     getScissorTest(): boolean;
     activeTexture(webglSlot: any): void;
     bindTexture(webglType: any, webglTexture: any): void;
+    // Same interface as https://developer.mozilla.org/en-US/docs/Web/API/WebGLRenderingContext/compressedTexImage2D
     compressedTexImage2D(): void;
+    // Same interface as https://developer.mozilla.org/en-US/docs/Web/API/WebGLRenderingContext/texImage2D
     texImage2D(): void;
     clearColor(r: number, g: number, b: number, a: number): void;
     clearDepth(depth: number): void;
@@ -6417,7 +6419,7 @@ export class CompressedTexture extends Texture {
 
 export class DataTexture extends Texture {
     constructor(
-        data: ArrayBuffer | Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array,
+        data: ArrayBuffer | TypedArray,
         width: number,
         height: number,
         format?: PixelFormat,

From 9833c73b93c3d62bc2eaa1f61bf4afbc52baad30 Mon Sep 17 00:00:00 2001
From: Sam Gronblom <sam.gronblom@reaktor.co.jp>
Date: Tue, 15 May 2018 14:57:22 +0900
Subject: [PATCH 116/575] Fix indentation of oauth2Model

---
 types/oauth2-server/oauth2-server-tests.ts | 62 +++++++++++-----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/types/oauth2-server/oauth2-server-tests.ts b/types/oauth2-server/oauth2-server-tests.ts
index faf9976873..9873eb6e9a 100644
--- a/types/oauth2-server/oauth2-server-tests.ts
+++ b/types/oauth2-server/oauth2-server-tests.ts
@@ -2,37 +2,37 @@ import express = require("express");
 import OAuth2Server = require("oauth2-server");
 
 const oauth2Model: OAuth2Server.AuthorizationCodeModel = {
-        getClient: async (clientId: string, clientSecret: string): Promise<OAuth2Server.Client | OAuth2Server.Falsey> => {
-            return undefined;
-        },
-        saveToken: async (token: OAuth2Server.Token, client: OAuth2Server.Client, user: OAuth2Server.User): Promise<OAuth2Server.Token> => {
-            return token;
-        },
-        getAccessToken: async (accessToken: string): Promise<OAuth2Server.Token> => {
-            return {
-                accessToken,
-                client: {id: "testClient", grants: ["access_token"]},
-                user: {id: "testUser"}
-            };
-        },
-        verifyScope: async (token: OAuth2Server.Token, scope: string): Promise<boolean> => {
-            return true;
-        },
-        getAuthorizationCode: async (authorizationCode: string): Promise<OAuth2Server.AuthorizationCode> => {
-            return {
-                authorizationCode,
-                expiresAt: new Date(),
-                redirectUri: "www.test.com",
-                client: {id: "testClient", grants: ["access_token"]},
-                user: {id: "testUser"}
-            };
-        },
-        saveAuthorizationCode: async (code: OAuth2Server.AuthorizationCode, client: OAuth2Server.Client, user: OAuth2Server.User): Promise<OAuth2Server.AuthorizationCode> => {
-            return code;
-        },
-        revokeAuthorizationCode: async (code: OAuth2Server.AuthorizationCode): Promise<boolean> => {
-            return true;
-        }
+    getClient: async (clientId: string, clientSecret: string): Promise<OAuth2Server.Client | OAuth2Server.Falsey> => {
+        return undefined;
+    },
+    saveToken: async (token: OAuth2Server.Token, client: OAuth2Server.Client, user: OAuth2Server.User): Promise<OAuth2Server.Token> => {
+        return token;
+    },
+    getAccessToken: async (accessToken: string): Promise<OAuth2Server.Token> => {
+        return {
+            accessToken,
+            client: { id: "testClient", grants: ["access_token"] },
+            user: { id: "testUser" }
+        };
+    },
+    verifyScope: async (token: OAuth2Server.Token, scope: string): Promise<boolean> => {
+        return true;
+    },
+    getAuthorizationCode: async (authorizationCode: string): Promise<OAuth2Server.AuthorizationCode> => {
+        return {
+            authorizationCode,
+            expiresAt: new Date(),
+            redirectUri: "www.test.com",
+            client: { id: "testClient", grants: ["access_token"] },
+            user: { id: "testUser" }
+        };
+    },
+    saveAuthorizationCode: async (code: OAuth2Server.AuthorizationCode, client: OAuth2Server.Client, user: OAuth2Server.User): Promise<OAuth2Server.AuthorizationCode> => {
+        return code;
+    },
+    revokeAuthorizationCode: async (code: OAuth2Server.AuthorizationCode): Promise<boolean> => {
+        return true;
+    }
 };
 
 const oauth2Server = new OAuth2Server({

From 1b754d2d763150c2aecdec073398e23a7361d9c0 Mon Sep 17 00:00:00 2001
From: Joscha Feth <joscha@feth.com>
Date: Tue, 15 May 2018 16:19:30 +1000
Subject: [PATCH 117/575] add: dependency-tree

---
 .../dependency-tree/dependency-tree-tests.ts  | 18 ++++++++++++
 types/dependency-tree/index.d.ts              | 29 +++++++++++++++++++
 types/dependency-tree/tsconfig.json           | 22 ++++++++++++++
 types/dependency-tree/tslint.json             |  1 +
 4 files changed, 70 insertions(+)
 create mode 100644 types/dependency-tree/dependency-tree-tests.ts
 create mode 100644 types/dependency-tree/index.d.ts
 create mode 100644 types/dependency-tree/tsconfig.json
 create mode 100644 types/dependency-tree/tslint.json

diff --git a/types/dependency-tree/dependency-tree-tests.ts b/types/dependency-tree/dependency-tree-tests.ts
new file mode 100644
index 0000000000..67f8c3bb82
--- /dev/null
+++ b/types/dependency-tree/dependency-tree-tests.ts
@@ -0,0 +1,18 @@
+import dependencyTree = require('dependency-tree');
+
+const tree = dependencyTree({
+  filename: 'path/to/a/file',
+  directory: 'path/to/all/files',
+  requireConfig: 'path/to/requirejs/config',
+  webpackConfig: 'path/to/webpack/config',
+  nodeModulesConfig: {
+    entry: 'module'
+  },
+  filter: path => path.indexOf('node_modules') === -1,
+  nonExistent: []
+});
+
+const list = dependencyTree.toList({
+  filename: 'path/to/a/file',
+  directory: 'path/to/all/files'
+});
diff --git a/types/dependency-tree/index.d.ts b/types/dependency-tree/index.d.ts
new file mode 100644
index 0000000000..be0a69676c
--- /dev/null
+++ b/types/dependency-tree/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for dependency-tree 6.1
+// Project: https://github.com/mrjoelkemp/node-dependency-tree
+// Definitions by: Joscha Feth <https://github.com/joscha>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace dependencyTree {
+    interface DependencyObj {
+        [k: string]: DependencyObj;
+    }
+
+    interface Options {
+        filename: string;
+        directory?: string;
+        requireConfig?: string;
+        webpackConfig?: string;
+        nodeModulesConfig?: any;
+        detective?: any;
+        visited?: DependencyObj;
+        filter?(path: string): boolean;
+        nonExistent?: string[];
+        isListForm?: boolean;
+    }
+
+    function toList(options: Options): string[];
+}
+
+declare function dependencyTree(options: dependencyTree.Options): dependencyTree.DependencyObj;
+
+export = dependencyTree;
diff --git a/types/dependency-tree/tsconfig.json b/types/dependency-tree/tsconfig.json
new file mode 100644
index 0000000000..412f8bf359
--- /dev/null
+++ b/types/dependency-tree/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",
+        "dependency-tree-tests.ts"
+    ]
+}
diff --git a/types/dependency-tree/tslint.json b/types/dependency-tree/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dependency-tree/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 60418667c1832f4ca0f13ea4bf8bfba25745a107 Mon Sep 17 00:00:00 2001
From: Diluka <pmars42@gmail.com>
Date: Tue, 15 May 2018 15:16:12 +0800
Subject: [PATCH 118/575] add sequelize instance method `random`

api doc see http://docs.sequelizejs.com/class/lib/sequelize.js~Sequelize.html#instance-method-random
---
 types/sequelize/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 4adf48948d..cc4bef61ba 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -6172,6 +6172,10 @@ declare namespace sequelize {
          */
         databaseVersion(): Promise<string>;
 
+        /**
+         * Get the fn for random based on the dialect
+         */
+        random(): fn;
     }
 
     //

From 5705586c05cb5fc1d41f132dc7f92561651d550d Mon Sep 17 00:00:00 2001
From: Joscha Feth <joscha@feth.com>
Date: Tue, 15 May 2018 17:30:02 +1000
Subject: [PATCH 119/575] Update tsconfig.json

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

diff --git a/types/dependency-tree/tsconfig.json b/types/dependency-tree/tsconfig.json
index 412f8bf359..5431546e97 100644
--- a/types/dependency-tree/tsconfig.json
+++ b/types/dependency-tree/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From f3eb7df93f86be3652cc69aaa04460e5e023fad4 Mon Sep 17 00:00:00 2001
From: Oliver Joseph Ash <oliverjash@gmail.com>
Date: Tue, 15 May 2018 08:32:09 +0100
Subject: [PATCH 120/575] Node: remove myself as author

In addition to https://github.com/DefinitelyTyped/DefinitelyTyped/pull/25610
---
 .github/CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f9324d1bdd..9084f165aa 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2645,8 +2645,8 @@
 /types/node/v4/                                 @eps1lon
 /types/node/v6/                                 @WilcoBakker @inlined @eps1lon @Alorel
 /types/node/v7/                                 @parambirs @tellnes @WilcoBakker @eps1lon
-/types/node/v8/                                 @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @OliverJAsh @eps1lon @Hannes-Magnusson-CK @jkomyno @hoo29 @n-e
-/types/node/                                    @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @OliverJAsh @eps1lon @Hannes-Magnusson-CK @jkomyno @ajafff @hoo29 @n-e
+/types/node/v8/                                 @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @hoo29 @n-e
+/types/node/                                    @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @ajafff @hoo29 @n-e
 /types/node-7z/                                 @erkie
 /types/node-array-ext/                          @Beng89
 /types/node-cache/                              @chrootsu @dthunell @useltmann

From 08bce4cb0618c59843a2149a00b7fbd7436228c1 Mon Sep 17 00:00:00 2001
From: Henrik Raitasola <henrik.raitasola@gmail.com>
Date: Tue, 15 May 2018 11:08:24 +0300
Subject: [PATCH 121/575] Add missing backPress navigator event

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

diff --git a/types/react-native-navigation/index.d.ts b/types/react-native-navigation/index.d.ts
index 86b94bff44..c380b4ae7e 100644
--- a/types/react-native-navigation/index.d.ts
+++ b/types/react-native-navigation/index.d.ts
@@ -118,7 +118,7 @@ export interface LightBox {
 }
 
 export interface NavigatorEvent {
-    id: 'willAppear' | 'didAppear' | 'willDisappear' | 'didDisappear' | 'willCommitPreview';
+    id: 'willAppear' | 'didAppear' | 'willDisappear' | 'didDisappear' | 'willCommitPreview' | 'backPress';
 }
 
 export class Navigator {

From 8bd493155842e447bf3be1640b419cd752a84587 Mon Sep 17 00:00:00 2001
From: Henrik Raitasola <henrik.raitasola@gmail.com>
Date: Tue, 15 May 2018 11:16:15 +0300
Subject: [PATCH 122/575] Add one missing function and one missing class

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

diff --git a/types/react-native-navigation/index.d.ts b/types/react-native-navigation/index.d.ts
index c380b4ae7e..c1d096fe5f 100644
--- a/types/react-native-navigation/index.d.ts
+++ b/types/react-native-navigation/index.d.ts
@@ -18,6 +18,7 @@ export namespace Navigation {
     function handleDeepLink(params?: { link: string; payload?: string; }): void;
     function registerScreen(screenId: string, generator: () => React.ComponentType<any>): void;
     function getCurrentlyVisibleScreenId(): Promise<string>;
+    function isAppLaunched(): Promise<boolean>;
 }
 
 export interface TabBasedApp {
@@ -155,6 +156,11 @@ export class ScreenVisibilityListener {
     unregister(): void;
 }
 
+export class NativeEventsReceiver {
+    constructor();
+    appLaunched(callback: () => void): void;
+}
+
 export interface ScreenVisibilityListenerParams {
     willAppear?: (params: ListenerParams) => void;
     didAppear?: (params: ListenerParams) => void;

From 9c7095b7b499f9b37fbf504502a5b66948a19017 Mon Sep 17 00:00:00 2001
From: Henrik Raitasola <henrik.raitasola@gmail.com>
Date: Tue, 15 May 2018 11:21:34 +0300
Subject: [PATCH 123/575] Add tests

---
 .../react-native-navigation-tests.tsx         | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/types/react-native-navigation/react-native-navigation-tests.tsx b/types/react-native-navigation/react-native-navigation-tests.tsx
index 004673e10a..6adc4f5111 100644
--- a/types/react-native-navigation/react-native-navigation-tests.tsx
+++ b/types/react-native-navigation/react-native-navigation-tests.tsx
@@ -1,6 +1,13 @@
 import * as React from 'react';
 import { Text, View } from 'react-native';
-import { Navigation, NavigationComponentProps, NavigatorStyle, NavigatorButtons, NavigatorEvent } from 'react-native-navigation';
+import { 
+    Navigation,
+    NavigationComponentProps,
+    NavigatorStyle,
+    NavigatorButtons,
+    NavigatorEvent,
+    NativeEventsReceiver,
+} from 'react-native-navigation';
 
 type Props = NavigationComponentProps & { height: number };
 
@@ -67,6 +74,17 @@ Navigation.registerComponent('example.Screen1', () => Screen1);
 Navigation.registerComponent('example.Screen2', () => Screen2);
 Navigation.registerComponent('example.Drawer', () => Drawer);
 
+Navigation.isAppLaunched().then(appLaunched => {
+    if (appLaunched) {
+      startApp(); // App is launched -> show UI
+    }
+    new NativeEventsReceiver().appLaunched(startApp); // App hasn't been launched yet -> show the UI only when needed.
+});
+
+function startApp() {
+    // do something here
+}
+
 Navigation.startTabBasedApp({
     tabs: [
         {

From d443147e896c0569cf6acb7f296ebca1a2cba1fb Mon Sep 17 00:00:00 2001
From: Henrik Raitasola <henrik.raitasola@gmail.com>
Date: Tue, 15 May 2018 11:25:11 +0300
Subject: [PATCH 124/575] Remove trailing whitespace

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

diff --git a/types/react-native-navigation/react-native-navigation-tests.tsx b/types/react-native-navigation/react-native-navigation-tests.tsx
index 6adc4f5111..e2ecc8bccb 100644
--- a/types/react-native-navigation/react-native-navigation-tests.tsx
+++ b/types/react-native-navigation/react-native-navigation-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Text, View } from 'react-native';
-import { 
+import {
     Navigation,
     NavigationComponentProps,
     NavigatorStyle,

From 138ea7344c0b98594b8bd4273263bb1ab687e9fc Mon Sep 17 00:00:00 2001
From: VincentBel <buaazqh@gmail.com>
Date: Tue, 15 May 2018 16:47:53 +0800
Subject: [PATCH 125/575] [react-loadable]: update types for v5.4

---
 types/react-loadable/index.d.ts     | 3 ++-
 types/react-loadable/test/index.tsx | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/types/react-loadable/index.d.ts b/types/react-loadable/index.d.ts
index beeb569d4c..b673d9b480 100644
--- a/types/react-loadable/index.d.ts
+++ b/types/react-loadable/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-loadable 5.3
+// Type definitions for react-loadable 5.4
 // Project: https://github.com/thejameskyle/react-loadable#readme
 // Definitions by: Diogo Franco <https://github.com/Kovensky>
 //                 Oden S. <https://github.com/odensc>
@@ -16,6 +16,7 @@ declare namespace LoadableExport {
         pastDelay: boolean;
         timedOut: boolean;
         error: any;
+        retry: () => void;
     }
 
     type Options<Props, Exports extends object> = OptionsWithoutRender<Props> | OptionsWithRender<Props, Exports>;
diff --git a/types/react-loadable/test/index.tsx b/types/react-loadable/test/index.tsx
index 5045fdf125..474ab4868e 100644
--- a/types/react-loadable/test/index.tsx
+++ b/types/react-loadable/test/index.tsx
@@ -9,6 +9,7 @@ class LoadingComponent extends React.Component<Loadable.LoadingComponentProps> {
         {this.props.isLoading}
         {this.props.pastDelay}
         {this.props.timedOut}
+        <button onClick={this.props.retry}>Retry</button>
       </div>
     );
   }

From aa9228e78554c6878bd33debc0582ac44f7fab9c Mon Sep 17 00:00:00 2001
From: Gerhard Stoebich <deb2001-github@yahoo.de>
Date: Tue, 15 May 2018 10:48:54 +0200
Subject: [PATCH 126/575] [node] Add http/2 pseudo headers to
 IncomingHttpHeaders

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 4e03c3f78b..ec7f6b0a76 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -6836,8 +6836,16 @@ declare module "http2" {
     import * as tls from "tls";
     import * as url from "url";
 
-    import { IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
-    export { IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
+    import { IncomingHttpHeaders as Http1IncomingHttpHeaders, OutgoingHttpHeaders } from "http";
+    export { OutgoingHttpHeaders } from "http";
+
+    export interface IncomingHttpHeaders extends Http1IncomingHttpHeaders {
+        ':path'?: string;
+        ':method'?: string;
+        ':status'?: string;
+        ':authority'?: string;
+        ':scheme'?: string;
+    }
 
     // Http2Stream
 

From 664c4ce051200f6c11cebd0e078b677da430786d Mon Sep 17 00:00:00 2001
From: Sam Gronblom <sam.gronblom@reaktor.co.jp>
Date: Tue, 15 May 2018 14:57:43 +0900
Subject: [PATCH 127/575] Fix type for generateAuthorizationCode

- Current docs:
https://oauth2-server.readthedocs.io/en/latest/model/spec.html#generateauthorizationcode-client-user-scope-callback
- Current implementation:
https://github.com/oauthjs/node-oauth2-server/blob/5f48a5ce060e22ae8032ea78a781518d5a7cd411/lib/handlers/authorize-handler.js#L138
---
 types/oauth2-server/index.d.ts             | 2 +-
 types/oauth2-server/oauth2-server-tests.ts | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/types/oauth2-server/index.d.ts b/types/oauth2-server/index.d.ts
index 06b6fbadb0..8f6da041fd 100644
--- a/types/oauth2-server/index.d.ts
+++ b/types/oauth2-server/index.d.ts
@@ -239,7 +239,7 @@ declare namespace OAuth2Server {
          * Invoked to generate a new authorization code.
          *
          */
-        generateAuthorizationCode?(callback?: Callback<string>): Promise<string>;
+        generateAuthorizationCode?(client: Client, user: User, scope: string, callback?: Callback<string>): Promise<string>;
 
         /**
          * Invoked to retrieve an existing authorization code previously saved through Model#saveAuthorizationCode().
diff --git a/types/oauth2-server/oauth2-server-tests.ts b/types/oauth2-server/oauth2-server-tests.ts
index 9873eb6e9a..fe5b22e85e 100644
--- a/types/oauth2-server/oauth2-server-tests.ts
+++ b/types/oauth2-server/oauth2-server-tests.ts
@@ -2,6 +2,13 @@ import express = require("express");
 import OAuth2Server = require("oauth2-server");
 
 const oauth2Model: OAuth2Server.AuthorizationCodeModel = {
+    generateAuthorizationCode: async (client, user, scope) => {
+        return JSON.stringify({
+            client,
+            user,
+            scope,
+        });
+    },
     getClient: async (clientId: string, clientSecret: string): Promise<OAuth2Server.Client | OAuth2Server.Falsey> => {
         return undefined;
     },

From 809121fb605e626eefb851b36699bd24e777cd2b Mon Sep 17 00:00:00 2001
From: Adrien Coffre <ext-adrien.coffre@here.com>
Date: Tue, 15 May 2018 11:46:19 +0200
Subject: [PATCH 128/575] Fix.

---
 types/three/three-core.d.ts | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 189584bbf7..82be388122 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -6054,21 +6054,21 @@ export class WebGLLights {
 /** 
  * An object with a series of statistical information about the graphics board memory and the rendering process. 
  */ 
-export class WebGLInfo { 
-    autoReset: boolean; 
+export class WebGLInfo {
+    autoReset: boolean;
     memory: { 
-        geometries: number; 
-        textures: number; 
-    }; 
-    programs: number | null; 
-    render: { 
-        calls: number; 
-        lines: number; 
-        points: number; 
-        triangles: number; 
-    }; 
-    reset(): void; 
-    update(): void; 
+        geometries: number;
+        textures: number;
+    };
+    programs: number | null;
+    render: {
+        calls: number;
+        frame: number;
+        lines: number;
+        points: number;
+        triangles: number;
+    };
+    reset(): void;
 }
 
 export class WebGLIndexedBufferRenderer {

From 928f885297a84f32a90164ced4b48c71923624ee Mon Sep 17 00:00:00 2001
From: Adrien Coffre <ext-adrien.coffre@here.com>
Date: Tue, 15 May 2018 11:55:59 +0200
Subject: [PATCH 129/575] Update programs too.

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

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 82be388122..059e4cbe89 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -6060,7 +6060,7 @@ export class WebGLInfo {
         geometries: number;
         textures: number;
     };
-    programs: number | null;
+    programs: WebGLProgram[] | null;
     render: {
         calls: number;
         frame: number;
@@ -6114,7 +6114,7 @@ export class WebGLProgram {
 export class WebGLPrograms {
     constructor(renderer: WebGLRenderer, capabilities: any);
 
-    programs: any[];
+    programs: WebGLProgram[];
 
     getParameters(material: ShaderMaterial, lights: any, fog: any, nClipPlanes: number, object: any): any;
     getProgramCode(material: ShaderMaterial, parameters: any): string;

From 0f644a7cbe037901eb47e4aa0f9542f38a650308 Mon Sep 17 00:00:00 2001
From: Arylo <arylo.open@gmail.com>
Date: Tue, 15 May 2018 18:15:11 +0800
Subject: [PATCH 130/575] Add type definition for cli-table

---
 types/cli-table/cli-table-tests.ts | 50 ++++++++++++++++++++++++++++++
 types/cli-table/index.d.ts         | 45 +++++++++++++++++++++++++++
 types/cli-table/tsconfig.json      | 23 ++++++++++++++
 types/cli-table/tslint.json        |  1 +
 4 files changed, 119 insertions(+)
 create mode 100644 types/cli-table/cli-table-tests.ts
 create mode 100644 types/cli-table/index.d.ts
 create mode 100644 types/cli-table/tsconfig.json
 create mode 100644 types/cli-table/tslint.json

diff --git a/types/cli-table/cli-table-tests.ts b/types/cli-table/cli-table-tests.ts
new file mode 100644
index 0000000000..30d160f699
--- /dev/null
+++ b/types/cli-table/cli-table-tests.ts
@@ -0,0 +1,50 @@
+import Table = require('cli-table');
+
+/**
+ * Example.
+ */
+
+/* col widths */
+const table = new Table({
+    head: ['Rel', 'Change', 'By', 'When'],
+    colWidths: [6, 21, 25, 17]
+});
+
+table.push(
+    ['v0.1', 'Testing something cool', 'rauchg@gmail.com', '7 minutes ago'],
+    ['v0.1', 'Testing something cool', 'rauchg@gmail.com', '8 minutes ago']
+);
+
+table.toString();
+
+/* compact */
+const table1 = new Table({
+    head: ['Rel', 'Change', 'By', 'When'],
+    colWidths: [6, 21, 25, 17],
+    style : {compact : true, 'padding-left' : 1}
+});
+
+table1.push(
+    ['v0.1', 'Testing something cool', 'rauchg@gmail.com', '7 minutes ago'],
+    ['v0.1', 'Testing something cool', 'rauchg@gmail.com', '8 minutes ago'],
+    [],
+    ['v0.1', 'Testing something cool', 'rauchg@gmail.com', '8 minutes ago']
+);
+
+/* headless */
+const headless_table = new Table();
+headless_table.push(
+    ['v0.1', 'Testing something cool', 'rauchg@gmail.com', '7 minutes ago']
+);
+/* vertical */
+const vertical_table = new Table();
+vertical_table.push(
+    { "Some Key": "Some Value"},
+    { "Another much longer key": "And its corresponding longer value"}
+);
+/* cross */
+const cross_table = new Table({ head: ["", "Header #1", "Header #2"] });
+cross_table.push(
+    { "Header #3": ["Value 1", "Value 2"] },
+    { "Header #4": ["Value 3", "Value 4"] }
+);
diff --git a/types/cli-table/index.d.ts b/types/cli-table/index.d.ts
new file mode 100644
index 0000000000..a39ac2d914
--- /dev/null
+++ b/types/cli-table/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for cli-table 0.3
+// Project: https://github.com/Automattic/cli-table
+// Definitions by: AryloYeung <https://github.com/arylo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+interface TableOptions {
+    chars: Partial<Record<(
+        'top' |
+        'top-mid' |
+        'top-left' |
+        'top-right' |
+        'bottom' |
+        'bottom-mid' |
+        'bottom-left' |
+        'bottom-right' |
+        'left' |
+        'left-mid' |
+        'mid' |
+        'mid-mid' |
+        'right' |
+        'right-mid' |
+        'middle'
+    ), string>>;
+    truncate: string;
+    colors: boolean;
+    colWidths: number[];
+    colAligns: Array<"left" | "middle" | "right">;
+    style: Partial<{
+        'padding-left': number;
+        'padding-right': number;
+        head: string[];
+        border: string[];
+        compact: boolean;
+    }>;
+    head: string[];
+}
+
+declare class Table extends Array {
+    constructor(options?: Partial<TableOptions>);
+    toString(): string;
+    static version: string;
+}
+
+export = Table;
diff --git a/types/cli-table/tsconfig.json b/types/cli-table/tsconfig.json
new file mode 100644
index 0000000000..50afa32769
--- /dev/null
+++ b/types/cli-table/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",
+        "cli-table-tests.ts"
+    ]
+}
diff --git a/types/cli-table/tslint.json b/types/cli-table/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cli-table/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From d1023531fa92cd749c3613ebd97ccab7aae06f67 Mon Sep 17 00:00:00 2001
From: Holger Jeromin <mailgithub@katur.de>
Date: Tue, 15 May 2018 12:32:27 +0200
Subject: [PATCH 131/575] jquery: Add overload for on() handler

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

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 8422f3ec5c..d6f09cb54d 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -4553,7 +4553,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @since 1.7
      */
     on(events: string,
-       handler: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+       handler: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | ((event: JQueryEventObject) => void) | false): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
      *

From afbcc5cfe0082bc9f64c9ed6f985a9358cd6f4b3 Mon Sep 17 00:00:00 2001
From: Holger Jeromin <mailgithub@katur.de>
Date: Tue, 15 May 2018 14:20:56 +0200
Subject: [PATCH 132/575] adding test

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

diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 5d6aaf0680..7375c5e814 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -3701,6 +3701,14 @@ function JQuery() {
                 event;
             });
 
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', function(event: JQueryEventObject) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType JQueryEventObject
+                event;
+            });
+
             // $ExpectType JQuery<HTMLElement>
             $('table').on('myEvent', function(this: I1, event) {
                 // $ExpectType I1

From 4c7fe8b432677a5ff5614b0bbc54b4db23e442cf Mon Sep 17 00:00:00 2001
From: Vincent Fabioux <vilcegt@gmail.com>
Date: Tue, 15 May 2018 14:36:46 +0200
Subject: [PATCH 133/575] [rc-tree] Add icon and other missing fields to props

---
 types/rc-tree/index.d.ts | 57 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/types/rc-tree/index.d.ts b/types/rc-tree/index.d.ts
index aac9e1ea9f..e8cdb487e6 100644
--- a/types/rc-tree/index.d.ts
+++ b/types/rc-tree/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for rc-tree 1.10
+// Type definitions for rc-tree 1.11
 // Project: https://github.com/react-component/tree
 // Definitions by: John Reilly <https://github.com/johnnyreilly>, Methuselah96 <https://github.com/Methuselah96>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -41,6 +41,10 @@ export interface TreeNodeProps {
      * whether it is a leaf node
      */
     isLeaf?: boolean;
+    /**
+     * customize icon. When you pass component, whose render will receive full TreeNode props as component props
+     */
+    icon?: JSX.Element | ((props: InternalTreeNodeProps) => JSX.Element);
 }
 
 export class TreeNode extends Component<TreeNodeProps> { }
@@ -76,6 +80,16 @@ export interface OnDragEnterData {
     expandedKeys: string[];
 }
 
+export interface OnDragOverData {
+    event: Event;
+    node: InternalTreeNode;
+}
+
+export interface OnDragLeaveData {
+    event: Event;
+    node: InternalTreeNode;
+}
+
 export interface OnDropData {
     event: Event;
     node: InternalTreeNode;
@@ -83,6 +97,11 @@ export interface OnDropData {
     dragNodesKeys: string[];
 }
 
+export interface OnDragEndData {
+    event: Event;
+    node: InternalTreeNode;
+}
+
 export interface TreeProps {
     /**
      * additional css class of root dom node
@@ -92,6 +111,10 @@ export interface TreeProps {
      * prefix class
      */
     prefixCls?: string;
+    /**
+     * whether disabled the tree
+     */
+    disabled?: boolean;
     /**
      * whether show line
      */
@@ -124,6 +147,10 @@ export interface TreeProps {
      * control expanding of specific treeNodes
      */
     expandedKeys?: string[];
+    /**
+     * auto expand parent treeNodes when init
+     */
+    defaultExpandParent?: boolean;
     /**
      * whether auto expand parent treeNodes
      */
@@ -146,6 +173,10 @@ export interface TreeProps {
      * default selected treeNodes
      */
     defaultSelectedKeys?: string[];
+    /**
+     * customize icon. When you pass component, whose render will receive full TreeNode props as component props
+     */
+    icon?: JSX.Element | ((props: InternalTreeNodeProps) => JSX.Element);
     /**
      * Controlled selected treeNodes(After setting, defaultSelectedKeys will not work)
      */
@@ -170,6 +201,18 @@ export interface TreeProps {
      * load data asynchronously
      */
     loadData?(node: InternalTreeNode): Promise<any>;
+    /**
+     * select current treeNode and show customized contextmenu
+     */
+    onRightClick?: (node: InternalTreeNode) => void;
+    /**
+     * call when mouse enter a treeNode
+     */
+    onMouseEnter?: (node: InternalTreeNode) => void;
+    /**
+     * call when mouse leave a treeNode
+     */
+    onMouseLeave?: (node: InternalTreeNode) => void;
     /**
      * whether can drag treeNode.
      */
@@ -182,10 +225,22 @@ export interface TreeProps {
      * event on drag enter
      */
     onDragEnter?: (props: OnDragEnterData) => void;
+    /**
+     * it execs when fire the tree's dragover event
+     */
+    onDragOver?: (props: OnDragOverData) => void;
+    /**
+     * it execs when fire the tree's dragleave event
+     */
+    onDragLeave?: (props: OnDragLeaveData) => void;
     /**
      * event on drag drop
      */
     onDrop?: (props: OnDropData) => void;
+    /**
+     * it execs when fire the tree's dragend event
+     */
+    onDragEnd?: (props: OnDragEndData) => void;
 }
 
 export default class Tree extends Component<TreeProps> { }

From c0c5afcf499dd1be30aed75e7e90f02c5fd6c903 Mon Sep 17 00:00:00 2001
From: Holger Jeromin <mailgithub@katur.de>
Date: Tue, 15 May 2018 14:39:13 +0200
Subject: [PATCH 134/575] fixing tests

---
 types/jquery/index.d.ts      | 12 +++++++++++-
 types/jquery/jquery-tests.ts | 24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index d6f09cb54d..9f955ef9d2 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -4553,7 +4553,17 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @since 1.7
      */
     on(events: string,
-       handler: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | ((event: JQueryEventObject) => void) | false): this;
+       handler: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param handler A function to execute when the event is triggered. 
+     * @see {@link https://api.jquery.com/on/}
+     * @since 1.7
+     */
+    on(events: string,
+        handler: ((event: JQueryEventObject) => void)): this;       
     /**
      * Attach an event handler function for one or more events to the selected elements.
      *
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 7375c5e814..5beb6c1a6e 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -3709,6 +3709,30 @@ function JQuery() {
                 event;
             });
 
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', function(event: JQueryInputEventObject) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType JQueryInputEventObject
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', function(event: JQueryMouseEventObject) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType JQueryMouseEventObject
+                event;
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', function(event: JQueryKeyEventObject) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType JQueryKeyEventObject
+                event;
+            });
+
             // $ExpectType JQuery<HTMLElement>
             $('table').on('myEvent', function(this: I1, event) {
                 // $ExpectType I1

From 68b3a85dfeb9e25cd7208658418c3b90561c2f27 Mon Sep 17 00:00:00 2001
From: Holger Jeromin <mailgithub@katur.de>
Date: Tue, 15 May 2018 14:48:40 +0200
Subject: [PATCH 135/575] fixing trailing whitespace

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

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 9f955ef9d2..981993e2d7 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -4558,12 +4558,12 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Attach an event handler function for one or more events to the selected elements.
      *
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
-     * @param handler A function to execute when the event is triggered. 
+     * @param handler A function to execute when the event is triggered.
      * @see {@link https://api.jquery.com/on/}
      * @since 1.7
      */
     on(events: string,
-        handler: ((event: JQueryEventObject) => void)): this;       
+        handler: ((event: JQueryEventObject) => void)): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
      *

From b4fed84066e23a469b91ef66ad0d7dc5ba44cb21 Mon Sep 17 00:00:00 2001
From: Holger Jeromin <mailgithub@katur.de>
Date: Tue, 15 May 2018 15:34:55 +0200
Subject: [PATCH 136/575] add DocumentFragement to allowed jQuery objects

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

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 8422f3ec5c..634771e4e7 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -5565,7 +5565,7 @@ interface Iterable<T> { }
 
 declare namespace JQuery {
     type TypeOrArray<T> = T | T[];
-    type Node = Element | Text | Comment;
+    type Node = Element | Text | Comment | DocumentFragment;
 
     /**
      * A string is designated htmlString in jQuery documentation when it is used to represent one or more
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 5d6aaf0680..0e68fcee2c 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -5153,7 +5153,7 @@ function JQuery() {
     function manipulation() {
         function after() {
             // $ExpectType JQuery<HTMLElement>
-            $('p').after('<p></p>', new Element(), new Text(), $('p').contents(), [new Element(), new Text(), $('p').contents()]);
+            $('p').after('<p></p>', new Element(), new Text(), $('p').contents(), [new Element(), new Text(), $('p').contents()], document.createDocumentFragment());
 
             // $ExpectType JQuery<HTMLElement>
             $('p').after(function(index, html) {
@@ -5218,7 +5218,7 @@ function JQuery() {
 
         function append() {
             // $ExpectType JQuery<HTMLElement>
-            $('p').append('<p></p>', new Element(), new Text(), $('p').contents(), [new Element(), new Text(), $('p').contents()]);
+            $('p').append('<p></p>', new Element(), new Text(), $('p').contents(), [new Element(), new Text(), $('p').contents()], document.createDocumentFragment());
 
             // $ExpectType JQuery<HTMLElement>
             $('p').append(function(index, html) {
@@ -5286,7 +5286,7 @@ function JQuery() {
 
         function before() {
             // $ExpectType JQuery<HTMLElement>
-            $('p').before('<p></p>', new Element(), new Text(), $('p').contents(), [new Element(), new Text(), $('p').contents()]);
+            $('p').before('<p></p>', new Element(), new Text(), $('p').contents(), [new Element(), new Text(), $('p').contents()], document.createDocumentFragment());
 
             // $ExpectType JQuery<HTMLElement>
             $('p').before(function(index, html) {
@@ -5351,7 +5351,7 @@ function JQuery() {
 
         function prepend() {
             // $ExpectType JQuery<HTMLElement>
-            $('p').prepend('<p></p>', new Element(), new Text(), $('p').contents(), [new Element(), new Text()], [new Element(), $('p').contents()]);
+            $('p').prepend('<p></p>', new Element(), new Text(), $('p').contents(), [new Element(), new Text()], [new Element(), $('p').contents()], document.createDocumentFragment());
 
             // $ExpectType JQuery<HTMLElement>
             $('p').prepend(function(index, html) {

From d7407e11715519331531b202f25599c114a8c8f7 Mon Sep 17 00:00:00 2001
From: Jason Unger <jason@rocketrip.com>
Date: Tue, 15 May 2018 09:50:10 -0400
Subject: [PATCH 137/575] Clean up type declarations

---
 types/react-radio-group/index.d.ts | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/types/react-radio-group/index.d.ts b/types/react-radio-group/index.d.ts
index 3dfa872527..5c3e6092ab 100644
--- a/types/react-radio-group/index.d.ts
+++ b/types/react-radio-group/index.d.ts
@@ -2,22 +2,20 @@
 // Project: https://github.com/chenglou/react-radio-group
 // Definitions by: Jason Unger <https://github.com/jsonunger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from 'react';
 
-type Value = React.InputHTMLAttributes<HTMLInputElement>['value'];
-
 export namespace Radio {
-    export type RadioProps = React.InputHTMLAttributes<HTMLInputElement>;
+    type RadioProps = React.InputHTMLAttributes<HTMLInputElement>;
 }
 export const Radio: React.ComponentClass<Radio.RadioProps>;
 
 export namespace RadioGroup {
-    export interface RadioGroupProps {
+    interface RadioGroupProps {
         name?: string;
-        selectedValue?: Value;
-        onChange?: (value: Value) => void;
+        selectedValue?: React.InputHTMLAttributes<HTMLInputElement>['value'];
+        onChange?: (value: React.InputHTMLAttributes<HTMLInputElement>['value']) => void;
         Component?: string | React.ReactElement<React.HTMLProps<HTMLElement>>;
     }
 }

From 63211a477b67d9ffbcf62613dc2ab7a41e14130a Mon Sep 17 00:00:00 2001
From: Jason Unger <jason@rocketrip.com>
Date: Tue, 15 May 2018 09:51:32 -0400
Subject: [PATCH 138/575] Update test to set state on change

---
 types/react-radio-group/react-radio-group-tests.tsx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/types/react-radio-group/react-radio-group-tests.tsx b/types/react-radio-group/react-radio-group-tests.tsx
index 76e093059b..d34d7d05ff 100644
--- a/types/react-radio-group/react-radio-group-tests.tsx
+++ b/types/react-radio-group/react-radio-group-tests.tsx
@@ -1,15 +1,20 @@
 import * as React from 'react';
 import { Radio, RadioGroup } from "react-radio-group";
 
-class ReactRadioGroup extends React.Component<RadioGroup.RadioGroupProps> {
-    handleChange: RadioGroup.RadioGroupProps['onChange'] = value => {
-        console.log(value);
+class ReactRadioGroup extends React.Component<RadioGroup.RadioGroupProps, { selectedValue: React.InputHTMLAttributes<HTMLInputElement>['value'] }> {
+    state = {
+        selectedValue: 2,
+    };
+
+    handleChange: RadioGroup.RadioGroupProps['onChange'] = selectedValue => {
+        console.log(selectedValue);
+        this.setState({ selectedValue });
     }
 
     render() {
         return (
             <div>
-                <RadioGroup name="radioGroup" onChange={this.handleChange} selectedValue={2}>
+                <RadioGroup name="radioGroup" onChange={this.handleChange} selectedValue={this.state.selectedValue}>
                     <Radio id="Option A" value="a" />
                     <Radio id="Option B" value={2} />
                     <Radio id="Option C" value={["hello"]} disabled />

From c20e3f91b0c2d161b0a0a0a553ae301785aadef8 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentl@theodo.fr>
Date: Tue, 15 May 2018 15:57:16 +0200
Subject: [PATCH 139/575] Improve tests

---
 types/react-native/test/globals.tsx | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/types/react-native/test/globals.tsx b/types/react-native/test/globals.tsx
index a6488cef82..b5eae800b1 100644
--- a/types/react-native/test/globals.tsx
+++ b/types/react-native/test/globals.tsx
@@ -1,3 +1,26 @@
 const fetchCopy: GlobalFetch['fetch'] = fetch;
 
-const requestInfoAsString: RequestInfo = 'request';
+const myHeaders = new Headers();
+myHeaders.append('Content-Type', 'image/jpeg');
+
+const myInit: RequestInit = {
+  method: 'GET',
+  headers: myHeaders,
+  mode: 'cors',
+};
+
+const myRequest = new Request('flowers.jpg');
+
+fetch(myRequest, myInit).then((response) => {
+  console.log(response.type);
+  console.log(response.url);
+  console.log(response.status);
+  console.log(response.ok);
+  console.log(response.statusText);
+  console.log(response.headers);
+
+  return response.blob();
+}).then((blob) => {
+  const init = { status: 200, statusText: 'SuperSmashingGreat!' }
+  const myResponse = new Response(blob, init);
+})

From d96a4c4398dfdb0b2bc359b5bef609905de4f14a Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Tue, 15 May 2018 07:47:34 -0700
Subject: [PATCH 140/575] globalize: convert to module (#25618)

---
 .../globalize-compiler-tests.ts               |   2 +-
 types/globalize-compiler/index.d.ts           |   4 +-
 types/globalize/index.d.ts                    | 672 +++++++++---------
 3 files changed, 340 insertions(+), 338 deletions(-)

diff --git a/types/globalize-compiler/globalize-compiler-tests.ts b/types/globalize-compiler/globalize-compiler-tests.ts
index 648ed40032..ae1f93cad2 100644
--- a/types/globalize-compiler/globalize-compiler-tests.ts
+++ b/types/globalize-compiler/globalize-compiler-tests.ts
@@ -1,6 +1,6 @@
 import * as ESTree from "estree";
+import globalize = require("globalize");
 import * as globalizeCompiler from "globalize-compiler";
-const globalize: GlobalizeStatic = null;
 
 let extractsArray: globalizeCompiler.FormatterOrParserFunction[];
 
diff --git a/types/globalize-compiler/index.d.ts b/types/globalize-compiler/index.d.ts
index 6f3874636a..382aa52efb 100644
--- a/types/globalize-compiler/index.d.ts
+++ b/types/globalize-compiler/index.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Ian Clanton-Thuon <https://github.com/iclanton>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="globalize" />
 import * as ESTree from "estree";
+import globalize = require("globalize");
 
 interface CompileTemplateOptions {
   /**
@@ -35,7 +35,7 @@ interface ExtractFunction {
    *
    * @returns an Array with the formatters and parsers created using the passed Globalize.
    */
-  (globalize: GlobalizeStatic): FormatterOrParserFunction[];
+  (globalize: Globalize.Static): FormatterOrParserFunction[];
 }
 
 interface CompileExtractsAttributes extends CompileOptions {
diff --git a/types/globalize/index.d.ts b/types/globalize/index.d.ts
index 6ec31883aa..0e6b8537fd 100644
--- a/types/globalize/index.d.ts
+++ b/types/globalize/index.d.ts
@@ -2,342 +2,344 @@
 // Project: https://github.com/jquery/globalize
 // Definitions by: Grégoire Castre <https://github.com/gcastre>, Aram Taieb <https://github.com/afromogli>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Note: You'll need the cldr.js definition file to use the globalize (https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/cldr.js)
 
-/// <reference types="cldrjs" />
+import * as Cldr from "cldrjs";
 
-interface DateFormatterOptions {
-	/**
-	 * String value indicating a skeleton (see description above), eg. { skeleton: "GyMMMd" }.
-	 * Skeleton provides a more flexible formatting mechanism than the predefined list full, long, medium, or short represented by date, time, or datetime.
-	 * Instead, they are an open-ended list of patterns containing only date field information, and in a canonical order.
-	 */
-	skeleton?: string;
-	/**
-	 * One of the following String values: full, long, medium, or short, eg. { date: "full" }.
-	 */
-	date?: "full" | "long" | "medium" | "short";
-	/**
-	 * One of the following String values: full, long, medium, or short, eg. { time: "full" }.
-	 */
-	time?: "full" | "long" | "medium" | "short";
-	/**
-	 * One of the following String values: full, long, medium, or short, eg. { datetime: "full" }
-	 */
-	datetime?: "full" | "long" | "medium" | "short";
-	/**
-	 * String value indicating a machine raw pattern (anything in the "Sym." column) eg. { raw: "dd/mm" }.
-	 * Note this is NOT recommended for i18n in general. Use skeleton instead.
-	 */
-	raw?: string;
+declare var globalize: globalize.Static;
+export as namespace Globalize;
+export = globalize;
 
-	/**
-	 * String based on the time zone names of the IANA time zone database, 
-	 * such as "Asia/Shanghai", "Asia/Kolkata", "America/New_York".
-	 */
-	timeZone?: string;
+declare namespace globalize {
+	interface DateFormatterOptions {
+		/**
+		 * String value indicating a skeleton (see description above), eg. { skeleton: "GyMMMd" }.
+		 * Skeleton provides a more flexible formatting mechanism than the predefined list full, long, medium, or short represented by date, time, or datetime.
+		 * Instead, they are an open-ended list of patterns containing only date field information, and in a canonical order.
+		 */
+		skeleton?: string;
+		/**
+		 * One of the following String values: full, long, medium, or short, eg. { date: "full" }.
+		 */
+		date?: "full" | "long" | "medium" | "short";
+		/**
+		 * One of the following String values: full, long, medium, or short, eg. { time: "full" }.
+		 */
+		time?: "full" | "long" | "medium" | "short";
+		/**
+		 * One of the following String values: full, long, medium, or short, eg. { datetime: "full" }
+		 */
+		datetime?: "full" | "long" | "medium" | "short";
+		/**
+		 * String value indicating a machine raw pattern (anything in the "Sym." column) eg. { raw: "dd/mm" }.
+		 * Note this is NOT recommended for i18n in general. Use skeleton instead.
+		 */
+		raw?: string;
+
+		/**
+		 * String based on the time zone names of the IANA time zone database,
+		 * such as "Asia/Shanghai", "Asia/Kolkata", "America/New_York".
+		 */
+		timeZone?: string;
+	}
+
+	interface CommonNumberFormatterOptions {
+		/**
+		 * Non-negative integer Number value indicating the minimum integer digits to be used. Numbers will be padded with leading zeroes if necessary.
+		 */
+		minimumIntegerDigits?: number;
+		/**
+		 * Non-negative integer Number values indicating the minimum and maximum fraction digits to be used.
+		 * Numbers will be rounded or padded with trailing zeroes if necessary.
+		 * Either one or both of these properties must be present.
+		 * If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
+		 */
+		minimumFractionDigits?: number;
+		/**
+		 * Non-negative integer Number values indicating the minimum and maximum fraction digits to be used.
+		 * Numbers will be rounded or padded with trailing zeroes if necessary.
+		 * Either one or both of these properties must be present.
+		 * If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
+		 */
+		maximumFractionDigits?: number;
+		/**
+		 * Positive integer Number values indicating the minimum and maximum fraction digits to be shown.
+		 * Either none or both of these properties are present
+		 * If they are, they override minimum and maximum integer and fraction digits.
+		 * The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
+		 */
+		minimumSignificantDigits?: number;
+		/**
+		 * Positive integer Number values indicating the minimum and maximum fraction digits to be shown.
+		 * Either none or both of these properties are present.
+		 * If they are, they override minimum and maximum integer and fraction digits.
+		 * The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
+		 */
+		maximumSignificantDigits?: number;
+		/**
+		 * String with rounding method ceil, floor, round (default), or truncate.
+		 */
+		round?: "ceil" | "floor" | "round" | "truncate";
+		/**
+		 * Boolean (default is true) value indicating whether a grouping separator should be used.
+		 */
+		useGrouping?: boolean;
+	}
+
+	interface NumberFormatterOptions extends CommonNumberFormatterOptions {
+		/**
+		 * decimal (default), or percent
+		 */
+		style?: "decimal" | "percent";
+	}
+
+	interface CurrencyFormatterOptions extends CommonNumberFormatterOptions {
+		/**
+		 * symbol (default), accounting, code or name.
+		 */
+		style?: "symbol" | "accounting" | "code" | "name";
+	}
+
+	interface NumberParserOptions {
+		/**
+		 * decimal (default), or percent.
+		 */
+		style?: "decimal" | "percent";
+	}
+
+	interface PluralGeneratorOptions {
+		/**
+		 * cardinal (default), or ordinal.
+		 */
+		type?: "cardinal" | "ordinal";
+	}
+
+	interface RelativeTimeFormatterOptions {
+		/**
+		 * eg. "short" or "narrow". Or falsy for default long form
+		 */
+		form?: "short" | "narrow";
+	}
+
+	interface UnitFormatterOptions {
+		/**
+		 * form: [String] eg. "long", "short" or "narrow".
+		 */
+		form?: "long" | "short" | "narrow";
+
+		/**
+		 * numberFormatter: [Function] a number formatter function. Defaults to Globalize .numberFormatter() for the current locale using the default options.
+		 */
+		numberFormatter?: NumberFormatterOptions;
+	}
+
+	interface Static {
+		cldr: Cldr.CldrStatic;
+
+		/**
+		 * Globalize.loadTimeZone ( ianaTzData, ... )
+		 * This method allows you to load IANA time zone data to enable options.timeZone feature on date formatters and parsers.
+		 * @param {Object} ianaTzData A JSON object with zdumped IANA timezone data. Get the data via https://github.com/rxaviers/iana-tz-data
+		 */
+		loadTimeZone(ianaTzData: Object): void;
+
+		/**
+		 * Globalize.load( json, ... )
+		 * @param {Object} [JSON]
+		 * Load resolved or unresolved cldr data.
+		 * Somewhat equivalent to previous Globalize.addCultureInfo(...).
+		 */
+		load(json: Object): void;
+
+		/**
+		 * Globalize.locale()
+		 * Return the default Cldr instance.
+		 */
+		locale(): Cldr.CldrStatic;
+
+		/**
+		 * Globalize.locale( [locale] )
+		 * @param {string} locale
+		 * Set default Cldr instance
+		 * Return the default Cldr instance.
+		 */
+
+		locale(locale: string): Cldr.CldrStatic;
+		/**
+		 * Globalize.locale( cldr )
+		 * @param {Cldr} cldr [Cldr instance]
+		 * Set default Cldr instance
+		 * Return the default Cldr instance.
+		 */
+		locale(cldr: Cldr.CldrStatic): Cldr.CldrStatic;
+
+		/**
+		 * .dateFormatter( options )
+		 * @param {DateFormatterOptions} options see date/expand_pattern for more info.
+		 * @returns {Function} Return a function that formats a date according to the given `options` and the default/instance locale.
+		 */
+		dateFormatter(options?: DateFormatterOptions): (value: Date) => string;
+
+		//Return a function that parses a string representing a date into a JavaScript Date object according to the given options. The default parsing assumes numeric year, month, and day (i.e., { skeleton: "yMd" }).
+		dateParser(options?: DateFormatterOptions): (value: string) => Date;
+
+		//Alias for .dateFormatter( [options] )( value ).
+		formatDate(value: Date, options?: DateFormatterOptions): string;
+		/**
+		 * Alias for .dateParser( [options] )( value ).
+		 * @param {string} value The object whose module id you wish to determine.
+		 * @param {DateFormatterOptions} options The object whose module id you wish to determine.
+		 * @returns {Date} Return the value as a Date.
+		 */
+		parseDate(value: string, options?: DateFormatterOptions): Date;
+
+		/**
+		 * Load messages data.
+		 * @param {Object} json JSON object of messages data. Keys can use any character, except /, { and }. Values (i.e., the message content itself) can contain any character.
+		 * @returns {void}
+		 */
+		loadMessages(json: Object): void;
+		/**
+		 * Return a function that formats a message (using ICU message format pattern) given its path and a set of variables into a user-readable string. It supports pluralization and gender inflections.
+		 * @param path String or Array containing the path of the message content, eg. "greetings/bye", or [ "greetings", "bye" ].
+		 * @returns {Function} Return A function that formats a message (using ICU message format pattern) given its path and a set of variables into a user-readable string. It supports pluralization and gender inflections.
+		 */
+		messageFormatter(path: string | string[]): (variables?: string | string[] | Object) => string;
+
+		/**
+		 * Formats a message (using ICU message format pattern) given its path and a set of variables into a user-readable string
+		 * @param path String or Array containing the path of the message content, eg. "greetings/bye", or [ "greetings", "bye" ].
+		 * @param variables Variables can be Objects, where each property can be referenced by name inside a message; or Arrays, where each entry of the Array can be used inside a message, using numeric indices. When passing one or more arguments of other types, they're converted to an Array and used as such.
+		 * @returns {string} Return a user-readable string.
+		 */
+		formatMessage(path: string | string[], variables?: string | string[] | Object): string
+
+		/**
+		 * Return a function that formats a number according to the given options or locale's defaults.
+		 * @param {NumberFormatterOptions} options A JSON object including none or any of the following options.
+		 * style Optional String decimal (default), or percent.
+		 * minimumIntegerDigits Optional Non-negative integer Number value indicating the minimum integer digits to be used. Numbers will be padded with leading zeroes if necessary.
+		 * minimumFractionDigits and maximumFractionDigits Optional Non-negative integer Number values indicating the minimum and maximum fraction digits to be used. Numbers will be rounded or padded with trailing zeroes if necessary. Either one or both of these properties must be present. If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
+		 * minimumSignificantDigits and maximumSignificantDigits Optional Positive integer Number values indicating the minimum and maximum fraction digits to be shown. Either none or both of these properties are present. If they are, they override minimum and maximum integer and fraction digits. The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
+		 * round Optional String with rounding method ceil, floor, round (default), or truncate.
+		 * useGrouping Optional Boolean (default is true) value indicating whether a grouping separator should be used.
+		 * @returns {Function} Return a function that formats a number according to the given options.
+		 */
+		numberFormatter(options?: NumberFormatterOptions): (value: number) => string;
+
+		/**
+		 * Return a function that parses a string representing a number according to the given options or locale's defaults.
+		 * @param {NumberParserOptions} options A JSON object including none or any of the following options.
+		 * style Optional String decimal (default), or percent.
+		 * @returns {Function} Return a function that parses a String representing a number according to the given options. If value is invalid, NaN is returned.
+		 */
+		numberParser(options?: NumberParserOptions): (value: string) => number
+
+		/**
+		 * Return a number formatted according to the given options or locale's defaults.
+		 * @param {number} value The number to format
+		 * @param {NumberFormatterOptions} options A JSON object including none or any of the following options.
+		 * style Optional String decimal (default), or percent.
+		 * minimumIntegerDigits Optional Non-negative integer Number value indicating the minimum integer digits to be used. Numbers will be padded with leading zeroes if necessary.
+		 * minimumFractionDigits and maximumFractionDigits Optional Non-negative integer Number values indicating the minimum and maximum fraction digits to be used. Numbers will be rounded or padded with trailing zeroes if necessary. Either one or both of these properties must be present. If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
+		 * minimumSignificantDigits and maximumSignificantDigits Optional Positive integer Number values indicating the minimum and maximum fraction digits to be shown. Either none or both of these properties are present. If they are, they override minimum and maximum integer and fraction digits. The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
+		 * round Optional String with rounding method ceil, floor, round (default), or truncate.
+		 * useGrouping Optional Boolean (default is true) value indicating whether a grouping separator should be used.
+		 * @returns {string} Return the number formatted
+		 */
+		formatNumber(value: number, options?: NumberFormatterOptions): string;
+
+		/**
+		 * A function that parses a string representing a number according to the given options or locale's defaults.
+		 * @param {string} value The number as string to parse
+		 * @param {NumberParserOptions} options A JSON object including none or any of the following options.
+		 * style Optional String decimal (default), or percent.
+		 * @returns {number} Return a number according to the given options. If value is invalid, NaN is returned.
+		 */
+		parseNumber(value: string, options?: NumberParserOptions): number;
+
+		/**
+		 * Return a function that formats a currency according to the given options or locale's defaults.
+		 * The returned function is invoked with one argument: the Number value to be formatted.
+		 * @param {string} currency 3-letter currency code as defined by ISO 4217, eg. USD.
+		 * @param {CurrencyFormatterOptions} options A JSON object including none or any of the following options.
+		 * @returns {Function} Return a function that formats a currency
+		 */
+		currencyFormatter(currency: string, options?: CurrencyFormatterOptions): (value: number) => string;
+
+		/**
+		 * Return a currency formatted according to the given options or locale's defaults.
+		 * @param {number} value The value to format.
+		 * @param {string} currency 3-letter currency code as defined by ISO 4217, eg. USD.
+		 * @param {CurrencyFormatterOptions} options A JSON object including none or any of the following options.
+		 * @returns {string} Return a string formatted in the currency according to the value and the options
+		 */
+		formatCurrency(value: number, currency: string, options?: CurrencyFormatterOptions): string;
+
+		/**
+		 * Return a function that returns the value's corresponding plural group: zero, one, two, few, many, or other.
+		 * The returned function is invoked with one argument: the Number value for which to return the plural group.
+		 * @param {PluralGeneratorOptions} options A JSON object including none or any of the following options.
+		 * type Optional String cardinal (default), or ordinal.
+		 * @returns {Function} Return a function that returns the value's corresponding plural group: zero, one, two, few, many, or other.
+		 */
+		pluralGenerator(options?: PluralGeneratorOptions): (value: number) => string;
+
+		/**
+		 * Returns the value's corresponding plural group: zero, one, two, few, many, or other.
+		 * @param {number} value A Number for which to return the plural group.
+		 * @param {PluralGeneratorOptions} options A JSON object including none or any of the following options.
+		 * type Optional String cardinal (default), or ordinal.
+		 * @returns {string} Returns the value's corresponding plural group: zero, one, two, few, many, or other.
+		 */
+		plural(value: number, options?: PluralGeneratorOptions): string;
+
+		/**
+		 * Returns a function that formats a relative time according to the given unit, options, and the default/instance locale.
+		 * The returned function is invoked with one argument: the number value to be formatted.
+		 * @param unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc.
+		 * @param options form: [String] eg. "short" or "narrow". Or falsy for default long form.
+		 * @returns {Function} Returns a function that formats a relative time according to the given unit.
+		 */
+		relativeTimeFormatter(unit: string, options?: RelativeTimeFormatterOptions): (value: number) => string;
+
+		/**
+		 * Return a relative time according to the given unit
+		 * @param {number} value The number to be formatted.
+		 * @param {string} unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc.
+		 * @param options form: [String] eg. "short" or "narrow". Or falsy for default long form.
+		 * @returns {string} Return a relative time according to the given unit.
+		 */
+		formatRelativeTime(value: number, unit: string, options?: RelativeTimeFormatterOptions): string;
+
+		/**
+		 * Returns a function that formats a unit according to the given unit, options, and the default/instance locale.
+		 * The returned function is invoked with one argument: the number value to be formatted.
+		 * @param unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc. Could also be a compound unit, eg. "mile-per-hour" or "mile/hour"
+		 * @param options form: [String] eg. "long", "short" or "narrow".
+		 * @returns {Function} Returns a function that formats a unit according to the given unit, options, and the default/instance locale.
+		 */
+		unitFormatter(unit: string, options?: UnitFormatterOptions): (value: number) => string;
+
+		/**
+		 * Alias for .unitFormatter( unit, options )( value ).
+		 * @param {number} value The number to be formatted.
+		 * @param {string} unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc. Could also be a compound unit, eg. "mile-per-hour" or "mile/hour"
+		 * @param {UnitFormatterOptions} options form: [String] eg. "long", "short" or "narrow".
+		 * @returns {string} Returns the unit formatted.
+		 */
+		formatUnit(value: number, unit: string, options?: UnitFormatterOptions): string
+
+		/**
+		 * Create a Globalize instance.
+		 * @param {string} Locale string of the instance.
+		 * @returns {Globalize} A Globalize instance
+		 */
+		new (locale: string): Static;
+		/**
+		 * Create a Globalize instance.
+		 * @param cldr Cldr instance of the instance.
+		 * @returns {Globalize} A Globalize instance
+		 */
+		new (cldr: Cldr.CldrStatic): Static;
+	}
 }
-
-interface CommonNumberFormatterOptions {
-	/**
-	 * Non-negative integer Number value indicating the minimum integer digits to be used. Numbers will be padded with leading zeroes if necessary.
-	 */
-	minimumIntegerDigits?: number;
-	/**
-	 * Non-negative integer Number values indicating the minimum and maximum fraction digits to be used.
-	 * Numbers will be rounded or padded with trailing zeroes if necessary.
-	 * Either one or both of these properties must be present.
-	 * If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
-	 */
-	minimumFractionDigits?: number;
-	/**
-	 * Non-negative integer Number values indicating the minimum and maximum fraction digits to be used.
-	 * Numbers will be rounded or padded with trailing zeroes if necessary.
-	 * Either one or both of these properties must be present.
-	 * If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
-	 */
-	maximumFractionDigits?: number;
-	/**
-	 * Positive integer Number values indicating the minimum and maximum fraction digits to be shown.
-	 * Either none or both of these properties are present
-	 * If they are, they override minimum and maximum integer and fraction digits.
-	 * The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
-	 */
-	minimumSignificantDigits?: number;
-	/**
-	 * Positive integer Number values indicating the minimum and maximum fraction digits to be shown.
-	 * Either none or both of these properties are present.
-	 * If they are, they override minimum and maximum integer and fraction digits.
-	 * The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
-	 */
-	maximumSignificantDigits?: number;
-	/**
-	 * String with rounding method ceil, floor, round (default), or truncate.
-	 */
-	round?: "ceil" | "floor" | "round" | "truncate";
-	/**
-	 * Boolean (default is true) value indicating whether a grouping separator should be used.
-	 */
-	useGrouping?: boolean;
-}
-
-interface NumberFormatterOptions extends CommonNumberFormatterOptions {
-	/**
-	 * decimal (default), or percent
-	 */
-	style?: "decimal" | "percent";
-}
-
-interface CurrencyFormatterOptions extends CommonNumberFormatterOptions {
-	/**
-	 * symbol (default), accounting, code or name.
-	 */
-	style?: "symbol" | "accounting" | "code" | "name";
-}
-
-interface NumberParserOptions {
-	/**
-	 * decimal (default), or percent.
-	 */
-	style?: "decimal" | "percent";
-}
-
-interface PluralGeneratorOptions {
-	/**
-	 * cardinal (default), or ordinal.
-	 */
-	type?: "cardinal" | "ordinal";
-}
-
-interface RelativeTimeFormatterOptions {
-	/**
-	 * eg. "short" or "narrow". Or falsy for default long form
-	 */
-	form?: "short" | "narrow";
-}
-
-interface UnitFormatterOptions {
-	/**
-	 * form: [String] eg. "long", "short" or "narrow".
-	 */
-	form?: "long" | "short" | "narrow";
-
-	/**
-	 * numberFormatter: [Function] a number formatter function. Defaults to Globalize .numberFormatter() for the current locale using the default options.
-	 */
-	numberFormatter?: NumberFormatterOptions;
-}
-
-interface GlobalizeStatic {
-
-	cldr: Cldr.CldrStatic;
-
-	/**
-	 * Globalize.loadTimeZone ( ianaTzData, ... )
-	 * This method allows you to load IANA time zone data to enable options.timeZone feature on date formatters and parsers.
-	 * @param {Object} ianaTzData A JSON object with zdumped IANA timezone data. Get the data via https://github.com/rxaviers/iana-tz-data
-	 */
-	loadTimeZone(ianaTzData: Object): void;
-
-	/**
-	 * Globalize.load( json, ... )
-	 * @param {Object} [JSON]
-	 * Load resolved or unresolved cldr data.
-	 * Somewhat equivalent to previous Globalize.addCultureInfo(...).
-	 */
-	load(json: Object): void;
-
-	/**
-	 * Globalize.locale()
-	 * Return the default Cldr instance.
-	 */
-	locale(): Cldr.CldrStatic;
-
-	/**
-	 * Globalize.locale( [locale] )
-	 * @param {string} locale
-	 * Set default Cldr instance
-	 * Return the default Cldr instance.
-	 */
-
-	locale(locale: string): Cldr.CldrStatic;
-	/**
-	 * Globalize.locale( cldr )
-	 * @param {Cldr} cldr [Cldr instance]
-	 * Set default Cldr instance
-	 * Return the default Cldr instance.
-	 */
-	locale(cldr: Cldr.CldrStatic): Cldr.CldrStatic;
-
-	/**
-	 * .dateFormatter( options )
-	 * @param {DateFormatterOptions} options see date/expand_pattern for more info.
-	 * @returns {Function} Return a function that formats a date according to the given `options` and the default/instance locale.
-	 */
-	dateFormatter(options?: DateFormatterOptions): (value: Date) => string;
-
-	//Return a function that parses a string representing a date into a JavaScript Date object according to the given options. The default parsing assumes numeric year, month, and day (i.e., { skeleton: "yMd" }).
-	dateParser(options?: DateFormatterOptions): (value: string) => Date;
-
-	//Alias for .dateFormatter( [options] )( value ).
-	formatDate(value: Date, options?: DateFormatterOptions): string;
-	/**
-	 * Alias for .dateParser( [options] )( value ).
-	 * @param {string} value The object whose module id you wish to determine.
-	 * @param {DateFormatterOptions} options The object whose module id you wish to determine.
-	 * @returns {Date} Return the value as a Date.
-	 */
-	parseDate(value: string, options?: DateFormatterOptions): Date;
-
-	/**
-	 * Load messages data.
-	 * @param {Object} json JSON object of messages data. Keys can use any character, except /, { and }. Values (i.e., the message content itself) can contain any character.
-	 * @returns {void}
-	 */
-	loadMessages(json: Object): void;
-	/**
-	 * Return a function that formats a message (using ICU message format pattern) given its path and a set of variables into a user-readable string. It supports pluralization and gender inflections.
-	 * @param path String or Array containing the path of the message content, eg. "greetings/bye", or [ "greetings", "bye" ].
-	 * @returns {Function} Return A function that formats a message (using ICU message format pattern) given its path and a set of variables into a user-readable string. It supports pluralization and gender inflections.
-	 */
-	messageFormatter(path: string | string[]): (variables?: string | string[] | Object) => string;
-
-	/**
-	 * Formats a message (using ICU message format pattern) given its path and a set of variables into a user-readable string
-	 * @param path String or Array containing the path of the message content, eg. "greetings/bye", or [ "greetings", "bye" ].
-	 * @param variables Variables can be Objects, where each property can be referenced by name inside a message; or Arrays, where each entry of the Array can be used inside a message, using numeric indices. When passing one or more arguments of other types, they're converted to an Array and used as such.
-	 * @returns {string} Return a user-readable string.
-	 */
-	formatMessage(path: string | string[], variables?: string | string[] | Object): string
-
-	/**
-	 * Return a function that formats a number according to the given options or locale's defaults.
-	 * @param {NumberFormatterOptions} options A JSON object including none or any of the following options.
-	 * style Optional String decimal (default), or percent.
-	 * minimumIntegerDigits Optional Non-negative integer Number value indicating the minimum integer digits to be used. Numbers will be padded with leading zeroes if necessary.
-	 * minimumFractionDigits and maximumFractionDigits Optional Non-negative integer Number values indicating the minimum and maximum fraction digits to be used. Numbers will be rounded or padded with trailing zeroes if necessary. Either one or both of these properties must be present. If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
-	 * minimumSignificantDigits and maximumSignificantDigits Optional Positive integer Number values indicating the minimum and maximum fraction digits to be shown. Either none or both of these properties are present. If they are, they override minimum and maximum integer and fraction digits. The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
-	 * round Optional String with rounding method ceil, floor, round (default), or truncate.
-	 * useGrouping Optional Boolean (default is true) value indicating whether a grouping separator should be used.
-	 * @returns {Function} Return a function that formats a number according to the given options.
-	 */
-	numberFormatter(options?: NumberFormatterOptions): (value: number) => string;
-
-	/**
-	 * Return a function that parses a string representing a number according to the given options or locale's defaults.
-	 * @param {NumberParserOptions} options A JSON object including none or any of the following options.
-	 * style Optional String decimal (default), or percent.
-	 * @returns {Function} Return a function that parses a String representing a number according to the given options. If value is invalid, NaN is returned.
-	 */
-	numberParser(options?: NumberParserOptions): (value: string) => number
-
-	/**
-	 * Return a number formatted according to the given options or locale's defaults.
-	 * @param {number} value The number to format
-	 * @param {NumberFormatterOptions} options A JSON object including none or any of the following options.
-	 * style Optional String decimal (default), or percent.
-	 * minimumIntegerDigits Optional Non-negative integer Number value indicating the minimum integer digits to be used. Numbers will be padded with leading zeroes if necessary.
-	 * minimumFractionDigits and maximumFractionDigits Optional Non-negative integer Number values indicating the minimum and maximum fraction digits to be used. Numbers will be rounded or padded with trailing zeroes if necessary. Either one or both of these properties must be present. If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
-	 * minimumSignificantDigits and maximumSignificantDigits Optional Positive integer Number values indicating the minimum and maximum fraction digits to be shown. Either none or both of these properties are present. If they are, they override minimum and maximum integer and fraction digits. The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
-	 * round Optional String with rounding method ceil, floor, round (default), or truncate.
-	 * useGrouping Optional Boolean (default is true) value indicating whether a grouping separator should be used.
-	 * @returns {string} Return the number formatted
-	 */
-	formatNumber(value: number, options?: NumberFormatterOptions): string;
-
-	/**
-	 * A function that parses a string representing a number according to the given options or locale's defaults.
-	 * @param {string} value The number as string to parse
-	 * @param {NumberParserOptions} options A JSON object including none or any of the following options.
-	 * style Optional String decimal (default), or percent.
-	 * @returns {number} Return a number according to the given options. If value is invalid, NaN is returned.
-	 */
-	parseNumber(value: string, options?: NumberParserOptions): number;
-
-	/**
-	 * Return a function that formats a currency according to the given options or locale's defaults.
-	 * The returned function is invoked with one argument: the Number value to be formatted.
-	 * @param {string} currency 3-letter currency code as defined by ISO 4217, eg. USD.
-	 * @param {CurrencyFormatterOptions} options A JSON object including none or any of the following options.
-	 * @returns {Function} Return a function that formats a currency
-	 */
-	currencyFormatter(currency: string, options?: CurrencyFormatterOptions): (value: number) => string;
-
-	/**
-	 * Return a currency formatted according to the given options or locale's defaults.
-	 * @param {number} value The value to format.
-	 * @param {string} currency 3-letter currency code as defined by ISO 4217, eg. USD.
-	 * @param {CurrencyFormatterOptions} options A JSON object including none or any of the following options.
-	 * @returns {string} Return a string formatted in the currency according to the value and the options
-	 */
-	formatCurrency(value: number, currency: string, options?: CurrencyFormatterOptions): string;
-
-	/**
-	 * Return a function that returns the value's corresponding plural group: zero, one, two, few, many, or other.
-	 * The returned function is invoked with one argument: the Number value for which to return the plural group.
-	 * @param {PluralGeneratorOptions} options A JSON object including none or any of the following options.
-	 * type Optional String cardinal (default), or ordinal.
-	 * @returns {Function} Return a function that returns the value's corresponding plural group: zero, one, two, few, many, or other.
-	 */
-	pluralGenerator(options?: PluralGeneratorOptions): (value: number) => string;
-
-	/**
-	 * Returns the value's corresponding plural group: zero, one, two, few, many, or other.
-	 * @param {number} value A Number for which to return the plural group.
-	 * @param {PluralGeneratorOptions} options A JSON object including none or any of the following options.
-	 * type Optional String cardinal (default), or ordinal.
-	 * @returns {string} Returns the value's corresponding plural group: zero, one, two, few, many, or other.
-	 */
-	plural(value: number, options?: PluralGeneratorOptions): string;
-
-	/**
-	 * Returns a function that formats a relative time according to the given unit, options, and the default/instance locale.
-	 * The returned function is invoked with one argument: the number value to be formatted.
-	 * @param unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc.
-	 * @param options form: [String] eg. "short" or "narrow". Or falsy for default long form.
-	 * @returns {Function} Returns a function that formats a relative time according to the given unit.
-	 */
-	relativeTimeFormatter(unit: string, options?: RelativeTimeFormatterOptions): (value: number) => string;
-
-	/**
-	 * Return a relative time according to the given unit
-	 * @param {number} value The number to be formatted.
-	 * @param {string} unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc.
-	 * @param options form: [String] eg. "short" or "narrow". Or falsy for default long form.
-	 * @returns {string} Return a relative time according to the given unit.
-	 */
-	formatRelativeTime(value: number, unit: string, options?: RelativeTimeFormatterOptions): string;
-
-	/**
-	 * Returns a function that formats a unit according to the given unit, options, and the default/instance locale.
-	 * The returned function is invoked with one argument: the number value to be formatted.
-	 * @param unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc. Could also be a compound unit, eg. "mile-per-hour" or "mile/hour"
-	 * @param options form: [String] eg. "long", "short" or "narrow".
-	 * @returns {Function} Returns a function that formats a unit according to the given unit, options, and the default/instance locale.
-	 */
-	unitFormatter(unit: string, options?: UnitFormatterOptions): (value: number) => string;
-
-	/**
-	 * Alias for .unitFormatter( unit, options )( value ).
-	 * @param {number} value The number to be formatted.
-	 * @param {string} unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc. Could also be a compound unit, eg. "mile-per-hour" or "mile/hour"
-	 * @param {UnitFormatterOptions} options form: [String] eg. "long", "short" or "narrow".
-	 * @returns {string} Returns the unit formatted.
-	 */
-	formatUnit(value: number, unit: string, options?: UnitFormatterOptions): string
-
-	/**
-	 * Create a Globalize instance.
-	 * @param {string} Locale string of the instance.
-	 * @returns {Globalize} A Globalize instance
-	 */
-	new (locale: string): GlobalizeStatic;
-	/**
-	 * Create a Globalize instance.
-	 * @param cldr Cldr instance of the instance.
-	 * @returns {Globalize} A Globalize instance
-	 */
-	new (cldr: Cldr.CldrStatic): GlobalizeStatic;
-}
-
-declare var Globalize: GlobalizeStatic;

From 57bf34b2305e4a345aad418dc0485f7f0601bdc3 Mon Sep 17 00:00:00 2001
From: Damian Bushong <stratosphere.programming@gmail.com>
Date: Tue, 15 May 2018 09:48:56 -0500
Subject: [PATCH 141/575] Remove User "id" property from oauth2-server typings.
 This is no longer required as of v2.

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

diff --git a/types/oauth2-server/index.d.ts b/types/oauth2-server/index.d.ts
index 06b6fbadb0..a4725538fd 100644
--- a/types/oauth2-server/index.d.ts
+++ b/types/oauth2-server/index.d.ts
@@ -327,7 +327,6 @@ declare namespace OAuth2Server {
      * A user object is completely transparent to oauth2-server and is simply used as input to model functions.
      */
     interface User {
-        id: string;
         [key: string]: any;
     }
 

From 2cdf91a8b37ab09161a74e98ca7fffd7d7b7daf8 Mon Sep 17 00:00:00 2001
From: Alan Plum <me@pluma.io>
Date: Tue, 15 May 2018 17:15:27 +0200
Subject: [PATCH 142/575] Add typings for rmfr

---
 types/rmfr/index.d.ts    | 17 +++++++++++++++++
 types/rmfr/rmfr-tests.ts | 39 +++++++++++++++++++++++++++++++++++++++
 types/rmfr/tsconfig.json | 16 ++++++++++++++++
 types/rmfr/tslint.json   |  1 +
 4 files changed, 73 insertions(+)
 create mode 100644 types/rmfr/index.d.ts
 create mode 100644 types/rmfr/rmfr-tests.ts
 create mode 100644 types/rmfr/tsconfig.json
 create mode 100644 types/rmfr/tslint.json

diff --git a/types/rmfr/index.d.ts b/types/rmfr/index.d.ts
new file mode 100644
index 0000000000..fc7c608e81
--- /dev/null
+++ b/types/rmfr/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for rmfr 2.0
+// Project: https://github.com/shinnn/rmfr#readme
+// Definitions by: Alan Plum <https://github.com/pluma>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import rimraf = require("rimraf");
+
+declare namespace rmfr {
+    type Options = rimraf.Options & {
+        glob?: rimraf.Options["glob"] | true;
+        disableGlob?: never;
+    };
+}
+declare function rmfr(path: string, options?: rmfr.Options): Promise<void>;
+
+export = rmfr;
diff --git a/types/rmfr/rmfr-tests.ts b/types/rmfr/rmfr-tests.ts
new file mode 100644
index 0000000000..efec2dd480
--- /dev/null
+++ b/types/rmfr/rmfr-tests.ts
@@ -0,0 +1,39 @@
+import rmfr = require("rmfr");
+
+(async () => {
+    // happy
+    await rmfr("tmp_file");
+    await rmfr("tmp_d*", {});
+    await rmfr("../{tmp_d*,test.js}", {
+        glob: {
+            cwd: "node_modules",
+            ignore: "some_filename"
+        }
+    });
+    await rmfr("test.js", {
+        glob: {
+            cwd: "this/directory/does/not/exist"
+        }
+    });
+
+    // $ExpectError
+    await rmfr(".gitignore", { unlink: (path, cb) => cb(new Error()) });
+    // $ExpectError
+    await rmfr();
+    // $ExpectError
+    await rmfr("<", { o: "O" }, "/");
+    // $ExpectError
+    await rmfr(["1"], { glob: true });
+    // $ExpectError
+    await rmfr("foo", 1);
+    // $ExpectError
+    await rmfr("foo", { chmod: new Set(["a"]) });
+    // $ExpectError
+    await rmfr("foo", {
+        maxBusyTries: "foo",
+        emfileWait: "bar",
+        glob: "baz"
+    });
+    // $ExpectError
+    await rmfr("foo", { disableGlob: true });
+})();
diff --git a/types/rmfr/tsconfig.json b/types/rmfr/tsconfig.json
new file mode 100644
index 0000000000..cbe39dd006
--- /dev/null
+++ b/types/rmfr/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", "rmfr-tests.ts"]
+}
diff --git a/types/rmfr/tslint.json b/types/rmfr/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/rmfr/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ae28bf8943f51911068626b8657d00db1479632f Mon Sep 17 00:00:00 2001
From: Alan Plum <me@pluma.io>
Date: Tue, 15 May 2018 17:38:46 +0200
Subject: [PATCH 143/575] Add mkdirp-promise typings

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

diff --git a/types/mkdirp-promise/index.d.ts b/types/mkdirp-promise/index.d.ts
new file mode 100644
index 0000000000..a4f389bca3
--- /dev/null
+++ b/types/mkdirp-promise/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for mkdirp-promise 5.0
+// Project: https://github.com/ahmadnassri/mkdirp-promise
+// Definitions by: Alan Plum <https://github.com/pluma>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+import mkdirp = require("mkdirp");
+
+declare function mkdirpPromise(
+    path: string,
+    opts?: mkdirp.Mode | mkdirp.Options
+): Promise<mkdirp.Made>;
+export = mkdirpPromise;
diff --git a/types/mkdirp-promise/mkdirp-promise-tests.ts b/types/mkdirp-promise/mkdirp-promise-tests.ts
new file mode 100644
index 0000000000..28efeb0766
--- /dev/null
+++ b/types/mkdirp-promise/mkdirp-promise-tests.ts
@@ -0,0 +1,6 @@
+import mkdirpPromise = require("mkdirp-promise");
+
+(async () => {
+    const path = await mkdirpPromise("hello");
+    if (path) await mkdirpPromise(path, { mode: 123 });
+})();
diff --git a/types/mkdirp-promise/tsconfig.json b/types/mkdirp-promise/tsconfig.json
new file mode 100644
index 0000000000..fd526f1aee
--- /dev/null
+++ b/types/mkdirp-promise/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", "mkdirp-promise-tests.ts"]
+}
diff --git a/types/mkdirp-promise/tslint.json b/types/mkdirp-promise/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mkdirp-promise/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e818117186fa2d8b307be639575aeac7d586f9b1 Mon Sep 17 00:00:00 2001
From: Nick Holloway <nick.holloway@blackpepper.co.uk>
Date: Fri, 11 May 2018 17:54:20 +0100
Subject: [PATCH 144/575] Add definition for AWS Lambda Code Pipeline event

---
 types/aws-lambda/aws-lambda-tests.ts | 52 ++++++++++++++++++++++++++++
 types/aws-lambda/index.d.ts          | 48 +++++++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/types/aws-lambda/aws-lambda-tests.ts b/types/aws-lambda/aws-lambda-tests.ts
index 9f9d7438e3..05b9033da7 100644
--- a/types/aws-lambda/aws-lambda-tests.ts
+++ b/types/aws-lambda/aws-lambda-tests.ts
@@ -525,6 +525,56 @@ function customAuthorizerCallback(cb: AWSLambda.CustomAuthorizerCallback) {
     cb(null, authResponse);
 }
 
+/* CodePipeline events https://docs.aws.amazon.com/codepipeline/latest/userguide/actions-invoke-lambda-function.html#actions-invoke-lambda-function-json-event-example */
+const CodePipelineEvent: AWSLambda.CodePipelineEvent = {
+    "CodePipeline.job": {
+        id: "11111111-abcd-1111-abcd-111111abcdef",
+        accountId: "111111111111",
+        data: {
+            actionConfiguration: {
+                configuration: {
+                    FunctionName: "MyLambdaFunctionForAWSCodePipeline",
+                    UserParameters: "some-input-such-as-a-URL"
+                }
+            },
+            inputArtifacts: [
+                {
+                    location: {
+                        s3Location: {
+                            bucketName: "the name of the bucket configured as the pipeline artifact store in Amazon S3, for example codepipeline-us-east-2-1234567890",
+                            objectKey: "the name of the application, for example CodePipelineDemoApplication.zip"
+                        },
+                        type: "S3"
+                    },
+                    revision: null,
+                    name: "ArtifactName"
+                }
+            ],
+            outputArtifacts: [],
+            artifactCredentials: {
+                secretAccessKey: "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
+                sessionToken: `MIICiTCCAfICCQD6m7oRw0uXOjANBgkqhkiG9w
+ 0BAQUFADCBiDELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZ
+ WF0dGxlMQ8wDQYDVQQKEwZBbWF6b24xFDASBgNVBAsTC0lBTSBDb25zb2xlMRIw
+ EAYDVQQDEwlUZXN0Q2lsYWMxHzAdBgkqhkiG9w0BCQEWEG5vb25lQGFtYXpvbi5
+ jb20wHhcNMTEwNDI1MjA0NTIxWhcNMTIwNDI0MjA0NTIxWjCBiDELMAkGA1UEBh
+ MCVVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMQ8wDQYDVQQKEwZBb
+ WF6b24xFDASBgNVBAsTC0lBTSBDb25zb2xlMRIwEAYDVQQDEwlUZXN0Q2lsYWMx
+ HzAdBgkqhkiG9w0BCQEWEG5vb25lQGFtYXpvbi5jb20wgZ8wDQYJKoZIhvcNAQE
+ BBQADgY0AMIGJAoGBAMaK0dn+a4GmWIWJ21uUSfwfEvySWtC2XADZ4nB+BLYgVI
+ k60CpiwsZ3G93vUEIO3IyNoH/f0wYK8m9TrDHudUZg3qX4waLG5M43q7Wgc/MbQ
+ ITxOUSQv7c7ugFFDzQGBzZswY6786m86gpEIbb3OhjZnzcvQAaRHhdlQWIMm2nr
+ AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAtCu4nUhVVxYUntneD9+h8Mg9q6q+auN
+ KyExzyLwaxlAoo7TJHidbtS4J5iNmZgXL0FkbFFBjvSfpJIlJ00zbhNYS5f6Guo
+ EDmFJl0ZxBHjJnyp378OD8uTs7fLvjx79LjSTbNYiytVbZPQUQ5Yaxu2jXnimvw
+ 3rrszlaEXAMPLE=`,
+                accessKeyId: "AKIAIOSFODNN7EXAMPLE"
+            },
+            continuationToken: "A continuation token if continuing job"
+        }
+    }
+};
+
 /* CloudFront events, see http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-event-structure.html */
 const CloudFrontRequestEvent: AWSLambda.CloudFrontRequestEvent = {
   Records: [
@@ -750,6 +800,8 @@ let apiGtwProxyHandler: AWSLambda.APIGatewayProxyHandler = (event: AWSLambda.API
 let proxyHandler: AWSLambda.ProxyHandler = (event: AWSLambda.APIGatewayEvent, context: AWSLambda.Context, cb: AWSLambda.ProxyCallback) => { };
 apiGtwProxyHandler = proxyHandler;
 
+let codePipelineHandler: AWSLambda.CodePipelineHandler = (event: AWSLambda.CodePipelineEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
+
 let cloudFrontRequestHandler: AWSLambda.CloudFrontRequestHandler = (event: AWSLambda.CloudFrontRequestEvent, context: AWSLambda.Context, cb: AWSLambda.CloudFrontRequestCallback) => {
     cb();
     cb(null);
diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index 7795c4cdfe..e8e305fd0a 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -501,6 +501,52 @@ export interface AuthResponseContext {
     [name: string]: any;
 }
 
+/**
+ * CodePipeline events
+ * https://docs.aws.amazon.com/codepipeline/latest/userguide/actions-invoke-lambda-function.html
+ */
+export interface S3ArtifactLocation {
+    bucketName: string;
+    objectKey: string;
+}
+export interface S3ArtifactStore {
+    type: 'S3';
+    s3Location: S3ArtifactLocation;
+}
+
+export type ArtifactLocation = S3ArtifactStore;
+
+export interface Artifact {
+    name: string;
+    revision: string | null;
+    location: ArtifactLocation;
+}
+
+export interface Credentials {
+    accessKeyId: string;
+    secretAccessKey: string;
+    sessionToken?: string;
+}
+
+export interface CodePipelineEvent {
+    "CodePipeline.job": {
+        id: string;
+        accountId: string;
+        data: {
+            actionConfiguration: {
+                configuration: {
+                    FunctionName: string;
+                    UserParameters: string;
+                }
+            };
+            inputArtifacts: Artifact[];
+            outputArtifacts: Artifact[];
+            artifactCredentials: Credentials;
+            continuationToken?: string;
+        };
+    };
+}
+
 /**
  * CloudFront events
  * http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-event-structure.html
@@ -653,6 +699,8 @@ export type ProxyCallback = APIGatewayProxyCallback; // Old name
 
 // TODO: IoT
 
+export type CodePipelineHandler = Handler<CodePipelineEvent, void>;
+
 export type CloudFrontRequestHandler = Handler<CloudFrontRequestEvent, CloudFrontRequestResult>;
 export type CloudFrontRequestCallback = Callback<CloudFrontRequestResult>;
 

From cab2b0c00635c52125f3ba7a7bbdf4b0f8362cfe Mon Sep 17 00:00:00 2001
From: yperess <yuval.peress@gmail.com>
Date: Tue, 15 May 2018 12:16:24 -0400
Subject: [PATCH 145/575] Fix return type for RedisOptions.reconnectOnError

As seen in the source https://github.com/luin/ioredis/blob/cf18554c142f461b3ad7ff716df596d7d1615828/lib/redis/parser.js#L50 the return values for the `reconnectOnError` functions should include `1` and `2`.
---
 types/ioredis/index.d.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/types/ioredis/index.d.ts b/types/ioredis/index.d.ts
index bc3d656985..84ca51982a 100644
--- a/types/ioredis/index.d.ts
+++ b/types/ioredis/index.d.ts
@@ -798,7 +798,11 @@ declare namespace IORedis {
          * Fixed in: https://github.com/DefinitelyTyped/DefinitelyTyped/pull/15858
          */
         retryStrategy?(times: number): number | false;
-        reconnectOnError?(error: Error): boolean;
+        /**
+         * 1/true means reconnect, 2 means reconnect and resend failed command. Returning false will ignore
+         * the error and do nothing.
+         */
+        reconnectOnError?(error: Error): boolean | 1 | 2;
         /**
          * By default, if there is no active connection to the Redis server, commands are added to a queue
          * and are executed once the connection is "ready" (when enableReadyCheck is true, "ready" means

From ab7ede4820deeb1a74f71ca41f0833b2626b0e4c Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Tue, 15 May 2018 12:16:26 -0700
Subject: [PATCH 146/575] fix(vision): fix incorrect interface extension

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

diff --git a/types/vision/index.d.ts b/types/vision/index.d.ts
index 757d2a5383..1c4e2ddc33 100644
--- a/types/vision/index.d.ts
+++ b/types/vision/index.d.ts
@@ -242,7 +242,7 @@ declare module 'hapi' {
 }
 
 declare module 'hapi' {
-    interface RouteOptions {
+    interface HandlerDecorations {
         /**
          * The view handler can be used with routes registered in the same realm as the view manager.
          * The handler takes an options parameter that can be either a string or an object.

From 9ea396d9d6dc3984da3c12cf6446063b0169f46f Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <tonguye@microsoft.com>
Date: Tue, 15 May 2018 20:38:24 +0200
Subject: [PATCH 147/575] [react-native] Add declarations for MessageQueue and
 BatchedBridge.

---
 types/react-native/BatchedBridge.d.ts | 23 +++++++++++++++++++++++
 types/react-native/index.d.ts         |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 types/react-native/BatchedBridge.d.ts

diff --git a/types/react-native/BatchedBridge.d.ts b/types/react-native/BatchedBridge.d.ts
new file mode 100644
index 0000000000..0f1b02a0f4
--- /dev/null
+++ b/types/react-native/BatchedBridge.d.ts
@@ -0,0 +1,23 @@
+interface SpyData {
+    type: number;
+    module?: string;
+    method: string | number;
+    args: any[];
+}
+
+declare class MessageQueue {
+    static spy(spyOrToggle: boolean | ((data: SpyData) => void)): void;
+
+    getCallableModule(name: string): Object;
+    registerCallableModule(name: string, module: Object): void;
+    registerLazyCallableModule(name: string, factory: () => Object): void;
+}
+
+declare module "react-native/Libraries/BatchedBridge/BatchedBridge" {
+    const BatchedBridge: MessageQueue;
+    export default BatchedBridge;
+}
+
+declare module "react-native/Libraries/BatchedBridge/MessageQueue" {
+    export default MessageQueue;
+}
diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 0ad2e8279f..d8a2a9327a 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -27,6 +27,7 @@
 
 /// <reference path="globals.d.ts" />
 /// <reference path="legacy-properties.d.ts" />
+/// <reference path="BatchedBridge.d.ts" />
 
 import * as React from 'react';
 

From 6744394a0aa73230d72b0f72620e2d11952c14f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Machist=C3=A9=20Quintana?= <machiste@slack-corp.com>
Date: Tue, 15 May 2018 14:04:28 -0700
Subject: [PATCH 148/575] Bump webpack typings to v4.4.x

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

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index fb8469dfa5..89b12ef1dd 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for webpack 4.1
+// Type definitions for webpack 4.4
 // Project: https://github.com/webpack/webpack
 // Definitions by: Qubo <https://github.com/tkqubo>
 //                 Benjamin Lim <https://github.com/bumbleblym>

From 3ef1d0d822b95e8eb4ab5be16d8afb62095bdc9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Machist=C3=A9=20Quintana?= <machiste@slack-corp.com>
Date: Tue, 15 May 2018 14:42:52 -0700
Subject: [PATCH 149/575] Use the actual compilation.Chunk type instead of any

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

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 89b12ef1dd..b49c235d30 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -560,7 +560,7 @@ declare namespace webpack {
             /** Assign modules to a cache group */
             test?: ((...args: any[]) => boolean) | string | RegExp;
             /** Select chunks for determining cache group content (defaults to \"initial\", \"initial\" and \"all\" requires adding these chunks to the HTML) */
-            chunks?: "initial" | "async" | "all" | ((chunk: any) => boolean);
+            chunks?: "initial" | "async" | "all" | ((chunk: compilation.Chunk) => boolean);
             /** Ignore minimum size, minimum chunks and maximum requests and always create chunks for this cache group */
             enforce?: boolean;
             /** Priority of this cache group */
@@ -580,7 +580,7 @@ declare namespace webpack {
         }
         interface SplitChunksOptions {
             /** Select chunks for determining shared modules (defaults to \"async\", \"initial\" and \"all\" requires adding these chunks to the HTML) */
-            chunks?: "initial" | "async" | "all" | ((chunk: any) => boolean);
+            chunks?: "initial" | "async" | "all" | ((chunk: compilation.Chunk) => boolean);
             /** Minimal size for the created chunk */
             minSize?: number;
             /** Minimum number of times a module has to be duplicated until it's considered for splitting */

From c1c69f49136c0b172e85babee8fff3b6a60b58f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Machist=C3=A9=20Quintana?= <machiste@slack-corp.com>
Date: Tue, 15 May 2018 14:44:42 -0700
Subject: [PATCH 150/575] Update chunks function test to use updated type

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

diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index d617c45a17..3f99d4704f 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -614,7 +614,7 @@ configuration = {
             cacheGroups: {
                 common: {
                     name: 'common',
-                    chunks(chunk: { name: string }) {
+                    chunks(chunk: webpack.compilation.Chunk) {
                         const allowedChunks = [
                             'renderer',
                             'component-window',

From 2050335081cbeb7d449332405e160807c4330dce Mon Sep 17 00:00:00 2001
From: Lauren Budorick <lauren@mapbox.com>
Date: Tue, 15 May 2018 17:00:09 -0700
Subject: [PATCH 151/575] Update mapbox-gl definitions

---
 types/mapbox-gl/index.d.ts | 147 +++++++++++++++++++++++++++++++------
 1 file changed, 123 insertions(+), 24 deletions(-)

diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index ece34d0938..16f886c4a1 100644
--- a/types/mapbox-gl/index.d.ts
+++ b/types/mapbox-gl/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mapbox GL JS v0.44.1
+// Type definitions for Mapbox GL JS v0.45.0
 // Project: https://github.com/mapbox/mapbox-gl-js
 // Definitions by: Dominik Bruderer <https://github.com/dobrud>, Patrick Reames <https://github.com/patrickr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -18,6 +18,7 @@ declare namespace mapboxgl {
     type LngLatBoundsLike = number[][] | LngLatLike[] | LngLatBounds;
     type PointLike = number[] | Point;
     type Expression = any[];
+    type Anchor = 'center' | 'left' | 'right' | 'top' | 'bottom' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
 
     /**
      * Map
@@ -33,8 +34,6 @@ declare namespace mapboxgl {
 
         removeControl(control: IControl): this;
 
-        getClasses(): string[];
-
         resize(): this;
 
         getBounds(): mapboxgl.LngLatBounds;
@@ -53,6 +52,12 @@ declare namespace mapboxgl {
 
         unproject(point: PointLike): mapboxgl.LngLat;
 
+        isMoving(): boolean;
+
+        isZooming(): boolean;
+
+        isRotating(): boolean;
+
         queryRenderedFeatures(pointOrBox?: PointLike | PointLike[], parameters?: { layers?: string[], filter?: any[] }): GeoJSON.Feature<GeoJSONGeometry>[];
 
         querySourceFeatures(sourceID: string, parameters?: { sourceLayer?: string, filter?: any[] }): GeoJSON.Feature<GeoJSONGeometry>[];
@@ -199,9 +204,6 @@ declare namespace mapboxgl {
         /** initial map center */
         center?: LngLatLike;
 
-        /** Style class names with which to initialize the map */
-        classes?: string[];
-
         /** ID of the container element */
         container?: string | Element;
 
@@ -218,7 +220,7 @@ declare namespace mapboxgl {
         hash?: boolean;
 
         /** If true, map creation will fail if the implementation determines that the performance of the created WebGL context would be dramatically lower than expected. */
-        failIfMayorPerformanceCaveat?: boolean;
+        failIfMajorPerformanceCaveat?: boolean;
 
         /** If false, no mouse, touch, or keyboard listeners are attached to the map, so it will not respond to input */
         interactive?: boolean;
@@ -420,6 +422,8 @@ declare namespace mapboxgl {
      */
     export class ScaleControl extends Control {
         constructor(options?: { maxWidth?: number, unit?: string })
+
+        setUnit(unit: 'imperial' | 'metric' | 'nautical'): void;
     }
 
     /**
@@ -457,7 +461,7 @@ declare namespace mapboxgl {
 
         closeOnClick?: boolean;
 
-        anchor?: 'top' | 'bottom' | 'left' | 'right' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
+        anchor?: Anchor;
 
         offset?: number | PointLike | { [key: string]: PointLike; };
     }
@@ -486,8 +490,11 @@ declare namespace mapboxgl {
     export interface Light {
         'anchor'?: 'map' | 'viewport';
         'position'?: number[];
+        'position-transition'?: Transition;
         'color'?: string;
+        'color-transition'?: Transition;
         'intensity'?: number;
+        'intensity-transition'?: Transition;
     }
 
     export interface Source {
@@ -526,6 +533,8 @@ declare namespace mapboxgl {
         clusterRadius?: number;
 
         clusterMaxZoom?: number;
+
+        lineMetrics?: boolean;
     }
 
     /**
@@ -578,7 +587,7 @@ declare namespace mapboxgl {
 
         coordinates: number[][];
 
-        canvas: string;
+        canvas: string | HTMLCanvasElement;
 
         getCanvas(): HTMLCanvasElement;
 
@@ -590,7 +599,7 @@ declare namespace mapboxgl {
 
         animate?: boolean;
 
-        canvas: string;
+        canvas: string | HTMLCanvasElement;
     }
 
     interface VectorSource extends Source {
@@ -738,8 +747,13 @@ declare namespace mapboxgl {
         static convert(a: PointLike): Point;
     }
 
+    /**
+     * Marker
+     */
     export class Marker {
-        constructor(element?: HTMLElement, options?: { offset?: PointLike });
+        constructor(options?: mapboxgl.MarkerOptions);
+
+        constructor(element?: HTMLElement, options?: mapboxgl.MarkerOptions);
 
         addTo(map: Map): this;
 
@@ -760,6 +774,16 @@ declare namespace mapboxgl {
         togglePopup(): this;
     }
 
+    export interface MarkerOptions {
+        element?: HTMLElement;
+
+        offset?: PointLike;
+
+        anchor?: Anchor;
+
+        color?: string
+    }
+
     /**
      * Evented
      */
@@ -773,10 +797,6 @@ declare namespace mapboxgl {
         off(type?: string | any, layer?: string, listener?: Function): this;
 
         once(type: string, listener: Function): this;
-
-        fire(type: string, data?: mapboxgl.EventData | Object): this;
-
-        listens(type: string): boolean;
     }
 
     /**
@@ -803,16 +823,20 @@ declare namespace mapboxgl {
         originalEvent: MouseEvent;
         point: mapboxgl.Point;
         lngLat: mapboxgl.LngLat;
+        preventDefault(): void;
+        defaultPrevented: boolean;
     }
 
     export class MapTouchEvent {
         type: string;
-        target: Map;
+        map: Map;
         originalEvent: TouchEvent;
         point: mapboxgl.Point;
         lngLat: mapboxgl.LngLat;
         points: Point[];
         lngLats: LngLat[];
+        preventDefault(): void;
+        defaultPrevented: boolean;
     }
 
     export class MapBoxZoomEvent {
@@ -825,9 +849,19 @@ declare namespace mapboxgl {
         dataType: 'source' | 'style' | 'tile';
         isSourceLoaded?: boolean;
         source?: mapboxgl.Source;
+        sourceDataType?: string;
+        tile?: any;
         coord?: any;
     }
 
+    export class MapWheelEvent {
+        type: string;
+        map: Map;
+        originalEvent: MouseEvent;
+        preventDefault(): void;
+        defaultPrevented: boolean;
+    }
+
     /**
      * AnimationOptions
      */
@@ -921,11 +955,12 @@ declare namespace mapboxgl {
         drag?: { data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent };
         dragend?: { data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent };
         pitch?: { data: mapboxgl.EventData };
+        wheel?: { data: mapboxgl.MapWheelEvent };
     }
 
     export interface Layer {
         id: string;
-        type?: 'fill' | 'line' | 'symbol' | 'circle' | 'fill-extrusion' | 'raster' | 'background' | 'heatmap';
+        type?: 'fill' | 'line' | 'symbol' | 'circle' | 'fill-extrusion' | 'raster' | 'background' | 'heatmap' | 'hillshade';
 
         metadata?: any;
         ref?: string;
@@ -940,8 +975,8 @@ declare namespace mapboxgl {
         interactive?: boolean;
 
         filter?: any[];
-        layout?: BackgroundLayout | FillLayout | FillExtrusionLayout | LineLayout | SymbolLayout | RasterLayout | CircleLayout | HeatmapLayout;
-        paint?: BackgroundPaint | FillPaint | FillExtrusionPaint | LinePaint | SymbolPaint | RasterPaint | CirclePaint | HeatmapPaint;
+        layout?: BackgroundLayout | FillLayout | FillExtrusionLayout | LineLayout | SymbolLayout | RasterLayout | CircleLayout | HeatmapLayout | HillshadeLayout;
+        paint?: BackgroundPaint | FillPaint | FillExtrusionPaint | LinePaint | SymbolPaint | RasterPaint | CirclePaint | HeatmapPaint | HillshadePaint;
     }
 
     export interface StyleFunction {
@@ -959,8 +994,11 @@ declare namespace mapboxgl {
 
     export interface BackgroundPaint {
         'background-color'?: string | Expression;
+        'background-color-transition'?: Transition;
         'background-pattern'?: string;
+        'background-pattern-transition'?: Transition;
         'background-opacity'?: number | Expression;
+        'background-opacity-transition'?: Transition;
     }
 
     export interface FillLayout {
@@ -970,11 +1008,16 @@ declare namespace mapboxgl {
     export interface FillPaint {
         'fill-antialias'?: boolean;
         'fill-opacity'?: number | StyleFunction | Expression;
+        'fill-opacity-transition'?: Transition;
         'fill-color'?: string | StyleFunction | Expression;
+        'fill-color-transition'?: Transition;
         'fill-outline-color'?: string | StyleFunction | Expression;
+        'fill-outline-color-transition'?: Transition;
         'fill-translate'?: number[] | Expression;
+        'fill-translate-transition'?: Transition;
         'fill-translate-anchor'?: 'map' | 'viewport';
         'fill-pattern'?: string;
+        'fill-pattern-transition'?: Transition;
     }
 
     export interface FillExtrusionLayout {
@@ -983,12 +1026,18 @@ declare namespace mapboxgl {
 
     export interface FillExtrusionPaint {
         'fill-extrusion-opacity'?: number | Expression;
+        'fill-extrusion-opacity-transition'?: Transition;
         'fill-extrusion-color'?: string | StyleFunction | Expression;
+        'fill-extrusion-color-transition'?: Transition;
         'fill-extrusion-translate'?: number[] | Expression;
+        'fill-extrusion-translate-transition'?: Transition;
         'fill-extrusion-translate-anchor'?: 'map' | 'viewport';
         'fill-extrusion-pattern'?: string;
+        'fill-extrusion-pattern-transition'?: Transition;
         'fill-extrusion-height'?: number | StyleFunction | Expression;
+        'fill-extrusion-height-transition'?: Transition;
         'fill-extrusion-base'?: number | StyleFunction | Expression;
+        'fill-extrusion-base-transition'?: Transition;
     }
 
     export interface LineLayout {
@@ -1002,16 +1051,25 @@ declare namespace mapboxgl {
 
     export interface LinePaint {
         'line-opacity'?: number | StyleFunction | Expression;
+        'line-opacity-transition'?: Transition;
         'line-color'?: string | StyleFunction | Expression;
+        'line-color-transition'?: Transition;
         'line-translate'?: number[] | Expression;
+        'line-translate-transition'?: Transition;
         'line-translate-anchor'?: 'map' | 'viewport';
         'line-width'?: number | StyleFunction | Expression;
+        'line-width-transition'?: Transition;
         'line-gap-width'?: number | StyleFunction | Expression;
+        'line-gap-width-transition'?: Transition;
         'line-offset'?: number | StyleFunction | Expression;
+        'line-offset-transition'?: Transition;
         'line-blur'?: number | StyleFunction | Expression;
+        'line-blur-transition'?: Transition;
         'line-dasharray'?: number[];
         'line-dasharray-transition'?: Transition;
         'line-pattern'?: string;
+        'line-pattern-transition'?: Transition;
+        'line-gradient'?: Expression;
     }
 
     export interface SymbolLayout {
@@ -1024,7 +1082,6 @@ declare namespace mapboxgl {
         'icon-ignore-placement'?: boolean;
         'icon-optional'?: boolean;
         'icon-rotation-alignment'?: 'map' | 'viewport' | 'auto';
-        'icon-pitch-alignment'?: 'map' | 'viewport' | 'auto';
         'icon-size'?: number | StyleFunction | Expression;
         'icon-text-fit'?: 'none' | 'both' | 'width' | 'height';
         'icon-text-fit-padding'?: number[] | Expression;
@@ -1033,6 +1090,8 @@ declare namespace mapboxgl {
         'icon-padding'?: number | Expression;
         'icon-keep-upright'?: boolean;
         'icon-offset'?: number[] | StyleFunction | Expression;
+        'icon-anchor'?: Anchor;
+        'icon-pitch-alignment'?: 'map' | 'viewport' | 'auto';
         'text-pitch-alignment'?: 'map' | 'viewport' | 'auto';
         'text-rotation-alignment'?: 'map' | 'viewport' | 'auto';
         'text-field'?: string | StyleFunction;
@@ -1042,7 +1101,7 @@ declare namespace mapboxgl {
         'text-line-height'?: number | Expression;
         'text-letter-spacing'?: number | Expression;
         'text-justify'?: 'left' | 'center' | 'right';
-        'text-anchor'?: 'center' | 'left' | 'right' | 'top' | 'bottom' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
+        'text-anchor'?: Anchor;
         'text-max-angle'?: number | Expression;
         'text-rotate'?: number | StyleFunction | Expression;
         'text-padding'?: number | Expression;
@@ -1052,23 +1111,34 @@ declare namespace mapboxgl {
         'text-allow-overlap'?: boolean;
         'text-ignore-placement'?: boolean;
         'text-optional'?: boolean;
-
     }
 
     export interface SymbolPaint {
         'icon-opacity'?: number | StyleFunction | Expression;
+        'icon-opacity-transition'?: Transition;
         'icon-color'?: string | StyleFunction | Expression;
+        'icon-color-transition'?: Transition;
         'icon-halo-color'?: string | StyleFunction | Expression;
+        'icon-halo-color-transition'?: Transition;
         'icon-halo-width'?: number | StyleFunction | Expression;
+        'icon-halo-width-transition'?: Transition;
         'icon-halo-blur'?: number | StyleFunction | Expression;
+        'icon-halo-blur-transition'?: Transition;
         'icon-translate'?: number[] | Expression;
+        'icon-translate-transition'?: Transition;
         'icon-translate-anchor'?: 'map' | 'viewport';
         'text-opacity'?: number | StyleFunction | Expression;
+        'text-opacity-transition'?: Transition;
         'text-color'?: string | StyleFunction | Expression;
+        'text-color-transition'?: Transition;
         'text-halo-color'?: string | StyleFunction | Expression;
+        'text-halo-color-transition'?: Transition;
         'text-halo-width'?: number | StyleFunction | Expression;
+        'text-halo-width-transition'?: Transition;
         'text-halo-blur'?: number | StyleFunction | Expression;
+        'text-halo-blur-transition'?: Transition;
         'text-translate'?: number[] | Expression;
+        'text-translate-transition'?: Transition;
         'text-translate-anchor'?: 'map' | 'viewport';
     }
 
@@ -1078,11 +1148,17 @@ declare namespace mapboxgl {
 
     export interface RasterPaint {
         'raster-opacity'?: number | Expression;
+        'raster-opacity-transition'?: Transition;
         'raster-hue-rotate'?: number | Expression;
+        'raster-hue-rotate-transition'?: Transition;
         'raster-brightness-min'?: number | Expression;
+        'raster-brightness-min-transition'?: Transition;
         'raster-brightness-max'?: number | Expression;
+        'raster-brightness-max-transition'?: Transition;
         'raster-saturation'?: number | Expression;
+        'raster-saturation-transition'?: Transition;
         'raster-contrast'?: number | Expression;
+        'raster-contrast-transition'?: Transition;
         'raster-fade-duration'?: number | Expression;
     }
 
@@ -1094,16 +1170,22 @@ declare namespace mapboxgl {
         'circle-radius'?: number | StyleFunction | Expression;
         'circle-radius-transition'?: Transition;
         'circle-color'?: string | StyleFunction | Expression;
+        'circle-color-transition'?: Transition;
         'circle-blur'?: number | StyleFunction | Expression;
+        'circle-blur-transition'?: Transition;
         'circle-opacity'?: number | StyleFunction | Expression;
         'circle-opacity-transition'?: Transition;
         'circle-translate'?: number[] | Expression;
+        'circle-translate-transition'?: Transition;
         'circle-translate-anchor'?: 'map' | 'viewport';
         'circle-pitch-scale'?: 'map' | 'viewport';
         'circle-pitch-alignment'?: 'map' | 'viewport';
         'circle-stroke-width'?: number | StyleFunction | Expression;
+        'circle-stroke-width-transition'?: Transition;
         'circle-stroke-color'?: string | StyleFunction | Expression;
+        'circle-stroke-color-transition'?: Transition;
         'circle-stroke-opacity'?: number | StyleFunction | Expression;
+        'circle-stroke-opacity-transition'?: Transition;
     }
 
     export interface HeatmapLayout {
@@ -1112,14 +1194,31 @@ declare namespace mapboxgl {
 
     export interface HeatmapPaint {
         'heatmap-radius'?: number | Expression;
-        'heatmap-transition'?: Transition;
+        'heatmap-radius-transition'?: Transition;
         'heatmap-weight'?: number | StyleFunction | Expression;
         'heatmap-intensity'?: number | Expression;
+        'heatmap-intensity-transition'?: Transition;
         'heatmap-color'?: string | Expression;
-        'heatmap-color-transition'?: Transition;
         'heatmap-opacity'?: number | Expression;
         'heatmap-opacity-transition'?: Transition;
     }
+
+    export interface HillshadeLayout {
+        visibility?: 'visible' | 'none';
+    }
+
+    export interface HillshadePaint {
+        'hillshade-illumination-direction'?: number | Expression;
+        'hillshade-illumination-anchor'?: 'map' | 'viewport';
+        'hillshade-exaggeration'?: number | Expression;
+        'hillshade-exaggeration-transition'?: Transition;
+        'hillshade-shadow-color'?: string | Expression;
+        'hillshade-shadow-color-transition'?: Transition;
+        'hillshade-highlight-color'?: string | Expression;
+        'hillshade-highlight-color-transition'?: Transition;
+        'hillshade-accent-color'?: string | Expression;
+        'hillshade-accent-color-transition'?: Transition;
+    }
 }
 
 declare module 'mapbox-gl' {

From c2cd90a611ffc174be0c29c17d0388d054a8bbc7 Mon Sep 17 00:00:00 2001
From: spacejack <spacejack@gmail.com>
Date: Tue, 15 May 2018 23:54:12 -0400
Subject: [PATCH 152/575] Add types for tail module

---
 types/tail/index.d.ts    | 40 ++++++++++++++++++++++++++++++++++++++++
 types/tail/test.ts       | 26 ++++++++++++++++++++++++++
 types/tail/tsconfig.json | 19 +++++++++++++++++++
 types/tail/tslint.json   |  3 +++
 4 files changed, 88 insertions(+)
 create mode 100644 types/tail/index.d.ts
 create mode 100644 types/tail/test.ts
 create mode 100644 types/tail/tsconfig.json
 create mode 100644 types/tail/tslint.json

diff --git a/types/tail/index.d.ts b/types/tail/index.d.ts
new file mode 100644
index 0000000000..00f80ab079
--- /dev/null
+++ b/types/tail/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for tail 1.2
+// Project: https://github.com/lucagrulla/node-tail
+// Definitions by: Mike Linkovich <https://github.com/spacejack>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+declare namespace Tail {
+    interface TailOptions {
+        separator?: string | RegExp;
+        fromBeginning?: boolean;
+        fsWatchOptions?: Record<string, any>;
+        follow?: boolean;
+        logger?: any;
+        encoding?: string;
+        useWatchFile?: boolean;
+    }
+
+    interface Tail {
+        /** Callback to listen for newlines appended to file */
+        on(eventType: 'line', cb: (data: any) => void): void;
+        /** Error callback */
+        on(eventType: 'error', cb: (error: any) => void): void;
+        /** Stop watching file */
+        unwatch(): void;
+        /** Start watching file if previously stopped */
+        watch(): void;
+    }
+
+    interface TailConstructor {
+        /** Creates a new Tail object that starts watching the specified file immediately. */
+        new(filename: string, options?: TailOptions): Tail;
+    }
+
+    interface Static {
+        Tail: TailConstructor;
+    }
+}
+
+declare const Tail: Tail.Static;
+export = Tail;
diff --git a/types/tail/test.ts b/types/tail/test.ts
new file mode 100644
index 0000000000..aa212a5b78
--- /dev/null
+++ b/types/tail/test.ts
@@ -0,0 +1,26 @@
+import { Tail } from 'tail';
+
+const tail = new Tail("test.txt");
+
+tail.on("line", data => {
+    console.log(data);
+});
+
+tail.on("error", error => {
+    console.log('ERROR: ', error);
+});
+
+tail.unwatch();
+
+tail.watch();
+
+// With options object
+const tail2 = new Tail("test2.txt", {
+    separator: /[\r]{0,1}\n/,
+    fromBeginning: false,
+    fsWatchOptions: {},
+    follow: true,
+    logger: console,
+    useWatchFile: false,
+    encoding: 'utf-8'
+});
diff --git a/types/tail/tsconfig.json b/types/tail/tsconfig.json
new file mode 100644
index 0000000000..20be91772d
--- /dev/null
+++ b/types/tail/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es2015", "dom"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictFunctionTypes": true,
+    "strictNullChecks": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": []
+  },
+  "files": [
+    "index.d.ts",
+    "test.ts"
+  ]
+}
diff --git a/types/tail/tslint.json b/types/tail/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/tail/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 9c7bda7995664b7f697fe637001ea54055765ee0 Mon Sep 17 00:00:00 2001
From: spacejack <spacejack@gmail.com>
Date: Wed, 16 May 2018 00:08:20 -0400
Subject: [PATCH 153/575] Rename test file

---
 types/tail/{test.ts => tail-tests.ts} | 0
 types/tail/tsconfig.json              | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename types/tail/{test.ts => tail-tests.ts} (100%)

diff --git a/types/tail/test.ts b/types/tail/tail-tests.ts
similarity index 100%
rename from types/tail/test.ts
rename to types/tail/tail-tests.ts
diff --git a/types/tail/tsconfig.json b/types/tail/tsconfig.json
index 20be91772d..fbc4b5e0ff 100644
--- a/types/tail/tsconfig.json
+++ b/types/tail/tsconfig.json
@@ -14,6 +14,6 @@
   },
   "files": [
     "index.d.ts",
-    "test.ts"
+    "tail-tests.ts"
   ]
 }

From d12e4ba256dd80911ea21a63b828e48da16cd083 Mon Sep 17 00:00:00 2001
From: Bruno Lemos <brunohplemos@gmail.com>
Date: Wed, 16 May 2018 01:30:49 -0300
Subject: [PATCH 154/575] [react-native] Image props should extend ImageStyle
 intead of ViewStyle

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 63f3157dfc..5fbc785e5a 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3385,7 +3385,7 @@ export type ImageSourcePropType = ImageURISource | ImageURISource[] | ImageRequi
 /**
  * @see https://facebook.github.io/react-native/docs/image.html
  */
-export interface ImagePropsBase extends ImagePropsIOS, ImagePropsAndroid, AccessibilityProps, ViewStyle {
+export interface ImagePropsBase extends ImagePropsIOS, ImagePropsAndroid, AccessibilityProps, ImageStyle {
     /**
      * onLayout function
      *

From ad76e164ab712acc5ac5c5ba5cca197d02b60cfc Mon Sep 17 00:00:00 2001
From: knegusen <knegusen@gmail.com>
Date: Wed, 16 May 2018 08:48:24 +0200
Subject: [PATCH 155/575] Added type definitions for react-collapsible

---
 types/react-collapsible/index.d.ts            | 35 +++++++++++++++++++
 .../react-collapsible-tests.tsx               | 17 +++++++++
 types/react-collapsible/tsconfig.json         | 24 +++++++++++++
 types/react-collapsible/tslint.json           |  1 +
 4 files changed, 77 insertions(+)
 create mode 100644 types/react-collapsible/index.d.ts
 create mode 100644 types/react-collapsible/react-collapsible-tests.tsx
 create mode 100644 types/react-collapsible/tsconfig.json
 create mode 100644 types/react-collapsible/tslint.json

diff --git a/types/react-collapsible/index.d.ts b/types/react-collapsible/index.d.ts
new file mode 100644
index 0000000000..f52e953684
--- /dev/null
+++ b/types/react-collapsible/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for react-collapsible 2.2
+// Project: https://github.com/glennflanagan/react-collapsible#readme
+// Definitions by: knegusen <https://github.com/knegusen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface CollapsibleProp {
+    children?: string | React.ReactNode;
+    transitionTime?: number;
+    transitionCloseTime?: number;
+    triggerTagName?: string;
+    easing?: string;
+    open?: boolean;
+    classParentString?: string;
+    openedClassName?: string;
+    triggerStyle?: object;
+    triggerClassName?: string;
+    triggerOpenedClassName?: string;
+    contentOuterClassName?: string;
+    contentInnerClassName?: string;
+    accordionPosition?: string | number;
+    handleTriggerClick?: (accordionPosition?: string | number) => void;
+    onOpen?: () => void;
+    onClose?: () => void;
+    onOpening?: () => void;
+    onClosing?: () => void;
+    trigger?: string | React.ReactNode;
+    triggerWhenOpen?: string | React.ReactNode;
+    triggerDisabled?: boolean;
+    lazyRender?: boolean;
+    overflowWhenOpen?: 'hidden' | 'visible' | 'auto' | 'scroll' | 'inherit' | 'initial' | 'unset';
+    triggerSibling?: React.ReactNode | string | (() => void);
+    tabIndex?: number;
+}
+
+export default class Collapsible extends React.Component<CollapsibleProp> {}
diff --git a/types/react-collapsible/react-collapsible-tests.tsx b/types/react-collapsible/react-collapsible-tests.tsx
new file mode 100644
index 0000000000..69050d6b8c
--- /dev/null
+++ b/types/react-collapsible/react-collapsible-tests.tsx
@@ -0,0 +1,17 @@
+import Collapsible from "react-collapsible";
+import * as React from "react";
+
+const Component = (
+    <div>
+        <Collapsible trigger="Start here">
+            <p>
+                This is the collapsible content. It can be any element or React
+                component you like.
+            </p>
+            <p>
+                It can even be another Collapsible component. Check out the next
+                section!
+            </p>
+        </Collapsible>
+    </div>
+);
diff --git a/types/react-collapsible/tsconfig.json b/types/react-collapsible/tsconfig.json
new file mode 100644
index 0000000000..a75a29a44a
--- /dev/null
+++ b/types/react-collapsible/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-collapsible-tests.tsx"
+    ]
+}
diff --git a/types/react-collapsible/tslint.json b/types/react-collapsible/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-collapsible/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From a4bb93652611df2859712cefc36b92ff75aa9226 Mon Sep 17 00:00:00 2001
From: knegusen <knegusen@gmail.com>
Date: Wed, 16 May 2018 08:55:50 +0200
Subject: [PATCH 156/575] Specify version of typescript in declaration file

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

diff --git a/types/react-collapsible/index.d.ts b/types/react-collapsible/index.d.ts
index f52e953684..ad56aba34e 100644
--- a/types/react-collapsible/index.d.ts
+++ b/types/react-collapsible/index.d.ts
@@ -2,7 +2,9 @@
 // Project: https://github.com/glennflanagan/react-collapsible#readme
 // Definitions by: knegusen <https://github.com/knegusen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
 
+import * as React from "react";
 export interface CollapsibleProp {
     children?: string | React.ReactNode;
     transitionTime?: number;

From ddac6e2625089bdb1e40091ea21097a9d08390b0 Mon Sep 17 00:00:00 2001
From: Bruno Lemos <brunohplemos@gmail.com>
Date: Wed, 16 May 2018 03:35:00 -0300
Subject: [PATCH 157/575] [react-native] Add tests for ImageStyle and ViewStyle
 as props

---
 types/react-native/test/index.tsx | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index 0bd0309963..f51c041b8c 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -22,6 +22,7 @@ import {
     DataSourceAssetCallback,
     DeviceEventEmitterStatic,
     Dimensions,
+    Image,
     ImageStyle,
     InteractionManager,
     ListView,
@@ -462,4 +463,24 @@ class StatusBarTest extends React.Component {
     }
 }
 
+class StylePropsTest extends React.PureComponent {
+    render() {
+        const uri = 'https://seeklogo.com/images/T/typescript-logo-B29A3F462D-seeklogo.com.png'
+
+        return (
+            <View backgroundColor="lightgray" flex={1} overflow="scroll">
+                <Image
+                    borderRadius={100}
+                    height={300}
+                    margin={20}
+                    overflow="visible" // ps: must fail if "scroll"
+                    source={{ uri }}
+                    tintColor="green"
+                    width={300}
+                />
+            </View>
+        );
+    }
+}
+
 const listViewDataSourceTest = new ListView.DataSource({rowHasChanged: () => true})

From cf5dd197b379cd6cdf3072c6d724e22372ef87f3 Mon Sep 17 00:00:00 2001
From: Bruno Lemos <brunohplemos@gmail.com>
Date: Wed, 16 May 2018 03:45:45 -0300
Subject: [PATCH 158/575] [react-native] [Image] Disable broken props: width,
 height and tintColor

---
 types/react-native/index.d.ts     | 8 ++++++++
 types/react-native/test/index.tsx | 7 ++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 5fbc785e5a..bb4c163ac5 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3494,6 +3494,14 @@ export interface ImagePropsBase extends ImagePropsIOS, ImagePropsAndroid, Access
      * A unique identifier for this element to be used in UI Automation testing scripts.
      */
     testID?: string;
+
+    /**
+     * Currently broken
+     * @see https://github.com/facebook/react-native/pull/19281
+     */
+    width?: never,
+    height?: never,
+    tintColor?: never,
 }
 
 export interface ImageProps extends ImagePropsBase {
diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index f51c041b8c..b3487057ed 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -471,12 +471,13 @@ class StylePropsTest extends React.PureComponent {
             <View backgroundColor="lightgray" flex={1} overflow="scroll">
                 <Image
                     borderRadius={100}
-                    height={300}
+                    // height={200}
                     margin={20}
                     overflow="visible" // ps: must fail if "scroll"
                     source={{ uri }}
-                    tintColor="green"
-                    width={300}
+                    style={{ width: 200, height: 200, tintColor: 'green' }}
+                    // tintColor="green"
+                    // width={200}
                 />
             </View>
         );

From abe1825055ff967255fa698b97a2fcac81b6c9b6 Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <edward.sammut.alessi@preeostudios.com>
Date: Wed, 16 May 2018 10:52:50 +0200
Subject: [PATCH 159/575] Typings for react-native-multi-slider

---
 types/react-native-multi-slider/index.d.ts    | 145 ++++++++++++++++++
 .../react-native-multi-slider-tests.tsx       |  68 ++++++++
 types/react-native-multi-slider/tsconfig.json |  24 +++
 types/react-native-multi-slider/tslint.json   |   1 +
 4 files changed, 238 insertions(+)
 create mode 100644 types/react-native-multi-slider/index.d.ts
 create mode 100644 types/react-native-multi-slider/react-native-multi-slider-tests.tsx
 create mode 100644 types/react-native-multi-slider/tsconfig.json
 create mode 100644 types/react-native-multi-slider/tslint.json

diff --git a/types/react-native-multi-slider/index.d.ts b/types/react-native-multi-slider/index.d.ts
new file mode 100644
index 0000000000..9e1a94c2f0
--- /dev/null
+++ b/types/react-native-multi-slider/index.d.ts
@@ -0,0 +1,145 @@
+// Type definitions for react-native-multi-slider 0.3
+// Project: https://github.com/JackDanielsAndCode/react-native-multi-slider#readme
+// Definitions by: Edward Sammut Alessi <https://github.com/Slessi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from "react";
+import { ViewStyle } from "react-native";
+
+export interface MarkerProps {
+    pressed?: number;
+    markerStyle?: ViewStyle;
+    pressedMarkerStyle?: ViewStyle;
+    value?: number;
+}
+
+export interface MutliSliderProps {
+    /**
+     * An array containing one or two values (determines one or two markers respectively) that are the initial marker values.
+     * Note these must be possible values from your set up.
+     *
+     * Default [0]
+     */
+    values?: number[];
+
+    /**
+     * Function to be called at beginning of press
+     */
+    onValuesChangeStart?: () => void;
+
+    /**
+     * Function called after every change in value, with current values passed in as an array.
+     */
+    onValuesChange?: (change: number[]) => void;
+
+    /**
+     * Function called on end of press with final values passed in as an array
+     */
+    onValuesChangeFinish?: (change: number[]) => void;
+
+    /**
+     * Width of track
+     *
+     * Default 280
+     */
+    sliderLength?: number;
+
+    /**
+     * TODO
+     */
+    sliderOrientation?: "horizontal" | "vertical";
+
+    /**
+     * Area to be touched, should enclose the whole marker.
+     * Will be automatically centered and contain the marker.
+     * Slip displacement If finger leaves the marker measures distance before responder cuts out and changes are no
+     * longer registered, if not given marker will be active until pressed released.
+     */
+    touchDimensions?: {
+        height: number;
+        width: number;
+        borderRadius: number;
+        slipDisplacement: number;
+    };
+
+    customMarker?: React.ComponentType<MarkerProps>;
+
+    /**
+     * Slider min value corresponding to far left
+     *
+     * Default 0
+     */
+    min?: number;
+
+    /**
+     * Slider max value corresponding to far right
+     *
+     * Default 10
+     */
+    max?: number;
+
+    /**
+     * The step size between values. Make sure min max range is divisible by this to get expected results
+     *
+     * Default 1
+     */
+    step?: number;
+
+    /**
+     * Array of values corresponding to the slider's position (left to right on slider index 0 to end respectively).
+     * Values of any type can be inserted and the slider will simply give them back in the callbacks
+     */
+    optionsArray?: number[];
+
+    /**
+     * Style of sliders container, note be careful in applying styles that may affect the children's (i.e. the slider's) positioning
+     *
+     * Default { height: 30 }
+     */
+    containerStyle?: ViewStyle;
+
+    /**
+     * Customise the track
+     *
+     * Default { borderRadius: 7, height: 3.5 }
+     */
+    trackStyle?: ViewStyle;
+
+    /**
+     * Style for the track up to a single marker or between double markers
+     *
+     * Default { backgroundColor: 'blue' }
+     */
+    selectedStyle?: ViewStyle;
+
+    /**
+     * Style for remaining track
+     *
+     * Default { backgroundColor: 'grey' }
+     */
+    unselectedStyle?: ViewStyle;
+
+    /**
+     * Customise the marker's style
+     *
+     * Default {
+     *     height:30,
+     *     width: 30,
+     *     borderRadius: 15,
+     *     backgroundColor:'#E8E8E8',
+     *     borderWidth: 0.5,
+     *     borderColor: 'grey',
+     * }
+     */
+    markerStyle?: ViewStyle;
+
+    /**
+     * Style to be given to marker when pressed
+     *
+     * Default { backgroundColor:'#D3D3D3' }
+     */
+    pressedMarkerStyle?: ViewStyle;
+}
+
+export default class MultiSlider extends React.Component<MutliSliderProps> {}
diff --git a/types/react-native-multi-slider/react-native-multi-slider-tests.tsx b/types/react-native-multi-slider/react-native-multi-slider-tests.tsx
new file mode 100644
index 0000000000..1bb7a3ad4f
--- /dev/null
+++ b/types/react-native-multi-slider/react-native-multi-slider-tests.tsx
@@ -0,0 +1,68 @@
+import * as React from "react";
+import { View } from "react-native";
+import MultiSlider from "react-native-multi-slider";
+
+class SliderTest extends React.Component {
+    getInitialState() {
+        return {
+            sliderOneChanging: false,
+            sliderOneValue: [ 5 ],
+        };
+    }
+
+    SliderOneValuesChangeStart() {
+        return true;
+    }
+
+    SliderOneValuesChange(values: number[]) {
+        return values[0];
+    }
+
+    SliderOneValuesChangeFinish() {
+        return false;
+    }
+
+    /**
+     * Examples as from https://github.com/JackDanielsAndCode/react-native-multi-slider/blob/master/index.ios.js
+     */
+    render() {
+        return (
+            <React.Fragment>
+                <MultiSlider
+                    values={[ 5 ]}
+                    sliderLength={280}
+                    onValuesChangeStart={this.SliderOneValuesChangeStart}
+                    onValuesChange={this.SliderOneValuesChange}
+                    onValuesChangeFinish={this.SliderOneValuesChangeFinish}
+                />
+
+                <MultiSlider values={[ 3, 7 ]} sliderLength={280} />
+
+                <MultiSlider
+                    selectedStyle={{
+                        backgroundColor: "gold",
+                    }}
+                    unselectedStyle={{
+                        backgroundColor: "silver",
+                    }}
+                    values={[ 5 ]}
+                    containerStyle={{
+                        height: 40,
+                    }}
+                    trackStyle={{
+                        height: 10,
+                        backgroundColor: "red",
+                    }}
+                    touchDimensions={{
+                        height: 40,
+                        width: 40,
+                        borderRadius: 20,
+                        slipDisplacement: 40,
+                    }}
+                    customMarker={(props) => <View {...props} />}
+                    sliderLength={280}
+                />
+            </React.Fragment>
+        );
+    }
+}
diff --git a/types/react-native-multi-slider/tsconfig.json b/types/react-native-multi-slider/tsconfig.json
new file mode 100644
index 0000000000..c67d12e21d
--- /dev/null
+++ b/types/react-native-multi-slider/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "jsx": "react-native",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-multi-slider-tests.tsx"
+    ]
+}
diff --git a/types/react-native-multi-slider/tslint.json b/types/react-native-multi-slider/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-multi-slider/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 5de0032929854a282ded0a04930fd1e2fb62a636 Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <edward.sammut.alessi@preeostudios.com>
Date: Wed, 16 May 2018 11:04:10 +0200
Subject: [PATCH 160/575] Typings for extract-files

---
 types/extract-files/extract-files-tests.ts |  9 +++++++++
 types/extract-files/index.d.ts             | 20 +++++++++++++++++++
 types/extract-files/tsconfig.json          | 23 ++++++++++++++++++++++
 types/extract-files/tslint.json            |  1 +
 4 files changed, 53 insertions(+)
 create mode 100644 types/extract-files/extract-files-tests.ts
 create mode 100644 types/extract-files/index.d.ts
 create mode 100644 types/extract-files/tsconfig.json
 create mode 100644 types/extract-files/tslint.json

diff --git a/types/extract-files/extract-files-tests.ts b/types/extract-files/extract-files-tests.ts
new file mode 100644
index 0000000000..862f29d5f3
--- /dev/null
+++ b/types/extract-files/extract-files-tests.ts
@@ -0,0 +1,9 @@
+import { ReactNativeFile, ReactNativeFileOptions } from "extract-files";
+
+const options: ReactNativeFileOptions = {
+    name: "",
+    type: "",
+    uri: "",
+};
+
+new ReactNativeFile(options);
diff --git a/types/extract-files/index.d.ts b/types/extract-files/index.d.ts
new file mode 100644
index 0000000000..1cbbc215c3
--- /dev/null
+++ b/types/extract-files/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for extract-files 3.1
+// Project: https://github.com/jaydenseric/extract-files#readme
+// Definitions by: My Self <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface ReactNativeFileOptions {
+    uri: string;
+    type: string;
+    name: string;
+}
+
+export class ReactNativeFile {
+    uri: string;
+    type: string;
+    name: string;
+
+    constructor(options: ReactNativeFileOptions);
+
+    static list(files: ReactNativeFileOptions[]): ReactNativeFile[];
+}
diff --git a/types/extract-files/tsconfig.json b/types/extract-files/tsconfig.json
new file mode 100644
index 0000000000..6c462da54e
--- /dev/null
+++ b/types/extract-files/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",
+        "extract-files-tests.ts"
+    ]
+}
diff --git a/types/extract-files/tslint.json b/types/extract-files/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/extract-files/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 29586ecded460a01998370259c02e499fb4b8a2d Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <Slessi@users.noreply.github.com>
Date: Wed, 16 May 2018 11:05:52 +0200
Subject: [PATCH 161/575] Update index.d.ts

Fix TS version due to react's higher TS version
---
 types/react-native-multi-slider/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-native-multi-slider/index.d.ts b/types/react-native-multi-slider/index.d.ts
index 9e1a94c2f0..2b6ed2ac2a 100644
--- a/types/react-native-multi-slider/index.d.ts
+++ b/types/react-native-multi-slider/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/JackDanielsAndCode/react-native-multi-slider#readme
 // Definitions by: Edward Sammut Alessi <https://github.com/Slessi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 import { ViewStyle } from "react-native";

From ddc97f58b3421d065ca415c6c29b80c959935b5f Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <Slessi@users.noreply.github.com>
Date: Wed, 16 May 2018 11:15:44 +0200
Subject: [PATCH 162/575] Update index.d.ts

Update maintainer name
---
 types/extract-files/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/extract-files/index.d.ts b/types/extract-files/index.d.ts
index 1cbbc215c3..412dc09a98 100644
--- a/types/extract-files/index.d.ts
+++ b/types/extract-files/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for extract-files 3.1
 // Project: https://github.com/jaydenseric/extract-files#readme
-// Definitions by: My Self <https://github.com/me>
+// Definitions by: Edward Sammut Alessi <https://github.com/Slessi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export interface ReactNativeFileOptions {

From 7007542e784f343a1d9e9a16ef7991a27f656bd6 Mon Sep 17 00:00:00 2001
From: Holger Jeromin <mailgithub@katur.de>
Date: Wed, 16 May 2018 11:29:25 +0200
Subject: [PATCH 163/575] adding JQueryEventObject to all on handlers and fix
 tests

---
 types/jquery/index.d.ts      | 44 ++++++++++++++++++++++++++++++++++--
 types/jquery/jquery-tests.ts | 32 ++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 981993e2d7..9aa6be68a2 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -4517,6 +4517,21 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
               selector: JQuery.Selector | null,
               data: TData,
               handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
+    /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the
+     *                 selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/on/}
+     * @since 1.7
+     */
+    on<TData>(events: string,
+        selector: JQuery.Selector | null,
+        data: TData,
+        handler: ((event: JQueryEventObject) => void)): this; // tslint:disable-line:unified-signatures
     /**
      * Attach an event handler function for one or more events to the selected elements.
      *
@@ -4532,6 +4547,19 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
        selector: JQuery.Selector,
        handler: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the
+     *                 selector is null or omitted, the event is always triggered when it reaches the selected element.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/on/}
+     * @since 1.7
+     */
+    on(events: string,
+        selector: JQuery.Selector,
+        handler: ((event: JQueryEventObject) => void)): this; // tslint:disable-line:unified-signatures
+     /**
      * Attach an event handler function for one or more events to the selected elements.
      *
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -4543,7 +4571,19 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
     on<TData>(events: string,
               data: TData,
               handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
-    /**
+     /**
+     * Attach an event handler function for one or more events to the selected elements.
+     *
+     * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
+     * @param data Data to be passed to the handler in event.data when an event is triggered.
+     * @param handler A function to execute when the event is triggered.
+     * @see {@link https://api.jquery.com/on/}
+     * @since 1.7
+     */
+    on<TData>(events: string,
+        data: TData,
+        handler: ((event: JQueryEventObject) => void)): this; // tslint:disable-line:unified-signatures
+/**
      * Attach an event handler function for one or more events to the selected elements.
      *
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -4563,7 +4603,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @since 1.7
      */
     on(events: string,
-        handler: ((event: JQueryEventObject) => void)): this;
+        handler: ((event: JQueryEventObject) => void)): this; // tslint:disable-line:unified-signatures
     /**
      * Attach an event handler function for one or more events to the selected elements.
      *
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 5beb6c1a6e..0cceb359b5 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -3634,6 +3634,14 @@ function JQuery() {
                 event;
             });
 
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', 'td', 'myData', function(event: JQueryEventObject) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType JQueryEventObject
+                event;
+            });
+
             // $ExpectType JQuery<HTMLElement>
             $('table').on('myEvent', 'td', 'myData', function(this: I1, event) {
                 // $ExpectType I1
@@ -3650,6 +3658,14 @@ function JQuery() {
                 event;
             });
 
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', null, 'myData', function(event: JQueryEventObject) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType JQueryEventObject
+                event;
+            });
+
             // $ExpectType JQuery<HTMLElement>
             $('table').on('myEvent', null, 'myData', function(this: I1, event) {
                 // $ExpectType I1
@@ -3666,6 +3682,14 @@ function JQuery() {
                 event;
             });
 
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', 'td', function(event: JQueryEventObject) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType JQueryEventObject
+                event;
+            });
+
             // $ExpectType JQuery<HTMLElement>
             $('table').on('myEvent', 'td', function(this: I1, event) {
                 // $ExpectType I1
@@ -3685,6 +3709,14 @@ function JQuery() {
                 event;
             });
 
+            // $ExpectType JQuery<HTMLElement>
+            $('table').on('myEvent', 3, function(event: JQueryEventObject) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType JQueryEventObject
+                event;
+            });
+
             // $ExpectType JQuery<HTMLElement>
             $('table').on('myEvent', 3, function(this: I1, event) {
                 // $ExpectType I1

From 18f8612b62a88530c33d8444d9249c83f885867f Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <Slessi@users.noreply.github.com>
Date: Wed, 16 May 2018 11:36:12 +0200
Subject: [PATCH 164/575] Update index.d.ts

Fix typo
---
 types/react-native-multi-slider/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/react-native-multi-slider/index.d.ts b/types/react-native-multi-slider/index.d.ts
index 2b6ed2ac2a..a3a5f39c63 100644
--- a/types/react-native-multi-slider/index.d.ts
+++ b/types/react-native-multi-slider/index.d.ts
@@ -14,7 +14,7 @@ export interface MarkerProps {
     value?: number;
 }
 
-export interface MutliSliderProps {
+export interface MultiSliderProps {
     /**
      * An array containing one or two values (determines one or two markers respectively) that are the initial marker values.
      * Note these must be possible values from your set up.
@@ -142,4 +142,4 @@ export interface MutliSliderProps {
     pressedMarkerStyle?: ViewStyle;
 }
 
-export default class MultiSlider extends React.Component<MutliSliderProps> {}
+export default class MultiSlider extends React.Component<MultiSliderProps> {}

From cda7bba75c60c9d7e6473db4981aa8b79eada7c4 Mon Sep 17 00:00:00 2001
From: Holger Jeromin <mailgithub@katur.de>
Date: Wed, 16 May 2018 11:47:48 +0200
Subject: [PATCH 165/575] asterisks fix

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

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 9aa6be68a2..be4b2f2346 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -4559,7 +4559,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
     on(events: string,
         selector: JQuery.Selector,
         handler: ((event: JQueryEventObject) => void)): this; // tslint:disable-line:unified-signatures
-     /**
+    /**
      * Attach an event handler function for one or more events to the selected elements.
      *
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -4571,7 +4571,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
     on<TData>(events: string,
               data: TData,
               handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
-     /**
+    /**
      * Attach an event handler function for one or more events to the selected elements.
      *
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
@@ -4583,7 +4583,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
     on<TData>(events: string,
         data: TData,
         handler: ((event: JQueryEventObject) => void)): this; // tslint:disable-line:unified-signatures
-/**
+    /**
      * Attach an event handler function for one or more events to the selected elements.
      *
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".

From 63fb6fdcb46cfb53490240a3f5d84f4091f62630 Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <tonguye@microsoft.com>
Date: Wed, 16 May 2018 13:21:57 +0200
Subject: [PATCH 166/575] fixup! [react-native] Add declarations for
 MessageQueue and BatchedBridge.

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

diff --git a/types/react-native/BatchedBridge.d.ts b/types/react-native/BatchedBridge.d.ts
index 0f1b02a0f4..dd63f73087 100644
--- a/types/react-native/BatchedBridge.d.ts
+++ b/types/react-native/BatchedBridge.d.ts
@@ -15,9 +15,9 @@ declare class MessageQueue {
 
 declare module "react-native/Libraries/BatchedBridge/BatchedBridge" {
     const BatchedBridge: MessageQueue;
-    export default BatchedBridge;
+    export = BatchedBridge;
 }
 
 declare module "react-native/Libraries/BatchedBridge/MessageQueue" {
-    export default MessageQueue;
+    export = MessageQueue;
 }

From 18d941bfe0513cf8750fc4ba39feda337bb186a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wang=20D=C3=A0p=C3=A9ng?= <wonderfuly@gmail.com>
Date: Wed, 16 May 2018 19:24:05 +0800
Subject: [PATCH 167/575] Update http-assert assert definition

`assert` should support `assert(value, 500, { toast: 'custom error message' })`
---
 types/http-assert/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/http-assert/index.d.ts b/types/http-assert/index.d.ts
index aac93be123..37609bffda 100644
--- a/types/http-assert/index.d.ts
+++ b/types/http-assert/index.d.ts
@@ -10,6 +10,7 @@
  * @param opts custom properties to attach to the error object
  */
 declare function assert(value: any, status?: number, msg?: string, opts?: {}): void;
+declare function assert(value: any, status?: number, opts?: {}): void;
 
 declare namespace assert {
     /**

From 5f5b3f1cb0d1fa587c097eeee106983f807972d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wang=20D=C3=A0p=C3=A9ng?= <wonderfuly@gmail.com>
Date: Wed, 16 May 2018 19:30:06 +0800
Subject: [PATCH 168/575] Update http-assert version

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

diff --git a/types/http-assert/index.d.ts b/types/http-assert/index.d.ts
index 37609bffda..e48d69fa59 100644
--- a/types/http-assert/index.d.ts
+++ b/types/http-assert/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for http-assert 1.2
+// Type definitions for http-assert 1.3
 // Project: https://github.com/jshttp/http-assert
 // Definitions by: jKey Lu <https://github.com/jkeylu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 41b4cf88d9a7e1d38d1ac8a5512071810090680b Mon Sep 17 00:00:00 2001
From: Vincent Fabioux <vilcegt@gmail.com>
Date: Wed, 16 May 2018 13:43:46 +0200
Subject: [PATCH 169/575] [rc-tree] Fix incorrect right click, mouse enter and
 mouse leave props type.

---
 types/rc-tree/index.d.ts | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/types/rc-tree/index.d.ts b/types/rc-tree/index.d.ts
index e8cdb487e6..1ec7cc1e26 100644
--- a/types/rc-tree/index.d.ts
+++ b/types/rc-tree/index.d.ts
@@ -69,6 +69,21 @@ export interface SelectData {
     event: "select";
 }
 
+export interface OnRightClickData {
+    event: Event;
+    node: InternalTreeNode;
+}
+
+export interface OnMouseEnterData {
+    event: Event;
+    node: InternalTreeNode;
+}
+
+export interface OnMouseLeaveData {
+    event: Event;
+    node: InternalTreeNode;
+}
+
 export interface OnDragStartData {
     event: Event;
     node: InternalTreeNode;
@@ -204,15 +219,15 @@ export interface TreeProps {
     /**
      * select current treeNode and show customized contextmenu
      */
-    onRightClick?: (node: InternalTreeNode) => void;
+    onRightClick?: (props: OnRightClickData) => void;
     /**
      * call when mouse enter a treeNode
      */
-    onMouseEnter?: (node: InternalTreeNode) => void;
+    onMouseEnter?: (props: OnMouseEnterData) => void;
     /**
      * call when mouse leave a treeNode
      */
-    onMouseLeave?: (node: InternalTreeNode) => void;
+    onMouseLeave?: (props: OnMouseLeaveData) => void;
     /**
      * whether can drag treeNode.
      */

From b31d9543ea371e290f6e771fec4dd5cca9250abd Mon Sep 17 00:00:00 2001
From: "rheese.burgess" <rheese.burgess@googlemail.com>
Date: Wed, 16 May 2018 12:57:33 +0100
Subject: [PATCH 170/575] [matter.js] Added damping to constraints

---
 types/matter-js/index.d.ts         | 28 +++++++++++++++++++++++++++-
 types/matter-js/matter-js-tests.ts |  3 ++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/types/matter-js/index.d.ts b/types/matter-js/index.d.ts
index ffca8627d0..4275785191 100644
--- a/types/matter-js/index.d.ts
+++ b/types/matter-js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Matter.js - 0.10.0
+// Type definitions for Matter.js - 0.10.1
 // Project: https://github.com/liabru/matter-js
 // Definitions by: Ivane Gegia <https://twitter.com/ivanegegia>,
 //                 David Asmuth <https://github.com/piranha771>,
@@ -1629,6 +1629,19 @@ declare namespace Matter {
         */
         stiffness?: number;
 
+        /**
+         * A `Number` that specifies the damping of the constraint, 
+         * i.e. the amount of resistance applied to each body based on their velocities to limit the amount of oscillation.
+         * Damping will only be apparent when the constraint also has a very low `stiffness`.
+         * A value of `0.1` means the constraint will apply heavy damping, resulting in little to no oscillation.
+         * A value of `0` means the constraint will apply no damping.
+         *
+         * @property damping
+         * @type number
+         * @default 0
+         */
+        damping?: number;
+
         /**
          * A `String` denoting the type of object.
          *
@@ -1772,6 +1785,19 @@ declare namespace Matter {
         */
         stiffness: number;
 
+        /**
+         * A `Number` that specifies the damping of the constraint, 
+         * i.e. the amount of resistance applied to each body based on their velocities to limit the amount of oscillation.
+         * Damping will only be apparent when the constraint also has a very low `stiffness`.
+         * A value of `0.1` means the constraint will apply heavy damping, resulting in little to no oscillation.
+         * A value of `0` means the constraint will apply no damping.
+         *
+         * @property damping
+         * @type number
+         * @default 0
+         */
+        damping: number;
+
         /**
          * A `String` denoting the type of object.
          *
diff --git a/types/matter-js/matter-js-tests.ts b/types/matter-js/matter-js-tests.ts
index 3c34f91ecc..d5dca7e50b 100644
--- a/types/matter-js/matter-js-tests.ts
+++ b/types/matter-js/matter-js-tests.ts
@@ -42,7 +42,8 @@ World.add(engine.world, stack);
 var constraint1 = Constraint.create({
 	bodyA: box1,
 	bodyB: box2,
-	stiffness: 0.02
+	stiffness: 0.02,
+	damping: 0.01
 });
 
 //Query 

From 4461c0f21189a7677c450fd45d7642b01d722f25 Mon Sep 17 00:00:00 2001
From: islishude <lishude@aliyun.com>
Date: Wed, 16 May 2018 20:12:20 +0800
Subject: [PATCH 171/575] feat(bitcoinjs-lib): add bech32 field to Network
 interface

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

diff --git a/types/bitcoinjs-lib/index.d.ts b/types/bitcoinjs-lib/index.d.ts
index 1e8255e7ef..f099f77ecb 100644
--- a/types/bitcoinjs-lib/index.d.ts
+++ b/types/bitcoinjs-lib/index.d.ts
@@ -27,6 +27,7 @@ export interface In {
 }
 
 export interface Network {
+    bech32?: string,
     bip32: {
         public: number;
         private: number;

From 7da1141f4ea59a19e51327d55e78620cbcfceae6 Mon Sep 17 00:00:00 2001
From: Oliver Joseph Ash <oliverjash@gmail.com>
Date: Wed, 16 May 2018 13:13:56 +0100
Subject: [PATCH 172/575] Node: add `undefined` to `ParsedUrlQuery` index
 signature

---
 types/node/index.d.ts    | 2 +-
 types/node/v8/index.d.ts | 2 +-
 types/node/v9/index.d.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index b26ea63807..d964a41c43 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -991,7 +991,7 @@ declare module "querystring" {
         decodeURIComponent?: Function;
     }
 
-    interface ParsedUrlQuery { [key: string]: string | string[]; }
+    interface ParsedUrlQuery { [key: string]: string | string[] | undefined; }
 
     export function stringify<T>(obj: T, sep?: string, eq?: string, options?: StringifyOptions): string;
     export function parse(str: string, sep?: string, eq?: string, options?: ParseOptions): ParsedUrlQuery;
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 32530306c2..27014e0cb0 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -895,7 +895,7 @@ declare module "querystring" {
         decodeURIComponent?: Function;
     }
 
-    interface ParsedUrlQuery { [key: string]: string | string[]; }
+    interface ParsedUrlQuery { [key: string]: string | string[] | undefined; }
 
     export function stringify<T>(obj: T, sep?: string, eq?: string, options?: StringifyOptions): string;
     export function parse(str: string, sep?: string, eq?: string, options?: ParseOptions): ParsedUrlQuery;
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index e7112daa25..014fd9bac1 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -982,7 +982,7 @@ declare module "querystring" {
         decodeURIComponent?: Function;
     }
 
-    interface ParsedUrlQuery { [key: string]: string | string[]; }
+    interface ParsedUrlQuery { [key: string]: string | string[] | undefined; }
 
     export function stringify<T>(obj: T, sep?: string, eq?: string, options?: StringifyOptions): string;
     export function parse(str: string, sep?: string, eq?: string, options?: ParseOptions): ParsedUrlQuery;

From 47fab38e3261c07e8ed7867e215a7a8c8d0dd3f3 Mon Sep 17 00:00:00 2001
From: islishude <lishude@aliyun.com>
Date: Wed, 16 May 2018 20:25:36 +0800
Subject: [PATCH 173/575] fix: fix typo

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

diff --git a/types/bitcoinjs-lib/index.d.ts b/types/bitcoinjs-lib/index.d.ts
index f099f77ecb..a1870263e0 100644
--- a/types/bitcoinjs-lib/index.d.ts
+++ b/types/bitcoinjs-lib/index.d.ts
@@ -27,7 +27,7 @@ export interface In {
 }
 
 export interface Network {
-    bech32?: string,
+    bech32?: string;
     bip32: {
         public: number;
         private: number;

From f7c46ccc76f00e236043fcb5dd8344448d7896cf Mon Sep 17 00:00:00 2001
From: Niklas Lindgren <niklas@musicglue.com>
Date: Wed, 16 May 2018 15:33:16 +0100
Subject: [PATCH 174/575] style: prettier format

---
 types/node-fetch/index.d.ts | 180 ++++++++++++++++++++++--------------
 1 file changed, 110 insertions(+), 70 deletions(-)

diff --git a/types/node-fetch/index.d.ts b/types/node-fetch/index.d.ts
index 874e216e89..02f1c8500e 100644
--- a/types/node-fetch/index.d.ts
+++ b/types/node-fetch/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for node-fetch v1.6
+// Type definitions for node-fetch v2.1.2
 // Project: https://github.com/bitinn/node-fetch
 // Definitions by: Torsten Werner <https://github.com/torstenwerner>
+//                 Niklas Lindgren <https://github.com/nikcorg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 ///<reference types="node" />
@@ -8,103 +9,142 @@
 import { Agent } from "http";
 
 export class Request extends Body {
-	constructor(input: string | Request, init?: RequestInit);
-	method: string;
-	url: string;
-	headers: Headers;
-	context: RequestContext;
-	referrer: string;
-	redirect: RequestRedirect;
+    constructor(input: string | Request, init?: RequestInit);
+    method: string;
+    url: string;
+    headers: Headers;
+    context: RequestContext;
+    referrer: string;
+    redirect: RequestRedirect;
 
-	//node-fetch extensions to the whatwg/fetch spec
-	compress: boolean;
-	agent?: Agent;
-	counter: number;
-	follow: number;
-	hostname: string;
-	protocol: string;
-	port?: number;
-	timeout: number;
-	size: number;
+    //node-fetch extensions to the whatwg/fetch spec
+    compress: boolean;
+    agent?: Agent;
+    counter: number;
+    follow: number;
+    hostname: string;
+    protocol: string;
+    port?: number;
+    timeout: number;
+    size: number;
 }
 
 interface RequestInit {
-	//whatwg/fetch standard options
-	method?: string;
-	headers?: HeaderInit | { [index: string]: string };
-	body?: BodyInit;
-	redirect?: RequestRedirect;
+    //whatwg/fetch standard options
+    method?: string;
+    headers?: HeaderInit | { [index: string]: string };
+    body?: BodyInit;
+    redirect?: RequestRedirect;
 
-	//node-fetch extensions
-	timeout?: number; //=0 req/res timeout in ms, it resets on redirect. 0 to disable (OS limit applies)
-	compress?: boolean; //=true support gzip/deflate content encoding. false to disable
-	size?: number; //=0 maximum response body size in bytes. 0 to disable
-	agent?: Agent; //=null http.Agent instance, allows custom proxy, certificate etc.
-	follow?: number; //=20 maximum redirect count. 0 to not follow redirect
+    //node-fetch extensions
+    timeout?: number; //=0 req/res timeout in ms, it resets on redirect. 0 to disable (OS limit applies)
+    compress?: boolean; //=true support gzip/deflate content encoding. false to disable
+    size?: number; //=0 maximum response body size in bytes. 0 to disable
+    agent?: Agent; //=null http.Agent instance, allows custom proxy, certificate etc.
+    follow?: number; //=20 maximum redirect count. 0 to not follow redirect
 
-	//node-fetch does not support mode, cache or credentials options
+    //node-fetch does not support mode, cache or credentials options
 }
 
 type RequestContext =
-	"audio" | "beacon" | "cspreport" | "download" | "embed" |
-	"eventsource" | "favicon" | "fetch" | "font" | "form" | "frame" |
-	"hyperlink" | "iframe" | "image" | "imageset" | "import" |
-	"internal" | "location" | "manifest" | "object" | "ping" | "plugin" |
-	"prefetch" | "script" | "serviceworker" | "sharedworker" |
-	"subresource" | "style" | "track" | "video" | "worker" |
-	"xmlhttprequest" | "xslt";
+    | "audio"
+    | "beacon"
+    | "cspreport"
+    | "download"
+    | "embed"
+    | "eventsource"
+    | "favicon"
+    | "fetch"
+    | "font"
+    | "form"
+    | "frame"
+    | "hyperlink"
+    | "iframe"
+    | "image"
+    | "imageset"
+    | "import"
+    | "internal"
+    | "location"
+    | "manifest"
+    | "object"
+    | "ping"
+    | "plugin"
+    | "prefetch"
+    | "script"
+    | "serviceworker"
+    | "sharedworker"
+    | "subresource"
+    | "style"
+    | "track"
+    | "video"
+    | "worker"
+    | "xmlhttprequest"
+    | "xslt";
 type RequestMode = "same-origin" | "no-cors" | "cors";
 type RequestRedirect = "follow" | "error" | "manual";
 type RequestCredentials = "omit" | "same-origin" | "include";
 type RequestCache =
-	"default" | "no-store" | "reload" | "no-cache" |
-	"force-cache" | "only-if-cached";
+    | "default"
+    | "no-store"
+    | "reload"
+    | "no-cache"
+    | "force-cache"
+    | "only-if-cached";
 
 export class Headers {
-	append(name: string, value: string): void;
-	delete(name: string): void;
-	get(name: string): string | null;
-	getAll(name: string): Array<string>;
-	has(name: string): boolean;
-	set(name: string, value: string): void;
-	forEach(callback: (value: string, name: string) => void): void;
+    append(name: string, value: string): void;
+    delete(name: string): void;
+    get(name: string): string | null;
+    getAll(name: string): Array<string>;
+    has(name: string): boolean;
+    set(name: string, value: string): void;
+    forEach(callback: (value: string, name: string) => void): void;
 }
 
 export class Body {
-	bodyUsed: boolean;
-	body: NodeJS.ReadableStream;
-	json(): Promise<any>;
-	json<T>(): Promise<T>;
-	text(): Promise<string>;
-	buffer(): Promise<Buffer>;
-	arrayBuffer(): Promise<ArrayBuffer>;
+    bodyUsed: boolean;
+    body: NodeJS.ReadableStream;
+    json(): Promise<any>;
+    json<T>(): Promise<T>;
+    text(): Promise<string>;
+    buffer(): Promise<Buffer>;
+    arrayBuffer(): Promise<ArrayBuffer>;
 }
 
 export class Response extends Body {
-	constructor(body?: BodyInit, init?: ResponseInit);
-	static error(): Response;
-	static redirect(url: string, status: number): Response;
-	type: ResponseType;
-	url: string;
-	status: number;
-	ok: boolean;
-	size: number;
-	statusText: string;
-	timeout: number;
-	headers: Headers;
-	clone(): Response;
+    constructor(body?: BodyInit, init?: ResponseInit);
+    static error(): Response;
+    static redirect(url: string, status: number): Response;
+    type: ResponseType;
+    url: string;
+    status: number;
+    ok: boolean;
+    size: number;
+    statusText: string;
+    timeout: number;
+    headers: Headers;
+    clone(): Response;
 }
 
-type ResponseType = "basic" | "cors" | "default" | "error" | "opaque" | "opaqueredirect";
+type ResponseType =
+    | "basic"
+    | "cors"
+    | "default"
+    | "error"
+    | "opaque"
+    | "opaqueredirect";
 
 interface ResponseInit {
-	status: number;
-	statusText?: string;
-	headers?: HeaderInit;
+    status: number;
+    statusText?: string;
+    headers?: HeaderInit;
 }
 
 type HeaderInit = Headers | Array<string>;
 type BodyInit = ArrayBuffer | ArrayBufferView | string | NodeJS.ReadableStream;
 type RequestInfo = Request | string;
 
-export default function fetch(url: string | Request, init?: RequestInit): Promise<Response>;
+export default function fetch(
+    url: string | Request,
+    init?: RequestInit
+): Promise<Response>;

From eba02ef3a0e4a407d3e5402ad6824d0ad26ddaf4 Mon Sep 17 00:00:00 2001
From: Niklas Lindgren <niklas@musicglue.com>
Date: Wed, 16 May 2018 15:34:07 +0100
Subject: [PATCH 175/575] feat: add missing methods on Headers

---
 types/node-fetch/index.d.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/types/node-fetch/index.d.ts b/types/node-fetch/index.d.ts
index 02f1c8500e..d6e76a3bad 100644
--- a/types/node-fetch/index.d.ts
+++ b/types/node-fetch/index.d.ts
@@ -91,7 +91,8 @@ type RequestCache =
     | "force-cache"
     | "only-if-cached";
 
-export class Headers {
+export class Headers implements Iterable<[string, string]> {
+    constructor(init?: Headers | { [k: string]: string });
     append(name: string, value: string): void;
     delete(name: string): void;
     get(name: string): string | null;
@@ -99,6 +100,11 @@ export class Headers {
     has(name: string): boolean;
     set(name: string, value: string): void;
     forEach(callback: (value: string, name: string) => void): void;
+    keys(): Iterator<string>;
+    entries(): Iterator<[string, string]>;
+    values(): Iterator<[string]>;
+    raw(): { [k: string]: string };
+    [Symbol.iterator](): Iterator<[string, string]>;
 }
 
 export class Body {

From 2cbe57ed327e4ff0e531250e3375c3ade02e9209 Mon Sep 17 00:00:00 2001
From: Niklas Lindgren <niklas@musicglue.com>
Date: Wed, 16 May 2018 16:08:45 +0100
Subject: [PATCH 176/575] feat: add Blob definition

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

diff --git a/types/node-fetch/index.d.ts b/types/node-fetch/index.d.ts
index d6e76a3bad..a173d08aaa 100644
--- a/types/node-fetch/index.d.ts
+++ b/types/node-fetch/index.d.ts
@@ -107,6 +107,12 @@ export class Headers implements Iterable<[string, string]> {
     [Symbol.iterator](): Iterator<[string, string]>;
 }
 
+export class Blob {
+    type: string;
+    size: number;
+    slice(start?: number, end?: number): Blob;
+}
+
 export class Body {
     bodyUsed: boolean;
     body: NodeJS.ReadableStream;

From 505f5955af254d1d1c3beea163c4a6021cf4716a Mon Sep 17 00:00:00 2001
From: Niklas Lindgren <niklas@musicglue.com>
Date: Wed, 16 May 2018 15:48:30 +0100
Subject: [PATCH 177/575] feat: add FetchError defintion

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

diff --git a/types/node-fetch/index.d.ts b/types/node-fetch/index.d.ts
index a173d08aaa..98ccbde8fe 100644
--- a/types/node-fetch/index.d.ts
+++ b/types/node-fetch/index.d.ts
@@ -123,6 +123,11 @@ export class Body {
     arrayBuffer(): Promise<ArrayBuffer>;
 }
 
+export class FetchError extends Error {
+    name: "FetchError";
+    constructor(message: string, type: string, systemError: string);
+}
+
 export class Response extends Body {
     constructor(body?: BodyInit, init?: ResponseInit);
     static error(): Response;

From 7074864dbdcbd644e065fa793a7cd6a1bbb16c92 Mon Sep 17 00:00:00 2001
From: Niklas Lindgren <niklas@musicglue.com>
Date: Wed, 16 May 2018 15:51:20 +0100
Subject: [PATCH 178/575] feat: amend Request definition

---
 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 98ccbde8fe..5c9c8c3741 100644
--- a/types/node-fetch/index.d.ts
+++ b/types/node-fetch/index.d.ts
@@ -9,13 +9,14 @@
 import { Agent } from "http";
 
 export class Request extends Body {
-    constructor(input: string | Request, init?: RequestInit);
+    constructor(input: string | { href: string } | Request, init?: RequestInit);
     method: string;
     url: string;
     headers: Headers;
     context: RequestContext;
     referrer: string;
     redirect: RequestRedirect;
+    clone(): Request;
 
     //node-fetch extensions to the whatwg/fetch spec
     compress: boolean;

From b635ffe8a70097f8b8bcd669959fcfb520148d7c Mon Sep 17 00:00:00 2001
From: Niklas Lindgren <niklas@musicglue.com>
Date: Wed, 16 May 2018 16:12:58 +0100
Subject: [PATCH 179/575] feat: amend Body definition

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

diff --git a/types/node-fetch/index.d.ts b/types/node-fetch/index.d.ts
index 5c9c8c3741..dc11802c76 100644
--- a/types/node-fetch/index.d.ts
+++ b/types/node-fetch/index.d.ts
@@ -115,11 +115,14 @@ export class Blob {
 }
 
 export class Body {
+    constructor(body?: any, opts?: { size?: number; timeout?: number });
+    blob(): Promise<Buffer>;
     bodyUsed: boolean;
     body: NodeJS.ReadableStream;
     json(): Promise<any>;
     json<T>(): Promise<T>;
     text(): Promise<string>;
+    textConverted(): Promise<string>;
     buffer(): Promise<Buffer>;
     arrayBuffer(): Promise<ArrayBuffer>;
 }

From 91c0804fdeef02a4591d8fed3a27d79997e54a96 Mon Sep 17 00:00:00 2001
From: Rene Kiupel <zaidor@hotmail.de>
Date: Wed, 16 May 2018 17:15:10 +0200
Subject: [PATCH 180/575] added 2 missing defs (domain+request)

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

diff --git a/types/amazon-product-api/index.d.ts b/types/amazon-product-api/index.d.ts
index 34bafd04f4..f266001632 100644
--- a/types/amazon-product-api/index.d.ts
+++ b/types/amazon-product-api/index.d.ts
@@ -33,6 +33,8 @@ interface IItemLookupOptions {
     searchIndex?: string;
     truncateReviewsAt?: number;
     variationPage?: string;
+    domain?: string;
+    request?: Function;
 }
 
 interface IBrowseNodeLookupOptions {

From 61b2726389e292245ec5c9f20c6da403898fd378 Mon Sep 17 00:00:00 2001
From: Niklas Lindgren <niklas@musicglue.com>
Date: Wed, 16 May 2018 16:15:28 +0100
Subject: [PATCH 181/575] style: sort methods and union members in alphabetical
 order

---
 types/node-fetch/index.d.ts | 81 +++++++++++++++++++------------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/types/node-fetch/index.d.ts b/types/node-fetch/index.d.ts
index dc11802c76..57c752d55e 100644
--- a/types/node-fetch/index.d.ts
+++ b/types/node-fetch/index.d.ts
@@ -10,39 +10,39 @@ import { Agent } from "http";
 
 export class Request extends Body {
     constructor(input: string | { href: string } | Request, init?: RequestInit);
-    method: string;
-    url: string;
-    headers: Headers;
-    context: RequestContext;
-    referrer: string;
-    redirect: RequestRedirect;
     clone(): Request;
+    context: RequestContext;
+    headers: Headers;
+    method: string;
+    redirect: RequestRedirect;
+    referrer: string;
+    url: string;
 
     //node-fetch extensions to the whatwg/fetch spec
-    compress: boolean;
     agent?: Agent;
+    compress: boolean;
     counter: number;
     follow: number;
     hostname: string;
-    protocol: string;
     port?: number;
-    timeout: number;
+    protocol: string;
     size: number;
+    timeout: number;
 }
 
 interface RequestInit {
     //whatwg/fetch standard options
-    method?: string;
-    headers?: HeaderInit | { [index: string]: string };
     body?: BodyInit;
+    headers?: HeaderInit | { [index: string]: string };
+    method?: string;
     redirect?: RequestRedirect;
 
     //node-fetch extensions
-    timeout?: number; //=0 req/res timeout in ms, it resets on redirect. 0 to disable (OS limit applies)
-    compress?: boolean; //=true support gzip/deflate content encoding. false to disable
-    size?: number; //=0 maximum response body size in bytes. 0 to disable
     agent?: Agent; //=null http.Agent instance, allows custom proxy, certificate etc.
+    compress?: boolean; //=true support gzip/deflate content encoding. false to disable
     follow?: number; //=20 maximum redirect count. 0 to not follow redirect
+    size?: number; //=0 maximum response body size in bytes. 0 to disable
+    timeout?: number; //=0 req/res timeout in ms, it resets on redirect. 0 to disable (OS limit applies)
 
     //node-fetch does not support mode, cache or credentials options
 }
@@ -74,37 +74,40 @@ type RequestContext =
     | "script"
     | "serviceworker"
     | "sharedworker"
-    | "subresource"
     | "style"
+    | "subresource"
     | "track"
     | "video"
     | "worker"
     | "xmlhttprequest"
     | "xslt";
-type RequestMode = "same-origin" | "no-cors" | "cors";
-type RequestRedirect = "follow" | "error" | "manual";
-type RequestCredentials = "omit" | "same-origin" | "include";
+type RequestMode = "cors" | "no-cors" | "same-origin";
+type RequestRedirect = "error" | "follow" | "manual";
+type RequestCredentials = "omit" | "include" | "same-origin";
+
 type RequestCache =
     | "default"
-    | "no-store"
-    | "reload"
-    | "no-cache"
     | "force-cache"
-    | "only-if-cached";
+    | "no-cache"
+    | "no-store"
+    | "only-if-cached"
+    | "reload";
 
 export class Headers implements Iterable<[string, string]> {
     constructor(init?: Headers | { [k: string]: string });
+    forEach(callback: (value: string, name: string) => void): void;
     append(name: string, value: string): void;
     delete(name: string): void;
     get(name: string): string | null;
     getAll(name: string): Array<string>;
     has(name: string): boolean;
-    set(name: string, value: string): void;
-    forEach(callback: (value: string, name: string) => void): void;
-    keys(): Iterator<string>;
-    entries(): Iterator<[string, string]>;
-    values(): Iterator<[string]>;
     raw(): { [k: string]: string };
+    set(name: string, value: string): void;
+
+    // Iterator methods
+    entries(): Iterator<[string, string]>;
+    keys(): Iterator<string>;
+    values(): Iterator<[string]>;
     [Symbol.iterator](): Iterator<[string, string]>;
 }
 
@@ -116,15 +119,15 @@ export class Blob {
 
 export class Body {
     constructor(body?: any, opts?: { size?: number; timeout?: number });
+    arrayBuffer(): Promise<ArrayBuffer>;
     blob(): Promise<Buffer>;
-    bodyUsed: boolean;
     body: NodeJS.ReadableStream;
+    bodyUsed: boolean;
+    buffer(): Promise<Buffer>;
     json(): Promise<any>;
     json<T>(): Promise<T>;
     text(): Promise<string>;
     textConverted(): Promise<string>;
-    buffer(): Promise<Buffer>;
-    arrayBuffer(): Promise<ArrayBuffer>;
 }
 
 export class FetchError extends Error {
@@ -136,15 +139,15 @@ export class Response extends Body {
     constructor(body?: BodyInit, init?: ResponseInit);
     static error(): Response;
     static redirect(url: string, status: number): Response;
-    type: ResponseType;
-    url: string;
-    status: number;
+    clone(): Response;
+    headers: Headers;
     ok: boolean;
     size: number;
+    status: number;
     statusText: string;
     timeout: number;
-    headers: Headers;
-    clone(): Response;
+    type: ResponseType;
+    url: string;
 }
 
 type ResponseType =
@@ -156,14 +159,14 @@ type ResponseType =
     | "opaqueredirect";
 
 interface ResponseInit {
+    headers?: HeaderInit;
     status: number;
     statusText?: string;
-    headers?: HeaderInit;
 }
 
-type HeaderInit = Headers | Array<string>;
-type BodyInit = ArrayBuffer | ArrayBufferView | string | NodeJS.ReadableStream;
-type RequestInfo = Request | string;
+type HeaderInit = Array<string> | Headers;
+type BodyInit = ArrayBuffer | ArrayBufferView | NodeJS.ReadableStream | string;
+type RequestInfo = string | Request;
 
 export default function fetch(
     url: string | Request,

From 956fe591b8c118cbfd4c0303df7fd29c08939481 Mon Sep 17 00:00:00 2001
From: Niklas Lindgren <niklas@musicglue.com>
Date: Wed, 16 May 2018 16:26:19 +0100
Subject: [PATCH 182/575] style: drop leading pipe in union for compat with
 TS2.0

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

diff --git a/types/node-fetch/index.d.ts b/types/node-fetch/index.d.ts
index 57c752d55e..47638e382f 100644
--- a/types/node-fetch/index.d.ts
+++ b/types/node-fetch/index.d.ts
@@ -48,7 +48,7 @@ interface RequestInit {
 }
 
 type RequestContext =
-    | "audio"
+    "audio"
     | "beacon"
     | "cspreport"
     | "download"
@@ -86,7 +86,7 @@ type RequestRedirect = "error" | "follow" | "manual";
 type RequestCredentials = "omit" | "include" | "same-origin";
 
 type RequestCache =
-    | "default"
+    "default"
     | "force-cache"
     | "no-cache"
     | "no-store"
@@ -151,7 +151,7 @@ export class Response extends Body {
 }
 
 type ResponseType =
-    | "basic"
+    "basic"
     | "cors"
     | "default"
     | "error"

From 9abbb97f487ab233cbce02f82616fe58c5931a1a Mon Sep 17 00:00:00 2001
From: Thomas Gossmann <gossi@users.noreply.github.com>
Date: Wed, 16 May 2018 17:30:14 +0200
Subject: [PATCH 183/575] Make third argument of addObserver and removeObserver
 optional

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

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index a35ed40dec..0d3c957a5b 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -1683,7 +1683,7 @@ declare module 'ember' {
             addObserver<Target>(
                 key: keyof this,
                 target: Target,
-                method: ObserverMethod<Target, this>
+                method?: ObserverMethod<Target, this>
             ): void;
             /**
              * Remove an observer you have previously registered on this object. Pass
@@ -1693,7 +1693,7 @@ declare module 'ember' {
             removeObserver<Target>(
                 key: keyof this,
                 target: Target,
-                method: ObserverMethod<Target, this>
+                method?: ObserverMethod<Target, this>
             ): any;
             /**
              * Retrieves the value of a property, or a default value in the case that the

From c7139f6cd62a3d316d9845cdeb98a870a2bafd76 Mon Sep 17 00:00:00 2001
From: Alec Zopf <alec.zopf@gmail.com>
Date: Wed, 16 May 2018 15:48:29 -0400
Subject: [PATCH 184/575] add handling for superagent pfx with passphrase

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

diff --git a/types/superagent/index.d.ts b/types/superagent/index.d.ts
index 6520b4eb66..8f457c804c 100644
--- a/types/superagent/index.d.ts
+++ b/types/superagent/index.d.ts
@@ -4,6 +4,7 @@
 //                 Michael Ledin <https://github.com/mxl>
 //                 Pap Lőrinc <https://github.com/paplorinc>
 //                 Shrey Jain <https://github.com/shreyjain1994>
+//                 Alec Zopf <https://github.com/zopf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -131,7 +132,7 @@ declare namespace request {
         on(name: string, handler: (event: any) => void): this;
         parse(parser: Parser): this;
         part(): this;
-        pfx(cert: Buffer | string): this;
+        pfx(cert: Buffer | string | { pfx: Buffer, passphrase: string }): this;
         pipe(stream: NodeJS.WritableStream, options?: object): stream.Writable;
         query(val: object | string): this;
         redirects(n: number): this;
diff --git a/types/superagent/superagent-tests.ts b/types/superagent/superagent-tests.ts
index 351e78b156..66046759f1 100644
--- a/types/superagent/superagent-tests.ts
+++ b/types/superagent/superagent-tests.ts
@@ -373,6 +373,16 @@ request
     .pfx(pfx)
     .end(callback);
 
+// pfx with passphrase, from: https://github.com/visionmedia/superagent/pull/1230/commits/96af65ffc6256df633f893095d1dc828694bbfbc
+const passpfx = fs.readFileSync('passcert.pfx');
+request
+    .post('/secure')
+    .pfx({
+        pfx: passpfx,
+        passphrase: 'test'
+    })
+    .end(callback);
+
 // ok, from: https://github.com/visionmedia/superagent/commit/34533bbc29833889090847c45a82b0ea81b2f06d
 request
     .get('/404')

From ebb93d17ef6d9050deb943acf4ec7657db12734a Mon Sep 17 00:00:00 2001
From: Thomas Gossmann <gossi@users.noreply.github.com>
Date: Wed, 16 May 2018 22:35:16 +0200
Subject: [PATCH 185/575] tests for addObserver and removeObserver with
 optional 3rd parameter

---
 types/ember/test/observable.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/ember/test/observable.ts b/types/ember/test/observable.ts
index cf871807b2..3585535dec 100755
--- a/types/ember/test/observable.ts
+++ b/types/ember/test/observable.ts
@@ -14,6 +14,11 @@ class MyComponent extends Ember.Component {
         this.removeObserver('foo', this, this.fooDidChange);
         Ember.removeObserver(this, 'foo', this, 'fooDidChange');
         Ember.removeObserver(this, 'foo', this, this.fooDidChange);
+        const lambda = () => {
+            this.fooDidChange(this, 'foo');
+        };
+        this.addObserver('foo', lambda);
+        this.removeObserver('foo', lambda);
     }
 
     fooDidChange(sender: MyComponent, key: 'foo') {

From 51dfb8cc7a7b63c6f7f4af73a67e40af748dee9b Mon Sep 17 00:00:00 2001
From: Sagie Maoz <sagie@google.com>
Date: Wed, 16 May 2018 18:32:16 -0400
Subject: [PATCH 186/575] add types for @mapbox/geojson-area

---
 types/mapbox__geojson-area/index.d.ts         | 12 ++++++++++
 .../mapbox__geojson-area-tests.ts             | 21 +++++++++++++++++
 types/mapbox__geojson-area/tsconfig.json      | 23 +++++++++++++++++++
 types/mapbox__geojson-area/tslint.json        |  1 +
 4 files changed, 57 insertions(+)
 create mode 100644 types/mapbox__geojson-area/index.d.ts
 create mode 100644 types/mapbox__geojson-area/mapbox__geojson-area-tests.ts
 create mode 100644 types/mapbox__geojson-area/tsconfig.json
 create mode 100644 types/mapbox__geojson-area/tslint.json

diff --git a/types/mapbox__geojson-area/index.d.ts b/types/mapbox__geojson-area/index.d.ts
new file mode 100644
index 0000000000..5c622342d8
--- /dev/null
+++ b/types/mapbox__geojson-area/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for @mapbox/geojson-area 0.2
+// Project: https://github.com/mapbox/geojson-area#readme
+// Definitions by: Sagie Maoz <https://github.com/n0nick>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+// tslint:disable-next-line no-single-declare-module
+declare module "@mapbox/geojson-area" {
+  import { Geometry } from 'geojson';
+
+  function geometry(geo: Geometry): number;
+}
diff --git a/types/mapbox__geojson-area/mapbox__geojson-area-tests.ts b/types/mapbox__geojson-area/mapbox__geojson-area-tests.ts
new file mode 100644
index 0000000000..b7d0803372
--- /dev/null
+++ b/types/mapbox__geojson-area/mapbox__geojson-area-tests.ts
@@ -0,0 +1,21 @@
+import { geometry } from '@mapbox/geojson-area';
+
+// Using a polygon argument
+// $ExpectType number
+geometry({
+  type: "Polygon",
+  coordinates: [
+    [
+      [170.0, 45.0], [180.0, 45.0]
+    ], [
+      [-180.0, 45.0], [-170.0, 45.0]
+    ]
+  ]
+});
+
+// Using a point argument
+// $ExpectType number
+geometry({
+  type: "Point",
+  coordinates: [12, 23]
+});
diff --git a/types/mapbox__geojson-area/tsconfig.json b/types/mapbox__geojson-area/tsconfig.json
new file mode 100644
index 0000000000..0009348b22
--- /dev/null
+++ b/types/mapbox__geojson-area/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",
+        "mapbox__geojson-area-tests.ts"
+    ]
+}
diff --git a/types/mapbox__geojson-area/tslint.json b/types/mapbox__geojson-area/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mapbox__geojson-area/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 605ede46f71db9222d1d16f055479471ea2624fb Mon Sep 17 00:00:00 2001
From: Aaron Schiff <tsdodo@gmail.com>
Date: Wed, 16 May 2018 22:19:10 -0500
Subject: [PATCH 187/575] xmldoc: Corrected, expanded, and refined typings

---
 types/xmldoc/index.d.ts | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/types/xmldoc/index.d.ts b/types/xmldoc/index.d.ts
index d4e9f92ec6..87d3403ebb 100644
--- a/types/xmldoc/index.d.ts
+++ b/types/xmldoc/index.d.ts
@@ -6,31 +6,35 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped): // TypeScript Version: 2.1
 
 export class XmlDocument extends XmlElement {
-    constructor(xmlString: string);
+    constructor(xml: string);
 
     doctype: string;
 }
 
-export class XmlElement {
-    constructor(tag: XmlElement);
+export type XmlNode = XmlElement | XmlTextNode | XmlCDataNode | XmlCommentNode;
 
+export class XmlElement {
+    constructor(tag: XmlTag);
+
+    type: 'element';
     name: string;
     attr: XmlAttributes;
     val: string;
-    children: XmlElement[];
-    firstChild: XmlElement;
-    lastChild: XmlElement;
+    children: XmlNode[];
+    firstChild: XmlNode | null;
+    lastChild: XmlNode | null;
     line: number;
     column: number;
     position: number;
     startTagPosition: number;
 
-    eachChild(func: (child: XmlElement, index?: number, array?: XmlElement[]) => void): void;
-    childNamed(name: string): XmlElement;
+    eachChild(iterator: (child: XmlElement, index: number, array: XmlNode[]) => void): void;
+    eachChild<T>(iterator: (this: T, child: XmlElement, index: number, array: XmlNode[]) => void, context: T): void;
+    childNamed(name: string): XmlElement | undefined;
     childrenNamed(name: string): XmlElement[];
-    childWithAttribute(name: string, value?: string): XmlElement;
-    descendantWithPath(path: string): XmlElement;
-    valueWithPath(path: string): string;
+    childWithAttribute(name: string, value?: string | null): XmlElement | undefined;
+    descendantWithPath(path: string): XmlElement | undefined;
+    valueWithPath(path: string): string | undefined;
     toString(opts?: XmlOptions): string;
     toStringWithIndent(indent: string, opts?: XmlOptions): string;
 }
@@ -38,6 +42,9 @@ export class XmlElement {
 export class XmlTextNode {
     constructor(text: string);
 
+    type: 'text';
+    text: string;
+
     toString(opts?: XmlOptions): string;
     toStringWithIndent(indent: string, opts?: XmlOptions): string;
 }
@@ -45,6 +52,9 @@ export class XmlTextNode {
 export class XmlCDataNode {
     constructor(cdata: string);
 
+    type: 'cdata';
+    cdata: string;
+
     toString(opts?: XmlOptions): string;
     toStringWithIndent(indent: string, opts?: XmlOptions): string;
 }
@@ -52,6 +62,9 @@ export class XmlCDataNode {
 export class XmlCommentNode {
     constructor(comment: string);
 
+    type: 'comment';
+    comment: string;
+
     toString(opts?: XmlOptions): string;
     toStringWithIndent(indent: string, opts?: XmlOptions): string;
 }

From d4284a1d4489781c9f157f49f1d802bad68ce959 Mon Sep 17 00:00:00 2001
From: Christian Rackerseder <git@echooff.de>
Date: Wed, 16 May 2018 14:45:12 +0200
Subject: [PATCH 188/575] [pino] Fixed typings

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

diff --git a/types/pino/index.d.ts b/types/pino/index.d.ts
index 02b66cc745..0f98e0a622 100644
--- a/types/pino/index.d.ts
+++ b/types/pino/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for pino 4.7
+// Type definitions for pino 4.16
 // Project: https://github.com/pinojs/pino.git
 // Definitions by: Peter Snider <https://github.com/psnider>
 //                 BendingBender <https://github.com/BendingBender>
+//                 Christian Rackerseder <https://github.com/screendriver>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -192,6 +193,10 @@ declare namespace P {
                 trace?: WriteFn;
             } & { [logLevel: string]: WriteFn });
         };
+        /**
+         * key-value object added as child logger to each log line. If set to null the base child logger is not added
+         */
+        base?: { [key: string]: any } | null;
     }
 
     interface PrettyOptions {
diff --git a/types/pino/pino-tests.ts b/types/pino/pino-tests.ts
index cc7704be77..6d226a1d92 100644
--- a/types/pino/pino-tests.ts
+++ b/types/pino/pino-tests.ts
@@ -49,6 +49,9 @@ pino({
     }
 });
 
+pino({ base: null });
+pino({ base: { foo: 'bar' } });
+
 if ('pino' in log) console.log(`pino version: ${log.pino}`);
 
 log.child({a: 'property'}).info('hello child!');

From c91d807e1c23ca4a96d8b04bb2c8754966b04339 Mon Sep 17 00:00:00 2001
From: "J.C" <jcyuan.space@gmail.com>
Date: Thu, 17 May 2018 13:34:54 +0800
Subject: [PATCH 189/575] fixed typing error & argument type error.

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

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index a7f7950a48..a188fa796a 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -6244,8 +6244,8 @@ export class WebGLDepthBuffer {
     constructor(gl: any, state: any);
 
     setTest(depthTest: boolean): void;
-    sertMask(depthMask: number): void;
-    setFunc(depthFunc: Function): void;
+    setMask(depthMask: number): void;
+    setFunc(depthFunc: number): void;
     setLocked(lock: boolean): void;
     setClear(depth: any): void;
     reset(): void;
@@ -6255,8 +6255,8 @@ export class WebGLStencilBuffer {
     constructor(gl: any, state: any);
 
     setTest(stencilTest: boolean): void;
-    sertMask(stencilMask: number): void;
-    setFunc(stencilFunc: Function, stencilRef: any, stencilMask: number): void;
+    setMask(stencilMask: number): void;
+    setFunc(stencilFunc: number, stencilRef: any, stencilMask: number): void;
     setOp(stencilFail: any, stencilZFail: any, stencilZPass: any): void;
     setLocked(lock: boolean): void;
     setClear(stencil: any): void;

From 4b546c57128554c31db3b7729c6d538871fee6b3 Mon Sep 17 00:00:00 2001
From: "J.C" <jcyuan.space@gmail.com>
Date: Thu, 17 May 2018 13:42:50 +0800
Subject: [PATCH 190/575] update tweenjs to latest 1.0.2

---
 types/tweenjs/index.d.ts | 189 +++++++++++++++++++++++----------------
 1 file changed, 113 insertions(+), 76 deletions(-)

diff --git a/types/tweenjs/index.d.ts b/types/tweenjs/index.d.ts
index bcc3c87778..a9232b2f61 100644
--- a/types/tweenjs/index.d.ts
+++ b/types/tweenjs/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for TweenJS 0.6.0
+// Type definitions for TweenJS 1.0.2
 // Project: http://www.createjs.com/#!/TweenJS
-// Definitions by: Pedro Ferreira <https://bitbucket.org/drk4>, Chris Smith <https://github.com/evilangelist>
+// Definitions by: Pedro Ferreira <https://bitbucket.org/drk4>, Chris Smith <https://github.com/evilangelist>, J.C <https://github.com/jcyuan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /*
@@ -15,15 +15,6 @@
 /// <reference types="createjs-lib" />
 
 declare namespace createjs {
-    export class CSSPlugin {
-        constructor();
-
-        // properties
-        static cssSuffixMap: Object;
-
-        // methods
-        static install(): void;
-    }
 
     export class Ease {
         // methods
@@ -68,94 +59,140 @@ declare namespace createjs {
         static sineOut: (amount: number) => number;
     }
 
-    export class MotionGuidePlugin {
-        constructor();
+    export type TweenProps = {
+        useTicks?:boolean,
+        ignoreGlobalPause?:boolean,
+        loop?:number,
+        reversed?:boolean,
+        bounce?:boolean,
+        timeScale?:number,
+        pluginData?:any,
+        paused?:boolean,
+        position?:number,
+        onChange?:(e:Event) => void,
+        onComplete?:(e:Event) => void,
+        override?:boolean;
+    }
 
+    export type TimelineProps = {
+        useTicks?:boolean,
+        ignoreGlobalPause?:boolean,
+        loop?:number,
+        reversed?:boolean,
+        bounce?:boolean,
+        timeScale?:number,
+        paused?:boolean,
+        position?:number,
+        onChange?:(e:Event) => void,
+        onComplete?:(e:Event) => void
+    }
+    
+    export class TweenStep {
+        constructor(prev:TweenStep, t:number, d:number, props:TweenProps, ease:Function, passive:boolean);
+
+		next:TweenStep;
+		prev:TweenStep;
+		t:number;
+		d:number;
+		props:TweenProps;
+		ease:Function;
+		passive:boolean;
+		index:number;
+	}
+	
+	export class TweenAction {
+        constructor(prev:TweenAction, t:number, scope:any, funct:Function, params:any[]);
+
+		next:TweenAction;
+		prev:TweenAction;
+		t:number;
+		d:number;
+		scope:any;
+		funct:Function;
+		params:any[];
+	}
+
+    export class MotionGuidePlugin {
+
+        //properties
+        static priority:number;
+        static ID:string;
+        
         //methods
         static install(): Object;
+        static init(tween:Tween, prop:string, value:any):void;
+        static step(tween:Tween, step:TweenStep, props:TweenProps):void;
+        static change(tween:Tween, step:TweenStep, prop:string, value:any, ratio:number, end:boolean):void;
+        static debug(guideData:any, ctx:any, higlight:number[]):void;
     }
 
-    /*
-        NOTE: It is commented out because it conflicts with SamplePlugin Class of PreloadJS.
-              this class is mainly for documentation purposes.
-        http://www.createjs.com/Docs/TweenJS/classes/SamplePlugin.html
-    */
-    /*
-    export class SamplePlugin {
-        constructor();
+    export class Timeline extends AbstractTween {
+        constructor(props?:TimelineProps);
 
         // properties
-        static priority: any;
+        tweens:Tween[];
 
-        //methods
-        static init(tween: Tween, prop: string, value: any): any;
-        static step(tween: Tween, prop: string, startValue: any, injectProps: Object, endValue: any): void;
-        static install(): void;
-        static tween(tween: Tween, prop: string, value: any, startValues: Object, endValues: Object, ratio: number, wait: boolean, end: boolean): any;
+        // method
+        addTween(tween:Tween):Tween;
+        removeTween(tween:Tween):boolean;
+        updateDuration():void;
     }
-    */
 
-    export class Timeline extends EventDispatcher {
-        constructor (tweens: Tween[], labels: Object, props: Object);
+    export class AbstractTween extends EventDispatcher {
+        constructor(props?:TweenProps);
 
         // properties
-        duration: number;
-        ignoreGlobalPause: boolean;
-        loop: boolean;
-        position: Object;
+        ignoreGlobalPause:boolean;
+        loop:number;
+        useTicks:boolean;
+		reversed:boolean;
+        bounce:boolean;
+        timeScale:number;
+        duration:number;
+        position:number;
+        rawPosition:number;
+        
+        paused:boolean;
+        readonly currentLabel:string;
 
         // methods
-        addLabel(label: string, position: number): void;
-        addTween(...tween: Tween[]): void;
-        getCurrentLabel(): string;
-        getLabels(): Object[];
-        gotoAndPlay(positionOrLabel: string | number): void;
-        gotoAndStop(positionOrLabel: string | number): void;
-        removeTween(...tween: Tween[]): void;
-        resolve(positionOrLabel: string | number): number;
-        setLabels(o: Object): void;
-        setPaused(value: boolean): void;
-        setPosition(value: number, actionsMode?: number): boolean;
-        tick(delta: number): void;
-        updateDuration(): void;
+        advance(delta:number, ignoreActions?:boolean):void;
+        setPosition(rawPosition:number, ignoreActions?:boolean, jump?:boolean, callback?:(tween:AbstractTween) => void):void;
+        calculatePosition(rawPosition:number):void;
+        getLabels():string[];
+        setLabels(labels:{ [labelName:string] : number }[]):void;
+        addLabel(label:string, position:number):void;
+        gotoAndPlay(positionOrLabel:string | number):void;
+        gotoAndStop(positionOrLabel:string | number):void;
+        resolve(positionOrLabel:string | number):number;
+        toString():string;
     }
 
+    export class Tween extends AbstractTween {
+        constructor(target: any, props?: TweenProps);
 
-    export class Tween extends EventDispatcher {
-        constructor(target: Object, props?: Object, pluginData?: Object);
+        static IGNORE:any;
 
         // properties
-        duration: number;
-        static IGNORE: Object;
-        ignoreGlobalPause: boolean;
-        static LOOP: number;
-        loop: boolean;
-        static NONE: number;
-        onChange: Function; // deprecated
+        target: any;
+        pluginData: any;
         passive: boolean;
-        pluginData: Object;
-        position: number;
-        static REVERSE: number;
-        target: Object;
 
         // methods
-        call(callback: (tweenObject: Tween) => any, params?: any[], scope?: Object): Tween;    // when 'params' isn't given, the callback receives a tweenObject
-        call(callback: (...params: any[]) => any, params?: any[], scope?: Object): Tween; // otherwise, it receives the params only
-        static get(target: Object, props?: Object, pluginData?: Object, override?: boolean): Tween;
-        static hasActiveTweens(target?: Object): boolean;
-        static installPlugin(plugin: Object, properties: any[]): void;
-        pause(tween: Tween): Tween;
-        play(tween: Tween): Tween;
-        static removeAllTweens(): void;
-        static removeTweens(target: Object): void;
-        set(props: Object, target?: Object): Tween;
-        setPaused(value: boolean): Tween;
-        setPosition(value: number, actionsMode: number): boolean;
-        static tick(delta: number, paused: boolean): void;
-        tick(delta: number): void;
-        to(props: Object, duration?: number, ease?: (t: number) => number): Tween;
-        wait(duration: number, passive?: boolean): Tween;
+        static get(target:any, props?:TweenProps):Tween;
+        static tick(delta:number, paused:boolean):void;
+        static handleEvent(e:Event):void;
+        static removeTweens(target:any):void;
+        static removeAllTweens():void;
+        static hasActiveTweens(target:any):boolean;
 
+        wait(duration:number, passive?:boolean):Tween;
+        to(props:any, duration?:number, ease?:Function):Tween;
+        label(name:string):Tween;
+        call(callback:(...params:any[]) => void, params?:any[], scope?:any):Tween;
+        set(props:any, target?:any):Tween;
+        play(tween?:Tween):Tween;
+        pause(tween?:Tween):Tween;
     }
 
     export class TweenJS {

From 1b2f3e2ba1dfac8dfe8ea5d34918e0960c653bf7 Mon Sep 17 00:00:00 2001
From: Ionut Botizan <ionut.botizan@haufe-lexware.com>
Date: Thu, 17 May 2018 09:24:41 +0300
Subject: [PATCH 191/575] [node] Add debugPort to the Process interface

https://nodejs.org/api/process.html#process_process_debugport
---
 types/node/index.d.ts    | 1 +
 types/node/v0/index.d.ts | 1 +
 types/node/v4/index.d.ts | 1 +
 types/node/v6/index.d.ts | 1 +
 types/node/v7/index.d.ts | 1 +
 types/node/v8/index.d.ts | 1 +
 types/node/v9/index.d.ts | 1 +
 7 files changed, 7 insertions(+)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index b26ea63807..2eba98fffe 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -713,6 +713,7 @@ declare namespace NodeJS {
         abort(): void;
         chdir(directory: string): void;
         cwd(): string;
+        debugPort: number;
         emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
         env: ProcessEnv;
         exit(code?: number): never;
diff --git a/types/node/v0/index.d.ts b/types/node/v0/index.d.ts
index 37f92cbc50..b88dd54a0c 100644
--- a/types/node/v0/index.d.ts
+++ b/types/node/v0/index.d.ts
@@ -242,6 +242,7 @@ declare namespace NodeJS {
         abort(): void;
         chdir(directory: string): void;
         cwd(): string;
+        debugPort: number;
         env: any;
         exit(code?: number): void;
         getgid(): number;
diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts
index db5518575d..dab3b0c5d9 100644
--- a/types/node/v4/index.d.ts
+++ b/types/node/v4/index.d.ts
@@ -417,6 +417,7 @@ declare namespace NodeJS {
         abort(): void;
         chdir(directory: string): void;
         cwd(): string;
+        debugPort: number;
         env: any;
         exit(code?: number): void;
         exitCode: number;
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index 9d2ea9ea00..056021841c 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -480,6 +480,7 @@ declare namespace NodeJS {
         abort(): void;
         chdir(directory: string): void;
         cwd(): string;
+        debugPort: number;
         emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
         env: any;
         exit(code?: number): void;
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index 58497e23d6..055933977d 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -477,6 +477,7 @@ declare namespace NodeJS {
         abort(): void;
         chdir(directory: string): void;
         cwd(): string;
+        debugPort: number;
         emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
         env: any;
         exit(code?: number): never;
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 32530306c2..daaf68e5a8 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -561,6 +561,7 @@ declare namespace NodeJS {
         abort(): void;
         chdir(directory: string): void;
         cwd(): string;
+        debugPort: number;
         emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
         env: ProcessEnv;
         exit(code?: number): never;
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index e7112daa25..b59d5143c9 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -704,6 +704,7 @@ declare namespace NodeJS {
         abort(): void;
         chdir(directory: string): void;
         cwd(): string;
+        debugPort: number;
         emitWarning(warning: string | Error, name?: string, ctor?: Function): void;
         env: ProcessEnv;
         exit(code?: number): never;

From 7c8a56047d0698e6e8b626f2cd4674755a20ab57 Mon Sep 17 00:00:00 2001
From: Anastasiia Antonova <antonova64@gmail.com>
Date: Thu, 17 May 2018 13:49:32 +0700
Subject: [PATCH 192/575] package.json reformat: 4 spaces indentation according
 to the .editorconfig

---
 package.json | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index 37d1f4d48b..c5b1b03057 100644
--- a/package.json
+++ b/package.json
@@ -1,27 +1,27 @@
 {
-  "private": true,
-  "name": "definitely-typed",
-  "version": "0.0.2",
-  "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/DefinitelyTyped/DefinitelyTyped.git"
-  },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/DefinitelyTyped/DefinitelyTyped/issues"
-  },
-  "engines": {
-    "node": ">=7.8.0"
-  },
-  "scripts": {
-    "compile-scripts": "tsc -p scripts",
-    "not-needed": "node scripts/not-needed.js",
-    "test": "node node_modules/types-publisher/bin/tester/test.js --run-from-definitely-typed",
-    "lint": "dtslint types"
-  },
-  "devDependencies": {
-    "dtslint": "github:Microsoft/dtslint#production",
-    "types-publisher": "Microsoft/types-publisher#production"
-  }
+    "private": true,
+    "name": "definitely-typed",
+    "version": "0.0.2",
+    "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/DefinitelyTyped/DefinitelyTyped.git"
+    },
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/DefinitelyTyped/DefinitelyTyped/issues"
+    },
+    "engines": {
+        "node": ">=7.8.0"
+    },
+    "scripts": {
+        "compile-scripts": "tsc -p scripts",
+        "not-needed": "node scripts/not-needed.js",
+        "test": "node node_modules/types-publisher/bin/tester/test.js --run-from-definitely-typed",
+        "lint": "dtslint types"
+    },
+    "devDependencies": {
+        "dtslint": "github:Microsoft/dtslint#production",
+        "types-publisher": "Microsoft/types-publisher#production"
+    }
 }

From 1405d1c6197e1cc8ee178b6f19b79903cd7ff9fe Mon Sep 17 00:00:00 2001
From: Evghenii Vasilovici <Evghenii.Vasilovici@ca.com>
Date: Thu, 17 May 2018 10:26:56 +0200
Subject: [PATCH 193/575] Change result type of `columns()` and `tables()`
 callback definition of `Database`. Add `ODBCResult.fetchSync()` definition

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

diff --git a/types/ibm_db/index.d.ts b/types/ibm_db/index.d.ts
index de54b9ca26..24699c195e 100644
--- a/types/ibm_db/index.d.ts
+++ b/types/ibm_db/index.d.ts
@@ -104,9 +104,9 @@ export class Database implements Options {
 
     rollbackTransactionSync(): Database;
 
-    columns(catalog: string | null, schema: string | null, table: string | null, column: string | null, cb: (error: Error, res: ODBCResult) => void): void;
+    columns(catalog: string | null, schema: string | null, table: string | null, column: string | null, cb: (error: Error, res: any[]) => void): void;
 
-    tables(catalog: string | null, schema: string | null, table: string | null, type: string | null, cb: (error: Error, res: ODBCResult) => void): void;
+    tables(catalog: string | null, schema: string | null, table: string | null, type: string | null, cb: (error: Error, res: any[]) => void): void;
 
     describe(obj: DescribeObject,  cb: (error: Error, res: any[]) => void): void;
 
@@ -187,6 +187,7 @@ export class ODBCStatement {
 
 export class ODBCResult {
     fetchMode: number;
+    fetchSync(): any[];
     fetchAllSync(): any[];
     moreResultsSync(): any[];
     closeSync(): void;

From ff0c5eb0c03b26f5928cef50132c50d92339c051 Mon Sep 17 00:00:00 2001
From: Nick Holloway <nick.holloway@blackpepper.co.uk>
Date: Thu, 17 May 2018 09:35:00 +0100
Subject: [PATCH 194/575] Add encryption key to Code Pipeline event

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

diff --git a/types/aws-lambda/aws-lambda-tests.ts b/types/aws-lambda/aws-lambda-tests.ts
index 05b9033da7..8a3909329f 100644
--- a/types/aws-lambda/aws-lambda-tests.ts
+++ b/types/aws-lambda/aws-lambda-tests.ts
@@ -575,6 +575,8 @@ const CodePipelineEvent: AWSLambda.CodePipelineEvent = {
     }
 };
 
+CodePipelineEvent["CodePipeline.job"].data.encryptionKey = { type: 'KMS', id: 'key' };
+
 /* CloudFront events, see http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-event-structure.html */
 const CloudFrontRequestEvent: AWSLambda.CloudFrontRequestEvent = {
   Records: [
diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index e8e305fd0a..e61d2bac72 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -528,6 +528,11 @@ export interface Credentials {
     sessionToken?: string;
 }
 
+export interface EncryptionKey {
+    type: string;
+    id: string;
+}
+
 export interface CodePipelineEvent {
     "CodePipeline.job": {
         id: string;
@@ -542,6 +547,7 @@ export interface CodePipelineEvent {
             inputArtifacts: Artifact[];
             outputArtifacts: Artifact[];
             artifactCredentials: Credentials;
+            encryptionKey?: EncryptionKey & {type: 'KMS'};
             continuationToken?: string;
         };
     };

From fcd0b6a6b626752b3c99fe467398d419d72cae23 Mon Sep 17 00:00:00 2001
From: Nick Burrell <nick@nickburrell.com>
Date: Thu, 17 May 2018 10:51:48 +0100
Subject: [PATCH 195/575] Added StyleFunction to SymbolLayout -
 icon-allow-overlap

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

diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index ece34d0938..d8362a14d8 100644
--- a/types/mapbox-gl/index.d.ts
+++ b/types/mapbox-gl/index.d.ts
@@ -1020,7 +1020,7 @@ declare namespace mapboxgl {
         'symbol-placement'?: 'point' | 'line';
         'symbol-spacing'?: number | Expression;
         'symbol-avoid-edges'?: boolean;
-        'icon-allow-overlap'?: boolean;
+        'icon-allow-overlap'?: boolean | StyleFunction;
         'icon-ignore-placement'?: boolean;
         'icon-optional'?: boolean;
         'icon-rotation-alignment'?: 'map' | 'viewport' | 'auto';

From 63337ec9f8696a07ab2fa080925bebad7779e709 Mon Sep 17 00:00:00 2001
From: Anastasiia Antonova <antonova64@gmail.com>
Date: Thu, 17 May 2018 17:06:30 +0700
Subject: [PATCH 196/575] "chartist" files reformat: 4 spaces indentation
 according to the .editorconfig

---
 types/chartist/chartist-tests.ts |  527 +++++------
 types/chartist/index.d.ts        | 1398 +++++++++++++++---------------
 2 files changed, 972 insertions(+), 953 deletions(-)

diff --git a/types/chartist/chartist-tests.ts b/types/chartist/chartist-tests.ts
index 13a7c7dd1c..281eb4987d 100644
--- a/types/chartist/chartist-tests.ts
+++ b/types/chartist/chartist-tests.ts
@@ -1,429 +1,432 @@
 import Chartist = require("chartist");
+
 Chartist.escapingMap = {
-  '&': '&amp;',
-  '<': '&lt;',
-  '>': '&gt;',
-  '"': '&quot;',
-  '\'': '&#039;',
+    '&': '&amp;',
+    '<': '&lt;',
+    '>': '&gt;',
+    '"': '&quot;',
+    '\'': '&#039;',
 };
 
 Chartist.precision = 8;
 
 new Chartist.Line('.ct-chart', {
-  labels: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday'],
-  series: [
-    [12, 9, 7, 8, 5],
-    [2, 1, 3.5, 7, 3],
-    [1, 3, 4, 5, 6]
-  ]
+    labels: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday'],
+    series: [
+        [12, 9, 7, 8, 5],
+        [2, 1, 3.5, 7, 3],
+        [1, 3, 4, 5, 6]
+    ]
 }, {
     fullWidth: true,
     chartPadding: {
-      right: 40
+        right: 40
     }
-  });
+});
 
 var lineChart = new Chartist.Line('.ct-chart', {
-  labels: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
-  series: [
-    [5, 5, 10, 8, 7, 5, 4, null, null, null, 10, 10, 7, 8, 6, 9],
-    [10, 15, null, 12, null, 10, 12, 15, null, null, 12, null, 14, null, null, null],
-    [null, null, null, null, 3, 4, 1, 3, 4, 6, 7, 9, 5, null, null, null]
-  ]
+    labels: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
+    series: [
+        [5, 5, 10, 8, 7, 5, 4, null, null, null, 10, 10, 7, 8, 6, 9],
+        [10, 15, null, 12, null, 10, 12, 15, null, null, 12, null, 14, null, null, null],
+        [null, null, null, null, 3, 4, 1, 3, 4, 6, 7, 9, 5, null, null, null]
+    ]
 }, {
     fullWidth: true,
     chartPadding: {
-      right: 10
+        right: 10
     },
     low: 0
-  });
+});
 
 new Chartist.Line('.ct-chart', {
-  labels: ['1', '2', '3', '4', '5', '6'],
-  series: [
-    {
-      name: 'Fibonacci sequence',
-      data: [1, 2, 3, 5, 8, 13]
-    },
-    {
-      name: 'Golden section',
-      data: [1, 1.618, 2.618, 4.236, 6.854, 11.09]
-    }
-  ]
+    labels: ['1', '2', '3', '4', '5', '6'],
+    series: [
+        {
+            name: 'Fibonacci sequence',
+            data: [1, 2, 3, 5, 8, 13]
+        },
+        {
+            name: 'Golden section',
+            data: [1, 1.618, 2.618, 4.236, 6.854, 11.09]
+        }
+    ]
 });
 
 var data = {
-  series: [5, 3, 4]
+    series: [5, 3, 4]
 };
 
-var sum = (a: number, b: number) => { return a + b };
+var sum = (a: number, b: number) => {
+    return a + b
+};
 
 new Chartist.Pie('.ct-chart', data, {
-  labelInterpolationFnc: (value: number) => {
-    return Math.round(value / data.series.reduce(sum) * 100) + '%';
-  }
+    labelInterpolationFnc: (value: number) => {
+        return Math.round(value / data.series.reduce(sum) * 100) + '%';
+    }
 });
 
 new Chartist.Pie('.ct-chart', {
-  series: [20, 10, 30, 40]
+    series: [20, 10, 30, 40]
 }, {
     donut: true,
     donutWidth: 60,
     startAngle: 270,
     total: 200,
     showLabel: false
-  });
+});
 
 // Animation Donut example
 var chart = new Chartist.Pie('.ct-chart', {
-  series: [10, 20, 50, 20, 5, 50, 15],
-  labels: [1, 2, 3, 4, 5, 6, 7]
+    series: [10, 20, 50, 20, 5, 50, 15],
+    labels: [1, 2, 3, 4, 5, 6, 7]
 }, {
     donut: true,
     showLabel: false
-  });
+});
 
 chart.on('draw', (data: any) => {
-  if (data.type === 'slice') {
-    // Get the total path length in order to use for dash array animation
-    var pathLength = data.element._node.getTotalLength();
+    if (data.type === 'slice') {
+        // Get the total path length in order to use for dash array animation
+        var pathLength = data.element._node.getTotalLength();
 
-    // Set a dasharray that matches the path length as prerequisite to animate dashoffset
-    data.element.attr({
-      'stroke-dasharray': pathLength + 'px ' + pathLength + 'px'
-    });
+        // Set a dasharray that matches the path length as prerequisite to animate dashoffset
+        data.element.attr({
+            'stroke-dasharray': pathLength + 'px ' + pathLength + 'px'
+        });
 
-    // Create animation definition while also assigning an ID to the animation for later sync usage
-    var animationDefinition: Chartist.IChartistAnimations = {
-      'stroke-dashoffset': {
-        id: 'anim' + data.index,
-        dur: 1000,
-        from: -pathLength + 'px',
-        to: '0px',
-        easing: Chartist.Svg.Easing.easeOutQuint,
-        // We need to use `fill: 'freeze'` otherwise our animation will fall back to initial (not visible)
-        fill: 'freeze'
-      }
-    };
+        // Create animation definition while also assigning an ID to the animation for later sync usage
+        var animationDefinition: Chartist.IChartistAnimations = {
+            'stroke-dashoffset': {
+                id: 'anim' + data.index,
+                dur: 1000,
+                from: -pathLength + 'px',
+                to: '0px',
+                easing: Chartist.Svg.Easing.easeOutQuint,
+                // We need to use `fill: 'freeze'` otherwise our animation will fall back to initial (not visible)
+                fill: 'freeze'
+            }
+        };
 
-    // If this was not the first slice, we need to time the animation so that it uses the end sync event of the previous animation
-    if (data.index !== 0) {
-      animationDefinition['stroke-dashoffset'].begin = 'anim' + (data.index - 1) + '.end';
+        // If this was not the first slice, we need to time the animation so that it uses the end sync event of the previous animation
+        if (data.index !== 0) {
+            animationDefinition['stroke-dashoffset'].begin = 'anim' + (data.index - 1) + '.end';
+        }
+
+        // We need to set an initial value before the animation starts as we are not in guided mode which would do that for us
+        data.element.attr({
+            'stroke-dashoffset': -pathLength + 'px'
+        });
+
+        // We can't use guided mode as the animations need to rely on setting begin manually
+        // See http://gionkunz.github.io/chartist-js/api-documentation.html#chartistsvg-function-animate
+        data.element.animate(animationDefinition, false);
     }
-
-    // We need to set an initial value before the animation starts as we are not in guided mode which would do that for us
-    data.element.attr({
-      'stroke-dashoffset': -pathLength + 'px'
-    });
-
-    // We can't use guided mode as the animations need to rely on setting begin manually
-    // See http://gionkunz.github.io/chartist-js/api-documentation.html#chartistsvg-function-animate
-    data.element.animate(animationDefinition, false);
-  }
 });
 
 new Chartist.Bar('.ct-chart', {
-  labels: ['XS', 'S', 'M', 'L', 'XL', 'XXL', 'XXXL'],
-  series: [20, 60, 120, 200, 180, 20, 10]
+    labels: ['XS', 'S', 'M', 'L', 'XL', 'XXL', 'XXXL'],
+    series: [20, 60, 120, 200, 180, 20, 10]
 }, {
     distributeSeries: true
-  });
+});
 
 new Chartist.Bar('.ct-chart', {
-  labels: ['Quarter 1', 'Quarter 2', 'Quarter 3', 'Quarter 4'],
-  series: [
-    [5, 4, 3, 7],
-    [3, 2, 9, 5],
-    [1, 5, 8, 4],
-    [2, 3, 4, 6],
-    [4, 1, 2, 1]
-  ]
+    labels: ['Quarter 1', 'Quarter 2', 'Quarter 3', 'Quarter 4'],
+    series: [
+        [5, 4, 3, 7],
+        [3, 2, 9, 5],
+        [1, 5, 8, 4],
+        [2, 3, 4, 6],
+        [4, 1, 2, 1]
+    ]
 }, {
     // Default mobile configuration
     stackBars: true,
     axisX: {
-      labelInterpolationFnc: (value: string) => {
-        return value.split(/\s+/).map((word: string) => {
-          return word[0];
-        }).join('');
-      }
+        labelInterpolationFnc: (value: string) => {
+            return value.split(/\s+/).map((word: string) => {
+                return word[0];
+            }).join('');
+        }
     },
     axisY: {
-      offset: 20
+        offset: 20
     }
-  }, [
+}, [
     // Options override for media > 400px
     ['screen and (min-width: 400px)', {
-      reverseData: true,
-      horizontalBars: true,
-      axisX: {
-        labelInterpolationFnc: Chartist.noop
-      },
-      axisY: {
-        offset: 60
-      }
+        reverseData: true,
+        horizontalBars: true,
+        axisX: {
+            labelInterpolationFnc: Chartist.noop
+        },
+        axisY: {
+            offset: 60
+        }
     }],
     // Options override for media > 800px
     ['screen and (min-width: 800px)', {
-      stackBars: false,
-      seriesBarDistance: 10
+        stackBars: false,
+        seriesBarDistance: 10
     }],
     // Options override for media > 1000px
     ['screen and (min-width: 1000px)', {
-      reverseData: false,
-      horizontalBars: false,
-      seriesBarDistance: 15
+        reverseData: false,
+        horizontalBars: false,
+        seriesBarDistance: 15
     }]
-  ]);
+]);
 
 new Chartist.Pie('.ct-chart', {
-  series: [{
-    value: 20,
-    name: 'Series 1',
-    className: 'my-custom-class-one',
-    meta: 'Meta One'
-  }, {
-      value: 10,
-      name: 'Series 2',
-      className: 'my-custom-class-two',
-      meta: 'Meta Two'
+    series: [{
+        value: 20,
+        name: 'Series 1',
+        className: 'my-custom-class-one',
+        meta: 'Meta One'
     }, {
-      value: 70,
-      name: 'Series 3',
-      className: 'my-custom-class-three',
-      meta: 'Meta Three'
+        value: 10,
+        name: 'Series 2',
+        className: 'my-custom-class-two',
+        meta: 'Meta Two'
+    }, {
+        value: 70,
+        name: 'Series 3',
+        className: 'my-custom-class-three',
+        meta: 'Meta Three'
     }]
 });
 
 new Chartist.Bar('.bar-chart', {
-  labels: ['foo', 'bar', 'foobar'],
-  series: [
-    {
-      data: [1],
-      className: 'graph-foo',
-    },
-    {
-      data: [10],
-      className: 'graph-foo',
-    },
-    {
-      data: [12],
-      className: 'graph-foo',
-    }]
-  }, {
+    labels: ['foo', 'bar', 'foobar'],
+    series: [
+        {
+            data: [1],
+            className: 'graph-foo',
+        },
+        {
+            data: [10],
+            className: 'graph-foo',
+        },
+        {
+            data: [12],
+            className: 'graph-foo',
+        }]
+}, {
     seriesBarDistance: 30,
     reverseData: true,
     horizontalBars: true,
     height: '115px',
     axisY: {
-      offset: 70,
-      showGrid: false,
+        offset: 70,
+        showGrid: false,
     },
     axisX: {
-      scaleMinSpace: 200
+        scaleMinSpace: 200
     }
-  });
+});
 
 new Chartist.Line('.ct-chart', {
-  labels: [1, 2, 3, 4, 5, 6, 7, 8],
-  series: [
-    [5, 9, 7, 8, 5, 3, 5, 4]
-  ]
+    labels: [1, 2, 3, 4, 5, 6, 7, 8],
+    series: [
+        [5, 9, 7, 8, 5, 3, 5, 4]
+    ]
 }, {
     ticks: [0, 4],
     low: 0,
     showArea: true,
     axisY: {
-      showLabel: true,
-      showGrid: false,
-      ticks: [1, 4],
-      type: Chartist.FixedScaleAxis
+        showLabel: true,
+        showGrid: false,
+        ticks: [1, 4],
+        type: Chartist.FixedScaleAxis
     }
-  });
+});
 
 new Chartist.Line('.ct-chart', {
-  labels: [1, 2, 3, 4, 5, 6, 7, 8],
-  series: [
-    [5, 9, 7, 8, 5, 3, 5, 4]
-  ]
+    labels: [1, 2, 3, 4, 5, 6, 7, 8],
+    series: [
+        [5, 9, 7, 8, 5, 3, 5, 4]
+    ]
 }, {
     ticks: [0, 4],
     low: 0,
     showArea: true,
     axisX: {
-      showGrid: false
+        showGrid: false
     },
     axisY: {
-      showLabel: true,
-      showGrid: false,
-      ticks: [1, 4],
-      type: Chartist.FixedScaleAxis
+        showLabel: true,
+        showGrid: false,
+        ticks: [1, 4],
+        type: Chartist.FixedScaleAxis
     }
-  });
+});
 
 var chart2 = new Chartist.Line('.ct-chart', {
-  labels: [1, 2, 3, 4, 5],
-  series: [
-    [12, 9, 7, 8, 5]
-  ]
+    labels: [1, 2, 3, 4, 5],
+    series: [
+        [12, 9, 7, 8, 5]
+    ]
 });
 
 // Listening for draw events that get emitted by the Chartist chart
 chart2.on('draw', (data: any) => {
-  // If the draw event was triggered from drawing a point on the line chart
-  if (data.type === 'point') {
-    // We are creating a new path SVG element that draws a triangle around the point coordinates
-    var triangle = new Chartist.Svg('path', {
-      d: ['M',
-        data.x,
-        data.y - 15,
-        'L',
-        data.x - 15,
-        data.y + 8,
-        'L',
-        data.x + 15,
-        data.y + 8,
-        'z'].join(' '),
-      style: 'fill-opacity: 1'
-    }, 'ct-area');
+    // If the draw event was triggered from drawing a point on the line chart
+    if (data.type === 'point') {
+        // We are creating a new path SVG element that draws a triangle around the point coordinates
+        var triangle = new Chartist.Svg('path', {
+            d: ['M',
+                data.x,
+                data.y - 15,
+                'L',
+                data.x - 15,
+                data.y + 8,
+                'L',
+                data.x + 15,
+                data.y + 8,
+                'z'].join(' '),
+            style: 'fill-opacity: 1'
+        }, 'ct-area');
 
-    // With data.element we get the Chartist SVG wrapper and we can replace the original point drawn by Chartist with our newly created triangle
-    data.element.replace(triangle);
-  }
+        // With data.element we get the Chartist SVG wrapper and we can replace the original point drawn by Chartist with our newly created triangle
+        data.element.replace(triangle);
+    }
 });
 
 // Create a simple bi-polar bar chart
 var biPolarChart = new Chartist.Bar('.ct-chart', {
-  labels: ['W1', 'W2', 'W3', 'W4', 'W5', 'W6', 'W7', 'W8', 'W9', 'W10'],
-  series: [
-    [1, 2, 4, 8, 6, -2, -1, -4, -6, -2]
-  ]
+    labels: ['W1', 'W2', 'W3', 'W4', 'W5', 'W6', 'W7', 'W8', 'W9', 'W10'],
+    series: [
+        [1, 2, 4, 8, 6, -2, -1, -4, -6, -2]
+    ]
 }, {
     high: 10,
     low: -10,
     axisX: {
-      labelInterpolationFnc: (value: any, index: number) => {
-        return index % 2 === 0 ? value : null;
-      }
+        labelInterpolationFnc: (value: any, index: number) => {
+            return index % 2 === 0 ? value : null;
+        }
     }
-  });
+});
 
 // Listen for draw events on the bar chart
 biPolarChart.on('draw', (data: any) => {
-  // If this draw event is of type bar we can use the data to create additional content
-  if (data.type === 'bar') {
-    // We use the group element of the current series to append a simple circle with the bar peek coordinates and a circle radius that is depending on the value
-    data.group.append(new Chartist.Svg('circle', {
-      cx: data.x2,
-      cy: data.y2,
-      r: Math.abs(Chartist.getMultiValue(data.value)) * 2 + 5
-    }, 'ct-slice-pie'));
-  }
+    // If this draw event is of type bar we can use the data to create additional content
+    if (data.type === 'bar') {
+        // We use the group element of the current series to append a simple circle with the bar peek coordinates and a circle radius that is depending on the value
+        data.group.append(new Chartist.Svg('circle', {
+            cx: data.x2,
+            cy: data.y2,
+            r: Math.abs(Chartist.getMultiValue(data.value)) * 2 + 5
+        }, 'ct-slice-pie'));
+    }
 });
 
 new Chartist.Bar('.ct-chart', {
-  labels: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-  series: [
-    [5, 4, 3, 7, 5, 10, 3],
-    [3, 2, 9, 5, 4, 6, 4]
-  ]
+    labels: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+    series: [
+        [5, 4, 3, 7, 5, 10, 3],
+        [3, 2, 9, 5, 4, 6, 4]
+    ]
 }, {
     axisX: {
-      // On the x-axis start means top and end means bottom
-      position: 'start'
+        // On the x-axis start means top and end means bottom
+        position: 'start'
     },
     axisY: {
-      // On the y-axis start means left and end means right
-      position: 'end'
+        // On the y-axis start means left and end means right
+        position: 'end'
     }
-  });
+});
 
 new Chartist.Line('.ct-chart', {
-  labels: [1, 2, 3, 4, 5],
-  series: [[1, 2, 8, 1, 7]]
+    labels: [1, 2, 3, 4, 5],
+    series: [[1, 2, 8, 1, 7]]
 }, {
     lineSmooth: Chartist.Interpolation.none({
-      fillHoles: false
+        fillHoles: false
     })
-  });
+});
 
 new Chartist.Line('.ct-chart', {
-  labels: [1, 2, 3, 4, 5],
-  series: [[1, 2, 8, 1, 7]]
+    labels: [1, 2, 3, 4, 5],
+    series: [[1, 2, 8, 1, 7]]
 }, {
     lineSmooth: Chartist.Interpolation.simple({
-      divisor: 2,
-      fillHoles: false
+        divisor: 2,
+        fillHoles: false
     })
-  });
+});
 
 new Chartist.Line('.ct-chart', {
-  labels: [1, 2, 3, 4, 5],
-  series: [[1, 2, 8, 1, 7]]
+    labels: [1, 2, 3, 4, 5],
+    series: [[1, 2, 8, 1, 7]]
 }, {
     lineSmooth: Chartist.Interpolation.cardinal({
-      tension: 1,
-      fillHoles: false
+        tension: 1,
+        fillHoles: false
     })
-  });
+});
 
 new Chartist.Line('.ct-chart', {
-  labels: [1, 2, 3, 4, 5],
-  series: [[1, 2, 8, 1, 7]]
+    labels: [1, 2, 3, 4, 5],
+    series: [[1, 2, 8, 1, 7]]
 }, {
     lineSmooth: Chartist.Interpolation.step({
-      postpone: true,
-      fillHoles: false
+        postpone: true,
+        fillHoles: false
     })
-  });
+});
 
 var overlappingBarsData: Chartist.IChartistData = {
-  labels: ['Jan', 'Feb', 'Mar', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-  series: [
-    [5, 4, 3, 7, 5, 10, 3, 4, 8, 10, 6, 8],
-    [3, 2, 9, 5, 4, 6, 4, 6, 7, 8, 7, 4]
-  ]
+    labels: ['Jan', 'Feb', 'Mar', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+    series: [
+        [5, 4, 3, 7, 5, 10, 3, 4, 8, 10, 6, 8],
+        [3, 2, 9, 5, 4, 6, 4, 6, 7, 8, 7, 4]
+    ]
 };
 
 var overlappingBarsOptions: Chartist.IBarChartOptions = {
-  seriesBarDistance: 10
+    seriesBarDistance: 10
 };
 
 var overlappingBarsResponsiveOptions: Array<Chartist.IResponsiveOptionTuple<Chartist.IBarChartOptions>> = [
-  ['screen and (max-width: 640px)', {
-    seriesBarDistance: 5,
-    axisX: {
-      labelInterpolationFnc: (value: any) => {
-        return value[0];
-      }
-    }
-  }]
+    ['screen and (max-width: 640px)', {
+        seriesBarDistance: 5,
+        axisX: {
+            labelInterpolationFnc: (value: any) => {
+                return value[0];
+            }
+        }
+    }]
 ];
 
 new Chartist.Bar('.ct-chart', overlappingBarsData, overlappingBarsOptions, overlappingBarsResponsiveOptions);
 
 new Chartist.Candle('.ct-chart', {
-  labels: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-  series: [
-    [5, 4, 3, 7],
-    [3, 2, 9, 5],
-    [5, 4, 3, 7],
-    [3, 2, 9, 5],
-    [5, 4, 3, 7],
-    [3, 2, 9, 5],
-    [3, 2, 9, 5]
-  ]
+    labels: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+    series: [
+        [5, 4, 3, 7],
+        [3, 2, 9, 5],
+        [5, 4, 3, 7],
+        [3, 2, 9, 5],
+        [5, 4, 3, 7],
+        [3, 2, 9, 5],
+        [3, 2, 9, 5]
+    ]
 }, {
-  axisX: {
-    labelOffset: {
-      x: -10,
-      y: 0
+    axisX: {
+        labelOffset: {
+            x: -10,
+            y: 0
+        }
+    },
+    axisY: {
+        showGrid: false,
+        labelInterpolationFnc: function (value: any) {
+            return value + 12000;
+        }
     }
-  },
-  axisY: {
-    showGrid: false,
-    labelInterpolationFnc: function (value: any) {
-      return value + 12000;
-    }
-  }
 });
diff --git a/types/chartist/index.d.ts b/types/chartist/index.d.ts
index 93918a5eeb..4f8826de9c 100644
--- a/types/chartist/index.d.ts
+++ b/types/chartist/index.d.ts
@@ -5,699 +5,715 @@
 
 declare namespace Chartist {
 
-  interface ChartistStatic {
-
-    /**
-     * Precision level used internally in Chartist for rounding. If you require more decimal places you can increase this number.
-     */
-    precision: number;
-
-    /**
-     * A map with characters to escape for strings to be safely used as attribute values.
-     */
-    escapingMap: IChartistEscapeMap;
-
-    Pie: IChartistPieChart;
-    Bar: IChartistBarChart;
-    Line: IChartistLineChart;
-    Candle: IChartistCandleChart;
-
-    FixedScaleAxis: IFixedScaleAxisStatic;
-    AutoScaleAxis: IAutoScaleAxisStatic;
-    StepAxis: IStepAxisStatic;
-
-    Svg: ChartistSvgStatic;
-    Interpolation: ChartistInterpolationStatic;
-
-    noop: Function;
-
-    alphaNumerate(n: number): string;
-    extend(target: Object, ...sources: Object[]): Object;
-
-    replaceAll(str: string, subStr: string, newSubStr: string): string;
-    ensureUnit(value: number, unit: string): string;
-    quantity(input: string | number): Object;
-
-    query(query: Node | string): Node;
-    times(length: number): Array<any>;
-    sum(previous: number, current: number): number;
-    mapMultiply(factor: number): (num: number) => number;
-    mapAdd(addend: number): (num: number) => number;
-    serialMap(arr: Array<any>, cb: Function): Array<any>;
-    roundWithPrecision(value: number, digits?: number): number;
-
-    getMultiValue(value: any, dimension?: any): number; // this method is not documented, but it is used in the examples
-
-    serialize(data: Object | string | number): string;
-    deserialize(data: string): Object | string | number;
-
-    createSvg(container: Node, width: string, height: string, className: string): Object; // TODO: Figure out if this is returning a ChartistSVGWrapper or an actual SVGElement
-
-    plugins: any;
-  }
-
-  interface IChartistEscapeMap {
-    [Key: string]: string;
-  }
-
-  interface IResponsiveOptionTuple<T extends IChartOptions> extends Array<string | T> {
-    0: string;
-    1: T;
-  }
-
-  // these have no other purpose than to help define the types that can be placed on
-  // a line chart axisX
-  // in the actual chartist library these are classes that project their options onto
-  // the parent class
-  interface IFixedScaleAxisStatic { }
-  interface IAutoScaleAxisStatic { }
-  interface IStepAxisStatic { }
-
-  // data formats are not well documented on all the ways they can be passed to the constructors
-  // this definition gives some intellisense, but does not protect the user from misuse
-  // TODO: come in and tidy this up and make it fit better
-  interface IChartistData {
-    labels?: Array<string> | Array<number> | Array<Date>;
-    series: Array<IChartistSeriesData> | Array<Array<IChartistData>> | Array<number> |  Array<Array<number>>;
-  }
-
-  interface IChartistSeriesData {
-    name?: string;
-    value?: number;
-    data?: Array<number>;
-    className?: string;
-    meta?: string; // I assume this could probably be a number as well?
-  }
-
-  interface IChartistBase<T extends IChartOptions> {
-    container: any;
-    data: IChartistData;
-    defaultOptions: T;
-    options: T;
-    responsiveOptions: Array<IResponsiveOptionTuple<T>>;
-
-    // this most likely doesn't need to be exposed to the user
-    eventEmitter: any;
-
-    supportsForeignObject: boolean;
-    supportsAnimations: boolean;
-    resizeListener: any;
-
-    plugins?: Array<any>; // all of these plugins seem to be functions with options, but keeping type any for now
-
-    update(data: Object, options?: T, override?: boolean): void;
-    detach(): void;
-
-    /**
-     * Use this function to register event handlers. The handler callbacks are synchronous and will run in the main thread rather than the event loop.
-     *
-     * @method on
-     * @param event {string} Name of the event. Check the examples for supported events.
-     * @param handler {Function} The handler function that will be called when an event with the given name was emitted. This function will receive a data argument which contains event data. See the example for more details.
-     */
-    on(event: string, handler: Function): IChartistBase<T>;
-
-    /**
-     * Use this function to un-register event handlers. If the handler function parameter is omitted all handlers for the given event will be un-registered.
-     *
-     * @method off
-     * @param event {string} Name of the event for which a handler should be removed
-     * @param handler {Function} The handler function that that was previously used to register a new event handler. This handler will be removed from the event handler list. If this parameter is omitted then all event handlers for the given event are removed from the list.
-     */
-    off(event: string, handler?: Function): IChartistBase<T>;
-  }
-
-  interface IChartistPieChart extends IChartistBase<IPieChartOptions> {
-    new (target: any, data: IChartistData, options?: IPieChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<IPieChartOptions>>): IChartistPieChart;
-  }
-
-  interface IChartistLineChart extends IChartistBase<ILineChartOptions> {
-    new (target: any, data: IChartistData, options?: ILineChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<ILineChartOptions>>): IChartistLineChart;
-  }
-
-  interface IChartistBarChart extends IChartistBase<IBarChartOptions> {
-    new (target: any, data: IChartistData, options?: IBarChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<IBarChartOptions>>): IChartistBarChart;
-  }
-
-  interface IChartistCandleChart extends IChartistBase<ICandleChartOptions> {
-    new (target: any, data: IChartistData, options?: ICandleChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<ICandleChartOptions>>): IChartistCandleChart;
-  }
-
-  interface IChartOptions {
-    /**
-     * If true the whole data is reversed including labels, the series order as well as the whole series data arrays.
-     */
-    reverseData?: boolean;
-
-    plugins?: Array<any>;
-  }
-
-  interface IPieChartOptions extends IChartOptions {
-    /**
-     * Specify a fixed width for the chart as a string (i.e. '100px' or '50%')
-     */
-    width?: number | string;
-
-    /**
-     * Specify a fixed height for the chart as a string (i.e. '100px' or '50%')
-     */
-    height?: number | string;
-
-    /**
-     * Padding of the chart drawing area to the container element and labels as a number or padding object {top: 5, right: 5, bottom: 5, left: 5}
-     */
-    chartPadding?: IChartPadding | number;
-
-    /**
-     * Override the class names that are used to generate the SVG structure of the chart
-     */
-    classNames?: IPieChartClasses;
-
-    /**
-     * The start angle of the pie chart in degrees where 0 points north. A higher value offsets the start angle clockwise.
-     */
-    startAngle?: number;
-
-    /**
-     * An optional total you can specify. By specifying a total value, the sum of the values in the series must be this total in order to draw a full pie. You can use this parameter to draw only parts of a pie or gauge charts.
-     */
-    total?: number;
-
-    /**
-     * If specified the donut CSS classes will be used and strokes will be drawn instead of pie slices.
-     */
-    donut?: boolean;
-    
-    /**
-     * If specified the donut segments will be drawn as shapes instead of strokes.
-     */
-    donutSolid?: boolean;
-
-    /**
-     * Specify the donut stroke width, currently done in javascript for convenience. May move to CSS styles in the future.
-     * This option can be set as number or string to specify a relative width (i.e. 100 or '30%').
-     */
-    donutWidth?: number | string;
-
-    /**
-     * Specify if a label should be shown or not
-     */
-    showLabel?: boolean;
-
-    /**
-     * Label position offset from the standard position which is half distance of the radius. This value can be either positive or negative. Positive values will position the label away from the center.
-     */
-    labelOffset?: number;
-
-    /**
-     * This option can be set to 'inside', 'outside' or 'center'. Positioned with 'inside' the labels will be placed on half the distance of the radius to the border of the Pie by respecting the 'labelOffset'. The 'outside' option will place the labels at the border of the pie and 'center' will place the labels in the absolute center point of the chart. The 'center' option only makes sense in conjunction with the 'labelOffset' option.
-     */
-    labelPosition?: string;
-
-    /**
-     * An interpolation function for the label value
-     */
-    labelInterpolationFnc?: Function;
-
-    /**
-     * Label direction can be 'neutral', 'explode' or 'implode'.  Default is 'neutral'.  The labels anchor will be positioned based on those settings as well as the fact if the labels are on the right or left side of the center of the chart. Usually explode is useful when labels are positioned far away from the center.
-     */
-    labelDirection?: string;
-
-    /**
-     * If true the whole data is reversed including labels, the series order as well as the whole series data arrays.
-     */
-    reverseData?: boolean;
-    
-    /**
-    * If true empty values will be ignored to avoid drawing unncessary slices and labels
-    */
-    ignoreEmptyValues?: boolean;
-  }
-
-  interface IChartPadding {
-    top?: number;
-    right?: number;
-    bottom?: number;
-    left?: number;
-  }
-
-  interface IPieChartClasses {
-    chartPie?: string;
-    chartDonut?: string;
-    series?: string;
-    slicePie?: string;
-    sliceDonut?: string;
-    label?: string;
-  }
-
-  interface IBarChartOptions extends IChartOptions {
-    axisX?: IBarChartAxis;
-    axisY?: IBarChartAxis;
-    width?: number | string;
-    height?: number | string;
-    high?: number;
-    low?: number;
-    ticks?: Array<string | number>;
-    onlyInteger?: boolean;
-    chartPadding?: IChartPadding;
-    seriesBarDistance?: number;
-
-    /**
-     * If set to true this property will cause the series bars to be stacked and form a total for each series point. This will also influence the y-axis and the overall bounds of the chart. In stacked mode the seriesBarDistance property will have no effect.
-     */
-    stackBars?: boolean;
-
-    horizontalBars?: boolean;
-    distributeSeries?: boolean;
-  }
-
-  interface IBarChartAxis {
-    offset?: number;
-    position?: string;
-    labelOffset?: {
-      x?: number;
-      y?: number;
-    };
-    showLabel?: boolean;
-    showGrid?: boolean;
-    labelInterpolationFnc?: Function;
-    scaleMinSpace?: number;
-    onlyInteger?: boolean;
-  }
-
-  interface IBarChartClasses {
-    chart?: string;
-    horizontalBars?: string;
-    label?: string;
-    labelGroup?: string;
-    series?: string;
-    bar?: string;
-    grid?: string;
-    gridGroup?: string;
-    vertical?: string;
-    horizontal?: string;
-    start?: string;
-    end?: string;
-  }
-
-  interface ILineChartOptions extends IChartOptions {
-    axisX?: IChartistStepAxis | IChartistFixedScaleAxis | IChartistAutoScaleAxis;
-    axisY?: IChartistStepAxis | IChartistFixedScaleAxis | IChartistAutoScaleAxis;
-    width?: number | string;
-    height?: number | string;
-    showLine?: boolean;
-    showPoint?: boolean;
-    showArea?: boolean;
-    areaBase?: number;
-    lineSmooth?: Function | boolean;
-    low?: number;
-    high?: number;
-    ticks?: Array<string | number>;
-    chartPadding?: IChartPadding;
-    fullWidth?: boolean;
-    classNames?: ILineChartClasses;
-  }
-
-  interface ILineChartAxis {
-    offset?: number;
-    position?: string;
-    labelOffset?: {
-      x?: number;
-      y?: number;
-    };
-    showLabel?: boolean;
-    showGrid?: boolean;
-    labelInterpolationFnc?: Function;
-  }
-
-  interface IChartistStepAxis extends ILineChartAxis {
-    type?: IStepAxisStatic;
-    ticks?: Array<string> | Array<number>;
-    stretch?: boolean;
-  }
-
-  interface IChartistFixedScaleAxis extends ILineChartAxis {
-    type?: IFixedScaleAxisStatic;
-    high?: number;
-    low?: number;
-    divisor?: number;
-    ticks?: Array<string> | Array<number>;
-  }
-
-  interface IChartistAutoScaleAxis extends ILineChartAxis {
-    high?: number;
-    low?: number;
-    scaleMinSpace?: number;
-    onlyInteger?: boolean;
-    referenceValue?: number;
-    type?: IAutoScaleAxisStatic;
-  }
-
-  interface ILineChartClasses {
-    /**
-     * Default is 'ct-chart-line'
-     */
-    chart?: string;
-    label?: string;
-    labelGroup?: string;
-    series?: string;
-    line?: string;
-    point?: string;
-    area?: string;
-    grid?: string;
-    gridGroup?: string;
-    gridBackground?: string;
-    vertical?: string;
-    horizontal?: string;
-    start?: string;
-    end?: string;
-  }
-
-  interface ICandleChartOptions extends IChartOptions {     
-       
-    /**       
-     * Options for X-Axis     
-     */       
-    axisX?: ICandleChartAxis;     
-      
-    /**       
-     * Options for Y-Axis     
-     */       
-    axisY?: ICandleChartAxis;     
-      
-    /**       
-     * Specify a fixed width for the chart as a string (i.e. '100px' or '50%')        
-     */       
-    width?: number | string;      
-      
-    /**       
-     * Specify a fixed height for the chart as a string (i.e. '100px' or '50%')       
-     */       
-    height?: number | string;     
-      
-    /**       
-     * Overriding the natural high of the chart allows you to zoom in or limit the charts highest displayed value     
-     */       
-    hight?: number | string;      
-      
-    /**       
-     * Overriding the natural low of the chart allows you to zoom in or limit the charts lowest displayed value       
-     */       
-    low?: number | string;        
-      
-    /**       
-     * Width of candle body in pixel (IMO is 2 px best minimum value)     
-     */       
-    candleWidth?: number | string;        
-      
-    /**       
-     * Width of candle wick in pixel (IMO is 1 px best minimum value)     
-     */       
-    candleWickWidth?: number | string;        
-      
-    /**       
-     * Use calculated x-axis step length, depending on the number of quotes to display, as candle width. Otherwise the candleWidth is being used.     
-     */       
-    useStepLengthAsCandleWidth?: boolean | string;        
-      
-    /**       
-     * Use 1/3 of candle body width as width for the candle wick, otherwise the candleWickWidth is being used.        
-     */       
-    useOneThirdAsCandleWickWidth?: boolean | string;      
-      
-    /**       
-     * Padding of the chart drawing area to the container element and labels as a number or padding object {top: 5, right: 5, bottom: 5, left: 5}     
-     */       
-    chartPadding?: IChartPadding | number;        
-      
-    /**       
-     * When set to true, the last grid line on the x-axis is not drawn and the chart elements will expand to the full available width of the chart. For the last label to be drawncorrectly you might need to add chart padding or offset the last label with a draw event handler.      
-     */       
-    fullWidth?: boolean | string;     
-       
-    /**       
-     * Override the class names that get used to generate the SVG structure of the chart      
-     */       
-    classNames?: ICandleChartClasses;     
-   }       
-       
-   interface ICandleChartAxis {        
-    /**       
-     * The offset of the chart drawing area to the border of the container        
-     */       
-    offset?: number;      
-    /**       
-     * Position where labels are placed. Can be set to `start` or `end` where `start` is equivalent to left or top on vertical axis and `end` is equivalent to right or bottom on horizontal axis.        
-     */       
-    position?: string;        
-    /**       
-     * Allows you to correct label positioning on this axis by positive or negative x and y offset.       
-     */       
-    labelOffset?: {       
-      x?: number;     
-      y?: number;     
-    };        
-    /**       
-     * If labels should be shown or not       
-     */       
-     showLabel?: boolean;      
-     /**       
-      * If the axis grid should be drawn or not        
-      */       
-     showGrid?: boolean;       
-     /**       
-      * Interpolation function that allows you to intercept the value from the axis label      
-      */       
-     labelInterpolationFnc?: Function;     
-    /**       
-      * Set the axis type to be used to project values on this axis. If not defined, Chartist.StepAxis will be used for the X-Axis, where the ticks option will be set to the labels in the data and the stretch option will be set to the global fullWidth option. This type can be changed to any axis constructor available (e.g. Chartist.FixedScaleAxis), where all axis options should be present here.      
-     */       
-     type?: any;       
-   }       
-       
-   interface ICandleChartClasses {     
-     chart?: string;       
-     label?: string;       
-     labelGroup?: string;      
-     series?: string;      
-     candlePositive?: string;      
-     candleNegative?: string,      
-     grid?: string,        
-     gridGroup?: string,       
-     gridBackground?: string,      
-     vertical?: string,        
-     horizontal?: string,      
-     start?: string,       
-     end?: string,     
-   }       
- 
-
-  interface ChartistSvgStatic {
-    new (name: HTMLElement | string, attributes: Object, className?: string, parent?: Object, insertFirst?: boolean): IChartistSvg;
-
-    Easing: ChartistEasingStatic;
-
-    /**
-     * This method checks for support of a given SVG feature like Extensibility, SVG-animation or the like. Check http://www.w3.org/TR/SVG11/feature for a detailed list.
-     */
-    isSupported(feature: string): boolean;
-  }
-
-  interface IChartistSvg {
-
-    /**
-     * Set attributes on the current SVG element of the wrapper you're currently working on.
-     */
-    attr(attributes: Object | string, ns: string): Object | string;
-
-    /**
-     * Create a new SVG element whose wrapper object will be selected for further operations. This way you can also create nested groups easily.
-     */
-    elem(name: string, attributes?: Object, className?: string, insertFirst?: boolean): IChartistSvg;
-
-    /**
-     * Returns the parent Chartist.SVG wrapper object
-     */
-    parent(): IChartistSvg;
-
-    /**
-     * This method returns a Chartist.Svg wrapper around the root SVG element of the current tree.
-     */
-    root(): IChartistSvg;
-
-    /**
-     * Find the first child SVG element of the current element that matches a CSS selector. The returned object is a Chartist.Svg wrapper.
-     */
-    querySelector(selector: string): IChartistSvg;
-
-    /**
-     * Find the all child SVG elements of the current element that match a CSS selector. The returned object is a Chartist.Svg.List wrapper.
-     */
-    querySelectorAll(selector: string): any; // this returns an svg wrapper list in the docs, need to see if that's just an array or a special list
-
-    /**
-     * This method creates a foreignObject (see https://developer.mozilla.org/en-US/docs/Web/SVG/Element/foreignObject) that allows to embed HTML content into a SVG graphic. With the help of foreignObjects you can enable the usage of regular HTML elements inside of SVG where they are subject for SVG positioning and transformation but the Browser will use the HTML rendering capabilities for the containing DOM.
-     */
-    foreignObject(content: any, attributes?: Object, className?: string, insertFirst?: boolean): IChartistSvg;
-
-    /**
-     * This method adds a new text element to the current Chartist.Svg wrapper.
-     */
-    text(t: string): IChartistSvg;
-
-    /**
-     * This method will clear all child nodes of the current wrapper object.
-     */
-    empty(): IChartistSvg;
-
-    /**
-     * This method will cause the current wrapper to remove itself from its parent wrapper. Use this method if you'd like to get rid of an element in a given DOM structure.
-     */
-    remove(): IChartistSvg;
-
-    /**
-     * This method will replace the element with a new element that can be created outside of the current DOM.
-     */
-    replace(): IChartistSvg;
-
-    /**
-     * This method will append an element to the current element as a child.
-     */
-    append(element: IChartistSvg, insertFirst?: boolean): IChartistSvg;
-
-    /**
-     * Returns an array of class names that are attached to the current wrapper element. This method can not be chained further.
-     */
-    classes(): Array<string>;
-
-    /**
-     * Adds one or a space separated list of classes to the current element and ensures the classes are only existing once.
-     *
-     * @method addClass
-     * @param names {string} A white space separated list of class names
-     */
-    addClass(names: string): IChartistSvg;
-
-    /**
-     * Removes one or a space separated list of classes from the current element.
-     *
-     * @method removeClass
-     * @param names {string} A white space separated list of class names
-     */
-    removeClass(names: string): IChartistSvg;
-
-    /**
-     * Removes all classes from the current element.
-     */
-    removeAllClasses(): IChartistSvg;
-
-    /**
-     * Get element height with fallback to svg BoundingBox or parent container dimensions
-     */
-    height(): number;
-
-    /**
-     * The animate function lets you animate the current element with SMIL animations. You can add animations for multiple attributes at the same time by using an animation definition object. This object should contain SMIL animation attributes.
-     */
-    animate(animations: IChartistAnimations, guided: boolean, eventEmitter: Object): IChartistSvg;
-
-    /**
-     * "Safe" way to get property value from svg BoundingBox. This is a workaround. Firefox throws an NS_ERROR_FAILURE error if getBBox() is called on an invisible node.
-     * THIS IS A WORKAROUND
-     */
-    getBBoxProperty(node: SVGElement, prop: string): string; // TODO: find a good example of this and add it to the tests, it might belong to static
-  }
-
-  interface IChartistAnimations {
-    [Key: string]: IChartistAnimationOptions;
-  }
-
-  interface IChartistAnimationOptions {
-    id?: string;
-    dur: string | number;
-    from: string | number;
-    to: string | number;
-    easing?: IChartistEasingDefinition | string;
-    fill?: string;
-    begin?: string;
-  }
-
-  interface IChartistEasingDefinition {
-    0: number;
-    1: number;
-    2: number;
-    3: number;
-  }
-
-  interface ChartistEasingStatic {
-    easeInSine: IChartistEasingDefinition;
-    easeOutSine: IChartistEasingDefinition;
-    easeInOutSine: IChartistEasingDefinition;
-    easeInQuad: IChartistEasingDefinition;
-    easeOutQuad: IChartistEasingDefinition;
-    easeInOutQuad: IChartistEasingDefinition;
-    easeInCubic: IChartistEasingDefinition;
-    easeOutCubic: IChartistEasingDefinition;
-    easeInOutCubic: IChartistEasingDefinition;
-    easeInQuart: IChartistEasingDefinition;
-    easeOutQuart: IChartistEasingDefinition;
-    easeInOutQuart: IChartistEasingDefinition;
-    easeInQuint: IChartistEasingDefinition;
-    easeOutQuint: IChartistEasingDefinition;
-    easeInOutQuint: IChartistEasingDefinition;
-    easeInExpo: IChartistEasingDefinition;
-    easeOutExpo: IChartistEasingDefinition;
-    easeInOutExpo: IChartistEasingDefinition;
-    easeInCirc: IChartistEasingDefinition;
-    easeOutCirc: IChartistEasingDefinition;
-    easeInOutCirc: IChartistEasingDefinition;
-    easeInBack: IChartistEasingDefinition;
-    easeOutBack: IChartistEasingDefinition;
-    easeInOutBack: IChartistEasingDefinition;
-  }
-
-  interface ChartistInterpolationStatic {
-
-    /**
-     * This interpolation function does not smooth the path and the result is only containing lines and no curves.
-     */
-    none(options?: IChartistInterpolationOptions): Function;
-
-    /**
-     * Simple smoothing creates horizontal handles that are positioned with a fraction of the length between two data points. You can use the divisor option to specify the amount of smoothing.
-     */
-    simple(options?: IChartistSimpleInterpolationOptions): Function;
-
-    /**
-     * Cardinal / Catmull-Rome spline interpolation is the default smoothing function in Chartist. It produces nice results where the splines will always meet the points. It produces some artifacts though when data values are increased or decreased rapidly. The line may not follow a very accurate path and if the line should be accurate this smoothing function does not produce the best results.
-     */
-    cardinal(options?: IChartistCardinalInterpolationOptions): Function;
-
-    /**
-     * Step interpolation will cause the line chart to move in steps rather than diagonal or smoothed lines. This interpolation will create additional points that will also be drawn when the showPoint option is enabled.
-     */
-    step(options?: IChartistStepInterpolationOptions): Function;
-  }
-
-  interface IChartistInterpolationOptions {
-    fillHoles?: boolean;
-  }
-
-  interface IChartistSimpleInterpolationOptions extends IChartistInterpolationOptions {
-    divisor?: number;
-  }
-
-  interface IChartistCardinalInterpolationOptions extends IChartistInterpolationOptions {
-    tension?: number;
-  }
-
-  interface IChartistStepInterpolationOptions extends IChartistInterpolationOptions {
-    postpone?: boolean;
-  }
+    interface ChartistStatic {
+
+        /**
+         * Precision level used internally in Chartist for rounding. If you require more decimal places you can increase this number.
+         */
+        precision: number;
+
+        /**
+         * A map with characters to escape for strings to be safely used as attribute values.
+         */
+        escapingMap: IChartistEscapeMap;
+
+        Pie: IChartistPieChart;
+        Bar: IChartistBarChart;
+        Line: IChartistLineChart;
+        Candle: IChartistCandleChart;
+
+        FixedScaleAxis: IFixedScaleAxisStatic;
+        AutoScaleAxis: IAutoScaleAxisStatic;
+        StepAxis: IStepAxisStatic;
+
+        Svg: ChartistSvgStatic;
+        Interpolation: ChartistInterpolationStatic;
+
+        noop: Function;
+
+        alphaNumerate(n: number): string;
+
+        extend(target: Object, ...sources: Object[]): Object;
+
+        replaceAll(str: string, subStr: string, newSubStr: string): string;
+
+        ensureUnit(value: number, unit: string): string;
+
+        quantity(input: string | number): Object;
+
+        query(query: Node | string): Node;
+
+        times(length: number): Array<any>;
+
+        sum(previous: number, current: number): number;
+
+        mapMultiply(factor: number): (num: number) => number;
+
+        mapAdd(addend: number): (num: number) => number;
+
+        serialMap(arr: Array<any>, cb: Function): Array<any>;
+
+        roundWithPrecision(value: number, digits?: number): number;
+
+        getMultiValue(value: any, dimension?: any): number; // this method is not documented, but it is used in the examples
+
+        serialize(data: Object | string | number): string;
+
+        deserialize(data: string): Object | string | number;
+
+        createSvg(container: Node, width: string, height: string, className: string): Object; // TODO: Figure out if this is returning a ChartistSVGWrapper or an actual SVGElement
+
+        plugins: any;
+    }
+
+    interface IChartistEscapeMap {
+        [Key: string]: string;
+    }
+
+    interface IResponsiveOptionTuple<T extends IChartOptions> extends Array<string | T> {
+        0: string;
+        1: T;
+    }
+
+    // these have no other purpose than to help define the types that can be placed on
+    // a line chart axisX
+    // in the actual chartist library these are classes that project their options onto
+    // the parent class
+    interface IFixedScaleAxisStatic {
+    }
+
+    interface IAutoScaleAxisStatic {
+    }
+
+    interface IStepAxisStatic {
+    }
+
+    // data formats are not well documented on all the ways they can be passed to the constructors
+    // this definition gives some intellisense, but does not protect the user from misuse
+    // TODO: come in and tidy this up and make it fit better
+    interface IChartistData {
+        labels?: Array<string> | Array<number> | Array<Date>;
+        series: Array<IChartistSeriesData> | Array<Array<IChartistData>> | Array<number> | Array<Array<number>>;
+    }
+
+    interface IChartistSeriesData {
+        name?: string;
+        value?: number;
+        data?: Array<number>;
+        className?: string;
+        meta?: string; // I assume this could probably be a number as well?
+    }
+
+    interface IChartistBase<T extends IChartOptions> {
+        container: any;
+        data: IChartistData;
+        defaultOptions: T;
+        options: T;
+        responsiveOptions: Array<IResponsiveOptionTuple<T>>;
+
+        // this most likely doesn't need to be exposed to the user
+        eventEmitter: any;
+
+        supportsForeignObject: boolean;
+        supportsAnimations: boolean;
+        resizeListener: any;
+
+        plugins?: Array<any>; // all of these plugins seem to be functions with options, but keeping type any for now
+
+        update(data: Object, options?: T, override?: boolean): void;
+
+        detach(): void;
+
+        /**
+         * Use this function to register event handlers. The handler callbacks are synchronous and will run in the main thread rather than the event loop.
+         *
+         * @method on
+         * @param event {string} Name of the event. Check the examples for supported events.
+         * @param handler {Function} The handler function that will be called when an event with the given name was emitted. This function will receive a data argument which contains event data. See the example for more details.
+         */
+        on(event: string, handler: Function): IChartistBase<T>;
+
+        /**
+         * Use this function to un-register event handlers. If the handler function parameter is omitted all handlers for the given event will be un-registered.
+         *
+         * @method off
+         * @param event {string} Name of the event for which a handler should be removed
+         * @param handler {Function} The handler function that that was previously used to register a new event handler. This handler will be removed from the event handler list. If this parameter is omitted then all event handlers for the given event are removed from the list.
+         */
+        off(event: string, handler?: Function): IChartistBase<T>;
+    }
+
+    interface IChartistPieChart extends IChartistBase<IPieChartOptions> {
+        new (target: any, data: IChartistData, options?: IPieChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<IPieChartOptions>>): IChartistPieChart;
+    }
+
+    interface IChartistLineChart extends IChartistBase<ILineChartOptions> {
+        new (target: any, data: IChartistData, options?: ILineChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<ILineChartOptions>>): IChartistLineChart;
+    }
+
+    interface IChartistBarChart extends IChartistBase<IBarChartOptions> {
+        new (target: any, data: IChartistData, options?: IBarChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<IBarChartOptions>>): IChartistBarChart;
+    }
+
+    interface IChartistCandleChart extends IChartistBase<ICandleChartOptions> {
+        new (target: any, data: IChartistData, options?: ICandleChartOptions, responsiveOptions?: Array<IResponsiveOptionTuple<ICandleChartOptions>>): IChartistCandleChart;
+    }
+
+    interface IChartOptions {
+        /**
+         * If true the whole data is reversed including labels, the series order as well as the whole series data arrays.
+         */
+        reverseData?: boolean;
+
+        plugins?: Array<any>;
+    }
+
+    interface IPieChartOptions extends IChartOptions {
+        /**
+         * Specify a fixed width for the chart as a string (i.e. '100px' or '50%')
+         */
+        width?: number | string;
+
+        /**
+         * Specify a fixed height for the chart as a string (i.e. '100px' or '50%')
+         */
+        height?: number | string;
+
+        /**
+         * Padding of the chart drawing area to the container element and labels as a number or padding object {top: 5, right: 5, bottom: 5, left: 5}
+         */
+        chartPadding?: IChartPadding | number;
+
+        /**
+         * Override the class names that are used to generate the SVG structure of the chart
+         */
+        classNames?: IPieChartClasses;
+
+        /**
+         * The start angle of the pie chart in degrees where 0 points north. A higher value offsets the start angle clockwise.
+         */
+        startAngle?: number;
+
+        /**
+         * An optional total you can specify. By specifying a total value, the sum of the values in the series must be this total in order to draw a full pie. You can use this parameter to draw only parts of a pie or gauge charts.
+         */
+        total?: number;
+
+        /**
+         * If specified the donut CSS classes will be used and strokes will be drawn instead of pie slices.
+         */
+        donut?: boolean;
+
+        /**
+         * If specified the donut segments will be drawn as shapes instead of strokes.
+         */
+        donutSolid?: boolean;
+
+        /**
+         * Specify the donut stroke width, currently done in javascript for convenience. May move to CSS styles in the future.
+         * This option can be set as number or string to specify a relative width (i.e. 100 or '30%').
+         */
+        donutWidth?: number | string;
+
+        /**
+         * Specify if a label should be shown or not
+         */
+        showLabel?: boolean;
+
+        /**
+         * Label position offset from the standard position which is half distance of the radius. This value can be either positive or negative. Positive values will position the label away from the center.
+         */
+        labelOffset?: number;
+
+        /**
+         * This option can be set to 'inside', 'outside' or 'center'. Positioned with 'inside' the labels will be placed on half the distance of the radius to the border of the Pie by respecting the 'labelOffset'. The 'outside' option will place the labels at the border of the pie and 'center' will place the labels in the absolute center point of the chart. The 'center' option only makes sense in conjunction with the 'labelOffset' option.
+         */
+        labelPosition?: string;
+
+        /**
+         * An interpolation function for the label value
+         */
+        labelInterpolationFnc?: Function;
+
+        /**
+         * Label direction can be 'neutral', 'explode' or 'implode'.  Default is 'neutral'.  The labels anchor will be positioned based on those settings as well as the fact if the labels are on the right or left side of the center of the chart. Usually explode is useful when labels are positioned far away from the center.
+         */
+        labelDirection?: string;
+
+        /**
+         * If true the whole data is reversed including labels, the series order as well as the whole series data arrays.
+         */
+        reverseData?: boolean;
+
+        /**
+         * If true empty values will be ignored to avoid drawing unncessary slices and labels
+         */
+        ignoreEmptyValues?: boolean;
+    }
+
+    interface IChartPadding {
+        top?: number;
+        right?: number;
+        bottom?: number;
+        left?: number;
+    }
+
+    interface IPieChartClasses {
+        chartPie?: string;
+        chartDonut?: string;
+        series?: string;
+        slicePie?: string;
+        sliceDonut?: string;
+        label?: string;
+    }
+
+    interface IBarChartOptions extends IChartOptions {
+        axisX?: IBarChartAxis;
+        axisY?: IBarChartAxis;
+        width?: number | string;
+        height?: number | string;
+        high?: number;
+        low?: number;
+        ticks?: Array<string | number>;
+        onlyInteger?: boolean;
+        chartPadding?: IChartPadding;
+        seriesBarDistance?: number;
+
+        /**
+         * If set to true this property will cause the series bars to be stacked and form a total for each series point. This will also influence the y-axis and the overall bounds of the chart. In stacked mode the seriesBarDistance property will have no effect.
+         */
+        stackBars?: boolean;
+
+        horizontalBars?: boolean;
+        distributeSeries?: boolean;
+    }
+
+    interface IBarChartAxis {
+        offset?: number;
+        position?: string;
+        labelOffset?: {
+            x?: number;
+            y?: number;
+        };
+        showLabel?: boolean;
+        showGrid?: boolean;
+        labelInterpolationFnc?: Function;
+        scaleMinSpace?: number;
+        onlyInteger?: boolean;
+    }
+
+    interface IBarChartClasses {
+        chart?: string;
+        horizontalBars?: string;
+        label?: string;
+        labelGroup?: string;
+        series?: string;
+        bar?: string;
+        grid?: string;
+        gridGroup?: string;
+        vertical?: string;
+        horizontal?: string;
+        start?: string;
+        end?: string;
+    }
+
+    interface ILineChartOptions extends IChartOptions {
+        axisX?: IChartistStepAxis | IChartistFixedScaleAxis | IChartistAutoScaleAxis;
+        axisY?: IChartistStepAxis | IChartistFixedScaleAxis | IChartistAutoScaleAxis;
+        width?: number | string;
+        height?: number | string;
+        showLine?: boolean;
+        showPoint?: boolean;
+        showArea?: boolean;
+        areaBase?: number;
+        lineSmooth?: Function | boolean;
+        low?: number;
+        high?: number;
+        ticks?: Array<string | number>;
+        chartPadding?: IChartPadding;
+        fullWidth?: boolean;
+        classNames?: ILineChartClasses;
+    }
+
+    interface ILineChartAxis {
+        offset?: number;
+        position?: string;
+        labelOffset?: {
+            x?: number;
+            y?: number;
+        };
+        showLabel?: boolean;
+        showGrid?: boolean;
+        labelInterpolationFnc?: Function;
+    }
+
+    interface IChartistStepAxis extends ILineChartAxis {
+        type?: IStepAxisStatic;
+        ticks?: Array<string> | Array<number>;
+        stretch?: boolean;
+    }
+
+    interface IChartistFixedScaleAxis extends ILineChartAxis {
+        type?: IFixedScaleAxisStatic;
+        high?: number;
+        low?: number;
+        divisor?: number;
+        ticks?: Array<string> | Array<number>;
+    }
+
+    interface IChartistAutoScaleAxis extends ILineChartAxis {
+        high?: number;
+        low?: number;
+        scaleMinSpace?: number;
+        onlyInteger?: boolean;
+        referenceValue?: number;
+        type?: IAutoScaleAxisStatic;
+    }
+
+    interface ILineChartClasses {
+        /**
+         * Default is 'ct-chart-line'
+         */
+        chart?: string;
+        label?: string;
+        labelGroup?: string;
+        series?: string;
+        line?: string;
+        point?: string;
+        area?: string;
+        grid?: string;
+        gridGroup?: string;
+        gridBackground?: string;
+        vertical?: string;
+        horizontal?: string;
+        start?: string;
+        end?: string;
+    }
+
+    interface ICandleChartOptions extends IChartOptions {
+
+        /**
+         * Options for X-Axis
+         */
+        axisX?: ICandleChartAxis;
+
+        /**
+         * Options for Y-Axis
+         */
+        axisY?: ICandleChartAxis;
+
+        /**
+         * Specify a fixed width for the chart as a string (i.e. '100px' or '50%')
+         */
+        width?: number | string;
+
+        /**
+         * Specify a fixed height for the chart as a string (i.e. '100px' or '50%')
+         */
+        height?: number | string;
+
+        /**
+         * Overriding the natural high of the chart allows you to zoom in or limit the charts highest displayed value
+         */
+        hight?: number | string;
+
+        /**
+         * Overriding the natural low of the chart allows you to zoom in or limit the charts lowest displayed value
+         */
+        low?: number | string;
+
+        /**
+         * Width of candle body in pixel (IMO is 2 px best minimum value)
+         */
+        candleWidth?: number | string;
+
+        /**
+         * Width of candle wick in pixel (IMO is 1 px best minimum value)
+         */
+        candleWickWidth?: number | string;
+
+        /**
+         * Use calculated x-axis step length, depending on the number of quotes to display, as candle width. Otherwise the candleWidth is being used.
+         */
+        useStepLengthAsCandleWidth?: boolean | string;
+
+        /**
+         * Use 1/3 of candle body width as width for the candle wick, otherwise the candleWickWidth is being used.
+         */
+        useOneThirdAsCandleWickWidth?: boolean | string;
+
+        /**
+         * Padding of the chart drawing area to the container element and labels as a number or padding object {top: 5, right: 5, bottom: 5, left: 5}
+         */
+        chartPadding?: IChartPadding | number;
+
+        /**
+         * When set to true, the last grid line on the x-axis is not drawn and the chart elements will expand to the full available width of the chart. For the last label to be drawncorrectly you might need to add chart padding or offset the last label with a draw event handler.
+         */
+        fullWidth?: boolean | string;
+
+        /**
+         * Override the class names that get used to generate the SVG structure of the chart
+         */
+        classNames?: ICandleChartClasses;
+    }
+
+    interface ICandleChartAxis {
+        /**
+         * The offset of the chart drawing area to the border of the container
+         */
+        offset?: number;
+        /**
+         * Position where labels are placed. Can be set to `start` or `end` where `start` is equivalent to left or top on vertical axis and `end` is equivalent to right or bottom on horizontal axis.
+         */
+        position?: string;
+        /**
+         * Allows you to correct label positioning on this axis by positive or negative x and y offset.
+         */
+        labelOffset?: {
+            x?: number;
+            y?: number;
+        };
+        /**
+         * If labels should be shown or not
+         */
+        showLabel?: boolean;
+        /**
+         * If the axis grid should be drawn or not
+         */
+        showGrid?: boolean;
+        /**
+         * Interpolation function that allows you to intercept the value from the axis label
+         */
+        labelInterpolationFnc?: Function;
+        /**
+         * Set the axis type to be used to project values on this axis. If not defined, Chartist.StepAxis will be used for the X-Axis, where the ticks option will be set to the labels in the data and the stretch option will be set to the global fullWidth option. This type can be changed to any axis constructor available (e.g. Chartist.FixedScaleAxis), where all axis options should be present here.
+         */
+        type?: any;
+    }
+
+    interface ICandleChartClasses {
+        chart?: string;
+        label?: string;
+        labelGroup?: string;
+        series?: string;
+        candlePositive?: string;
+        candleNegative?: string,
+        grid?: string,
+        gridGroup?: string,
+        gridBackground?: string,
+        vertical?: string,
+        horizontal?: string,
+        start?: string,
+        end?: string,
+    }
+
+
+    interface ChartistSvgStatic {
+        new (name: HTMLElement | string, attributes: Object, className?: string, parent?: Object, insertFirst?: boolean): IChartistSvg;
+
+        Easing: ChartistEasingStatic;
+
+        /**
+         * This method checks for support of a given SVG feature like Extensibility, SVG-animation or the like. Check http://www.w3.org/TR/SVG11/feature for a detailed list.
+         */
+        isSupported(feature: string): boolean;
+    }
+
+    interface IChartistSvg {
+
+        /**
+         * Set attributes on the current SVG element of the wrapper you're currently working on.
+         */
+        attr(attributes: Object | string, ns: string): Object | string;
+
+        /**
+         * Create a new SVG element whose wrapper object will be selected for further operations. This way you can also create nested groups easily.
+         */
+        elem(name: string, attributes?: Object, className?: string, insertFirst?: boolean): IChartistSvg;
+
+        /**
+         * Returns the parent Chartist.SVG wrapper object
+         */
+        parent(): IChartistSvg;
+
+        /**
+         * This method returns a Chartist.Svg wrapper around the root SVG element of the current tree.
+         */
+        root(): IChartistSvg;
+
+        /**
+         * Find the first child SVG element of the current element that matches a CSS selector. The returned object is a Chartist.Svg wrapper.
+         */
+        querySelector(selector: string): IChartistSvg;
+
+        /**
+         * Find the all child SVG elements of the current element that match a CSS selector. The returned object is a Chartist.Svg.List wrapper.
+         */
+        querySelectorAll(selector: string): any; // this returns an svg wrapper list in the docs, need to see if that's just an array or a special list
+
+        /**
+         * This method creates a foreignObject (see https://developer.mozilla.org/en-US/docs/Web/SVG/Element/foreignObject) that allows to embed HTML content into a SVG graphic. With the help of foreignObjects you can enable the usage of regular HTML elements inside of SVG where they are subject for SVG positioning and transformation but the Browser will use the HTML rendering capabilities for the containing DOM.
+         */
+        foreignObject(content: any, attributes?: Object, className?: string, insertFirst?: boolean): IChartistSvg;
+
+        /**
+         * This method adds a new text element to the current Chartist.Svg wrapper.
+         */
+        text(t: string): IChartistSvg;
+
+        /**
+         * This method will clear all child nodes of the current wrapper object.
+         */
+        empty(): IChartistSvg;
+
+        /**
+         * This method will cause the current wrapper to remove itself from its parent wrapper. Use this method if you'd like to get rid of an element in a given DOM structure.
+         */
+        remove(): IChartistSvg;
+
+        /**
+         * This method will replace the element with a new element that can be created outside of the current DOM.
+         */
+        replace(): IChartistSvg;
+
+        /**
+         * This method will append an element to the current element as a child.
+         */
+        append(element: IChartistSvg, insertFirst?: boolean): IChartistSvg;
+
+        /**
+         * Returns an array of class names that are attached to the current wrapper element. This method can not be chained further.
+         */
+        classes(): Array<string>;
+
+        /**
+         * Adds one or a space separated list of classes to the current element and ensures the classes are only existing once.
+         *
+         * @method addClass
+         * @param names {string} A white space separated list of class names
+         */
+        addClass(names: string): IChartistSvg;
+
+        /**
+         * Removes one or a space separated list of classes from the current element.
+         *
+         * @method removeClass
+         * @param names {string} A white space separated list of class names
+         */
+        removeClass(names: string): IChartistSvg;
+
+        /**
+         * Removes all classes from the current element.
+         */
+        removeAllClasses(): IChartistSvg;
+
+        /**
+         * Get element height with fallback to svg BoundingBox or parent container dimensions
+         */
+        height(): number;
+
+        /**
+         * The animate function lets you animate the current element with SMIL animations. You can add animations for multiple attributes at the same time by using an animation definition object. This object should contain SMIL animation attributes.
+         */
+        animate(animations: IChartistAnimations, guided: boolean, eventEmitter: Object): IChartistSvg;
+
+        /**
+         * "Safe" way to get property value from svg BoundingBox. This is a workaround. Firefox throws an NS_ERROR_FAILURE error if getBBox() is called on an invisible node.
+         * THIS IS A WORKAROUND
+         */
+        getBBoxProperty(node: SVGElement, prop: string): string; // TODO: find a good example of this and add it to the tests, it might belong to static
+    }
+
+    interface IChartistAnimations {
+        [Key: string]: IChartistAnimationOptions;
+    }
+
+    interface IChartistAnimationOptions {
+        id?: string;
+        dur: string | number;
+        from: string | number;
+        to: string | number;
+        easing?: IChartistEasingDefinition | string;
+        fill?: string;
+        begin?: string;
+    }
+
+    interface IChartistEasingDefinition {
+        0: number;
+        1: number;
+        2: number;
+        3: number;
+    }
+
+    interface ChartistEasingStatic {
+        easeInSine: IChartistEasingDefinition;
+        easeOutSine: IChartistEasingDefinition;
+        easeInOutSine: IChartistEasingDefinition;
+        easeInQuad: IChartistEasingDefinition;
+        easeOutQuad: IChartistEasingDefinition;
+        easeInOutQuad: IChartistEasingDefinition;
+        easeInCubic: IChartistEasingDefinition;
+        easeOutCubic: IChartistEasingDefinition;
+        easeInOutCubic: IChartistEasingDefinition;
+        easeInQuart: IChartistEasingDefinition;
+        easeOutQuart: IChartistEasingDefinition;
+        easeInOutQuart: IChartistEasingDefinition;
+        easeInQuint: IChartistEasingDefinition;
+        easeOutQuint: IChartistEasingDefinition;
+        easeInOutQuint: IChartistEasingDefinition;
+        easeInExpo: IChartistEasingDefinition;
+        easeOutExpo: IChartistEasingDefinition;
+        easeInOutExpo: IChartistEasingDefinition;
+        easeInCirc: IChartistEasingDefinition;
+        easeOutCirc: IChartistEasingDefinition;
+        easeInOutCirc: IChartistEasingDefinition;
+        easeInBack: IChartistEasingDefinition;
+        easeOutBack: IChartistEasingDefinition;
+        easeInOutBack: IChartistEasingDefinition;
+    }
+
+    interface ChartistInterpolationStatic {
+
+        /**
+         * This interpolation function does not smooth the path and the result is only containing lines and no curves.
+         */
+        none(options?: IChartistInterpolationOptions): Function;
+
+        /**
+         * Simple smoothing creates horizontal handles that are positioned with a fraction of the length between two data points. You can use the divisor option to specify the amount of smoothing.
+         */
+        simple(options?: IChartistSimpleInterpolationOptions): Function;
+
+        /**
+         * Cardinal / Catmull-Rome spline interpolation is the default smoothing function in Chartist. It produces nice results where the splines will always meet the points. It produces some artifacts though when data values are increased or decreased rapidly. The line may not follow a very accurate path and if the line should be accurate this smoothing function does not produce the best results.
+         */
+        cardinal(options?: IChartistCardinalInterpolationOptions): Function;
+
+        /**
+         * Step interpolation will cause the line chart to move in steps rather than diagonal or smoothed lines. This interpolation will create additional points that will also be drawn when the showPoint option is enabled.
+         */
+        step(options?: IChartistStepInterpolationOptions): Function;
+    }
+
+    interface IChartistInterpolationOptions {
+        fillHoles?: boolean;
+    }
+
+    interface IChartistSimpleInterpolationOptions extends IChartistInterpolationOptions {
+        divisor?: number;
+    }
+
+    interface IChartistCardinalInterpolationOptions extends IChartistInterpolationOptions {
+        tension?: number;
+    }
+
+    interface IChartistStepInterpolationOptions extends IChartistInterpolationOptions {
+        postpone?: boolean;
+    }
 }
 
 declare var Chartist: Chartist.ChartistStatic;
 
 export = Chartist;
-export as namespace Chartist;
\ No newline at end of file
+export as namespace Chartist;

From d09abea64fdcca8bbeb22ce7cc4a7819fdaac80b Mon Sep 17 00:00:00 2001
From: Anastasiia Antonova <antonova64@gmail.com>
Date: Thu, 17 May 2018 17:14:25 +0700
Subject: [PATCH 197/575] "chartist": added "series" to the ILineChartOptions,
 see
 https://gionkunz.github.io/chartist-js/examples.html#example-line-series-override

---
 types/chartist/chartist-tests.ts | 53 ++++++++++++++++++++++++++++++++
 types/chartist/index.d.ts        |  9 ++++++
 2 files changed, 62 insertions(+)

diff --git a/types/chartist/chartist-tests.ts b/types/chartist/chartist-tests.ts
index 281eb4987d..53ba63497c 100644
--- a/types/chartist/chartist-tests.ts
+++ b/types/chartist/chartist-tests.ts
@@ -53,6 +53,59 @@ new Chartist.Line('.ct-chart', {
     ]
 });
 
+
+// This example was taken here: https://gionkunz.github.io/chartist-js/examples.html#example-line-series-override
+new Chartist.Line('.ct-chart', {
+    labels: ['1', '2', '3', '4', '5', '6', '7', '8'],
+    // Naming the series with the series object array notation
+    series: [{
+        name: 'series-1',
+        data: [5, 2, -4, 2, 0, -2, 5, -3]
+    }, {
+        name: 'series-2',
+        data: [4, 3, 5, 3, 1, 3, 6, 4]
+    }, {
+        name: 'series-3',
+        data: [2, 4, 3, 1, 4, 5, 3, 2]
+    }]
+}, {
+    fullWidth: true,
+    // Within the series options you can use the series names
+    // to specify configuration that will only be used for the
+    // specific series.
+    series: {
+        'series-1': {
+            lineSmooth: Chartist.Interpolation.step()
+        },
+        'series-2': {
+            lineSmooth: Chartist.Interpolation.simple(),
+            showArea: true
+        },
+        'series-3': {
+            showPoint: false
+        }
+    }
+}, [
+    // You can even use responsive configuration overrides to
+    // customize your series configuration even further!
+    ['screen and (max-width: 320px)', {
+        series: {
+            'series-1': {
+                lineSmooth: Chartist.Interpolation.none()
+            },
+            'series-2': {
+                lineSmooth: Chartist.Interpolation.none(),
+                showArea: false
+            },
+            'series-3': {
+                lineSmooth: Chartist.Interpolation.none(),
+                showPoint: true
+            }
+        }
+    }]
+]);
+
+
 var data = {
     series: [5, 3, 4]
 };
diff --git a/types/chartist/index.d.ts b/types/chartist/index.d.ts
index 4f8826de9c..b82f0c9c96 100644
--- a/types/chartist/index.d.ts
+++ b/types/chartist/index.d.ts
@@ -333,6 +333,15 @@ declare namespace Chartist {
         chartPadding?: IChartPadding;
         fullWidth?: boolean;
         classNames?: ILineChartClasses;
+        series?: {
+            [key: string]: {
+                lineSmooth?: Function | boolean;
+                showLine?: boolean;
+                showPoint?: boolean;
+                showArea?: boolean;
+                areaBase?: number;
+            }
+        }
     }
 
     interface ILineChartAxis {

From 99d2325dd74f2a3df3474f768f1efedc64e4603d Mon Sep 17 00:00:00 2001
From: Anastasiia Antonova <antonova64@gmail.com>
Date: Thu, 17 May 2018 17:17:43 +0700
Subject: [PATCH 198/575] "chartist": modified definitions - added a new
 account there

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

diff --git a/types/chartist/index.d.ts b/types/chartist/index.d.ts
index b82f0c9c96..302d3ff157 100644
--- a/types/chartist/index.d.ts
+++ b/types/chartist/index.d.ts
@@ -1,6 +1,9 @@
 // Type definitions for Chartist v0.9.81
 // Project: https://github.com/gionkunz/chartist-js
-// Definitions by: Matt Gibbs <https://github.com/mtgibbs>, Simon Pfeifer <https://github.com/psimonski>, Cassey Lottman <https://github.com/clottman>
+// Definitions by: Matt Gibbs <https://github.com/mtgibbs>,
+// Simon Pfeifer <https://github.com/psimonski>,
+// Cassey Lottman <https://github.com/clottman>,
+// Anastasiia Antonova <https://github.com/affilnost>,
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Chartist {

From db5c8936d538293dffe34592aa84f813d0ec520d Mon Sep 17 00:00:00 2001
From: Mathias Paumgarten <mail@mathias-paumgarten.com>
Date: Thu, 17 May 2018 12:18:01 +0200
Subject: [PATCH 199/575] adds missing setPixels() method

---
 types/gl-texture2d/gl-texture2d-tests.ts | 13 +++++++++++--
 types/gl-texture2d/index.d.ts            |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/types/gl-texture2d/gl-texture2d-tests.ts b/types/gl-texture2d/gl-texture2d-tests.ts
index f51046f420..d3e07e4c77 100644
--- a/types/gl-texture2d/gl-texture2d-tests.ts
+++ b/types/gl-texture2d/gl-texture2d-tests.ts
@@ -54,11 +54,20 @@ texture2d(gl, ndarray([1, 2, 3]));
 
 const texture = texture2d(gl, canvas);
 
-texture.bind();
-texture.bind(1);
 texture.dispose();
 texture.generateMipmap();
 
+texture.bind();
+texture.bind(1);
+
+texture.setPixels(canvas);
+texture.setPixels(video);
+texture.setPixels(image);
+texture.setPixels(imageData);
+texture.setPixels(ndarray([1, 2, 3]));
+texture.setPixels(canvas, [1,1]);
+texture.setPixels(canvas, [1,1], 0);
+
 texture.magFilter = 1;
 texture.minFilter = 1;
 texture.mipSamples = 1;
diff --git a/types/gl-texture2d/index.d.ts b/types/gl-texture2d/index.d.ts
index 2b44b9985a..df52259e44 100644
--- a/types/gl-texture2d/index.d.ts
+++ b/types/gl-texture2d/index.d.ts
@@ -29,6 +29,7 @@ declare class Texture {
     bind(id?: number): number;
     dispose(): void;
     generateMipmap(): void;
+    setPixels( data: InputType | RawObject | ndarray, offset?: [number, number], mipLevel?: GLenum): void;
 }
 
 declare function texture2d(gl: WebGLRenderingContext, array: ndarray): Texture;

From fc556f6a5043a1b0c85f16db916921e32a1b1b46 Mon Sep 17 00:00:00 2001
From: Mathias Paumgarten <mail@mathias-paumgarten.com>
Date: Thu, 17 May 2018 12:27:50 +0200
Subject: [PATCH 200/575] fixes lint issues

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

diff --git a/types/gl-texture2d/gl-texture2d-tests.ts b/types/gl-texture2d/gl-texture2d-tests.ts
index d3e07e4c77..2f19753538 100644
--- a/types/gl-texture2d/gl-texture2d-tests.ts
+++ b/types/gl-texture2d/gl-texture2d-tests.ts
@@ -65,8 +65,8 @@ texture.setPixels(video);
 texture.setPixels(image);
 texture.setPixels(imageData);
 texture.setPixels(ndarray([1, 2, 3]));
-texture.setPixels(canvas, [1,1]);
-texture.setPixels(canvas, [1,1], 0);
+texture.setPixels(canvas, [1, 1]);
+texture.setPixels(canvas, [1, 1], 0);
 
 texture.magFilter = 1;
 texture.minFilter = 1;
diff --git a/types/gl-texture2d/index.d.ts b/types/gl-texture2d/index.d.ts
index df52259e44..4d979d99f9 100644
--- a/types/gl-texture2d/index.d.ts
+++ b/types/gl-texture2d/index.d.ts
@@ -29,7 +29,7 @@ declare class Texture {
     bind(id?: number): number;
     dispose(): void;
     generateMipmap(): void;
-    setPixels( data: InputType | RawObject | ndarray, offset?: [number, number], mipLevel?: GLenum): void;
+    setPixels(data: InputType | RawObject | ndarray, offset?: [number, number], mipLevel?: GLenum): void;
 }
 
 declare function texture2d(gl: WebGLRenderingContext, array: ndarray): Texture;

From 74f058695cae01aadf7e08f5e40f76f868dc5880 Mon Sep 17 00:00:00 2001
From: Anastasiia Antonova <antonova64@gmail.com>
Date: Thu, 17 May 2018 17:37:01 +0700
Subject: [PATCH 201/575] "chartist": changed definition formatting (due to the
 parse fail)

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

diff --git a/types/chartist/index.d.ts b/types/chartist/index.d.ts
index 302d3ff157..58db5e64ff 100644
--- a/types/chartist/index.d.ts
+++ b/types/chartist/index.d.ts
@@ -1,9 +1,6 @@
 // Type definitions for Chartist v0.9.81
 // Project: https://github.com/gionkunz/chartist-js
-// Definitions by: Matt Gibbs <https://github.com/mtgibbs>,
-// Simon Pfeifer <https://github.com/psimonski>,
-// Cassey Lottman <https://github.com/clottman>,
-// Anastasiia Antonova <https://github.com/affilnost>,
+// Definitions by: Matt Gibbs <https://github.com/mtgibbs>, Simon Pfeifer <https://github.com/psimonski>, Cassey Lottman <https://github.com/clottman>, Anastasiia Antonova <https://github.com/affilnost>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Chartist {

From 869ce88a827d7982673173a418cd2d2a2c10627b Mon Sep 17 00:00:00 2001
From: Maciej Blim <maciej.blim@vistex.com>
Date: Thu, 17 May 2018 12:57:57 +0200
Subject: [PATCH 202/575] add missing types for `reduceWhile`

---
 types/ramda/index.d.ts     | 12 ++++++++++++
 types/ramda/ramda-tests.ts | 24 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 9849ee48b1..8e033d3c15 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -20,6 +20,7 @@
 //                 Keagan McClelland <https://github.com/CaptJakk>
 //                 Tomas Szabo <https://github.com/deftomat>
 //                 Bonggyun Lee <https://github.com/deptno>
+//                 Maciek Blim <https://github.com/blimusiek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -1588,6 +1589,17 @@ declare namespace R {
         reduceRight<T, TResult>(fn: (elem: T, acc: TResult) => TResult): (acc: TResult, list: ReadonlyArray<T>) => TResult;
         reduceRight<T, TResult>(fn: (elem: T, acc: TResult) => TResult, acc: TResult): (list: ReadonlyArray<T>) => TResult;
 
+        /**
+         * Like reduce, reduceWhile returns a single item by iterating through the list, successively
+         * calling the iterator function. reduceWhile also takes a predicate that is evaluated before
+         * each step. If the predicate returns false, it "short-circuits" the iteration and returns
+         * the current value of the accumulator.
+         */
+        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>;
+
         /**
          * Similar to `filter`, except that it keeps only values for which the given predicate
          * function returns falsy.
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 8cbbf9ceac..b91ee8a9d1 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -1000,6 +1000,30 @@ type Pair = KeyValuePair<string, number>;
     R.reduceRight(flattenPairs)([], pairs); // => [ 'c', 3, 'b', 2, 'a', 1 ]
 };
 
+() => {
+    const isOdd = (acc: number, x: number) => x % 2 === 1;
+
+    const xs: number[] = [1, 3, 5, 60, 777, 800];
+    R.reduceWhile(isOdd, R.add, 0, xs); // => 9
+    R.reduceWhile(isOdd)(R.add, 0, xs); // => 9
+    R.reduceWhile(isOdd)(R.add, 0)(xs); // => 9
+    R.reduceWhile(isOdd)(R.add)(0, xs); // => 9
+    R.reduceWhile(isOdd)(R.add)(0)(xs); // => 9
+    R.reduceWhile(isOdd, R.add)(0, xs); // => 9
+    R.reduceWhile(isOdd, R.add)(0)(xs); // => 9
+    R.reduceWhile(isOdd, R.add, 0)(xs); // => 9
+
+    const ys: number[] = [];
+    R.reduceWhile(isOdd, R.add, 111, ys); // => 111
+    R.reduceWhile(isOdd)(R.add, 111, ys); // => 111
+    R.reduceWhile(isOdd)(R.add, 111)(ys); // => 111
+    R.reduceWhile(isOdd)(R.add)(111, ys); // => 111
+    R.reduceWhile(isOdd)(R.add)(111)(ys); // => 111
+    R.reduceWhile(isOdd, R.add)(111, ys); // => 111
+    R.reduceWhile(isOdd, R.add)(111)(ys); // => 111
+    R.reduceWhile(isOdd, R.add, 111)(ys); // => 111
+};
+
 () => {
     function isOdd(n: number) {
         return n % 2 === 1;

From 5fdf29acf42f24def4fd092807b1767e09b7f054 Mon Sep 17 00:00:00 2001
From: ratkus91 <sementzovandrey@gmail.com>
Date: Thu, 17 May 2018 14:23:13 +0300
Subject: [PATCH 203/575] Fixed Typings

Make it a module and keep a global namespace called XDate
---
 types/xdate/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/xdate/index.d.ts b/types/xdate/index.d.ts
index 6445691ff4..6d15878eb3 100644
--- a/types/xdate/index.d.ts
+++ b/types/xdate/index.d.ts
@@ -373,3 +373,6 @@ declare class XDate {
     public static UTC(year : number, month : number, day : number , hours? : number , minutes? : number , seconds?:number,ms?:number): number;
 
 }
+
+export = XDate;
+export as namespace XDate;

From ef1a48d2b220485a52437d332f82e6784befae85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Magrin?= <jeremy.magrin@gmail.com>
Date: Thu, 17 May 2018 14:36:47 +0200
Subject: [PATCH 204/575] Try to update type definition to new version of
 react-navigation 2.0.1

---
 types/react-navigation/index.d.ts | 477 +++++++++++++++++++-----------
 1 file changed, 303 insertions(+), 174 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 1233ca39e3..641dd8463f 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-navigation 1.5
+// Type definitions for react-navigation 2.0.1
 // Project: https://github.com/react-navigation/react-navigation
 // Definitions by: Huhuanming <https://github.com/huhuanming>
 //                 mhcgrq <https://github.com/mhcgrq>
@@ -16,11 +16,12 @@
 //                 Armando Assuncao <https://github.com/ArmandoAssuncao>
 //                 Ciaran Liedeman <https://github.com/cliedeman>
 //                 Edward Sammut Alessi <https://github.com/Slessi>
+//                 Jeremy Magrin <https://github.com/magrinj>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
 /**
- * Reference: https://github.com/react-navigation/react-navigation/tree/3f3ef6485c8932f49fddc3dd2c508629110bf2b6
+ * Reference: https://github.com/react-navigation/react-navigation/tree/a37473c5e4833f48796ee6c7c9cb4a8ac49d9c06
  *
  * NOTE: Please update the commit/link above when updating to a new Flow
  * react-navigation/flow/react-navigation.js reference, so we can conveniently just look at diffs on
@@ -43,15 +44,21 @@ export type AnimatedValue = any;
 
 export type HeaderMode = 'float' | 'screen' | 'none';
 
+export interface HeaderForceInset {
+  horizontal?: string;
+  vertical?: string,
+  left?: string,
+  right?: string,
+  top?: string,
+  bottom?: string,
+}
+
 export interface HeaderProps extends NavigationSceneRendererProps {
   mode: HeaderMode;
-  router: NavigationRouter<
-    NavigationState,
-    NavigationStackScreenOptions
-  >;
-  getScreenDetails: (navigationScene: NavigationScene) => NavigationScreenDetails<
-    NavigationStackScreenOptions
-  >;
+  router: NavigationRouter<NavigationState, NavigationStackScreenOptions>;
+  getScreenDetails: (
+    navigationScene: NavigationScene
+  ) => NavigationScreenDetails<NavigationStackScreenOptions>;
   style: StyleProp<ViewStyle>;
 }
 
@@ -76,7 +83,9 @@ export interface NavigationState {
   routes: any[];
 }
 
-export type NavigationRoute<Params = NavigationParams> = NavigationLeafRoute<Params> | NavigationStateRoute<Params>;
+export type NavigationRoute<Params = NavigationParams> =
+  | NavigationLeafRoute<Params>
+  | NavigationStateRoute<Params>;
 
 export interface NavigationLeafRoute<Params> {
   /**
@@ -100,7 +109,9 @@ export interface NavigationLeafRoute<Params> {
   params?: Params;
 }
 
-export type NavigationStateRoute<NavigationLeafRouteParams> = NavigationLeafRoute<NavigationLeafRouteParams> & NavigationState;
+export type NavigationStateRoute<
+  NavigationLeafRouteParams
+  > = NavigationLeafRoute<NavigationLeafRouteParams> & NavigationState;
 
 export type NavigationScreenOptionsGetter<Options> = (
   navigation: NavigationScreenProp<NavigationRoute<any>>,
@@ -113,7 +124,10 @@ export interface NavigationRouter<State = NavigationState, Options = {}> {
    * an optional previous state. When the action is considered handled but the
    * state is unchanged, the output state is null.
    */
-  getStateForAction: (action: NavigationAction, lastState?: State) => (State | null);
+  getStateForAction: (
+    action: NavigationAction,
+    lastState?: State
+  ) => State | null;
 
   /**
    * Maps a URI-like string to an action. This can be mapped to a state
@@ -122,14 +136,14 @@ export interface NavigationRouter<State = NavigationState, Options = {}> {
   getActionForPathAndParams: (
     path: string,
     params?: NavigationParams
-  ) => (NavigationAction | null);
+  ) => NavigationAction | null;
 
   getPathAndParamsForState: (
     state: State
   ) => {
-    path: string,
-    params?: NavigationParams,
-  };
+      path: string;
+      params?: NavigationParams;
+    };
 
   getComponentForRouteName: (routeName: string) => NavigationComponent;
 
@@ -147,11 +161,8 @@ export interface NavigationRouter<State = NavigationState, Options = {}> {
 }
 
 export type NavigationScreenOption<T> =
-  T
-  | ((
-    navigation: NavigationScreenProp<NavigationRoute>,
-    config: T
-  ) => T);
+  | T
+  | ((navigation: NavigationScreenProp<NavigationRoute>, config: T) => T);
 
 export interface NavigationScreenDetails<T> {
   options: T;
@@ -159,7 +170,9 @@ export interface NavigationScreenDetails<T> {
   navigation: NavigationScreenProp<NavigationRoute>;
 }
 
-export type NavigationScreenOptions = NavigationStackScreenOptions & NavigationTabScreenOptions & NavigationDrawerScreenOptions;
+export type NavigationScreenOptions = NavigationStackScreenOptions &
+  NavigationTabScreenOptions &
+  NavigationDrawerScreenOptions;
 
 export interface NavigationScreenConfigProps {
   navigation: NavigationScreenProp<NavigationRoute>;
@@ -167,30 +180,34 @@ export interface NavigationScreenConfigProps {
 }
 
 export type NavigationScreenConfig<Options> =
-  Options
-  | ((navigationOptionsContainer: NavigationScreenConfigProps & {
-      navigationOptions: NavigationScreenProp<NavigationRoute>,
-    }) => Options);
+  | Options
+  | ((
+    navigationOptionsContainer: NavigationScreenConfigProps & {
+      navigationOptions: NavigationScreenProp<NavigationRoute>;
+    }
+  ) => Options);
 
 export type NavigationComponent =
-  NavigationScreenComponent<any, any, any>
-  | NavigationNavigator<any, any, any>;
+  | NavigationScreenComponent<any, any, any>
+  | NavigationNavigator<any, any, any>
+  | any;
 
 export type NavigationScreenComponent<
-    Params = NavigationParams,
-    Options = {},
-    Props = {}
-> = React.ComponentType<NavigationScreenProps<Params, Options> & Props> &
-{ navigationOptions?: NavigationScreenConfig<Options> };
+  Params = NavigationParams,
+  Options = {},
+  Props = {}
+  > = React.ComponentType<NavigationScreenProps<Params, Options> & Props> & {
+    navigationOptions?: NavigationScreenConfig<Options>;
+  };
 
 export type NavigationNavigator<
-    State = NavigationState,
-    Options = {},
-    Props = {}
-> = React.ComponentType<NavigationNavigatorProps<Options, State> & Props> & {
-    router: NavigationRouter<State, Options>,
-    navigationOptions?: NavigationScreenConfig<Options>,
-};
+  State = NavigationState,
+  Options = {},
+  Props = {}
+  > = React.ComponentType<NavigationNavigatorProps<Options, State> & Props> & {
+    router: NavigationRouter<State, Options>;
+    navigationOptions?: NavigationScreenConfig<Options>;
+  };
 
 export interface NavigationParams {
   [key: string]: any;
@@ -206,7 +223,8 @@ export interface NavigationNavigateActionPayload {
   key?: string;
 }
 
-export interface NavigationNavigateAction extends NavigationNavigateActionPayload {
+export interface NavigationNavigateAction
+  extends NavigationNavigateActionPayload {
   type: 'Navigation/NAVIGATE';
 }
 
@@ -226,7 +244,8 @@ export interface NavigationSetParamsActionPayload {
   params?: NavigationParams;
 }
 
-export interface NavigationSetParamsAction extends NavigationSetParamsActionPayload {
+export interface NavigationSetParamsAction
+  extends NavigationSetParamsActionPayload {
   type: 'Navigation/SET_PARAMS';
 }
 
@@ -271,40 +290,69 @@ export interface NavigationPopToTopActionPayload {
   immediate?: boolean;
 }
 
-export interface NavigationPopToTopAction extends NavigationPopToTopActionPayload {
+export interface NavigationPopToTopAction
+  extends NavigationPopToTopActionPayload {
   type: 'Navigation/POP_TO_TOP';
 }
 
 export interface NavigationStackViewConfig {
   mode?: 'card' | 'modal';
   headerMode?: HeaderMode;
+  headerTransitionPreset?: 'fade-in-place' | 'uikit';
   cardStyle?: StyleProp<ViewStyle>;
   transitionConfig?: (
     transitionProps: NavigationTransitionProps,
     prevTransitionProps: NavigationTransitionProps,
-    isModal: boolean,
+    isModal: boolean
   ) => TransitionConfig;
-  onTransitionStart?: (transitionProps: NavigationTransitionProps, prevTransitionProps?: NavigationTransitionProps) => Promise<void> | void;
-  onTransitionEnd?: (transitionProps: NavigationTransitionProps, prevTransitionProps?: NavigationTransitionProps) => void;
+  onTransitionStart?: (
+    transitionProps: NavigationTransitionProps,
+    prevTransitionProps?: NavigationTransitionProps
+  ) => Promise<void> | void;
+  onTransitionEnd?: (
+    transitionProps: NavigationTransitionProps,
+    prevTransitionProps?: NavigationTransitionProps
+  ) => void;
+}
+
+/**
+ * Switch Navigator
+ */
+
+export interface NavigationSwitchRouterConfig {
+  initialRouteName?: string;
+  initialRouteParams?: NavigationParams;
+  paths?: NavigationPathsConfig;
+  navigationOptions?: NavigationScreenConfig<NavigationScreenOptions>;
+  order?: string[];
+  backBehavior?: 'none' | 'initialRoute'; // defaults to `'none'`
+  resetOnBlur?: boolean; // defaults to `true`
 }
 
 export interface NavigationStackScreenOptions {
   title?: string;
-  header?: (React.ReactElement<any> | ((headerProps: HeaderProps) => React.ReactElement<any>)) | null;
+  header?:
+  | (
+    | React.ReactElement<any>
+    | ((headerProps: HeaderProps) => React.ReactElement<any>))
+  | null;
   headerTransparent?: boolean;
   headerTitle?: string | React.ReactElement<any>;
   headerTitleStyle?: StyleProp<TextStyle>;
   headerTintColor?: string;
   headerLeft?: React.ReactElement<any>;
   headerBackTitle?: string | null;
+  headerBackImage?: React.ReactElement<any>;
   headerTruncatedBackTitle?: string;
   headerBackTitleStyle?: StyleProp<TextStyle>;
   headerPressColorAndroid?: string;
   headerRight?: React.ReactElement<any>;
   headerStyle?: StyleProp<ViewStyle>;
+  headerForceInset?: HeaderForceInset;
   headerBackground?: React.ReactNode | React.ReactType;
   gesturesEnabled?: boolean;
   gestureResponseDistance?: { vertical?: number; horizontal?: number };
+  gestureDirection?: 'default' | 'inverted';
 }
 
 export interface NavigationStackRouterConfig {
@@ -317,7 +365,7 @@ export interface NavigationStackRouterConfig {
 }
 
 export type NavigationStackAction =
-  NavigationInitAction
+  | NavigationInitAction
   | NavigationNavigateAction
   | NavigationBackAction
   | NavigationSetParamsAction
@@ -326,25 +374,30 @@ export type NavigationStackAction =
   | NavigationPopToTopAction;
 
 export type NavigationTabAction =
-  NavigationInitAction
+  | NavigationInitAction
   | NavigationNavigateAction
   | NavigationBackAction;
 
 export type NavigationAction =
-  NavigationInitAction
+  | NavigationInitAction
   | NavigationStackAction
   | NavigationTabAction;
 
-export type NavigationRouteConfig = NavigationComponent | ({
-  navigationOptions?: NavigationScreenConfig<any>,
-  path?: string,
-} & NavigationScreenRouteConfig);
+export type NavigationRouteConfig =
+  | NavigationComponent
+  | ({
+    navigationOptions?: NavigationScreenConfig<any>;
+    path?: string;
+  } & NavigationScreenRouteConfig);
 
-export type NavigationScreenRouteConfig = NavigationComponent | {
-    screen: NavigationComponent,
-} | {
-    getScreen: () => NavigationComponent,
-};
+export type NavigationScreenRouteConfig =
+  | NavigationComponent
+  | {
+    screen: NavigationComponent;
+  }
+  | {
+    getScreen: () => NavigationComponent;
+  };
 
 export interface NavigationPathsConfig {
   [routeName: string]: string;
@@ -360,45 +413,48 @@ export interface NavigationTabRouterConfig {
   backBehavior?: 'none' | 'initialRoute'; // defaults `initialRoute`
 }
 export interface TabScene {
-    route: NavigationRoute;
-    focused: boolean;
-    index: number;
-    tintColor?: string;
+  route: NavigationRoute;
+  focused: boolean;
+  index: number;
+  tintColor?: string;
 }
 export interface NavigationTabScreenOptions {
   title?: string;
   tabBarIcon?:
-    React.ReactElement<any>
-    | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
-      any
-    > | null));
+  | React.ReactElement<any>
+  | ((
+    options: { tintColor: string | null; focused: boolean }
+  ) => React.ReactElement<any> | null);
   tabBarLabel?:
-    string
-    | React.ReactElement<any>
-    | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
-      any
-    > | string | null));
+  | string
+  | React.ReactElement<any>
+  | ((
+    options: { tintColor: string | null; focused: boolean }
+  ) => React.ReactElement<any> | string | null);
   tabBarVisible?: boolean;
-  tabBarTestIDProps?: { testID?: string, accessibilityLabel?: string };
-  tabBarOnPress?: (options: {
-    scene: TabScene,
-    jumpToIndex: (index: number) => void
-  }) => void;
+  tabBarTestIDProps?: { testID?: string; accessibilityLabel?: string };
+  tabBarOnPress?: (
+    options: {
+      scene: TabScene;
+      jumpToIndex: (index: number) => void;
+    }
+  ) => void;
 }
 
 export interface NavigationDrawerScreenOptions {
   title?: string;
   drawerIcon?:
-    React.ReactElement<any>
-    | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
-      any
-    > | null));
+  | React.ReactElement<any>
+  | ((
+    options: { tintColor: string | null; focused: boolean }
+  ) => React.ReactElement<any> | null);
   drawerLabel?:
-    string
-    | React.ReactElement<any>
-    | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
-      any
-    > | null));
+  | string
+  | React.ReactElement<any>
+  | ((
+    options: { tintColor: string | null; focused: boolean }
+  ) => React.ReactElement<any> | null);
+  drawerLockMode?: 'unlocked' | 'locked-closed' | 'locked-open';
 }
 
 export interface NavigationRouteConfigMap {
@@ -413,22 +469,20 @@ export interface NavigationProp<S> {
 }
 
 export type EventType =
-| 'willFocus'
-| 'didFocus'
-| 'willBlur'
-| 'didBlur'
-| 'action';
+  | 'willFocus'
+  | 'didFocus'
+  | 'willBlur'
+  | 'didBlur'
+  | 'action';
 
 export interface NavigationEventPayload {
   type: EventType;
   action: NavigationAction;
   state: NavigationState;
-  lastState: NavigationState;
+  lastState: NavigationState | null | undefined;
 }
 
-export type NavigationEventCallback = (
-  payload: NavigationEventPayload
-) => void;
+export type NavigationEventCallback = (payload: NavigationEventPayload) => void;
 
 export interface NavigationEventSubscription {
   remove: () => void;
@@ -438,8 +492,14 @@ export interface NavigationScreenProp<S, P = NavigationParams> {
   state: S;
   dispatch: NavigationDispatch;
   goBack: (routeKey?: string | null) => boolean;
+  dismiss: () => boolean;
   navigate(options: {
-    routeName: string;
+    routeName: string | {
+      routeName: string;
+      params?: NavigationParams;
+      action?: NavigationNavigateAction;
+      key?: string;
+    };
     params?: NavigationParams;
     action?: NavigationAction;
     key?: string;
@@ -447,7 +507,7 @@ export interface NavigationScreenProp<S, P = NavigationParams> {
   navigate(
     routeNameOrOptions: string,
     params?: NavigationParams,
-    action?: NavigationAction,
+    action?: NavigationAction
   ): boolean;
   getParam: <T extends keyof P>(param: T, fallback?: P[T]) => P[T];
   setParams: (newParams: P) => boolean;
@@ -467,6 +527,7 @@ export interface NavigationScreenProp<S, P = NavigationParams> {
   ) => boolean;
   pop: (n?: number, params?: { immediate?: boolean }) => boolean;
   popToTop: (params?: { immediate?: boolean }) => boolean;
+  isFocused: () => boolean;
 }
 
 export interface NavigationNavigatorProps<O = {}, S = {}> {
@@ -558,7 +619,7 @@ export type NavigationAnimationSetter = (
   lastState: NavigationState
 ) => void;
 
-export type NavigationSceneRenderer = () => (React.ReactElement<any> | null);
+export type NavigationSceneRenderer = () => React.ReactElement<any> | null;
 
 export type NavigationStyleInterpolator = (
   props: NavigationSceneRendererProps
@@ -567,50 +628,49 @@ export type NavigationStyleInterpolator = (
 export interface LayoutEvent {
   nativeEvent: {
     layout: {
-      x: number,
-      y: number,
-      width: number,
-      height: number,
-    },
+      x: number;
+      y: number;
+      width: number;
+      height: number;
+    };
   };
 }
 
 export type NavigatorType =
-| 'react-navigation/STACK'
-| 'react-navigation/TABS'
-| 'react-navigation/DRAWER';
+  | 'react-navigation/STACK'
+  | 'react-navigation/TABS'
+  | 'react-navigation/DRAWER';
 
-export function addNavigationHelpers<S = {}>(
-  navigation: {
-    state: S;
-    dispatch: (action: NavigationAction) => any;
-    addListener?: (
-      eventName: string,
-      callback: NavigationEventCallback
-    ) => NavigationEventSubscription;
-  }
-): NavigationScreenProp<S>;
-
-export interface NavigationContainerProps {
+export interface NavigationContainerProps<S = {}, O = {}> {
   uriPrefix?: string | RegExp;
   onNavigationStateChange?: (
     prevNavigationState: NavigationState,
     nextNavigationState: NavigationState,
-    action: NavigationAction,
-  ) => void;
+    action: NavigationAction
+  ) => void | null | undefined;
+  navigation?: NavigationScreenProp<S>;
+  persistenceKey?: string | null | undefined;
+  renderLoadingExperimental?: React.ComponentType<{}>,
+  screenProps?: any;
+  navigationOptions?: O;
   style?: StyleProp<ViewStyle>;
 }
 
-export interface NavigationContainerComponent extends React.Component<
+export interface NavigationContainerComponent
+  extends React.Component<
   NavigationContainerProps & NavigationNavigatorProps<any>
   > {
   dispatch: NavigationDispatch;
 }
 
-export interface NavigationContainer extends React.ComponentClass<
+export interface NavigationContainer
+  extends React.ComponentClass<
   NavigationContainerProps & NavigationNavigatorProps<any>
   > {
-  new(props: NavigationContainerProps & NavigationNavigatorProps<any>, context?: any): NavigationContainerComponent;
+  new(
+    props: NavigationContainerProps & NavigationNavigatorProps<any>,
+    context?: any
+  ): NavigationContainerComponent;
 
   router: NavigationRouter<any, any>;
   screenProps: { [key: string]: any };
@@ -618,29 +678,43 @@ export interface NavigationContainer extends React.ComponentClass<
   state: { nav: NavigationState | null };
 }
 
-export interface StackNavigatorConfig extends NavigationStackViewConfig, NavigationStackRouterConfig {
+export interface StackNavigatorConfig
+  extends NavigationStackViewConfig,
+  NavigationStackRouterConfig {
   containerOptions?: any;
 }
 
 // Return createNavigationContainer
 export function StackNavigator(
   routeConfigMap: NavigationRouteConfigMap,
-  stackConfig?: StackNavigatorConfig,
+  stackConfig?: StackNavigatorConfig
+): NavigationContainer;
+
+export function createStackNavigator(
+  routeConfigMap: NavigationRouteConfigMap,
+  stackConfig?: StackNavigatorConfig
 ): NavigationContainer;
 
 export interface SwitchNavigatorConfig {
   initialRouteName: string;
   resetOnBlur?: boolean;
   paths?: NavigationPathsConfig;
-  backBehavior?: 'none' | 'initialRoute';
+  backBehavior?: 'none' | 'intialRoute';
 }
 
 // Return createNavigationContainer
+export type _SwitchNavigatorConfig = NavigationSwitchRouterConfig;
+
 export function SwitchNavigator(
   routeConfigMap: NavigationRouteConfigMap,
   switchConfig?: SwitchNavigatorConfig
 ): NavigationContainer;
 
+export function createSwitchNavigator(
+  routeConfigMap: NavigationRouteConfigMap,
+  switchConfig?: SwitchNavigatorConfig
+): NavigationContainer;
+
 // DrawerItems
 export const DrawerItems: React.ReactType;
 
@@ -655,21 +729,28 @@ export interface DrawerViewConfig {
   contentOptions?: any;
   style?: StyleProp<ViewStyle>;
 }
-export interface DrawerNavigatorConfig extends NavigationTabRouterConfig, DrawerViewConfig {
+export interface DrawerNavigatorConfig
+  extends NavigationTabRouterConfig,
+  DrawerViewConfig {
   containerConfig?: any;
   contentOptions?: {
-    activeTintColor?: string,
-    activeBackgroundColor?: string,
-    inactiveTintColor?: string,
-    inactiveBackgroundColor?: string,
-    style?: StyleProp<ViewStyle>,
-    labelStyle?: StyleProp<TextStyle>,
+    activeTintColor?: string;
+    activeBackgroundColor?: string;
+    inactiveTintColor?: string;
+    inactiveBackgroundColor?: string;
+    style?: StyleProp<ViewStyle>;
+    labelStyle?: StyleProp<TextStyle>;
   };
 }
 
 export function DrawerNavigator(
   routeConfigMap: NavigationRouteConfigMap,
-  drawerConfig?: DrawerNavigatorConfig,
+  drawerConfig?: DrawerNavigatorConfig
+): NavigationContainer;
+
+export function createDrawerNavigator(
+  routeConfigMap: NavigationRouteConfigMap,
+  drawerConfig?: DrawerNavigatorConfig
 ): NavigationContainer;
 
 /**
@@ -681,23 +762,23 @@ export interface TabViewConfig {
   tabBarComponent?: React.ReactType;
   tabBarPosition?: 'top' | 'bottom';
   tabBarOptions?: {
-    activeTintColor?: string,
-    allowFontScaling?: boolean,
-    activeBackgroundColor?: string,
-    inactiveTintColor?: string,
-    inactiveBackgroundColor?: string,
-    showLabel?: boolean,
-    style?: StyleProp<ViewStyle>,
-    labelStyle?: StyleProp<TextStyle>,
-    iconStyle?: StyleProp<ViewStyle>,
+    activeTintColor?: string;
+    allowFontScaling?: boolean;
+    activeBackgroundColor?: string;
+    inactiveTintColor?: string;
+    inactiveBackgroundColor?: string;
+    showLabel?: boolean;
+    style?: StyleProp<ViewStyle>;
+    labelStyle?: StyleProp<TextStyle>;
+    iconStyle?: StyleProp<ViewStyle>;
     // Top
-    showIcon?: boolean,
-    upperCaseLabel?: boolean,
-    pressColor?: string,
-    pressOpacity?: number,
-    scrollEnabled?: boolean,
-    tabStyle?: StyleProp<ViewStyle>,
-    indicatorStyle?: StyleProp<ViewStyle>,
+    showIcon?: boolean;
+    upperCaseLabel?: boolean;
+    pressColor?: string;
+    pressOpacity?: number;
+    scrollEnabled?: boolean;
+    tabStyle?: StyleProp<ViewStyle>;
+    indicatorStyle?: StyleProp<ViewStyle>;
   };
   swipeEnabled?: boolean;
   animationEnabled?: boolean;
@@ -705,16 +786,33 @@ export interface TabViewConfig {
 }
 
 // From navigators/TabNavigator.js
-export interface TabNavigatorConfig extends NavigationTabRouterConfig, TabViewConfig {
+export interface TabNavigatorConfig
+  extends NavigationTabRouterConfig,
+  TabViewConfig {
   lazy?: boolean;
   removeClippedSubviews?: boolean;
-  initialLayout?: { height: number, width: number };
+  initialLayout?: { height: number; width: number };
 }
 
 // From navigators/TabNavigator.js
 export function TabNavigator(
   routeConfigMap: NavigationRouteConfigMap,
-  drawConfig?: TabNavigatorConfig,
+  drawConfig?: TabNavigatorConfig
+): NavigationContainer;
+
+export function createTabNavigator(
+  routeConfigMap: NavigationRouteConfigMap,
+  drawConfig?: TabNavigatorConfig
+): NavigationContainer;
+
+export function createBottomTabNavigator(
+  routeConfigMap: NavigationRouteConfigMap,
+  drawConfig?: TabNavigatorConfig
+): NavigationContainer;
+
+export function createMaterialTopNavigator(
+  routeConfigMap: NavigationRouteConfigMap,
+  drawConfig?: TabNavigatorConfig
 ): NavigationContainer;
 
 export interface TabBarTopProps {
@@ -729,15 +827,17 @@ export interface TabBarTopProps {
   tabBarPosition: string;
   navigation: NavigationScreenProp<NavigationState>;
   jumpToIndex: (index: number) => void;
-  getLabel: (scene: TabScene) => (React.ReactNode | string);
+  getLabel: (scene: TabScene) => React.ReactNode | string;
   getOnPress: (
     previousScene: NavigationRoute,
     scene: TabScene
-  ) => (args: {
-    previousScene: NavigationRoute,
-    scene: TabScene,
-    jumpToIndex: (index: number) => void,
-  }) => void;
+  ) => (
+      args: {
+        previousScene: NavigationRoute;
+        scene: TabScene;
+        jumpToIndex: (index: number) => void;
+      }
+    ) => void;
   renderIcon: (scene: TabScene) => React.ReactElement<any>;
   labelStyle?: TextStyle;
   iconStyle?: ViewStyle;
@@ -754,15 +854,17 @@ export interface TabBarBottomProps {
   position: AnimatedValue;
   navigation: NavigationScreenProp<NavigationState>;
   jumpToIndex: (index: number) => void;
-  getLabel: (scene: TabScene) => (React.ReactNode | string);
+  getLabel: (scene: TabScene) => React.ReactNode | string;
   getOnPress: (
     previousScene: NavigationRoute,
     scene: TabScene
-  ) => (args: {
-    previousScene: NavigationRoute,
-    scene: TabScene,
-    jumpToIndex: (index: number) => void,
-  }) => void;
+  ) => (
+      args: {
+        previousScene: NavigationRoute;
+        scene: TabScene;
+        jumpToIndex: (index: number) => void;
+      }
+    ) => void;
   getTestIDProps: (scene: TabScene) => (scene: TabScene) => any;
   renderIcon: (scene: TabScene) => React.ReactNode;
   style?: ViewStyle;
@@ -789,12 +891,18 @@ export namespace NavigationActions {
   const POP_TO_TOP: 'Navigation/POP_TO_TOP';
 
   function init(options?: NavigationInitActionPayload): NavigationInitAction;
-  function navigate(options: NavigationNavigateActionPayload): NavigationNavigateAction;
+  function navigate(
+    options: NavigationNavigateActionPayload
+  ): NavigationNavigateAction;
   function reset(options: NavigationResetActionPayload): NavigationResetAction;
   function back(options?: NavigationBackActionPayload): NavigationBackAction;
-  function setParams(options: NavigationSetParamsActionPayload): NavigationSetParamsAction;
+  function setParams(
+    options: NavigationSetParamsActionPayload
+  ): NavigationSetParamsAction;
   function pop(options: NavigationPopActionPayload): NavigationPopAction;
-  function popToTop(options: NavigationPopToTopActionPayload): NavigationPopToTopAction;
+  function popToTop(
+    options: NavigationPopToTopActionPayload
+  ): NavigationPopToTopAction;
 }
 
 /**
@@ -807,8 +915,14 @@ export interface TransitionerProps {
     prevTransitionProps?: NavigationTransitionProps
   ) => NavigationTransitionSpec;
   navigation: NavigationScreenProp<NavigationState>;
-  onTransitionStart?: (transitionProps: NavigationTransitionProps, prevTransitionProps?: NavigationTransitionProps) => Promise<void> | void;
-  onTransitionEnd?: (transitionProps: NavigationTransitionProps, prevTransitionProps?: NavigationTransitionProps) => void;
+  onTransitionStart?: (
+    transitionProps: NavigationTransitionProps,
+    prevTransitionProps?: NavigationTransitionProps
+  ) => Promise<void> | void;
+  onTransitionEnd?: (
+    transitionProps: NavigationTransitionProps,
+    prevTransitionProps?: NavigationTransitionProps
+  ) => void;
   render: (
     transitionProps: NavigationTransitionProps,
     prevTransitionProps?: NavigationTransitionProps
@@ -826,7 +940,7 @@ export interface TransitionerState {
 export class Transitioner extends React.Component<
   TransitionerProps,
   TransitionerState
-> { }
+  > { }
 
 /**
  * Tab Router
@@ -853,12 +967,23 @@ export function StackRouter(
  *
  * @see https://github.com/react-navigation/react-navigation/blob/master/src/navigators/createNavigator.js
  */
+export interface NavigationDescriptor<Params = NavigationParams> {
+  key: string;
+  state: NavigationLeafRoute<Params> | NavigationStateRoute<Params>;
+  navigation: NavigationScreenProp<any>;
+  getComponent: () => React.ComponentType<{}>;
+}
+
+export type NavigationView<O, S> = React.ComponentType<{
+  descriptors: { [key: string]: NavigationDescriptor };
+} & NavigationInjectedProps>;
+
 export function createNavigator<C, S, Options>(
+  view: NavigationView<Options, S>,
   router: NavigationRouter<S, Options>,
-  routeConfigs?: NavigationRouteConfigMap,
   navigatorConfig?: {} | null,
   navigatorType?: NavigatorType
-): (NavigationView: React.ComponentClass<C>) => NavigationNavigator<C, S, Options>;
+): any;
 
 /**
  * Create an HOC that injects the navigation and manages the navigation state
@@ -879,7 +1004,10 @@ export function createNavigationContainer(
  * BEGIN CUSTOM CONVENIENCE INTERFACES
  */
 
-export interface NavigationScreenProps<Params = NavigationParams, Options = any> {
+export interface NavigationScreenProps<
+  Params = NavigationParams,
+  Options = any
+  > {
   navigation: NavigationScreenProp<NavigationRoute<Params>, Params>;
   screenProps?: { [key: string]: any };
   navigationOptions?: NavigationScreenConfig<Options>;
@@ -936,6 +1064,7 @@ export interface SafeAreaViewProps extends ViewProps {
     horizontal?: SafeAreaViewForceInsetValue;
     vertical?: SafeAreaViewForceInsetValue;
   };
+  children?: React.ReactNode;
 }
 
 export const SafeAreaView: React.ComponentClass<SafeAreaViewProps>;

From fbafc684a423aead9d9d127807a242454695630c Mon Sep 17 00:00:00 2001
From: Milena Chikova <chikova@progress.com>
Date: Thu, 17 May 2018 15:58:25 +0300
Subject: [PATCH 205/575] feat: upgrade Kendo UI definitions to 2018.2.516

---
 types/kendo-ui/index.d.ts | 366 ++++++++++++++++++++++++++++++++++----
 1 file changed, 335 insertions(+), 31 deletions(-)

diff --git a/types/kendo-ui/index.d.ts b/types/kendo-ui/index.d.ts
index b854d92b29..e734f52cfa 100644
--- a/types/kendo-ui/index.d.ts
+++ b/types/kendo-ui/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Kendo UI Professional v2018.1.117
+// Type definitions for Kendo UI Professional v2018.2.516
 // Project: http://www.telerik.com/kendo-ui
 // Definitions by: Telerik <https://github.com/telerik>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -815,9 +815,9 @@ declare namespace kendo.data {
     }
 
     interface PivotDataSourceOptions extends DataSourceOptions {
-        columns?: PivotDataSourceAxisOptions[];
-        measures?: PivotDataSourceMeasureOptions[];
-        rows?: PivotDataSourceAxisOptions[];
+        columns?: string[]|PivotDataSourceAxisOptions[];
+        measures?: string[]|PivotDataSourceMeasureOptions;
+        rows?: string[]|PivotDataSourceAxisOptions[];
         transport?: PivotTransport;
         schema?: PivotSchema;
     }
@@ -1242,7 +1242,8 @@ declare namespace kendo.data {
         batch?: boolean;
         data?: any;
         filter?: any;
-        group?: DataSourceGroupItem[];
+        group?: DataSourceGroupItem | DataSourceGroupItem[];
+        inPlaceSort?: boolean;
         offlineStorage?: any;
         page?: number;
         pageSize?: number;
@@ -1462,6 +1463,12 @@ declare namespace kendo.ui {
     }
 }
 
+declare namespace kendo.ui.editor {
+    class Toolbar extends kendo.ui.Widget{
+        window: kendo.ui.Window;
+    }
+}
+
 declare namespace kendo.mobile {
     function init(selector: string): void;
     function init(element: JQuery): void;
@@ -1791,7 +1798,7 @@ declare namespace kendo.ui {
     }
 
     interface ButtonGroupSelectEvent extends ButtonGroupEvent {
-        index?: number;
+        indices?: any;
     }
 
 
@@ -1869,6 +1876,107 @@ declare namespace kendo.ui {
     }
 
 
+    class Chat extends kendo.ui.Widget {
+
+        static fn: Chat;
+
+        options: ChatOptions;
+
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): Chat;
+
+        constructor(element: Element, options?: ChatOptions);
+
+
+        getUser(): any;
+        postMessage(message: string): void;
+        renderAttachments(options: any, sender: any): void;
+        renderMessage(message: any, sender: any): void;
+        renderSuggestedActions(suggestedActions: any): void;
+
+    }
+
+    interface ChatMessages {
+        placeholder?: string;
+    }
+
+    interface ChatUser {
+        iconUrl?: string;
+        name?: string;
+    }
+
+    interface ChatRenderAttachmentsOptionsAttachments {
+        content?: any;
+        contentType?: string;
+    }
+
+    interface ChatRenderAttachmentsOptions {
+        attachments?: ChatRenderAttachmentsOptionsAttachments;
+        attachmentLayout?: string;
+    }
+
+    interface ChatRenderAttachmentsSender {
+        id?: any;
+        name?: string;
+        iconUrl?: string;
+    }
+
+    interface ChatRenderMessageMessage {
+        type?: string;
+        text?: string;
+    }
+
+    interface ChatRenderMessageSender {
+        id?: any;
+        name?: string;
+        iconUrl?: string;
+    }
+
+    interface ChatRenderSuggestedActionsSuggestedActions {
+        title?: string;
+        value?: string;
+    }
+
+    interface ChatOptions {
+        name?: string;
+        messages?: ChatMessages;
+        user?: ChatUser;
+        actionClick?(e: ChatActionClickEvent): void;
+        post?(e: ChatPostEvent): void;
+        sendMessage?(e: ChatSendMessageEvent): void;
+        typingEnd?(e: ChatTypingEndEvent): void;
+        typingStart?(e: ChatTypingStartEvent): void;
+    }
+    interface ChatEvent {
+        sender: Chat;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface ChatActionClickEvent extends ChatEvent {
+        text?: string;
+    }
+
+    interface ChatPostEvent extends ChatEvent {
+        text?: string;
+        timestamp?: Date;
+        from?: any;
+    }
+
+    interface ChatSendMessageEvent extends ChatEvent {
+        text?: string;
+    }
+
+    interface ChatTypingEndEvent extends ChatEvent {
+    }
+
+    interface ChatTypingStartEvent extends ChatEvent {
+    }
+
+
     class ColorPalette extends kendo.ui.Widget {
 
         static fn: ColorPalette;
@@ -2751,6 +2859,140 @@ declare namespace kendo.ui {
     }
 
 
+    class DropDownTree extends kendo.ui.Widget {
+
+        static fn: DropDownTree;
+
+        options: DropDownTreeOptions;
+
+        dataSource: kendo.data.DataSource;
+        tagList: JQuery;
+        tree: JQuery;
+        treeview: kendo.ui.TreeView;
+
+        element: JQuery;
+        wrapper: JQuery;
+
+        static extend(proto: Object): DropDownTree;
+
+        constructor(element: Element, options?: DropDownTreeOptions);
+
+
+        close(): void;
+        destroy(): void;
+        enable(enable: boolean): void;
+        focus(): void;
+        items(): any;
+        open(): void;
+        readonly(readonly: boolean): void;
+        refresh(): void;
+        search(word: string): void;
+        setDataSource(dataSource: kendo.data.HierarchicalDataSource): void;
+        toggle(toggle?: boolean): void;
+        value(): any;
+        value(value: any): void;
+        value(value: string): void;
+
+    }
+
+    interface DropDownTreeAnimationClose {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface DropDownTreeAnimationOpen {
+        effects?: string;
+        duration?: number;
+    }
+
+    interface DropDownTreeAnimation {
+        close?: DropDownTreeAnimationClose;
+        open?: DropDownTreeAnimationOpen;
+    }
+
+    interface DropDownTreeCheckboxes {
+        checkChildren?: boolean;
+        name?: string;
+        template?: string|Function;
+    }
+
+    interface DropDownTreeMessages {
+        clear?: string;
+        deleteTag?: string;
+        singleTag?: string;
+    }
+
+    interface DropDownTreePopup {
+        appendTo?: string;
+        origin?: string;
+        position?: string;
+    }
+
+    interface DropDownTreeOptions {
+        name?: string;
+        animation?: boolean | DropDownTreeAnimation;
+        autoBind?: boolean;
+        autoClose?: boolean;
+        autoWidth?: boolean;
+        checkAll?: boolean;
+        checkAllTemplate?: string|Function;
+        checkboxes?: boolean | DropDownTreeCheckboxes;
+        clearButton?: boolean;
+        dataImageUrlField?: string;
+        dataSource?: any|any|kendo.data.HierarchicalDataSource;
+        dataSpriteCssClassField?: string;
+        dataTextField?: string|any;
+        dataUrlField?: string;
+        dataValueField?: string|any;
+        delay?: number;
+        enable?: boolean;
+        enforceMinLength?: boolean;
+        filter?: string;
+        footerTemplate?: string|Function;
+        height?: string|number;
+        ignoreCase?: boolean;
+        loadOnDemand?: boolean;
+        messages?: DropDownTreeMessages;
+        minLength?: number;
+        noDataTemplate?: string|Function;
+        placeholder?: string;
+        popup?: DropDownTreePopup;
+        headerTemplate?: string|Function;
+        valueTemplate?: string|Function;
+        tagMode?: string;
+        template?: string|Function;
+        text?: string;
+        value?: string|any;
+        valuePrimitive?: boolean;
+        change?(e: DropDownTreeChangeEvent): void;
+        close?(e: DropDownTreeCloseEvent): void;
+        dataBound?(e: DropDownTreeDataBoundEvent): void;
+        filtering?(e: DropDownTreeFilteringEvent): void;
+        open?(e: DropDownTreeOpenEvent): void;
+    }
+    interface DropDownTreeEvent {
+        sender: DropDownTree;
+        preventDefault: Function;
+        isDefaultPrevented(): boolean;
+    }
+
+    interface DropDownTreeChangeEvent extends DropDownTreeEvent {
+    }
+
+    interface DropDownTreeCloseEvent extends DropDownTreeEvent {
+    }
+
+    interface DropDownTreeDataBoundEvent extends DropDownTreeEvent {
+    }
+
+    interface DropDownTreeFilteringEvent extends DropDownTreeEvent {
+        filter?: any;
+    }
+
+    interface DropDownTreeOpenEvent extends DropDownTreeEvent {
+    }
+
+
     class Editor extends kendo.ui.Widget {
 
         static fn: Editor;
@@ -2758,6 +3000,7 @@ declare namespace kendo.ui {
         options: EditorOptions;
 
         body: Element;
+        toolbar: kendo.ui.editor.Toolbar;
 
         element: JQuery;
         wrapper: JQuery;
@@ -3246,6 +3489,8 @@ declare namespace kendo.ui {
         contains?: string;
         doesnotcontain?: string;
         endswith?: string;
+        isnullorempty?: string;
+        isnotnullorempty?: string;
     }
 
     interface FilterMenuOperators {
@@ -3755,9 +4000,9 @@ declare namespace kendo.ui {
     }
 
     interface GridColumnCommandItemIconClass {
+        cancel?: string;
         edit?: string;
         update?: string;
-        cancel?: string;
     }
 
     interface GridColumnCommandItemText {
@@ -3767,12 +4012,13 @@ declare namespace kendo.ui {
     }
 
     interface GridColumnCommandItem {
-        visible?: Function;
-        name?: string;
-        text?: string | GridColumnCommandItemText;
         className?: string;
         click?: Function;
         iconClass?: string | GridColumnCommandItemIconClass;
+        name?: string;
+        template?: string;
+        text?: string | GridColumnCommandItemText;
+        visible?: Function;
     }
 
     interface GridColumnFilterableCell {
@@ -3802,6 +4048,7 @@ declare namespace kendo.ui {
     }
 
     interface GridColumnSortable {
+        allowUnsort?: boolean;
         compare?: Function;
         initialDirection?: string;
     }
@@ -3810,7 +4057,7 @@ declare namespace kendo.ui {
         aggregates?: any;
         attributes?: any;
         columns?: any;
-        command?: string|(string|GridColumnCommandItem)[];
+        command?: string | string[] | GridColumnCommandItem | GridColumnCommandItem[];
         editable?: Function;
         encoded?: boolean;
         field?: string;
@@ -4064,7 +4311,7 @@ declare namespace kendo.ui {
         scrollable?: boolean | GridScrollable;
         selectable?: boolean|string;
         sortable?: boolean | GridSortable;
-        toolbar?: GridToolbarItem[] | any;
+        toolbar?: GridToolbarItem[];
         beforeEdit?(e: GridBeforeEditEvent): void;
         cancel?(e: GridCancelEvent): void;
         cellClose?(e: GridCellCloseEvent): void;
@@ -4531,20 +4778,22 @@ declare namespace kendo.ui {
         constructor(element: Element, options?: MediaPlayerOptions);
 
 
-        fullScreen(): void;
+        fullScreen(): boolean;
         fullScreen(value: boolean): void;
-        volume(): void;
+        media(): any;
+        media(value: any): void;
+        volume(): number;
         volume(value: number): void;
-        mute(value: boolean): void;
-        isEnded(): void;
-        isPaused(): void;
-        isPlaying(): void;
+        mute(value: boolean): boolean;
+        isEnded(): boolean;
+        isPaused(): boolean;
+        isPlaying(): boolean;
         pause(): void;
         play(): void;
-        seek(milliseconds: number): void;
+        seek(milliseconds: number): number;
         stop(): void;
-        titlebar(): void;
-        toolbar(): void;
+        titlebar(): JQuery;
+        toolbar(): kendo.ui.ToolBar;
 
     }
 
@@ -7405,14 +7654,53 @@ declare namespace kendo.ui {
         isFalse?: string;
         isTrue?: string;
         or?: string;
-        selectValue?: string;
-        cancel?: string;
-        operator?: string;
+    }
+
+    interface TreeListFilterableOperatorsDate {
+        eq?: string;
+        neq?: string;
+        isnull?: string;
+        isnotnull?: string;
+        gte?: string;
+        gt?: string;
+        lte?: string;
+        lt?: string;
+    }
+
+    interface TreeListFilterableOperatorsNumber {
+        eq?: string;
+        neq?: string;
+        isnull?: string;
+        isnotnull?: string;
+        gte?: string;
+        gt?: string;
+        lte?: string;
+        lt?: string;
+    }
+
+    interface TreeListFilterableOperatorsString {
+        eq?: string;
+        neq?: string;
+        isnull?: string;
+        isnotnull?: string;
+        isempty?: string;
+        isnotempty?: string;
+        startswith?: string;
+        contains?: string;
+        doesnotcontain?: string;
+        endswith?: string;
+    }
+
+    interface TreeListFilterableOperators {
+        string?: TreeListFilterableOperatorsString;
+        number?: TreeListFilterableOperatorsNumber;
+        date?: TreeListFilterableOperatorsDate;
     }
 
     interface TreeListFilterable {
         extra?: boolean;
         messages?: TreeListFilterableMessages;
+        operators?: TreeListFilterableOperators;
     }
 
     interface TreeListMessagesCommands {
@@ -7465,6 +7753,7 @@ declare namespace kendo.ui {
 
     interface TreeListToolbarItem {
         click?: Function;
+        imageClass?: string;
         name?: string;
         text?: string;
     }
@@ -7656,6 +7945,7 @@ declare namespace kendo.ui {
         enable(nodes: JQuery, enable?: boolean): void;
         enable(nodes: Element, enable?: boolean): void;
         enable(nodes: string, enable?: boolean): void;
+        enable(nodes: boolean, enable?: boolean): void;
         expand(nodes: JQuery): void;
         expand(nodes: Element): void;
         expand(nodes: string): void;
@@ -7663,7 +7953,7 @@ declare namespace kendo.ui {
         expandTo(targetNode: kendo.data.Node): void;
         expandTo(targetNode: any): void;
         findByText(text: string): JQuery;
-        findByUid(text: string): JQuery;
+        findByUid(uid: string): JQuery;
         focus(): void;
         insertAfter(nodeData: any, referenceNode: JQuery): JQuery;
         insertBefore(nodeData: any, referenceNode: JQuery): JQuery;
@@ -9310,7 +9600,7 @@ declare namespace kendo.dataviz.ui {
         findSeriesByName(name: string): kendo.dataviz.ChartSeries;
         getAxis(name: string): kendo.dataviz.ChartAxis;
         hideTooltip(): void;
-        plotArea(): void;
+        plotArea(): kendo.dataviz.ChartPlotArea;
         redraw(): void;
         refresh(): void;
         resize(force?: boolean): void;
@@ -10199,7 +10489,7 @@ declare namespace kendo.dataviz.ui {
     interface ChartSeriesItemLine {
         color?: string;
         opacity?: number;
-        width?: string;
+        width?: number;
         style?: string;
     }
 
@@ -10337,7 +10627,7 @@ declare namespace kendo.dataviz.ui {
     }
 
     interface ChartSeriesItemTargetLine {
-        width?: any|Function;
+        width?: number|Function;
     }
 
     interface ChartSeriesItemTarget {
@@ -11631,6 +11921,7 @@ declare namespace kendo.dataviz.ui {
         panes?: ChartPane[];
         pannable?: boolean | ChartPannable;
         pdf?: ChartPdf;
+        persistSeriesVisibility?: boolean;
         plotArea?: ChartPlotArea;
         renderAs?: string;
         series?: ChartSeriesItem[];
@@ -13148,6 +13439,8 @@ declare namespace kendo.dataviz.ui {
         tooltip?: MapLayerTooltip;
         maxSize?: number;
         minSize?: number;
+        maxZoom?: number;
+        minZoom?: number;
         opacity?: number;
         subdomains?: any;
         symbol?: string|Function;
@@ -15334,10 +15627,10 @@ declare namespace kendo.dataviz.ui {
         autoBind?: boolean;
         dateField?: string;
         pane?: StockChartNavigatorPane;
-        visible?: boolean;
         series?: StockChartNavigatorSeriesItem[];
         select?: StockChartNavigatorSelect;
         hint?: StockChartNavigatorHint;
+        visible?: boolean;
     }
 
     interface StockChartPaneBorder {
@@ -15964,6 +16257,7 @@ declare namespace kendo.dataviz.ui {
         legend?: StockChartLegend;
         panes?: StockChartPane[];
         pdf?: StockChartPdf;
+        persistSeriesVisibility?: boolean;
         plotArea?: StockChartPlotArea;
         renderAs?: string;
         series?: StockChartSeriesItem[];
@@ -17557,13 +17851,14 @@ declare namespace kendo {
         function bind(element: JQuery, viewModel: kendo.data.ObservableObject, namespace?: any): void;
         function bind(element: Element, viewModel: any, namespace?: any): void;
         function bind(element: Element, viewModel: kendo.data.ObservableObject, namespace?: any): void;
-        function observableHierarchy(array: any): void;
         function confirm(text: string): JQueryPromise<any>;
         function culture(culture: string): void;
         function destroy(element: string): void;
         function destroy(element: JQuery): void;
         function destroy(element: Element): void;
+        function guid(): string;
         function htmlEncode(value: string): string;
+        function observableHierarchy(array: any): void;
         function parseDate(value: string, formats?: string, culture?: string): Date;
         function parseDate(value: string, formats?: any, culture?: string): Date;
         function parseFloat(value: string, culture?: string): number;
@@ -17752,6 +18047,7 @@ declare namespace kendo.spreadsheet {
         columnWidth(index: number, width?: number): void;
         batch(callback: Function, changeEventArgs: any): void;
         deleteColumn(index: number): void;
+        deleteRow(index: number): void;
         fromJSON(data: any): void;
         frozenColumns(): number;
         frozenColumns(count?: number): void;
@@ -18894,7 +19190,6 @@ declare namespace kendo.ooxml {
         cells?: WorkbookSheetRowCell[];
         index?: number;
         height?: number;
-        type?: "header" | "footer" | "groupHeader" | "groupFooter" | "data";
     }
 
     interface WorkbookSheet {
@@ -18903,6 +19198,7 @@ declare namespace kendo.ooxml {
         frozenColumns?: number;
         frozenRows?: number;
         filter?: WorkbookSheetFilter;
+        mergedCells?: any;
         name?: string;
         rows?: WorkbookSheetRow[];
         showGridLines?: boolean;
@@ -20042,6 +20338,10 @@ interface JQuery {
     kendoChart(options: kendo.dataviz.ui.ChartOptions): JQuery;
     data(key: "kendoChart"): kendo.dataviz.ui.Chart;
 
+    kendoChat(): JQuery;
+    kendoChat(options: kendo.ui.ChatOptions): JQuery;
+    data(key: "kendoChat"): kendo.ui.Chat;
+
     kendoColorPalette(): JQuery;
     kendoColorPalette(options: kendo.ui.ColorPaletteOptions): JQuery;
     data(key: "kendoColorPalette"): kendo.ui.ColorPalette;
@@ -20086,6 +20386,10 @@ interface JQuery {
     kendoDropDownList(options: kendo.ui.DropDownListOptions): JQuery;
     data(key: "kendoDropDownList"): kendo.ui.DropDownList;
 
+    kendoDropDownTree(): JQuery;
+    kendoDropDownTree(options: kendo.ui.DropDownTreeOptions): JQuery;
+    data(key: "kendoDropDownTree"): kendo.ui.DropDownTree;
+
     kendoEditor(): JQuery;
     kendoEditor(options: kendo.ui.EditorOptions): JQuery;
     data(key: "kendoEditor"): kendo.ui.Editor;

From 6ca98463e74cd086e82936d2786558d4e8c87132 Mon Sep 17 00:00:00 2001
From: Deyan Kamburov <dkamburov@infragistics.com>
Date: Thu, 17 May 2018 16:53:19 +0300
Subject: [PATCH 206/575] Apply several fixes to ignite-ui typings

---
 types/ignite-ui/index.d.ts | 1101 +++++++++++++++++++++++++++++++++++-
 1 file changed, 1084 insertions(+), 17 deletions(-)

diff --git a/types/ignite-ui/index.d.ts b/types/ignite-ui/index.d.ts
index a57a3606fe..58e4ec6446 100644
--- a/types/ignite-ui/index.d.ts
+++ b/types/ignite-ui/index.d.ts
@@ -21789,11 +21789,11 @@ interface SelectionChangingEventUIParam {
 	items?: any;
 }
 
-interface SelectionChangedEvent {
-	(event: Event, ui: SelectionChangedEventUIParam): void;
+interface IgComboSelectionChangedEvent {
+	(event: Event, ui: IgComboSelectionChangedEventUIParam): void;
 }
 
-interface SelectionChangedEventUIParam {
+interface IgComboSelectionChangedEventUIParam {
 	/**
 	 * Used to obtain reference to igCombo.
 	 */
@@ -22347,7 +22347,7 @@ interface IgCombo {
 	 * Use ui.items to obtain reference to array of new selected items. That can be null.
 	 * Use ui.oldItems to obtain reference to array of old selected items. That can be null.
 	 */
-	selectionChanged?: SelectionChangedEvent;
+	selectionChanged?: IgComboSelectionChangedEvent;
 
 	/**
 	 * Option for igCombo
@@ -23867,7 +23867,7 @@ interface JQuery {
 	 * Use ui.items to obtain reference to array of new selected items. That can be null.
 	 * Use ui.oldItems to obtain reference to array of old selected items. That can be null.
 	 */
-	igCombo(optionLiteral: 'option', optionName: "selectionChanged"): SelectionChangedEvent;
+	igCombo(optionLiteral: 'option', optionName: "selectionChanged"): IgComboSelectionChangedEvent;
 
 	/**
 	 * Event which is raised after selection change.
@@ -23879,7 +23879,7 @@ interface JQuery {
 	 *
 	 * @optionValue Define event handler function.
 	 */
-	igCombo(optionLiteral: 'option', optionName: "selectionChanged", optionValue: SelectionChangedEvent): void;
+	igCombo(optionLiteral: 'option', optionName: "selectionChanged", optionValue: IgComboSelectionChangedEvent): void;
 	igCombo(options: IgCombo): JQuery;
 	igCombo(optionLiteral: 'option', optionName: string): any;
 	igCombo(optionLiteral: 'option', options: IgCombo): JQuery;
@@ -25206,6 +25206,979 @@ interface JQuery {
 	igDialog(optionLiteral: 'option', optionName: string, optionValue: any): JQuery;
 	igDialog(methodName: string, ...methodParams: any[]): any;
 }
+interface IgDoughnutChartSeries {
+	/**
+	 * Gets or sets the current series type.
+	 *
+	 * Valid values:
+	 * "flat" Series has flat 1-dimensional data.
+	 */
+	type?: string;
+
+	/**
+	 * Whether the series should render a tooltip.
+	 */
+	showTooltip?: boolean;
+
+	/**
+	 * The name of template or the template itself that chart tooltip will use to render.
+	 */
+	tooltipTemplate?: string;
+
+	/**
+	 * Gets or sets the data source for the chart.
+	 */
+	itemsSource?: any;
+
+	/**
+	 * Gets or Sets the property name that contains the values.
+	 */
+	valueMemberPath?: string;
+
+	/**
+	 * Gets or sets the property name that contains the labels.
+	 */
+	labelMemberPath?: string;
+
+	/**
+	 * Gets or sets the property name that contains the legend labels.
+	 */
+	legendLabelMemberPath?: string;
+
+	/**
+	 * Gets or sets the position of chart labels.
+	 *
+	 * Valid values:
+	 * "none" No labels will be displayed.
+	 * "center" Labels will be displayed in the center.
+	 * "insideEnd" Labels will be displayed inside and by the edge of the container.
+	 * "outsideEnd" Labels will be displayed outside the container.
+	 * "bestFit" Labels will automatically decide their location.
+	 */
+	labelsPosition?: string;
+
+	/**
+	 * Gets or sets whether the leader lines are visible.
+	 *
+	 * Valid values:
+	 * "visible" Display the element.
+	 * "collapsed" Do not display the element.
+	 */
+	leaderLineVisibility?: string;
+
+	/**
+	 * Gets or sets the style for the leader lines.
+	 */
+	leaderLineStyle?: any;
+
+	/**
+	 * Gets or sets what type of leader lines will be used for the outside end labels.
+	 *
+	 * Valid values:
+	 * "straight" A straight line is drawn between the slice and its label.
+	 * "arc" A curved line is drawn between the slice and its label. The line follows makes a natural turn from the slice to the label.
+	 * "spline" A curved line is drawn between the slice and its label. The line starts radially from the slice and then turns to the label.
+	 */
+	leaderLineType?: string;
+
+	/**
+	 * Gets or sets the margin between a label and its leader line. The default is 6 pixels.
+	 */
+	leaderLineMargin?: number;
+
+	/**
+	 * Gets or sets the threshold value that determines if slices are grouped into the Others slice.
+	 */
+	othersCategoryThreshold?: number;
+
+	/**
+	 * Gets or sets whether to use numeric or percent-based threshold value.
+	 *
+	 * Valid values:
+	 * "number" Data value is compared directly to the value of OthersCategoryThreshold.
+	 * "percent" Data value is compared to OthersCategoryThreshold as a percentage of the total.
+	 */
+	othersCategoryType?: string;
+
+	/**
+	 * Gets or sets the label of the Others slice.
+	 */
+	othersCategoryText?: string;
+
+	/**
+	 * Gets or sets the legend used for the current chart.
+	 */
+	legend?: any;
+
+	/**
+	 * Sets or gets a function which takes an object that produces a formatted label for displaying in the chart.
+	 */
+	formatLabel?: any;
+
+	/**
+	 * Sets or gets a function which takes an object that produces a formatted label for displaying in the chart's legend.
+	 */
+	formatLegendLabel?: any;
+
+	/**
+	 * Gets or sets the pixel amount by which the labels are offset from the edge of the slices.
+	 */
+	labelExtent?: number;
+
+	/**
+	 * Gets or sets the starting angle of the chart.
+	 * The default zero value is equivalent to 3 o'clock.
+	 */
+	startAngle?: number;
+
+	/**
+	 * Gets or sets the style used when a slice is selected.
+	 */
+	selectedStyle?: any;
+
+	/**
+	 * Gets or sets the palette of brushes to use for coloring the slices.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	brushes?: any;
+
+	/**
+	 * Gets or sets the palette of brushes to use for outlines on the slices.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	outlines?: any;
+
+	/**
+	 * Gets or sets whether all surface interactions with the plot area should be disabled.
+	 */
+	isSurfaceInteractionDisabled?: boolean;
+
+	/**
+	 * Gets or sets the scaling factor of the chart's radius. Value between 0 and 1.
+	 */
+	radiusFactor?: number;
+
+	/**
+	 * Option for IgDoughnutChartSeries
+	 */
+	[optionName: string]: any;
+}
+
+interface HoleDimensionsChangedEvent {
+	(event: Event, ui: HoleDimensionsChangedEventUIParam): void;
+}
+
+interface HoleDimensionsChangedEventUIParam {}
+
+interface IgDoughnutChart {
+	/**
+	 * The width of the chart. It can be set as a number in pixels, string (px) or percentage (%).
+	 */
+	width?: string|number;
+
+	/**
+	 * The height of the chart. It can be set as a number in pixels, string (px) or percentage (%).
+	 */
+	height?: string|number;
+
+	/**
+	 * An array of series objects.
+	 */
+	series?: IgDoughnutChartSeries[];
+
+	/**
+	 * Gets or sets whether the slices can be selected.
+	 */
+	allowSliceSelection?: boolean;
+
+	/**
+	 * Gets or sets whether all surface interactions with the plot area should be disabled.
+	 */
+	isSurfaceInteractionDisabled?: boolean;
+
+	/**
+	 * Gets or sets whether the slices can be exploded.
+	 */
+	allowSliceExplosion?: boolean;
+
+	/**
+	 * Gets or sets the inner extent of the doughnut chart. It is percent from the outer ring's radius.
+	 */
+	innerExtent?: number;
+
+	/**
+	 * Gets or sets the style used when a slice is selected.
+	 */
+	selectedStyle?: any;
+
+	/**
+	 * Gets or sets the scaling value used to affect the pixel density of the control.
+	 * A higher scaling ratio will produce crisper visuals at the expense of memory.  Lower values will cause the control
+	 * to appear blurry.
+	 */
+	pixelScalingRatio?: number;
+
+	/**
+	 * Gets sets template for tooltip associated with chart item.
+	 * Example: "Value: $(ValueMemberPathInDataSource)"
+	 */
+	tooltipTemplate?: string;
+
+	/**
+	 * Gets sets maximum number of displayed records in chart.
+	 */
+	maxRecCount?: number;
+
+	/**
+	 * Gets sets a valid data source.
+	 * That can be instance of array or primitives, array of objects, instance of $.ig.DataSource, or any other data accepted by $.ig.DataSource.
+	 * Note: if it is set to string and "dataSourceType" option is not set, then $.ig.JSONPDataSource is used.
+	 */
+	dataSource?: any;
+
+	/**
+	 * Gets sets data source type (such as "json", "xml", etc). Please refer to the documentation of $.ig.DataSource and its type property
+	 */
+	dataSourceType?: string;
+
+	/**
+	 * Gets sets url which is used for sending JSON on request for remote data.
+	 */
+	dataSourceUrl?: string;
+
+	/**
+	 * See $.ig.DataSource. property in the response specifying the total number of records on the server.
+	 */
+	responseTotalRecCountKey?: string;
+
+	/**
+	 * See $.ig.DataSource. This is basically the property in the responses where data records are held, if the response is wrapped.
+	 */
+	responseDataKey?: string;
+
+	/**
+	 * Event fired when the mouse has hovered on a series and the tooltip is about to show
+	 * Function takes arguments evt and ui.
+	 * Use ui.element to get reference to tooltip DOM element.
+	 * Use ui.item to get reference to current series item object.
+	 * Use ui.chart to get reference to chart object.
+	 * Use ui.series to get reference to current series object.
+	 * Use ui.actualItemBrush to get item brush.
+	 * Use ui.actualSeriesBrush to get series brush.
+	 */
+	tooltipShowing?: TooltipShowingEvent;
+
+	/**
+	 * Event fired after a tooltip is shown
+	 * Function takes arguments evt and ui.
+	 * Use ui.element to get reference to tooltip DOM element.
+	 * Use ui.item to get reference to current series item object.
+	 * Use ui.chart to get reference to chart object.
+	 * Use ui.series to get reference to current series object.
+	 * Use ui.actualItemBrush to get item brush.
+	 * Use ui.actualSeriesBrush to get series brush.
+	 */
+	tooltipShown?: TooltipShownEvent;
+
+	/**
+	 * Event fired when the mouse has left a series and the tooltip is about to hide
+	 * Function takes arguments evt and ui.
+	 * Use ui.element to get reference to tooltip DOM element.
+	 * Use ui.item to get reference to current series item object.
+	 * Use ui.chart to get reference to chart object.
+	 * Use ui.series to get reference to current series object.
+	 * Use ui.actualItemBrush to get item brush.
+	 * Use ui.actualSeriesBrush to get series brush.
+	 */
+	tooltipHiding?: TooltipHidingEvent;
+
+	/**
+	 * Event fired after a tooltip is hidden
+	 * Function takes arguments evt and ui.
+	 * Use ui.element to get reference to tooltip DOM element.
+	 * Use ui.item to get reference to current series item object.
+	 * Use ui.chart to get reference to chart object.
+	 * Use ui.series to get reference to current series object.
+	 * Use ui.actualItemBrush to get item brush.
+	 * Use ui.actualSeriesBrush to get series brush.
+	 */
+	tooltipHidden?: TooltipHiddenEvent;
+
+	/**
+	 * Event fired when the control is displayed on a non HTML5 compliant browser
+	 */
+	browserNotSupported?: BrowserNotSupportedEvent;
+
+	/**
+	 * Raised when the slice is clicked.
+	 */
+	sliceClick?: SliceClickEvent;
+
+	/**
+	 * Raised when the dimensions (center point or radius) of the doughnut hole change.
+	 */
+	holeDimensionsChanged?: HoleDimensionsChangedEvent;
+
+	/**
+	 * Event which is raised before data binding.
+	 * Return false in order to cancel data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 */
+	dataBinding?: DataBindingEvent;
+
+	/**
+	 * Event which is raised after data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.data to obtain reference to array actual data which is displayed by chart.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 */
+	dataBound?: DataBoundEvent;
+
+	/**
+	 * Event which is raised before tooltip is updated.
+	 * Return false in order to cancel updating and hide tooltip.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.text to obtain html of tooltip. Value of that member can be modified. If modified value is null or empty string, then current content of tooltip keeps old value.
+	 * Use ui.item to obtain reference to item. Value of that member can be modified or replaced by custom item.
+	 * Use ui.x to obtain left position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.y to obtain top position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip. Value of that member can be replaced by custom element.
+	 */
+	updateTooltip?: UpdateTooltipEvent;
+
+	/**
+	 * Event which is raised before tooltip is hidden.
+	 * Return false in order to cancel hiding and keep tooltip visible.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.item to obtain reference to item.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip or value of ui.element from last updateTooltip event. Value of that member can be replaced by custom element.
+	 */
+	hideTooltip?: HideTooltipEvent;
+
+	/**
+	 * Option for igDoughnutChart
+	 */
+	[optionName: string]: any;
+}
+interface IgDoughnutChartMethods {
+	/**
+	 * Adds a new series to the doughnut chart.
+	 *
+	 * @param seriesObj The series object to be added.
+	 */
+	addSeries(seriesObj: Object): void;
+
+	/**
+	 * Removes the specified series from the doughnut chart.
+	 *
+	 * @param seriesObj The series object identifying the series to be removed.
+	 */
+	removeSeries(seriesObj: Object): void;
+
+	/**
+	 * Updates the series with the specified name with the specified new property values.
+	 *
+	 * @param value The series object identifying the series to be updated.
+	 */
+	updateSeries(value: Object): void;
+
+	/**
+	 * Returns the center of the doughnut chart.
+	 */
+	getCenterCoordinates(): Object;
+
+	/**
+	 * Returns the radius of the chart's hole.
+	 */
+	getHoleRadius(): number;
+
+	/**
+	 * Returns information about how the doughnut chart is rendered.
+	 */
+	exportVisualData(): Object;
+
+	/**
+	 * Causes all of the series that have pending changes e.g. by changed property values to be rendered immediately.
+	 */
+	flush(): void;
+
+	/**
+	 * Destroys the widget.
+	 */
+	destroy(): void;
+
+	/**
+	 * Returns data source of the series.
+	 *
+	 * @param series Optional. The series name. If not provided an array of series data sources is returned.
+	 */
+	getData(series: string): Object;
+
+	/**
+	 * Find index of item within actual data used by chart.
+	 *
+	 * @param item The reference to item.
+	 */
+	findIndexOfItem(item: Object): number;
+
+	/**
+	 * Get item within actual data used by chart. That is similar to this.getData()[ index ].
+	 *
+	 * @param index Index of data item.
+	 */
+	getDataItem(index: Object): Object;
+
+	/**
+	 * Adds a new item to the data source and notifies the chart.
+	 *
+	 * @param item The item that we want to add to the data source.
+	 */
+	addItem(item: Object): Object;
+
+	/**
+	 * Inserts a new item to the data source and notifies the chart.
+	 *
+	 * @param item the new item that we want to insert in the data source.
+	 * @param index The index in the data source where the new item will be inserted.
+	 */
+	insertItem(item: Object, index: number): Object;
+
+	/**
+	 * Deletes an item from the data source and notifies the chart.
+	 *
+	 * @param index The index in the data source from where the item will be been removed.
+	 */
+	removeItem(index: number): Object;
+
+	/**
+	 * Updates an item in the data source and notifies the chart.
+	 *
+	 * @param index The index of the item in the data source that we want to change.
+	 * @param item The new item object that will be set in the data source.
+	 */
+	setItem(index: number, item: Object): Object;
+
+	/**
+	 * Notifies the chart that an item has been set in an associated data source.
+	 *
+	 * @param dataSource The data source in which the change happened.
+	 * @param index The index in the items source that has been changed.
+	 * @param newItem the new item that has been set in the collection.
+	 * @param oldItem the old item that has been overwritten in the collection.
+	 */
+	notifySetItem(dataSource: Object, index: number, newItem: Object, oldItem: Object): Object;
+
+	/**
+	 * Notifies the chart that the items have been cleared from an associated data source.
+	 * It's not necessary to notify more than one target of a change if they share the same items source.
+	 *
+	 * @param dataSource The data source in which the change happened.
+	 */
+	notifyClearItems(dataSource: Object): Object;
+
+	/**
+	 * Notifies the target axis or series that an item has been inserted at the specified index in its data source.
+	 * It's not necessary to notify more than one target of a change if they share the same items source.
+	 *
+	 * @param dataSource The data source in which the change happened.
+	 * @param index The index in the items source where the new item has been inserted.
+	 * @param newItem the new item that has been set in the collection.
+	 */
+	notifyInsertItem(dataSource: Object, index: number, newItem: Object): Object;
+
+	/**
+	 * Notifies the target axis or series that an item has been removed from the specified index in its data source.
+	 * It's not necessary to notify more than one target of a change if they share the same items source.
+	 *
+	 * @param dataSource The data source in which the change happened.
+	 * @param index The index in the items source from where the old item has been removed.
+	 * @param oldItem the old item that has been removed from the collection.
+	 */
+	notifyRemoveItem(dataSource: Object, index: number, oldItem: Object): Object;
+
+	/**
+	 * Get reference to chart object.
+	 */
+	chart(): Object;
+
+	/**
+	 * Binds data to the chart
+	 */
+	dataBind(): void;
+}
+interface JQuery {
+	data(propertyName: "igDoughnutChart"): IgDoughnutChartMethods;
+}
+
+interface JQuery {
+	igDoughnutChart(methodName: "addSeries", seriesObj: Object): void;
+	igDoughnutChart(methodName: "removeSeries", seriesObj: Object): void;
+	igDoughnutChart(methodName: "updateSeries", value: Object): void;
+	igDoughnutChart(methodName: "getCenterCoordinates"): Object;
+	igDoughnutChart(methodName: "getHoleRadius"): number;
+	igDoughnutChart(methodName: "exportVisualData"): Object;
+	igDoughnutChart(methodName: "flush"): void;
+	igDoughnutChart(methodName: "destroy"): void;
+	igDoughnutChart(methodName: "getData", series: string): Object;
+	igDoughnutChart(methodName: "findIndexOfItem", item: Object): number;
+	igDoughnutChart(methodName: "getDataItem", index: Object): Object;
+	igDoughnutChart(methodName: "addItem", item: Object): Object;
+	igDoughnutChart(methodName: "insertItem", item: Object, index: number): Object;
+	igDoughnutChart(methodName: "removeItem", index: number): Object;
+	igDoughnutChart(methodName: "setItem", index: number, item: Object): Object;
+	igDoughnutChart(methodName: "notifySetItem", dataSource: Object, index: number, newItem: Object, oldItem: Object): Object;
+	igDoughnutChart(methodName: "notifyClearItems", dataSource: Object): Object;
+	igDoughnutChart(methodName: "notifyInsertItem", dataSource: Object, index: number, newItem: Object): Object;
+	igDoughnutChart(methodName: "notifyRemoveItem", dataSource: Object, index: number, oldItem: Object): Object;
+	igDoughnutChart(methodName: "chart"): Object;
+	igDoughnutChart(methodName: "dataBind"): void;
+
+	/**
+	 * The width of the chart. It can be set as a number in pixels, string (px) or percentage (%).
+	 */
+
+	igDoughnutChart(optionLiteral: 'option', optionName: "width"): string|number;
+
+	/**
+	 * The width of the chart. It can be set as a number in pixels, string (px) or percentage (%).
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igDoughnutChart(optionLiteral: 'option', optionName: "width", optionValue: string|number): void;
+
+	/**
+	 * The height of the chart. It can be set as a number in pixels, string (px) or percentage (%).
+	 */
+
+	igDoughnutChart(optionLiteral: 'option', optionName: "height"): string|number;
+
+	/**
+	 * The height of the chart. It can be set as a number in pixels, string (px) or percentage (%).
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igDoughnutChart(optionLiteral: 'option', optionName: "height", optionValue: string|number): void;
+
+	/**
+	 * An array of series objects.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "series"): IgDoughnutChartSeries[];
+
+	/**
+	 * An array of series objects.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "series", optionValue: IgDoughnutChartSeries[]): void;
+
+	/**
+	 * Gets  whether the slices can be selected.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "allowSliceSelection"): boolean;
+
+	/**
+	 * Sets whether the slices can be selected.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "allowSliceSelection", optionValue: boolean): void;
+
+	/**
+	 * Gets  whether all surface interactions with the plot area should be disabled.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "isSurfaceInteractionDisabled"): boolean;
+
+	/**
+	 * Sets whether all surface interactions with the plot area should be disabled.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "isSurfaceInteractionDisabled", optionValue: boolean): void;
+
+	/**
+	 * Gets  whether the slices can be exploded.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "allowSliceExplosion"): boolean;
+
+	/**
+	 * Sets whether the slices can be exploded.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "allowSliceExplosion", optionValue: boolean): void;
+
+	/**
+	 * Gets  the inner extent of the doughnut chart. It is percent from the outer ring's radius.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "innerExtent"): number;
+
+	/**
+	 * Sets the inner extent of the doughnut chart. It is percent from the outer ring's radius.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "innerExtent", optionValue: number): void;
+
+	/**
+	 * Gets  the style used when a slice is selected.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "selectedStyle"): any;
+
+	/**
+	 * Sets the style used when a slice is selected.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "selectedStyle", optionValue: any): void;
+
+	/**
+	 * Gets  the scaling value used to affect the pixel density of the control.
+	 * A higher scaling ratio will produce crisper visuals at the expense of memory.  Lower values will cause the control
+	 * to appear blurry.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "pixelScalingRatio"): number;
+
+	/**
+	 * Sets the scaling value used to affect the pixel density of the control.
+	 * A higher scaling ratio will produce crisper visuals at the expense of memory.  Lower values will cause the control
+	 * to appear blurry.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "pixelScalingRatio", optionValue: number): void;
+
+	/**
+	 * Gets  template for tooltip associated with chart item.
+	 * Example: "Value: $(ValueMemberPathInDataSource)"
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipTemplate"): string;
+
+	/**
+	 * Sets template for tooltip associated with chart item.
+	 * Example: "Value: $(ValueMemberPathInDataSource)"
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipTemplate", optionValue: string): void;
+
+	/**
+	 * Gets  maximum number of displayed records in chart.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "maxRecCount"): number;
+
+	/**
+	 * Sets maximum number of displayed records in chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "maxRecCount", optionValue: number): void;
+
+	/**
+	 * Gets  a valid data source.
+	 * That can be instance of array or primitives, array of objects, instance of $.ig.DataSource, or any other data accepted by $.ig.DataSource.
+	 * Note: if it is set to string and "dataSourceType" option is not set, then $.ig.JSONPDataSource is used.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "dataSource"): any;
+
+	/**
+	 * Sets a valid data source.
+	 * That can be instance of array or primitives, array of objects, instance of $.ig.DataSource, or any other data accepted by $.ig.DataSource.
+	 * Note: if it is set to string and "dataSourceType" option is not set, then $.ig.JSONPDataSource is used.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
+
+	/**
+	 * Gets  data source type (such as "json", "xml", etc). Please refer to the documentation of $.ig.DataSource and its type property
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "dataSourceType"): string;
+
+	/**
+	 * Sets data source type (such as "json", "xml", etc). Please refer to the documentation of $.ig.DataSource and its type property
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "dataSourceType", optionValue: string): void;
+
+	/**
+	 * Gets  url which is used for sending JSON on request for remote data.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "dataSourceUrl"): string;
+
+	/**
+	 * Sets url which is used for sending JSON on request for remote data.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "dataSourceUrl", optionValue: string): void;
+
+	/**
+	 * See $.ig.DataSource. property in the response specifying the total number of records on the server.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "responseTotalRecCountKey"): string;
+
+	/**
+	 * See $.ig.DataSource. property in the response specifying the total number of records on the server.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "responseTotalRecCountKey", optionValue: string): void;
+
+	/**
+	 * See $.ig.DataSource. This is basically the property in the responses where data records are held, if the response is wrapped.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "responseDataKey"): string;
+
+	/**
+	 * See $.ig.DataSource. This is basically the property in the responses where data records are held, if the response is wrapped.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "responseDataKey", optionValue: string): void;
+
+	/**
+	 * Event fired when the mouse has hovered on a series and the tooltip is about to show
+	 * Function takes arguments evt and ui.
+	 * Use ui.element to get reference to tooltip DOM element.
+	 * Use ui.item to get reference to current series item object.
+	 * Use ui.chart to get reference to chart object.
+	 * Use ui.series to get reference to current series object.
+	 * Use ui.actualItemBrush to get item brush.
+	 * Use ui.actualSeriesBrush to get series brush.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipShowing"): TooltipShowingEvent;
+
+	/**
+	 * Event fired when the mouse has hovered on a series and the tooltip is about to show
+	 * Function takes arguments evt and ui.
+	 * Use ui.element to get reference to tooltip DOM element.
+	 * Use ui.item to get reference to current series item object.
+	 * Use ui.chart to get reference to chart object.
+	 * Use ui.series to get reference to current series object.
+	 * Use ui.actualItemBrush to get item brush.
+	 * Use ui.actualSeriesBrush to get series brush.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipShowing", optionValue: TooltipShowingEvent): void;
+
+	/**
+	 * Event fired after a tooltip is shown
+	 * Function takes arguments evt and ui.
+	 * Use ui.element to get reference to tooltip DOM element.
+	 * Use ui.item to get reference to current series item object.
+	 * Use ui.chart to get reference to chart object.
+	 * Use ui.series to get reference to current series object.
+	 * Use ui.actualItemBrush to get item brush.
+	 * Use ui.actualSeriesBrush to get series brush.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipShown"): TooltipShownEvent;
+
+	/**
+	 * Event fired after a tooltip is shown
+	 * Function takes arguments evt and ui.
+	 * Use ui.element to get reference to tooltip DOM element.
+	 * Use ui.item to get reference to current series item object.
+	 * Use ui.chart to get reference to chart object.
+	 * Use ui.series to get reference to current series object.
+	 * Use ui.actualItemBrush to get item brush.
+	 * Use ui.actualSeriesBrush to get series brush.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipShown", optionValue: TooltipShownEvent): void;
+
+	/**
+	 * Event fired when the mouse has left a series and the tooltip is about to hide
+	 * Function takes arguments evt and ui.
+	 * Use ui.element to get reference to tooltip DOM element.
+	 * Use ui.item to get reference to current series item object.
+	 * Use ui.chart to get reference to chart object.
+	 * Use ui.series to get reference to current series object.
+	 * Use ui.actualItemBrush to get item brush.
+	 * Use ui.actualSeriesBrush to get series brush.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipHiding"): TooltipHidingEvent;
+
+	/**
+	 * Event fired when the mouse has left a series and the tooltip is about to hide
+	 * Function takes arguments evt and ui.
+	 * Use ui.element to get reference to tooltip DOM element.
+	 * Use ui.item to get reference to current series item object.
+	 * Use ui.chart to get reference to chart object.
+	 * Use ui.series to get reference to current series object.
+	 * Use ui.actualItemBrush to get item brush.
+	 * Use ui.actualSeriesBrush to get series brush.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipHiding", optionValue: TooltipHidingEvent): void;
+
+	/**
+	 * Event fired after a tooltip is hidden
+	 * Function takes arguments evt and ui.
+	 * Use ui.element to get reference to tooltip DOM element.
+	 * Use ui.item to get reference to current series item object.
+	 * Use ui.chart to get reference to chart object.
+	 * Use ui.series to get reference to current series object.
+	 * Use ui.actualItemBrush to get item brush.
+	 * Use ui.actualSeriesBrush to get series brush.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipHidden"): TooltipHiddenEvent;
+
+	/**
+	 * Event fired after a tooltip is hidden
+	 * Function takes arguments evt and ui.
+	 * Use ui.element to get reference to tooltip DOM element.
+	 * Use ui.item to get reference to current series item object.
+	 * Use ui.chart to get reference to chart object.
+	 * Use ui.series to get reference to current series object.
+	 * Use ui.actualItemBrush to get item brush.
+	 * Use ui.actualSeriesBrush to get series brush.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipHidden", optionValue: TooltipHiddenEvent): void;
+
+	/**
+	 * Event fired when the control is displayed on a non HTML5 compliant browser
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "browserNotSupported"): BrowserNotSupportedEvent;
+
+	/**
+	 * Event fired when the control is displayed on a non HTML5 compliant browser
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "browserNotSupported", optionValue: BrowserNotSupportedEvent): void;
+
+	/**
+	 * Raised when the slice is clicked.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "sliceClick"): SliceClickEvent;
+
+	/**
+	 * Raised when the slice is clicked.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "sliceClick", optionValue: SliceClickEvent): void;
+
+	/**
+	 * Raised when the dimensions (center point or radius) of the doughnut hole change.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "holeDimensionsChanged"): HoleDimensionsChangedEvent;
+
+	/**
+	 * Raised when the dimensions (center point or radius) of the doughnut hole change.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "holeDimensionsChanged", optionValue: HoleDimensionsChangedEvent): void;
+
+	/**
+	 * Event which is raised before data binding.
+	 * Return false in order to cancel data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "dataBinding"): DataBindingEvent;
+
+	/**
+	 * Event which is raised before data binding.
+	 * Return false in order to cancel data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "dataBinding", optionValue: DataBindingEvent): void;
+
+	/**
+	 * Event which is raised after data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.data to obtain reference to array actual data which is displayed by chart.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "dataBound"): DataBoundEvent;
+
+	/**
+	 * Event which is raised after data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.data to obtain reference to array actual data which is displayed by chart.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "dataBound", optionValue: DataBoundEvent): void;
+
+	/**
+	 * Event which is raised before tooltip is updated.
+	 * Return false in order to cancel updating and hide tooltip.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.text to obtain html of tooltip. Value of that member can be modified. If modified value is null or empty string, then current content of tooltip keeps old value.
+	 * Use ui.item to obtain reference to item. Value of that member can be modified or replaced by custom item.
+	 * Use ui.x to obtain left position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.y to obtain top position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip. Value of that member can be replaced by custom element.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "updateTooltip"): UpdateTooltipEvent;
+
+	/**
+	 * Event which is raised before tooltip is updated.
+	 * Return false in order to cancel updating and hide tooltip.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.text to obtain html of tooltip. Value of that member can be modified. If modified value is null or empty string, then current content of tooltip keeps old value.
+	 * Use ui.item to obtain reference to item. Value of that member can be modified or replaced by custom item.
+	 * Use ui.x to obtain left position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.y to obtain top position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip. Value of that member can be replaced by custom element.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "updateTooltip", optionValue: UpdateTooltipEvent): void;
+
+	/**
+	 * Event which is raised before tooltip is hidden.
+	 * Return false in order to cancel hiding and keep tooltip visible.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.item to obtain reference to item.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip or value of ui.element from last updateTooltip event. Value of that member can be replaced by custom element.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "hideTooltip"): HideTooltipEvent;
+
+	/**
+	 * Event which is raised before tooltip is hidden.
+	 * Return false in order to cancel hiding and keep tooltip visible.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.item to obtain reference to item.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip or value of ui.element from last updateTooltip event. Value of that member can be replaced by custom element.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igDoughnutChart(optionLiteral: 'option', optionName: "hideTooltip", optionValue: HideTooltipEvent): void;
+	igDoughnutChart(options: IgDoughnutChart): JQuery;
+	igDoughnutChart(optionLiteral: 'option', optionName: string): any;
+	igDoughnutChart(optionLiteral: 'option', options: IgDoughnutChart): JQuery;
+	igDoughnutChart(optionLiteral: 'option', optionName: string, optionValue: any): JQuery;
+	igDoughnutChart(methodName: string, ...methodParams: any[]): any;
+}
 interface RenderingEvent {
 	(event: Event, ui: RenderingEventUIParam): void;
 }
@@ -26669,6 +27642,9 @@ interface IgNumericEditor {
 	 */
 	toUpper?: any;
 
+	/**
+	 *
+	 */
 	textMode?: any;
 
 	/**
@@ -27248,6 +28224,9 @@ interface IgCurrencyEditor {
 	 */
 	toUpper?: any;
 
+	/**
+	 *
+	 */
 	textMode?: any;
 
 	/**
@@ -27730,6 +28709,9 @@ interface IgPercentEditor {
 	 */
 	toUpper?: any;
 
+	/**
+	 *
+	 */
 	textMode?: any;
 
 	/**
@@ -28128,6 +29110,9 @@ interface IgMaskEditor {
 	 */
 	dropDownOnReadOnly?: boolean;
 
+	/**
+	 *
+	 */
 	textMode?: any;
 
 	/**
@@ -28663,6 +29648,9 @@ interface IgDateEditor {
 	 */
 	dropDownOrientation?: string;
 
+	/**
+	 *
+	 */
 	textMode?: any;
 
 	/**
@@ -29225,6 +30213,9 @@ interface IgDatePicker {
 	 */
 	dropDownOrientation?: string;
 
+	/**
+	 *
+	 */
 	textMode?: any;
 
 	/**
@@ -30059,6 +31050,9 @@ interface IgTimePicker {
 	 */
 	excludeKeys?: string;
 
+	/**
+	 *
+	 */
 	textMode?: any;
 
 	/**
@@ -32002,8 +32996,12 @@ interface JQuery {
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "toUpper", optionValue: any): void;
 
+	/**
+	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "textMode"): any;
 
+	/**
+	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
@@ -32939,8 +33937,12 @@ interface JQuery {
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "toUpper", optionValue: any): void;
 
+	/**
+	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "textMode"): any;
 
+	/**
+	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
@@ -33815,8 +34817,12 @@ interface JQuery {
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "toUpper", optionValue: any): void;
 
+	/**
+	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "textMode"): any;
 
+	/**
+	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
@@ -34522,8 +35528,12 @@ interface JQuery {
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly", optionValue: boolean): void;
 
+	/**
+	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "textMode"): any;
 
+	/**
+	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
@@ -35522,8 +36532,12 @@ interface JQuery {
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "dropDownOrientation", optionValue: string): void;
 
+	/**
+	 */
 	igDateEditor(optionLiteral: 'option', optionName: "textMode"): any;
 
+	/**
+	 */
 	igDateEditor(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
@@ -36538,8 +37552,12 @@ interface JQuery {
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dropDownOrientation", optionValue: string): void;
 
+	/**
+	 */
 	igDatePicker(optionLiteral: 'option', optionName: "textMode"): any;
 
+	/**
+	 */
 	igDatePicker(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
@@ -37968,8 +38986,12 @@ interface JQuery {
 	 */
 	igTimePicker(optionLiteral: 'option', optionName: "excludeKeys", optionValue: string): void;
 
+	/**
+	 */
 	igTimePicker(optionLiteral: 'option', optionName: "textMode"): any;
 
+	/**
+	 */
 	igTimePicker(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
@@ -89671,6 +90693,22 @@ interface HyperlinkExecutingEventUIParam {
 	hyperlink?: any;
 }
 
+interface IgSpreadsheetSelectionChangedEvent {
+	(event: Event, ui: IgSpreadsheetSelectionChangedEventUIParam): void;
+}
+
+interface IgSpreadsheetSelectionChangedEventUIParam {
+	/**
+	 * Gets a reference to the spreadsheet widget.
+	 */
+	owner?: any;
+
+	/**
+	 * Get the [pane](ig.spreadsheet.SpreadsheetPane) for which the selection has changed.
+	 */
+	pane?: any;
+}
+
 interface UserPromptDisplayingEvent {
 	(event: Event, ui: UserPromptDisplayingEventUIParam): void;
 }
@@ -89970,7 +91008,7 @@ interface IgSpreadsheet {
 	/**
 	 * Invoked when the selection for a ig.spreadsheet.SpreadsheetPane of the Spreadsheet is changed.
 	 */
-	selectionChanged?: SelectionChangedEvent;
+	selectionChanged?: IgSpreadsheetSelectionChangedEvent;
 
 	/**
 	 * Invoked when the user will be prompted with a message regarding an operation that is being performed.
@@ -90657,14 +91695,14 @@ interface JQuery {
 	/**
 	 * Invoked when the selection for a ig.spreadsheet.SpreadsheetPane of the Spreadsheet is changed.
 	 */
-	igSpreadsheet(optionLiteral: 'option', optionName: "selectionChanged"): SelectionChangedEvent;
+	igSpreadsheet(optionLiteral: 'option', optionName: "selectionChanged"): IgSpreadsheetSelectionChangedEvent;
 
 	/**
 	 * Invoked when the selection for a ig.spreadsheet.SpreadsheetPane of the Spreadsheet is changed.
 	 *
 	 * @optionValue New value to be set.
 	 */
-	igSpreadsheet(optionLiteral: 'option', optionName: "selectionChanged", optionValue: SelectionChangedEvent): void;
+	igSpreadsheet(optionLiteral: 'option', optionName: "selectionChanged", optionValue: IgSpreadsheetSelectionChangedEvent): void;
 
 	/**
 	 * Invoked when the user will be prompted with a message regarding an operation that is being performed.
@@ -93097,6 +94135,27 @@ interface IgTreeDragAndDropSettings {
 	[optionName: string]: any;
 }
 
+interface IgTreeSelectionChangedEvent {
+	(event: Event, ui: IgTreeSelectionChangedEventUIParam): void;
+}
+
+interface IgTreeSelectionChangedEventUIParam {
+	/**
+	 * Gets a reference to the tree.
+	 */
+	owner?: any;
+
+	/**
+	 * Gets a reference to currently selected nodes.
+	 */
+	selectedNodes?: any[];
+
+	/**
+	 * Gets a reference to the newly added nodes to the selection.
+	 */
+	newNodes?: any[];
+}
+
 interface NodeCheckstateChangingEvent {
 	(event: Event, ui: NodeCheckstateChangingEventUIParam): void;
 }
@@ -93674,7 +94733,7 @@ interface IgTree {
 	/**
 	 * Fired after a new node is selected.
 	 */
-	selectionChanged?: SelectionChangedEvent;
+	selectionChanged?: IgTreeSelectionChangedEvent;
 
 	/**
 	 * Fired before the checkbox state of a node is changed.
@@ -94578,14 +95637,14 @@ interface JQuery {
 	/**
 	 * Fired after a new node is selected.
 	 */
-	igTree(optionLiteral: 'option', optionName: "selectionChanged"): SelectionChangedEvent;
+	igTree(optionLiteral: 'option', optionName: "selectionChanged"): IgTreeSelectionChangedEvent;
 
 	/**
 	 * Fired after a new node is selected.
 	 *
 	 * @optionValue New value to be set.
 	 */
-	igTree(optionLiteral: 'option', optionName: "selectionChanged", optionValue: SelectionChangedEvent): void;
+	igTree(optionLiteral: 'option', optionName: "selectionChanged", optionValue: IgTreeSelectionChangedEvent): void;
 
 	/**
 	 * Fired before the checkbox state of a node is changed.
@@ -112280,7 +113339,7 @@ interface JQuery {
 	igZoomSlider(methodName: string, ...methodParams: any[]): any;
 }
 
-interface IgLoader {
+interface IgLoaderSettings {
     scriptPath: string;
     cssPath: string;
     resources?: string;
@@ -112293,12 +113352,20 @@ interface IgLoader {
     preinit?: Function;
 }
 
+interface IgLoader {
+    settings?: IgLoaderSettings;
+    load(resources: string, callback?: Function, preinit?: Function): IgLoader;
+    preinit(callback: Function): IgLoader;
+}
+
 interface IgniteUIStatic {
+    regional?: any;
+    util?: any;
     tmpl(template: string, data: any, ...args: any[]): string;
-    loader(options: IgLoader): void;
-    loader(callback: Function): void;
-    loader(resources: string, callback: Function): void;
-    loader(): any;
+    loader(options: IgLoaderSettings): IgLoader;
+    loader(callback: Function): IgLoader;
+    loader(resources: string, callback: Function): IgLoader;
+    loader(): IgLoader;
     OlapUtilities: any;
 }
 

From 38af94810c50c0132150f1ed2a97769e1d7e0db9 Mon Sep 17 00:00:00 2001
From: Deyan Kamburov <dkamburov@infragistics.com>
Date: Thu, 17 May 2018 17:01:33 +0300
Subject: [PATCH 207/575] Remove empty jsdocs

---
 types/ignite-ui/index.d.ts | 49 --------------------------------------
 1 file changed, 49 deletions(-)

diff --git a/types/ignite-ui/index.d.ts b/types/ignite-ui/index.d.ts
index 58e4ec6446..1fa6cf1168 100644
--- a/types/ignite-ui/index.d.ts
+++ b/types/ignite-ui/index.d.ts
@@ -27642,9 +27642,6 @@ interface IgNumericEditor {
 	 */
 	toUpper?: any;
 
-	/**
-	 *
-	 */
 	textMode?: any;
 
 	/**
@@ -28224,9 +28221,6 @@ interface IgCurrencyEditor {
 	 */
 	toUpper?: any;
 
-	/**
-	 *
-	 */
 	textMode?: any;
 
 	/**
@@ -28709,9 +28703,6 @@ interface IgPercentEditor {
 	 */
 	toUpper?: any;
 
-	/**
-	 *
-	 */
 	textMode?: any;
 
 	/**
@@ -29110,9 +29101,6 @@ interface IgMaskEditor {
 	 */
 	dropDownOnReadOnly?: boolean;
 
-	/**
-	 *
-	 */
 	textMode?: any;
 
 	/**
@@ -29648,9 +29636,6 @@ interface IgDateEditor {
 	 */
 	dropDownOrientation?: string;
 
-	/**
-	 *
-	 */
 	textMode?: any;
 
 	/**
@@ -30213,9 +30198,6 @@ interface IgDatePicker {
 	 */
 	dropDownOrientation?: string;
 
-	/**
-	 *
-	 */
 	textMode?: any;
 
 	/**
@@ -31050,9 +31032,6 @@ interface IgTimePicker {
 	 */
 	excludeKeys?: string;
 
-	/**
-	 *
-	 */
 	textMode?: any;
 
 	/**
@@ -32996,12 +32975,8 @@ interface JQuery {
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "toUpper", optionValue: any): void;
 
-	/**
-	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "textMode"): any;
 
-	/**
-	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
@@ -33937,12 +33912,8 @@ interface JQuery {
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "toUpper", optionValue: any): void;
 
-	/**
-	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "textMode"): any;
 
-	/**
-	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
@@ -34817,12 +34788,8 @@ interface JQuery {
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "toUpper", optionValue: any): void;
 
-	/**
-	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "textMode"): any;
 
-	/**
-	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
@@ -35528,12 +35495,8 @@ interface JQuery {
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly", optionValue: boolean): void;
 
-	/**
-	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "textMode"): any;
 
-	/**
-	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
@@ -36532,12 +36495,8 @@ interface JQuery {
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "dropDownOrientation", optionValue: string): void;
 
-	/**
-	 */
 	igDateEditor(optionLiteral: 'option', optionName: "textMode"): any;
 
-	/**
-	 */
 	igDateEditor(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
@@ -37552,12 +37511,8 @@ interface JQuery {
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dropDownOrientation", optionValue: string): void;
 
-	/**
-	 */
 	igDatePicker(optionLiteral: 'option', optionName: "textMode"): any;
 
-	/**
-	 */
 	igDatePicker(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**
@@ -38986,12 +38941,8 @@ interface JQuery {
 	 */
 	igTimePicker(optionLiteral: 'option', optionName: "excludeKeys", optionValue: string): void;
 
-	/**
-	 */
 	igTimePicker(optionLiteral: 'option', optionName: "textMode"): any;
 
-	/**
-	 */
 	igTimePicker(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
 
 	/**

From 5289ad7cc4947ae43846a89ea5aaa14036fe5d25 Mon Sep 17 00:00:00 2001
From: Alec Zopf <alec.zopf@gmail.com>
Date: Thu, 17 May 2018 10:28:42 -0400
Subject: [PATCH 208/575] incrementing version number in header

---
 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 8f457c804c..dc161d0fea 100644
--- a/types/superagent/index.d.ts
+++ b/types/superagent/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for SuperAgent 3.5
+// Type definitions for SuperAgent 3.8.3
 // Project: https://github.com/visionmedia/superagent
 // Definitions by: Nico Zelaya <https://github.com/NicoZelaya>
 //                 Michael Ledin <https://github.com/mxl>

From 4ec5c6f66454bc2d344d18eb1296d1fc784b1100 Mon Sep 17 00:00:00 2001
From: Alec Zopf <alec.zopf@gmail.com>
Date: Thu, 17 May 2018 10:48:00 -0400
Subject: [PATCH 209/575] removing patch 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 dc161d0fea..7daf5f47dc 100644
--- a/types/superagent/index.d.ts
+++ b/types/superagent/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for SuperAgent 3.8.3
+// Type definitions for SuperAgent 3.8
 // Project: https://github.com/visionmedia/superagent
 // Definitions by: Nico Zelaya <https://github.com/NicoZelaya>
 //                 Michael Ledin <https://github.com/mxl>

From 502c045aef9f93c846a198e59efc8c55386f8d15 Mon Sep 17 00:00:00 2001
From: Thomas Gossmann <gossi@users.noreply.github.com>
Date: Thu, 17 May 2018 17:37:42 +0200
Subject: [PATCH 210/575] Overloading add/removeObserver and add/removeListener

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

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 0d3c957a5b..fbd356f3c1 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -1683,7 +1683,11 @@ declare module 'ember' {
             addObserver<Target>(
                 key: keyof this,
                 target: Target,
-                method?: ObserverMethod<Target, this>
+                method: ObserverMethod<Target, this>
+            ): void;
+            addObserver<Target>(
+                key: keyof this,
+                method: ObserverMethod<Target, this>
             ): void;
             /**
              * Remove an observer you have previously registered on this object. Pass
@@ -1693,7 +1697,11 @@ declare module 'ember' {
             removeObserver<Target>(
                 key: keyof this,
                 target: Target,
-                method?: ObserverMethod<Target, this>
+                method: ObserverMethod<Target, this>
+            ): any;
+            removeObserver<Target>(
+                key: keyof this,
+                method: ObserverMethod<Target, this>
             ): any;
             /**
              * Retrieves the value of a property, or a default value in the case that the
@@ -3010,6 +3018,12 @@ declare module 'ember' {
             method: ObserverMethod<Target, Context>,
             once?: boolean
         ): void;
+        function addListener<Context, Target>(
+            obj: Context,
+            key: keyof Context,
+            method: ObserverMethod<Target, Context>,
+            once?: boolean
+        ): void;
         /**
          * Remove an event listener
          */
@@ -3019,6 +3033,11 @@ declare module 'ember' {
             target: Target,
             method: ObserverMethod<Target, Context>
         ): any;
+        function removeListener<Context, Target>(
+            obj: Context,
+            key: keyof Context,
+            method: ObserverMethod<Target, Context>
+        ): any;
         /**
          * Send an event. The execution of suspended listeners
          * is skipped, and once listeners are removed. A listener without
@@ -3112,6 +3131,11 @@ declare module 'ember' {
             target: Target,
             method: ObserverMethod<Target, Context>
         ): void;
+        function addObserver<Context, Target>(
+            obj: Context,
+            key: keyof Context,
+            method: ObserverMethod<Target, Context>
+        ): void;
         /**
          * Remove an observer you have previously registered on this object. Pass
          * the same key, target, and method you passed to `addObserver()` and your
@@ -3123,6 +3147,11 @@ declare module 'ember' {
             target: Target,
             method: ObserverMethod<Target, Context>
         ): any;
+        function removeObserver<Context, Target>(
+            obj: Context,
+            key: keyof Context,
+            method: ObserverMethod<Target, Context>
+        ): any;
         /**
          * Gets the value of a property on an object. If the property is computed,
          * the function will be invoked. If the property is not defined but the

From 318e099c2e169f92f09464927e384070f1faa0c8 Mon Sep 17 00:00:00 2001
From: Benjamin Dobson <benjamin.dobson@softwire.com>
Date: Thu, 17 May 2018 17:01:06 +0100
Subject: [PATCH 211/575] @types/jwplayer updated to work with JWP 8.2.2

---
 types/jwplayer/index.d.ts | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/types/jwplayer/index.d.ts b/types/jwplayer/index.d.ts
index aee22c16f1..15991c7f9c 100644
--- a/types/jwplayer/index.d.ts
+++ b/types/jwplayer/index.d.ts
@@ -89,6 +89,12 @@ interface AdImpressionParam extends CallbackParam {
     wrapper: any[];
 }
 
+interface AdScheduleParam extends CallbackParam {
+    tag: string;
+    client: string;
+    adbreaks: Array<object>;
+}
+
 interface AdStartedParam extends CallbackParam {
     creativetype: string;
     tag: string;
@@ -287,8 +293,12 @@ interface JWPlayer {
 	on(event: 'adRequest', callback: EventCallback<AdRequestParam>): void;
 	once(event: 'adRequest', callback: EventCallback<AdRequestParam>): void;
 	off(event: 'adRequest'): void;
-	trigger(event: 'adRequest', args: AdRequestParam): void;
-	on(event: 'adStarted', callback: EventCallback<AdStartedParam>): void;
+	trigger(event: 'adRequest', args: AdScheduleParam): void;
+    on(event: 'adSchedule', callback: EventCallback<AdScheduleParam>): void;
+    once(event: 'adSchedule', callback: EventCallback<AdScheduleParam>): void;
+    off(event: 'adSchedule'): void;
+    trigger(event: 'adSchedule', args: AdRequestParam): void;
+    on(event: 'adStarted', callback: EventCallback<AdStartedParam>): void;
 	once(event: 'adStarted', callback: EventCallback<AdStartedParam>): void;
 	off(event: 'adStarted'): void;
 	trigger(event: 'adStarted', args: AdStartedParam): void;
@@ -424,7 +434,11 @@ interface JWPlayer {
 	once(event: 'seek', callback: EventCallback<SeekParam>): void;
 	off(event: 'seek'): void;
 	trigger(event: 'seek', args: SeekParam): void;
-	on(event: 'setupError', callback: EventCallback<ErrorParam>): void;
+    on(event: 'seeked', callback: () => void): void;
+    once(event: 'seeked', callback: () => void): void;
+    off(event: 'seeked'): void;
+    trigger(event: 'seeked'): void
+    on(event: 'setupError', callback: EventCallback<ErrorParam>): void;
 	once(event: 'setupError', callback: EventCallback<ErrorParam>): void;
 	off(event: 'setupError'): void;
 	trigger(event: 'setupError', args: ErrorParam): void;

From 38289b5abfe1bb2b1c1c140082721f621b12dfca Mon Sep 17 00:00:00 2001
From: Thomas Gossmann <gossi@users.noreply.github.com>
Date: Thu, 17 May 2018 18:06:54 +0200
Subject: [PATCH 212/575] no unnecessary generics

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

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index fbd356f3c1..196820d531 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -1685,9 +1685,9 @@ declare module 'ember' {
                 target: Target,
                 method: ObserverMethod<Target, this>
             ): void;
-            addObserver<Target>(
+            addObserver(
                 key: keyof this,
-                method: ObserverMethod<Target, this>
+                method: ObserverMethod<this, this>
             ): void;
             /**
              * Remove an observer you have previously registered on this object. Pass
@@ -1699,9 +1699,9 @@ declare module 'ember' {
                 target: Target,
                 method: ObserverMethod<Target, this>
             ): any;
-            removeObserver<Target>(
+            removeObserver(
                 key: keyof this,
-                method: ObserverMethod<Target, this>
+                method: ObserverMethod<this, this>
             ): any;
             /**
              * Retrieves the value of a property, or a default value in the case that the
@@ -3018,10 +3018,10 @@ declare module 'ember' {
             method: ObserverMethod<Target, Context>,
             once?: boolean
         ): void;
-        function addListener<Context, Target>(
+        function addListener<Context>(
             obj: Context,
             key: keyof Context,
-            method: ObserverMethod<Target, Context>,
+            method: ObserverMethod<Context, Context>,
             once?: boolean
         ): void;
         /**
@@ -3033,10 +3033,10 @@ declare module 'ember' {
             target: Target,
             method: ObserverMethod<Target, Context>
         ): any;
-        function removeListener<Context, Target>(
+        function removeListener<Context>(
             obj: Context,
             key: keyof Context,
-            method: ObserverMethod<Target, Context>
+            method: ObserverMethod<Context, Context>
         ): any;
         /**
          * Send an event. The execution of suspended listeners
@@ -3131,10 +3131,10 @@ declare module 'ember' {
             target: Target,
             method: ObserverMethod<Target, Context>
         ): void;
-        function addObserver<Context, Target>(
+        function addObserver<Context>(
             obj: Context,
             key: keyof Context,
-            method: ObserverMethod<Target, Context>
+            method: ObserverMethod<Context, Context>
         ): void;
         /**
          * Remove an observer you have previously registered on this object. Pass
@@ -3147,10 +3147,10 @@ declare module 'ember' {
             target: Target,
             method: ObserverMethod<Target, Context>
         ): any;
-        function removeObserver<Context, Target>(
+        function removeObserver<Context>(
             obj: Context,
             key: keyof Context,
-            method: ObserverMethod<Target, Context>
+            method: ObserverMethod<Context, Context>
         ): any;
         /**
          * Gets the value of a property on an object. If the property is computed,

From ee939689676ed95a1cdf5bae1926a85ce1f76269 Mon Sep 17 00:00:00 2001
From: Benjamin Dobson <benjamin.dobson@softwire.com>
Date: Thu, 17 May 2018 17:17:46 +0100
Subject: [PATCH 213/575] Fixed type mismatch between adRequest and adSchedule

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

diff --git a/types/jwplayer/index.d.ts b/types/jwplayer/index.d.ts
index 15991c7f9c..e01620bff5 100644
--- a/types/jwplayer/index.d.ts
+++ b/types/jwplayer/index.d.ts
@@ -293,11 +293,11 @@ interface JWPlayer {
 	on(event: 'adRequest', callback: EventCallback<AdRequestParam>): void;
 	once(event: 'adRequest', callback: EventCallback<AdRequestParam>): void;
 	off(event: 'adRequest'): void;
-	trigger(event: 'adRequest', args: AdScheduleParam): void;
+	trigger(event: 'adRequest', args: AdRequestParam): void;
     on(event: 'adSchedule', callback: EventCallback<AdScheduleParam>): void;
     once(event: 'adSchedule', callback: EventCallback<AdScheduleParam>): void;
     off(event: 'adSchedule'): void;
-    trigger(event: 'adSchedule', args: AdRequestParam): void;
+    trigger(event: 'adSchedule', args: AdScheduleParam): void;
     on(event: 'adStarted', callback: EventCallback<AdStartedParam>): void;
 	once(event: 'adStarted', callback: EventCallback<AdStartedParam>): void;
 	off(event: 'adStarted'): void;

From fa80fda5078f458234b08d3467f5b772cfdee5fc Mon Sep 17 00:00:00 2001
From: Benjamin Dobson <benjamin.dobson@softwire.com>
Date: Thu, 17 May 2018 17:20:24 +0100
Subject: [PATCH 214/575] Array style fix

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

diff --git a/types/jwplayer/index.d.ts b/types/jwplayer/index.d.ts
index e01620bff5..b2f9879d59 100644
--- a/types/jwplayer/index.d.ts
+++ b/types/jwplayer/index.d.ts
@@ -92,7 +92,7 @@ interface AdImpressionParam extends CallbackParam {
 interface AdScheduleParam extends CallbackParam {
     tag: string;
     client: string;
-    adbreaks: Array<object>;
+    adbreaks: object[];
 }
 
 interface AdStartedParam extends CallbackParam {

From 5f0eecaffcc19723315a967b6c4fdde5a830fb5e Mon Sep 17 00:00:00 2001
From: Benjamin Dobson <benjamin.dobson@softwire.com>
Date: Thu, 17 May 2018 17:26:31 +0100
Subject: [PATCH 215/575] object -> any in AdScheduleParam

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

diff --git a/types/jwplayer/index.d.ts b/types/jwplayer/index.d.ts
index b2f9879d59..4ab24f88cf 100644
--- a/types/jwplayer/index.d.ts
+++ b/types/jwplayer/index.d.ts
@@ -92,7 +92,7 @@ interface AdImpressionParam extends CallbackParam {
 interface AdScheduleParam extends CallbackParam {
     tag: string;
     client: string;
-    adbreaks: object[];
+    adbreaks: any[];
 }
 
 interface AdStartedParam extends CallbackParam {

From 629d40c1c2548a56b19c67a36d913b5c62b06bad Mon Sep 17 00:00:00 2001
From: Benjamin Dobson <benjamin.dobson@softwire.com>
Date: Thu, 17 May 2018 17:30:12 +0100
Subject: [PATCH 216/575] Updated version number in header

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

diff --git a/types/jwplayer/index.d.ts b/types/jwplayer/index.d.ts
index 4ab24f88cf..3c54446a6b 100644
--- a/types/jwplayer/index.d.ts
+++ b/types/jwplayer/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for JW Player V8.0
+// Type definitions for JW Player V8.2
 // Project: https://github.com/jwplayer/jwplayer/
 // Definitions by: Martin Duparc <https://github.com/martinduparc>
 //                 Tomer Kruvi <https://github.com/kutomer>

From 1d1c5f8a6304219c715a696cc77609f9652588ab Mon Sep 17 00:00:00 2001
From: Benjamin Dobson <benjamin.dobson@softwire.com>
Date: Thu, 17 May 2018 17:35:02 +0100
Subject: [PATCH 217/575] Revert "object -> any in AdScheduleParam"

This reverts commit 5f0eecaffcc19723315a967b6c4fdde5a830fb5e.
---
 types/jwplayer/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/jwplayer/index.d.ts b/types/jwplayer/index.d.ts
index 3c54446a6b..9479ea5fa1 100644
--- a/types/jwplayer/index.d.ts
+++ b/types/jwplayer/index.d.ts
@@ -92,7 +92,7 @@ interface AdImpressionParam extends CallbackParam {
 interface AdScheduleParam extends CallbackParam {
     tag: string;
     client: string;
-    adbreaks: any[];
+    adbreaks: object[];
 }
 
 interface AdStartedParam extends CallbackParam {

From 62901eb27cfe85f4879b3c04a90fb030430855b5 Mon Sep 17 00:00:00 2001
From: Benjamin Dobson <benjamin.dobson@softwire.com>
Date: Thu, 17 May 2018 17:44:26 +0100
Subject: [PATCH 218/575] Add my name and minimum typescript version

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

diff --git a/types/jwplayer/index.d.ts b/types/jwplayer/index.d.ts
index 9479ea5fa1..6481b59faf 100644
--- a/types/jwplayer/index.d.ts
+++ b/types/jwplayer/index.d.ts
@@ -4,7 +4,9 @@
 //                 Tomer Kruvi <https://github.com/kutomer>
 //                 Philipp Gürtler <https://github.com/philippguertler>
 //                 Daniel McGraw <https://github.com/danielmcgraw>
+//                 Benjamin Dobson <https://github.com/bpdsw>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 // JW Player is the leading HTML5 & Flash video player, optimized for mobile and the desktop. Easy enough for beginners, advanced enough for pros.
 

From 9f18f414ecb2666e0e810da8e6f6220c3d09aedc Mon Sep 17 00:00:00 2001
From: forest yox <forest.yox@technergetics.com>
Date: Thu, 17 May 2018 13:52:26 -0400
Subject: [PATCH 219/575] added acoords

---
 types/fabric/fabric-impl.d.ts | 5 +++++
 types/fabric/test/index.ts    | 1 +
 2 files changed, 6 insertions(+)

diff --git a/types/fabric/fabric-impl.d.ts b/types/fabric/fabric-impl.d.ts
index e35b0ebe0d..580b132e60 100644
--- a/types/fabric/fabric-impl.d.ts
+++ b/types/fabric/fabric-impl.d.ts
@@ -2249,6 +2249,11 @@ interface IObjectOptions {
 	 * Not used by fabric, just for convenience
 	 */
 	data?: any;
+
+    /**
+     * Describes the object's corner position in canvas object absolute properties.
+     */
+    aCoords?: {bl: Point, br: Point, tl: Point, tr: Point};
 }
 export interface Object extends IObservable<Object>, IObjectOptions, IObjectAnimation<Object> { }
 export class Object {
diff --git a/types/fabric/test/index.ts b/types/fabric/test/index.ts
index 1060525a00..e6b72b4281 100644
--- a/types/fabric/test/index.ts
+++ b/types/fabric/test/index.ts
@@ -1,3 +1,4 @@
+
 function sample1() {
   const canvas = new fabric.Canvas('c', {
     hoverCursor: 'pointer',

From e41d767e634d8b915f5d460aea27e2e3741a7815 Mon Sep 17 00:00:00 2001
From: Thomas Gossmann <gossi@users.noreply.github.com>
Date: Thu, 17 May 2018 20:01:51 +0200
Subject: [PATCH 220/575] addListener with 3 or 5 parameters

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

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 196820d531..a1cfc84334 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -3021,8 +3021,7 @@ declare module 'ember' {
         function addListener<Context>(
             obj: Context,
             key: keyof Context,
-            method: ObserverMethod<Context, Context>,
-            once?: boolean
+            method: ObserverMethod<Context, Context>
         ): void;
         /**
          * Remove an event listener

From 14d56932beb9f6a93275321b85e48177de4b93d1 Mon Sep 17 00:00:00 2001
From: Thomas Gossmann <gossi@users.noreply.github.com>
Date: Thu, 17 May 2018 20:02:36 +0200
Subject: [PATCH 221/575] Add tests for Ember.addObserver and
 Ember.removeObserver

---
 types/ember/test/observable.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/ember/test/observable.ts b/types/ember/test/observable.ts
index 3585535dec..a642da271f 100755
--- a/types/ember/test/observable.ts
+++ b/types/ember/test/observable.ts
@@ -19,6 +19,8 @@ class MyComponent extends Ember.Component {
         };
         this.addObserver('foo', lambda);
         this.removeObserver('foo', lambda);
+        Ember.addObserver(this, 'foo', lambda);
+        Ember.removeObserver(this, 'foo', lambda);
     }
 
     fooDidChange(sender: MyComponent, key: 'foo') {

From 80ad40ad7817831d5daaa54edac229a666278990 Mon Sep 17 00:00:00 2001
From: forest yox <forest.yox@technergetics.com>
Date: Thu, 17 May 2018 14:34:29 -0400
Subject: [PATCH 222/575] fixed inadvertant whitespace

---
 types/fabric/test/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/fabric/test/index.ts b/types/fabric/test/index.ts
index e6b72b4281..1060525a00 100644
--- a/types/fabric/test/index.ts
+++ b/types/fabric/test/index.ts
@@ -1,4 +1,3 @@
-
 function sample1() {
   const canvas = new fabric.Canvas('c', {
     hoverCursor: 'pointer',

From 7ccb318b17d8c96bb27e4abd0b859ff609f3f551 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Thu, 17 May 2018 13:42:36 -0700
Subject: [PATCH 223/575] TestErrorChange

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index d0eaf593c5..cee60e05fc 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -148,6 +148,8 @@ declare namespace Office {
     }
     /**
      * Provides specific information about an error that occurred during an asynchronous data operation.
+     * 
+     * Remarks: The Error object is accessed from the AsyncResult object that is returned in the function passed as the callback argument of an asynchronous data operation, such as the setSelectedDataAsync method of the Document object.
      */
     export interface Error {
         /**

From 96a4cebfb03d9e561eface2717ba591a0c3f0572 Mon Sep 17 00:00:00 2001
From: Simon Epskamp <simon@frontwise.com>
Date: Thu, 17 May 2018 23:04:27 +0200
Subject: [PATCH 224/575] react-transition-group: allow component={null} on
 TransitionGroup

---
 types/react-transition-group/TransitionGroup.d.ts | 2 +-
 types/react-transition-group/index.d.ts           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/react-transition-group/TransitionGroup.d.ts b/types/react-transition-group/TransitionGroup.d.ts
index 13e8daf228..913c034729 100644
--- a/types/react-transition-group/TransitionGroup.d.ts
+++ b/types/react-transition-group/TransitionGroup.d.ts
@@ -3,7 +3,7 @@ import { TransitionActions, TransitionProps } from "./Transition";
 
 declare namespace TransitionGroup {
     interface IntrinsicTransitionGroupProps<T extends keyof JSX.IntrinsicElements = "div"> extends TransitionActions {
-        component?: T;
+        component?: T|null;
     }
 
     interface ComponentTransitionGroupProps<T extends ReactType> extends TransitionActions {
diff --git a/types/react-transition-group/index.d.ts b/types/react-transition-group/index.d.ts
index 6a90201af5..dbe906f679 100644
--- a/types/react-transition-group/index.d.ts
+++ b/types/react-transition-group/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for react-transition-group 2.0
 // Project: https://github.com/reactjs/react-transition-group
 // Definitions by: Karol Janyst <https://github.com/LKay>
+//                 Epskampie <https://github.com/Epskampie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 

From d3285aecfbf49636899b85b69ef63d715db926c5 Mon Sep 17 00:00:00 2001
From: Jack Walters <waltersjack@gmail.com>
Date: Thu, 17 May 2018 14:43:30 -0700
Subject: [PATCH 225/575] Added in missing horizontalFill and verticalFill

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

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index b274430529..ecdcd1f420 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -284,6 +284,8 @@ export interface CartesianGridProps extends Partial<PresentationAttributes> {
     offset?: object;
     chartWidth?: number;
     chartHeight?: number;
+    horizontalFill?: string[];
+    verticalFill?: string[];
 }
 
 export class CartesianGrid extends React.Component<CartesianGridProps> { }

From 6a825c9425430a2c80c92c132ad4edb354b17940 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Thu, 17 May 2018 15:20:53 -0700
Subject: [PATCH 226/575] first pass porting old docs text

---
 types/office-js/index.d.ts | 230 ++++++++++++++++++++++++++++++-------
 1 file changed, 188 insertions(+), 42 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index cee60e05fc..0ff10134b5 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -20,6 +20,9 @@ declare namespace Office {
     }
 
     export var Promise: PromiseConstructor;
+    /**
+     * Gets the Context object that represents the runtime environment of the add-in and provides access to the top-level objects of the API.
+     */
     export var context: Context;
     /**
      * This method is called after the Office API was loaded.
@@ -149,7 +152,9 @@ declare namespace Office {
     /**
      * Provides specific information about an error that occurred during an asynchronous data operation.
      * 
-     * Remarks: The Error object is accessed from the AsyncResult object that is returned in the function passed as the callback argument of an asynchronous data operation, such as the setSelectedDataAsync method of the Document object.
+     * @remarks
+     * The Error object is accessed from the AsyncResult object that is returned in the function passed as the callback argument of an asynchronous data operation, such as the setSelectedDataAsync method of the Document object.
+     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
      */
     export interface Error {
         /**
@@ -165,6 +170,9 @@ declare namespace Office {
          */
         name: string;
     }
+    /**
+     * Provides objects and methods that you can use to create and manipulate UI components, such as dialog boxes, in your Office Add-ins. 
+     */
     export interface UI {
         /**
         * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
@@ -190,24 +198,18 @@ declare namespace Office {
         * @param callback Optional. Accepts a callback method to handle the dialog creation attempt.
         */
         displayDialogAsync(startAddress: string, options: DialogOptions, callback: (result: AsyncResult) => void): void;
-
         /**
-         * Synchronously delivers a message from the dialog to its parent add-in.
+         * Delivers a message from the dialog box to its parent/opener page. The page calling this API must be on the same domain as the parent. 
          * @param messageObject Accepts a message from the dialog to deliver to the add-in.
          */
         messageParent(messageObject: any): void;
         /**
          * Closes the UI container where the JavaScript is executing.
-         *
-         * Supported hosts: Outlook - Minimum requirement set: Mailbox 1.5
-         *
          * The behavior of this method is specified by the following:
-         *
-         * Called from a UI-less command button: No effect. Any dialog opened by displayDialogAsync will remain open.
-         *
-         * Called from a taskpane: The taskpane will close. Any dialog opened by displayDialogAsync will also close. If the taskpane supports pinning and was pinned by the user, it will be un-pinned.
-         *
-         * Called from a module extension: No effect.
+         * - Called from a UI-less command button: No effect. Any dialog opened by displayDialogAsync will remain open.
+         * - Called from a taskpane: The taskpane will close. Any dialog opened by displayDialogAsync will also close. If the taskpane supports pinning and was pinned by the user, it will be un-pinned.
+         * - Called from a module extension: No effect.
+         * Hosts: Outlook - Minimum requirement set: Mailbox 1.5
          */
         closeContainer(): void;
     }
@@ -826,18 +828,55 @@ declare namespace Office {
          */
         type: EventType;
     }
+    /**
+     * Represents the document file associated with an Office Add-in.
+     * 
+     * @remarks
+     * Access the File object with the AsyncResult.value property in the callback function passed to the Document.getFileAsync method.
+     * Hosts: PowerPoint, Word
+     */
     export interface File {
+        /**
+         * Gets the document file size in bytes.
+         * @remarks
+         * Hosts: PowerPoint, Word
+         */
         size: number;
+        /**
+         * Gets the number of slices into which the file is divided.
+         * @remarks
+         * Hosts: PowerPoint, Word
+         */
         sliceCount: number;
         /**
-         * Closes the File.
-         * @param callback The optional callback method
+         * Closes the document file.
+         * No more than two documents are allowed to be in memory; otherwise the Document.getFileAsync operation will fail. Use the File.closeAsync method to close the file when you are finished working with it.
+         * Hosts: PowerPoint, Word
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
+         * @remarks
+         * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
+         * In the callback function passed to the closeAsync method, you can use the properties of the AsyncResult object to return the following information.
+         * Property - Use to...
+         * AsyncResult.value - Always returns undefined because there is no object or data to retrieve.
+         * AsyncResult.status - Determine the success or failure of the operation.
+         * AsyncResult.error - Access an Error object that provides error information if the operation failed.
+         * AsyncResult.asyncContext - Access your user-defined  object or value, if you passed one as the asyncContext parameter.
          */
         closeAsync(callback?: (result: AsyncResult) => void): void;
         /**
-         * Gets the specified slice.
-         * @param sliceIndex The index of the slice to be retrieved
-         * @param callback The optional callback method
+         * Returns the specified slice.
+         * @remarks
+         * Hosts: PowerPoint, Word
+         * @param sliceIndex Specifies the zero-based index of the slice to be retrieved. Required.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
+         * @remarks
+         * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
+         * In the callback function passed to the getSliceAsync method, you can use the properties of the AsyncResult object to return the following information.
+         * Property - Use to...
+         * AsyncResult.value - Access the Slice object.
+         * AsyncResult.status - Determine the success or failure of the operation.
+         * AsyncResult.error - Access an Error object that provides error information if the operation failed.
+         * AsyncResult.asyncContext - Access your user-defined  object or value, if you passed one as the asyncContext parameter.
          */
         getSliceAsync(sliceIndex: number, callback?: (result: AsyncResult) => void): void;
     }
@@ -851,58 +890,143 @@ declare namespace Office {
         columnCount: number;
         rowCount: number;
     }
+    /**
+     * Represents custom settings for a task pane or content add-in that are stored in the host document as name/value pairs.
+     * 
+     * @remarks
+     * The settings created by using the methods of the Settings object are saved per add-in and per document. That is, they are available only to the add-in that created them, and only from the document in which they are saved.
+     * The name of a setting is a string, while the value can be a string, number, boolean, null, object, or array.
+     * The Settings object is automatically loaded as part of the Document object, and is available by calling the settings property of that object when the add-in is activated. The developer is responsible for calling the saveAsync method after adding or deleting settings to save the settings in the document.
+     * Hosts: Access, Excel, PowerPoint, Word
+     */
     export interface Settings {
         /**
-         * Adds an event handler for the object using the specified event type.
-         * @param eventType The event type. For settings can be 'settingsChanged'
-         * @param handler The name of the handler
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * Adds an event handler for the settingsChanged event.
+         * @remarks
+         * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
+         * Important: Your add-in's code can register a handler for the settingsChanged event when the add-in is running with any Excel client, but the event will fire only when the add-in is loaded with a spreadsheet that is opened in Excel Online, and more than one user is editing the spreadsheet (co-authoring). Therefore, effectively the settingsChanged event is supported only in Excel Online in co-authoring scenarios.
+         * Hosts: Excel
+         * @param eventType Specifies the type of event to add. Required.
+         * @param handler The event handler function to add. Required.
+         * @param options Specifies any of the following optional parameters.
+         * @param asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @remarks
+         * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
+         * In the callback function passed to the addHandlerAsync method, you can use the properties of the AsyncResult object to return the following information.
+         * Property - Use to...
+         * AsyncResult.value - Always returns undefined because there is no data or object to retrieve when adding an event handler.
+         * AsyncResult.status - Determine the success or failure of the operation.
+         * AsyncResult.error - Access an Error object that provides error information if the operation failed.
+         * AsyncResult.asyncContext - Access your user-defined object or value, if you passed one as the asyncContext parameter.
          */
         addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Retrieves the setting with the specified name.
-         * @param settingName The name of the setting
+         * Retrieves the specified setting.
+         * @remarks
+         * Hosts: Access, Excel, PowerPoint, Word
+         * @param settingName The case-sensitive name of the setting to retrieve.
+         * @returns An object that has property names mapped to JSON serialized values.
          */
         get(name: string): any;
         /**
-         * Gets the latest version of the settings object.
-         * @param callback The optional callback method
+         * Reads all settings persisted in the document and refreshes the content or task pane add-in's copy of those settings held in memory.
+         * @remarks
+         * This method is useful in Word and PowerPoint coauthoring scenarios when multiple instances of the same add-in are working against the same document. Because each add-in is working against an in-memory copy of the settings loaded from the document at the time the user opened it, the settings values used by each user can get out of sync. This can happen whenever an instance of the add-in calls the Settings.saveAsync method to persist all of that user's settings to the document. Calling the refreshAsync method from the event handler for the settingsChanged event of the add-in will refresh the settings values for all users.
+         * The refreshAsync method can be called from add-ins created for Excel, but since it doesn't support coauthoring there is no reason to do so.
+         * Hosts: Access, Excel, PowerPoint, Word
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @remarks
+         * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
+         * In the callback function passed to the refreshAsync method, you can use the properties of the AsyncResult object to return the following information.
+         * Property - Use to...
+         * AsyncResult.value - Access a Settings object with the refreshed values.
+         * AsyncResult.status - Determine the success or failure of the operation.
+         * AsyncResult.error - Access an Error object that provides error information if the operation failed.
+         * AsyncResult.asyncContext - Access your user-defined  object or value, if you passed one as the asyncContext parameter.
          */
         refreshAsync(callback?: (result: AsyncResult) => void): void;
         /**
-         * Removes the setting with the specified name.
-         * @param settingName The name of the setting
+         * Removes the specified setting.
+         * @remarks
+         * null is a valid value for a setting. Therefore, assigning null to the setting will not remove it from the settings property bag.
+         * Important: Be aware that the Settings.remove method affects only the in-memory copy of the settings property bag. To persist the removal of the specified setting in the document, at some point after calling the Settings.remove method and before the add-in is closed, you must call the Settings.saveAsync method.
+         * Hosts: Access, Excel, PowerPoint, Word
+         * @param settingName The case-sensitive name of the setting to remove.
          */
         remove(name: string): void;
         /**
-         * Removes an event handler for the specified event type.
-         * @param eventType The event type. For settings can be 'settingsChanged'
-         * @param options Syntax example: {handler:eventHandler}
-         *       handler: Indicates a specific handler to be removed, if not specified all handlers are removed
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * Removes an event handler for the settingsChanged event.
+         * @remarks
+         * If the optional handler parameter is omitted when calling the removeHandlerAsync method, all event handlers for the specified eventType will be removed.
+         * Hosts: Access, Excel, PowerPoint
+         * @param eventType Specifies the type of event to remove. Required.
+         * @param options Specifies any of the following optional parameters.
+         * @param handler: Specifies the name of the handler to remove.
+         * @param asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @remarks
+         * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
+         * In the callback function passed to the removeHandlerAsync method, you can use the properties of the AsyncResult object to return the following information.
          */
         removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Saves all settings.
+         * Persists the in-memory copy of the settings property bag in the document.
+         * @remarks
+         * Any settings previously saved by an add-in are loaded when it is initialized, so during the lifetime of the session you can just use the set and get methods to work with the in-memory copy of the settings property bag. When you want to persist the settings so that they are available the next time the add-in is used, use the saveAsync method.
+         * Note: The saveAsync method persists the in-memory settings property bag into the document file; however, the changes to the document file itself are saved only when the user (or AutoRecover setting) saves the document to the file system.
+         * The refreshAsync method is only useful in coauthoring scenarios (which are only supported in Word) when other instances of the same add-in might change the settings and those changes should be made available to all instances.
+         * Hosts: Access, Excel, PowerPoint, Word
          * @param options Syntax example: {overwriteIfStale:false}
-         *       overwriteIfStale: Indicates whether the setting will be replaced if stale.
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * @param overwriteIfStale: Indicates whether the setting will be replaced if stale.
+         * @param asyncContext: Object keeping state for the callback
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
+         * @remarks
+         * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
+         * In the callback function passed to the saveAsync method, you can use the properties of the AsyncResult object to return the following information.
+         * Property - Use to...
+         * AsyncResult.value - Always returns  undefined because there is no object or data to retrieve.
+         * AsyncResult.status - Determine the success or failure of the operation.
+         * AsyncResult.error - Access an Error object that provides error information if the operation failed.
+         * AsyncResult.asyncContext - Access your user-defined  object or value, if you passed one as the asyncContext parameter.
          */
         saveAsync(callback?: (result: AsyncResult) => void): void;
         /**
-         * Sets a value for the setting with the specified name.
-         * @param settingName The name of the setting
-         * @param value The value for the setting
+         * Sets or creates the specified setting.
+         * @remarks
+         * The set method creates a new setting of the specified name if it does not already exist, or sets an existing setting of the specified name in the in-memory copy of the settings property bag. After you call the Settings.saveAsync method, the value is stored in the document as the serialized JSON representation of its data type. A maximum of 2MB is available for the settings of each add-in.
+         * Important: Be aware that the Settings.set method affects only the in-memory copy of the settings property bag. To make sure that additions or changes to settings will be available to your add-in the next time the document is opened, at some point after calling the Settings.set method and before the add-in is closed, you must call the Settings.saveAsync method to persist settings in the document.
+         * Hosts: Access, Excel, PowerPoint, Word
+         * @param settingName The case-sensitive name of the setting to set or create.
+         * @param value Specifies the value to be stored.
          */
         set(name: string, value: any): void;
     }
+    /**
+     * Represents a slice of a document file.
+     * @remarks
+     * The Slice object is accessed with the File.getSliceAsync method.
+     * Hosts: PowerPoint, Word
+     */
     export interface Slice {
+        /**
+         * Gets the raw data of the file slice in Office.FileType.Text ("text") or Office.FileType.Compressed ("compressed") format as specified by the fileType parameter of the call to the Document.getFileAsync method.
+         * @remarks
+         * Files in the "compressed" format will return a byte array that can be transformed to a base64-encoded string if required.
+         * Hosts: PowerPoint, Word
+         */
         data: any;
+        /**
+         * Gets the zero-based index of the file slice.
+         * @remarks
+         * Hosts: PowerPoint, Word
+         */
         index: number;
+        /**
+         * Gets the size of the slice in bytes.
+         * @remarks
+         * Hosts: PowerPoint, Word
+         */
         size: number;
     }
     export interface TableBinding extends Binding {
@@ -968,10 +1092,32 @@ declare namespace Office {
          */
         setTableOptionsAsync(tableOptions: any, options?: any, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+     * Represents the data in a table or a TableBinding.
+     * @remarks
+     * Hosts: Excel, Word
+     */
     export class TableData {
         constructor(rows: any[][], headers: any[]);
         constructor();
+        /**
+         * Gets or sets the headers of the table.
+         * @remarks
+         * To specify headers, you must specify an array of arrays that corresponds to the structure of the table. For example, to specify headers for a two-column table you would set the header property to [['header1', 'header2']].
+         * If you specify null for the headers property (or leaving the property empty when you construct a TableData object), the following results occur when your code executes:
+         * - If you insert a new table, the default column headers for the table are created.
+         * - If you overwrite or update an existing table, the existing headers are not altered.
+         * Hosts: Excel, Word
+         */
         headers: any[];
+        /**
+         * Gets or sets the rows in the table. Returns an array of arrays that contains the data in the table. Returns an empty array ``, if there are no rows.
+         * To specify rows, you must specify an array of arrays that corresponds to the structure of the table. For example, to specify two rows of string values in a two-column table you would set the rows property to [['a', 'b'], ['c', 'd']].
+         * If you specify null for the rows property (or leave the property empty when you construct a TableData object), the following results occur when your code executes:
+         * - If you insert a new table, a blank row will be inserted.
+         * - If you overwrite or update an existing table, the existing rows are not altered.
+         * Hosts: Excel, Word
+         */
         rows: any[][];
     }
     export enum Table {

From e22bae51fddb5fb774bb319947b27512af75f715 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Thu, 17 May 2018 15:25:40 -0700
Subject: [PATCH 227/575] [react-tooltip] Add dataTip argument to getContent
 callback

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

diff --git a/types/react-tooltip/index.d.ts b/types/react-tooltip/index.d.ts
index e9690b8f5c..044e737402 100644
--- a/types/react-tooltip/index.d.ts
+++ b/types/react-tooltip/index.d.ts
@@ -39,7 +39,7 @@ declare namespace ReactTooltip {
     type ElementEvents = (keyof HTMLElementEventMap) | string;
     type WindowEvents = (keyof WindowEventMap) | string;
 
-    type GetContentCallback = () => React.ReactNode;
+    type GetContentCallback = (dataTip: string) => React.ReactNode;
     type GetContent = GetContentCallback | [GetContentCallback, number];
 
     type Place = "top" | "right" | "bottom" | "left";
diff --git a/types/react-tooltip/react-tooltip-tests.tsx b/types/react-tooltip/react-tooltip-tests.tsx
index 97b7a085ea..313804c901 100644
--- a/types/react-tooltip/react-tooltip-tests.tsx
+++ b/types/react-tooltip/react-tooltip-tests.tsx
@@ -8,7 +8,7 @@ export class ReactTooltipTest extends React.PureComponent {
     }
 
     render() {
-        const getContent: ReactTooltip.GetContent = [() => Math.floor(Math.random() * 100), 30];
+        const getContent: ReactTooltip.GetContent = [dataTip => Math.floor(Math.random() * 100), 30];
 
         return <div>
             <a data-tip data-for="happyFace"> d(`･∀･)b </a>
@@ -53,8 +53,8 @@ export class ReactTooltipTest extends React.PureComponent {
             <a data-for="getContent" data-tip>=( •̀д•́)</a>
             <ReactTooltip id="getContent" getContent={getContent} />
 
-            <a data-for="overTime" data-tip>=( •̀д•́)</a>
-            <ReactTooltip id="overTime" wrapper="span" getContent={[() => new Date().toISOString(), 1000]} />
+            <a data-for="overTime" data-tip="3/14/1592">=( •̀д•́)</a>
+            <ReactTooltip id="overTime" wrapper="span" getContent={[dateString => new Date(dateString).toISOString(), 1000]} />
 
             <a data-tip data-for="happyFace"> d(`･∀･)b </a>
             <ReactTooltip

From 2fcebc56302948d3220749a057caf28cb3d5f55e Mon Sep 17 00:00:00 2001
From: Victor Vu <victor.vinh.vu@gmail.com>
Date: Thu, 17 May 2018 16:39:11 -0700
Subject: [PATCH 228/575] Added new SparkPost Sending Domain Status/Verify
 Attributes

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

diff --git a/types/sparkpost/index.d.ts b/types/sparkpost/index.d.ts
index b6914240b2..661d8b74c5 100644
--- a/types/sparkpost/index.d.ts
+++ b/types/sparkpost/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for sparkpost 2.1
 // Project: https://github.com/SparkPost/node-sparkpost
-// Definitions by: Joshua DeVinney <https://github.com/geoffreak>, Bond <https://github.com/bondz>
+// Definitions by: Joshua DeVinney <https://github.com/geoffreak>, Bond <https://github.com/bondz>, Victor <https://github.com/vvu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -1139,6 +1139,10 @@ declare namespace SparkPost {
         abuse_at_status: "valid" | "invalid" | "unverified" | "pending";
         /** Verification status of postmaster@ mailbox */
         postmaster_at_status: "valid" | "invalid" | "unverified" | "pending";
+        /** Verification status of CNAME configuration */
+        cname_status: "valid" | "invalid" | "unverified" | "pending";
+        /** Verification status of MX configuration */
+        mx_status: "valid" | "invalid" | "unverified" | "pending";
     }
 
     interface VerifyOptions {
@@ -1173,6 +1177,10 @@ declare namespace SparkPost {
          *
          */
         abuse_at_token?: string;
+        /**
+         * Request verification of CNAME record
+         */
+        cname_verify?: boolean;
     }
 
     interface VerifyResults extends Status {

From 3fb449e39a30595871cff946f4e369ca002444e4 Mon Sep 17 00:00:00 2001
From: Fahmi Akbar Wildana <fahmi.a.w@gmail.com>
Date: Fri, 18 May 2018 09:22:00 +0700
Subject: [PATCH 229/575] [@types/mathjs] update Unit

Base on current docs http://mathjs.org/docs/datatypes/units.html#api
---
 types/mathjs/index.d.ts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index a02729b635..f0694feb99 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -1307,9 +1307,26 @@ declare namespace math { // tslint:disable-line strict-export-declare-modifiers
 		phi: number;
     }
 
+	interface MathJSON {
+		mathjs?: string;
+		value: number;
+		unit: string;
+		fixPrefix?: boolean;
+	}
+
 	interface Unit {
 		to(unit: string): Unit;
 		toNumber(unit: string): number;
+    	clone(): Unit;
+		equalBase(unit: Unit): boolean;
+		equals(unit: Unit): boolean;
+		format(options: FormatOptions): string;
+		fromJSON(json: MathJSON): Unit;
+		toJSON(): MathJSON;
+		splitUnit(parts: string[]): Unit[];
+		toNumeric(unit: string): number | Fraction | BigNumber;
+		toSI(): Unit;
+		toString(): string;
 	}
 
 	interface CreateUnitOptions {

From 5f58da50b39a59509b4d87515f8000048c0a40e6 Mon Sep 17 00:00:00 2001
From: Fahmi Akbar Wildana <f.a.wildana@gmail.com>
Date: Fri, 18 May 2018 09:34:13 +0700
Subject: [PATCH 230/575] [avoid common mistake] change to ReadonlyArray

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

diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index f0694feb99..7141fa077c 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -1323,7 +1323,7 @@ declare namespace math { // tslint:disable-line strict-export-declare-modifiers
 		format(options: FormatOptions): string;
 		fromJSON(json: MathJSON): Unit;
 		toJSON(): MathJSON;
-		splitUnit(parts: string[]): Unit[];
+		splitUnit(parts: ReadonlyArray<string>): Unit[];
 		toNumeric(unit: string): number | Fraction | BigNumber;
 		toSI(): Unit;
 		toString(): string;

From 023a89ede6e2f1c642ed0384a9a6d148d67e9bb2 Mon Sep 17 00:00:00 2001
From: Fahmi Akbar Wildana <f.a.wildana@gmail.com>
Date: Fri, 18 May 2018 09:41:12 +0700
Subject: [PATCH 231/575] increase version number

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

diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index 7141fa077c..cdecc3e1b4 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for mathjs 3.20
+// Type definitions for mathjs 3.21
 // Project: http://mathjs.org/
 // Definitions by: Ilya Shestakov <https://github.com/siavol>,
 // 				   Andy Patterson <https://github.com/andnp>

From 48a6cc8ee5435658a5fe13b99c6d8787018f7045 Mon Sep 17 00:00:00 2001
From: Martijn <martijn@m19.nl>
Date: Fri, 18 May 2018 14:48:47 +0800
Subject: [PATCH 232/575] Add useMaster to FindOptions<T>

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index cc4bef61ba..203e069b16 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -3366,6 +3366,13 @@ declare namespace sequelize {
          * Throw EmptyResultError if a record is not found
          */
         rejectOnEmpty?: boolean;
+
+       /**
+         * Force the query to use the write pool
+         *
+         * Defaults to false
+         */
+        useMaster?: boolean;
     }
 
     type AnyFindOptions = FindOptions<any>;

From 4ef613d9f91dc57cee0af83dd367cba1df5413cf Mon Sep 17 00:00:00 2001
From: Haroen Viaene <hello@haroen.me>
Date: Fri, 18 May 2018 14:02:25 +0200
Subject: [PATCH 233/575] fix(algoliasearch): camel case

[placeholders](https://www.algolia.com/doc/api-reference/api-parameters/placeholders/)
[camelCaseAttributes](https://www.algolia.com/doc/api-reference/api-parameters/camelCaseAttributes/)
---
 types/algoliasearch/algoliasearch-tests.ts |  3 ++-
 types/algoliasearch/index.d.ts             | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/types/algoliasearch/algoliasearch-tests.ts b/types/algoliasearch/algoliasearch-tests.ts
index 96270b31eb..87fdb95a01 100644
--- a/types/algoliasearch/algoliasearch-tests.ts
+++ b/types/algoliasearch/algoliasearch-tests.ts
@@ -94,7 +94,8 @@ let _algoliaIndexSettings: IndexSettings = {
   allowCompressionOfIntegerArray: false,
   altCorrections: [{}],
   minProximity: 0,
-  placeholders: '',
+  placeholders: { '': [''] },
+  camelCaseAttributes: [''],
 };
 
 let _algoliaQueryParameters: QueryParameters = {
diff --git a/types/algoliasearch/index.d.ts b/types/algoliasearch/index.d.ts
index ba46f37ce6..9315a7f6b9 100644
--- a/types/algoliasearch/index.d.ts
+++ b/types/algoliasearch/index.d.ts
@@ -1759,10 +1759,18 @@ declare namespace algoliasearch {
     minProximity?: number;
     /**
      * This is an advanced use-case to define a token substitutable by a list of words without having the original token searchable
-     * default: ''
+     * default: {}
      * https://github.com/algolia/algoliasearch-client-js#placeholders
      */
-    placeholders?: any;
+    placeholders?: {
+      [name: string]: string[],
+    };
+    /**
+     * List of attributes on which to do a decomposition of camel case words.
+     *
+     https://www.algolia.com/doc/api-reference/api-parameters/camelCaseAttributes/
+     */
+    camelCaseAttributes?: string[];
   }
 
   interface Response {

From 26255b4c7dd19d2df3540c646be8b3c92bb60564 Mon Sep 17 00:00:00 2001
From: Andrea Ascari <dev.ascariandrea@gmail.com>
Date: Fri, 18 May 2018 16:02:42 +0200
Subject: [PATCH 234/575] Added missing optional refreshToken in
 PasswordRealmResponse, closes #25823.

---
 types/react-native-auth0/index.d.ts           |  1 +
 .../react-native-auth0-tests.ts               | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/types/react-native-auth0/index.d.ts b/types/react-native-auth0/index.d.ts
index 153bfd65d9..1291baeafd 100644
--- a/types/react-native-auth0/index.d.ts
+++ b/types/react-native-auth0/index.d.ts
@@ -54,6 +54,7 @@ export interface PasswordRealmResponse {
     idToken: string;
     scope: string;
     tokenType: "Bearer";
+    refreshToken?: string;
 }
 
 export interface RefreshTokenParams {
diff --git a/types/react-native-auth0/react-native-auth0-tests.ts b/types/react-native-auth0/react-native-auth0-tests.ts
index 3f659cbdee..08f8b0bc59 100644
--- a/types/react-native-auth0/react-native-auth0-tests.ts
+++ b/types/react-native-auth0/react-native-auth0-tests.ts
@@ -30,12 +30,19 @@ auth0.auth.logoutUrl({
     returnTo: "http://localhost:3000"
 });
 
-auth0.auth.passwordRealm({
-    username: "me@example.com",
-    password: "password",
-    realm: "realm",
-    audience: "user-info"
-});
+auth0.auth
+    .passwordRealm({
+        username: "me@example.com",
+        password: "password",
+        realm: "realm",
+        audience: "user-info"
+    })
+    .then(res => {
+        if (res.refreshToken) {
+            return res.refreshToken;
+        }
+        return res.accessToken;
+    });
 
 auth0.auth.refreshToken({
     refreshToken: "refresh-token",

From 57cb3558e2bedbdd1f0e0030ec33f860795d9755 Mon Sep 17 00:00:00 2001
From: waterfoul <waterfoul@gmail.com>
Date: Fri, 18 May 2018 08:56:09 -0500
Subject: [PATCH 235/575] Fixed the typings for inferred types with functional
 components

---
 types/react-redux/index.d.ts            | 13 ++++---
 types/react-redux/react-redux-tests.tsx | 51 +++++++++++++++++--------
 2 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 0519a43bb5..a7f3dea705 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-redux 6.0.0
+// Type definitions for react-redux 6.0.1
 // Project: https://github.com/rackt/react-redux
 // Definitions by: Qubo <https://github.com/tkqubo>,
 //                 Thomas Hasner <https://github.com/thasner>,
@@ -54,7 +54,7 @@ interface AdvancedComponentDecorator<TProps, TOwnProps> {
  * - it is present in both DecorationTargetProps and InjectedProps
  * - DecorationTargetProps[P] extends InjectedProps[P]
  * ie: decorated component can accept more types than decorator is injecting
- * 
+ *
  * For decoration, inject props or ownProps are all optionnaly
  * required by the decorated (right hand side) component.
  * But any property required by the decorated component must extend the injected property
@@ -70,9 +70,12 @@ type Shared<
 // Will not pass through the injected props if they are passed in during
 // render. Also adds new prop requirements from TNeedsProps.
 export interface InferableComponentEnhancerWithProps<TInjectedProps, TNeedsProps> {
-    <P extends Shared<TInjectedProps, P>>(
-        component: Component<P>
-    ): ComponentClass<Omit<P, keyof Shared<TInjectedProps, P>> & TNeedsProps> & {WrappedComponent: Component<P>}
+	(
+		component: StatelessComponent<TInjectedProps>
+	): ComponentClass<TNeedsProps> & {WrappedComponent: StatelessComponent<TInjectedProps>}
+	<P extends Shared<TInjectedProps, P>>(
+		component: Component<P>
+	): ComponentClass<Omit<P, keyof Shared<TInjectedProps, P>> & TNeedsProps> & {WrappedComponent: Component<P>}
 }
 
 // Injects props and removes them from the prop requirements.
diff --git a/types/react-redux/react-redux-tests.tsx b/types/react-redux/react-redux-tests.tsx
index ebc174dd1c..16fb7f0306 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -813,23 +813,42 @@ namespace TestControlledComponentWithoutDispatchProp {
 }
 
 namespace TestDispatchToPropsAsObject {
-    const onClick: ActionCreator<{}> = () => ({});
-    const mapStateToProps = (state: any) => {
-        return {
-            title: state.app.title as string,
-        };
-    };
-    const dispatchToProps = {
-        onClick,
-    };
+	const onClick: ActionCreator<{}> = () => ({});
+	const mapStateToProps = (state: any) => {
+		return {
+			title: state.app.title as string,
+		};
+	};
+	const dispatchToProps = {
+		onClick,
+	};
 
-    type Props = { title: string; } & typeof dispatchToProps;
-    const HeaderComponent: React.StatelessComponent<Props> = (props) => {
-        return <h1>{props.title}</h1>;
-    }
+	type Props = { title: string; } & typeof dispatchToProps;
+	const HeaderComponent: React.StatelessComponent<Props> = (props) => {
+		return <h1>{props.title}</h1>;
+	}
 
-    const Header = connect(mapStateToProps, dispatchToProps)(HeaderComponent);
-    <Header />
+	const Header = connect(mapStateToProps, dispatchToProps)(HeaderComponent);
+	<Header />
+}
+
+namespace TestInferredFunctionalComponent {
+
+	const Header = connect(
+		(
+			{ app: { title }}: { app: { title: string }},
+			{ extraText }: { extraText: string }
+		) => ({
+			title,
+			extraText
+		}),
+		(dispatch) => ({
+			onClick: () => dispatch({ type: 'test' })
+		})
+	)(({ title, extraText, onClick }) => {
+		return <h1 onClick={onClick}>{title} {extraText}</h1>;
+	});
+	<Header extraText='text'/>
 }
 
 namespace TestWrappedComponent {
@@ -933,7 +952,7 @@ namespace TestWithoutTOwnPropsDecoratedInference {
     // This should compile
     React.createElement(ConnectedWithOwnPropsClass, { own: 'string', forwarded: 'string' });
     React.createElement(ConnectedWithOwnPropsClass, { own: 'string', forwarded: 'string' });
-    
+
     // This should not compile, it is missing ForwardedProps
     React.createElement(ConnectedWithOwnPropsClass, { own: 'string' }); // $ExpectError
     React.createElement(ConnectedWithOwnPropsStateless, { own: 'string' }); // $ExpectError

From 3a0062e9fdf7003372e2fe63e9163b71285fe869 Mon Sep 17 00:00:00 2001
From: Jason Unger <jason@rocketrip.com>
Date: Fri, 18 May 2018 10:26:01 -0400
Subject: [PATCH 236/575] Updates to react-radio-group types

- Allow `value` of Radio component to be any
- Add most HTMLProps to RadioGroup component
- Fix typing for `Component` prop on RadioGroup to be a string or React
component
---
 types/react-radio-group/index.d.ts            | 18 ++++---
 .../react-radio-group-tests.tsx               | 49 ++++++++++++++++---
 2 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/types/react-radio-group/index.d.ts b/types/react-radio-group/index.d.ts
index 5c3e6092ab..561599ed0a 100644
--- a/types/react-radio-group/index.d.ts
+++ b/types/react-radio-group/index.d.ts
@@ -6,17 +6,21 @@
 
 import * as React from 'react';
 
+// Omit taken from https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-311923766
+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 namespace Radio {
-    type RadioProps = React.InputHTMLAttributes<HTMLInputElement>;
+    type RadioProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'value' | 'name' | 'role' | 'type' | 'aria-checked'> & {
+        value: any;
+    };
 }
 export const Radio: React.ComponentClass<Radio.RadioProps>;
 
 export namespace RadioGroup {
-    interface RadioGroupProps {
-        name?: string;
-        selectedValue?: React.InputHTMLAttributes<HTMLInputElement>['value'];
-        onChange?: (value: React.InputHTMLAttributes<HTMLInputElement>['value']) => void;
-        Component?: string | React.ReactElement<React.HTMLProps<HTMLElement>>;
-    }
+    type RadioGroupProps = Omit<React.HTMLProps<any>, 'onChange'> & {
+        selectedValue?: any;
+        onChange?: (value: any) => void;
+        Component?: React.ReactType<Omit<React.HTMLProps<any>, 'onChange' | 'role'>>;
+    };
 }
 export const RadioGroup: React.ComponentClass<RadioGroup.RadioGroupProps>;
diff --git a/types/react-radio-group/react-radio-group-tests.tsx b/types/react-radio-group/react-radio-group-tests.tsx
index d34d7d05ff..d99b8aeed2 100644
--- a/types/react-radio-group/react-radio-group-tests.tsx
+++ b/types/react-radio-group/react-radio-group-tests.tsx
@@ -1,24 +1,61 @@
 import * as React from 'react';
 import { Radio, RadioGroup } from "react-radio-group";
 
-class ReactRadioGroup extends React.Component<RadioGroup.RadioGroupProps, { selectedValue: React.InputHTMLAttributes<HTMLInputElement>['value'] }> {
+const DefaultComponent: React.SFC<React.HTMLProps<HTMLDivElement>> = ({ children, ...rest }) => {
+    return (
+        <div style={{ display: 'flex' }} {...rest}>
+            {children}
+        </div>
+    );
+};
+
+interface ReactRadioGroupState {
+    selectedValueA: any;
+    selectedValueB: any;
+}
+
+class ReactRadioGroup extends React.Component<RadioGroup.RadioGroupProps, ReactRadioGroupState> {
     state = {
-        selectedValue: 2,
+        selectedValueA: 2,
+        selectedValueB: true,
     };
 
-    handleChange: RadioGroup.RadioGroupProps['onChange'] = selectedValue => {
-        console.log(selectedValue);
-        this.setState({ selectedValue });
+    handleChange = (key: keyof ReactRadioGroupState) => (value: any) => {
+        console.log(key, value);
+        this.setState(state => {
+            return {
+                ...state,
+                [key]: value,
+            };
+        });
     }
 
     render() {
         return (
             <div>
-                <RadioGroup name="radioGroup" onChange={this.handleChange} selectedValue={this.state.selectedValue}>
+                <RadioGroup
+                    name="radioGroupA"
+                    onChange={this.handleChange('selectedValueA')}
+                    selectedValue={this.state.selectedValueA}
+                    Component={DefaultComponent}
+                    className="here-is-a-classname"
+                >
                     <Radio id="Option A" value="a" />
                     <Radio id="Option B" value={2} />
                     <Radio id="Option C" value={["hello"]} disabled />
                 </RadioGroup>
+                <RadioGroup
+                    name="radioGroupB"
+                    onChange={this.handleChange('selectedValueB')}
+                    selectedValue={this.state.selectedValueB}
+                    Component="span"
+                    style={{marginBottom: '10px'}}
+                >
+                    <Radio id="Option D" value={true} />
+                    <Radio id="Option E" value={null} />
+                    <Radio id="Option F" value={undefined} />
+                    <Radio id="Option G" value={{name: 'Mark'}} disabled />
+                </RadioGroup>
             </div>
         );
     }

From f65854486264a626b71000e8159e121a96f787e6 Mon Sep 17 00:00:00 2001
From: Chris Santero <chris@simply360.org>
Date: Fri, 18 May 2018 11:54:26 -0400
Subject: [PATCH 237/575] [qunit] Add QUnit.equiv

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

diff --git a/types/qunit/index.d.ts b/types/qunit/index.d.ts
index a0276a3488..2b7eb586ff 100644
--- a/types/qunit/index.d.ts
+++ b/types/qunit/index.d.ts
@@ -595,6 +595,14 @@ interface QUnit {
      */
     todo(name: string, callback?: (assert: Assert) => void): void;
 
+    /**
+     * Compares two values. Returns true if they are equivalent.
+     *
+     * @param a The first value
+     * @param b The second value
+     */
+    equiv<T>(a: T, b: T): boolean;
+
     /**
      * Are the test running from the server or not.
      */ 
diff --git a/types/qunit/qunit-tests.ts b/types/qunit/qunit-tests.ts
index 25ffc9fbf1..e726113604 100644
--- a/types/qunit/qunit-tests.ts
+++ b/types/qunit/qunit-tests.ts
@@ -556,3 +556,9 @@ QUnit.test( "test with beforeEach and afterEach", function( assert ) {
 QUnit.todo( "a todo test", function( assert ) {
   assert.equal( 0, 1, "0 does not equal 1, so this todo should pass" );
 });
+
+let equivResult: boolean;
+equivResult = QUnit.equiv({}, {});
+equivResult = QUnit.equiv(1, 2);
+equivResult = QUnit.equiv('foo', 'bar');
+equivResult = QUnit.equiv(['foo'], ['bar']);

From b1f8a39a7f789b12ff54ee5ca008f95262c14d13 Mon Sep 17 00:00:00 2001
From: Jack Walters <waltersjack@gmail.com>
Date: Fri, 18 May 2018 11:05:14 -0700
Subject: [PATCH 238/575] Update recharts-tests.tsx

---
 types/recharts/recharts-tests.tsx | 49 ++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/types/recharts/recharts-tests.tsx b/types/recharts/recharts-tests.tsx
index 39bcf69c89..6b82b5f137 100644
--- a/types/recharts/recharts-tests.tsx
+++ b/types/recharts/recharts-tests.tsx
@@ -88,6 +88,7 @@ class Component extends React.Component<{}, ComponentState> {
         };
         return (
             <div style={{width: "100%", height: "100%"}}>
+                <div>verticalFill sample</div>
                 <ResponsiveContainer>
                     <LineChart width={500} height={300} data={data}>
                         <XAxis dataKey="name">
@@ -96,7 +97,53 @@ class Component extends React.Component<{}, ComponentState> {
                         <YAxis>
                             <Label>Y axis</Label>
                         </YAxis>
-                        <CartesianGrid stroke="#eee" strokeDasharray="5 5" />
+                        <CartesianGrid vertical={true} horizontal={false} verticalFill={["#fafafa", "#c8c8c8"]}  />
+                        <Line type="monotone" dataKey="uv" stroke="#8884d8" onClick={ this.clickHandler } />
+                        <Line type="monotone" dataKey="pv" stroke="#82ca9d" />
+                        <Tooltip />
+                        <Brush dataKey="name" />
+                        <ReferenceLine />
+                        <ReferenceArea
+                            stroke="red"
+                            fill="red"
+                            y2={1}
+                            strokeOpacity={0.2}
+                            fillOpacity={0.1}
+                        />
+                    </LineChart>
+                </ResponsiveContainer>
+                <ResponsiveContainer>
+                    <LineChart width={500} height={300} data={data}>
+                        <XAxis dataKey="name">
+                            <Label>X axis - name</Label>
+                        </XAxis>
+                        <YAxis>
+                            <Label>Y axis</Label>
+                        </YAxis>
+                        <CartesianGrid vertical={false} horizontal={true} horizontalFill={["#fafafa", "#c8c8c8"]}  />
+                        <Line type="monotone" dataKey="uv" stroke="#8884d8" onClick={ this.clickHandler } />
+                        <Line type="monotone" dataKey="pv" stroke="#82ca9d" />
+                        <Tooltip />
+                        <Brush dataKey="name" />
+                        <ReferenceLine />
+                        <ReferenceArea
+                            stroke="red"
+                            fill="red"
+                            y2={1}
+                            strokeOpacity={0.2}
+                            fillOpacity={0.1}
+                        />
+                    </LineChart>
+                </ResponsiveContainer>
+                <ResponsiveContainer>
+                    <LineChart width={500} height={300} data={data}>
+                        <XAxis dataKey="name">
+                            <Label>X axis - name</Label>
+                        </XAxis>
+                        <YAxis>
+                            <Label>Y axis</Label>
+                        </YAxis>
+                        <CartesianGrid stroke="#eee" strokeDasharray="5 5"  />
                         <Line type="monotone" dataKey="uv" stroke="#8884d8" onClick={ this.clickHandler } />
                         <Line type="monotone" dataKey="pv" stroke="#82ca9d" />
                         <Tooltip />

From cc5f1242dc1c78b93f1a4d5fa2f5e2c1204b8662 Mon Sep 17 00:00:00 2001
From: Jack Walters <waltersjack@gmail.com>
Date: Fri, 18 May 2018 11:06:06 -0700
Subject: [PATCH 239/575] Update recharts-tests.tsx

---
 types/recharts/recharts-tests.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/recharts/recharts-tests.tsx b/types/recharts/recharts-tests.tsx
index 6b82b5f137..7eed634119 100644
--- a/types/recharts/recharts-tests.tsx
+++ b/types/recharts/recharts-tests.tsx
@@ -88,7 +88,6 @@ class Component extends React.Component<{}, ComponentState> {
         };
         return (
             <div style={{width: "100%", height: "100%"}}>
-                <div>verticalFill sample</div>
                 <ResponsiveContainer>
                     <LineChart width={500} height={300} data={data}>
                         <XAxis dataKey="name">

From 82dfbee722cea537d5ee9f95d57590dac96f03d5 Mon Sep 17 00:00:00 2001
From: Drew Diamantoukos <MercifulCode@gmail.com>
Date: Fri, 18 May 2018 14:35:36 -0400
Subject: [PATCH 240/575] Added missing hoverinfo type permutations

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

diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index ac35dc064b..4089505394 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -386,7 +386,16 @@ export interface ScatterData {
 	'marker.colorbar': {}; // TODO
 	mode: 'lines' | 'markers' | 'text' | 'lines+markers' | 'text+markers' | 'text+lines' | 'text+lines+markers' | 'none';
 	hoveron: 'points' | 'fills';
-	hoverinfo: 'text';
+    hoverinfo: 'all' | 'none' | 'skip' |
+               'x' | 'x+text' | 'x+name' |
+               'x+y' | 'x+y+text' | 'x+y+name' |
+               'x+y+z' | 'x+y+z+text' | 'x+y+z+name' |
+               'y+x' | 'y+x+text' | 'y+x+name' |
+               'y+z' | 'y+z+text' | 'y+z+name' |
+               'y+x+z' | 'y+x+z+text' | 'y+x+z+name' |
+               'z+x' | 'z+x+text' | 'z+x+name' |
+               'z+y+x' | 'z+y+x+text' | 'z+y+x+name' |
+               'z+x+y' | 'z+x+y+text' | 'z+x+y+name';
 	fill: 'none' | 'tozeroy' | 'tozerox' | 'tonexty' | 'tonextx' | 'toself' | 'tonext';
 	fillcolor: string;
 	legendgroup: string;
@@ -394,6 +403,12 @@ export interface ScatterData {
 	connectgaps: boolean;
 }
 
+/*
+Any combination of "x", "y", "z", "text", "name" joined with a "+" OR "all" or "none" or "skip".
+examples: "x", "y", "x+y", "x+y+z", "all"
+default: "all"
+*/
+
 export interface ScatterMarker {
 	symbol: string | string[]; // Drawing.symbolList
 	color: Color | number[];

From bb30c9d9e4cdf8ebb54090b22bd061fc0ac82294 Mon Sep 17 00:00:00 2001
From: Drew Diamantoukos <MercifulCode@gmail.com>
Date: Fri, 18 May 2018 14:38:10 -0400
Subject: [PATCH 241/575] Upped plotly.js type 1.36 -> 1.37

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

diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index 4089505394..48b97bab8b 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for plotly.js 1.36
+// Type definitions for plotly.js 1.37
 // Project: https://plot.ly/javascript/
 // Definitions by: Chris Gervang <https://github.com/chrisgervang>
 // 				Martin Duparc <https://github.com/martinduparc>

From 5bc9242a2116253c71c5871c130a655291298f95 Mon Sep 17 00:00:00 2001
From: Michael Smith <smithmb.code@gmail.com>
Date: Fri, 18 May 2018 15:21:04 -0400
Subject: [PATCH 242/575] Allow passing a boolean to the sort field of Options

Options.sort can be `false` to disallow sorting (see: https://github.com/LeaVerou/awesomplete/pull/17043)
---
 types/awesomplete/index.d.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/awesomplete/index.d.ts b/types/awesomplete/index.d.ts
index e73b7cf2f3..9f5060de03 100644
--- a/types/awesomplete/index.d.ts
+++ b/types/awesomplete/index.d.ts
@@ -42,7 +42,8 @@ declare class Awesomplete {
 }
 
 declare namespace Awesomplete {
-    type Suggestion = string | {label: string | any, value: string | any} | [string, string];
+    type Suggestion = string | { label: string | any, value: string | any } | [string, string];
+    type SortFunction = (left: number | any[], right: number | any[]) => number;
 
     interface Options {
         list?: string | string[] | Element | Array<{ label: string, value: any }> | Array<[string, string]>;
@@ -51,7 +52,7 @@ declare namespace Awesomplete {
         autoFirst?: boolean;
         data?(item: Suggestion, input: string): string;
         filter?(text: string, input: string): boolean;
-        sort?(left: number | any[], right: number | any[]): number;
+        sort?: boolean | SortFunction;
         item?(text: string, input: string): HTMLElement;
         replace?(text: string): void;
     }

From be78af0d6cac15f583ca21e89a79f4708cd91911 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Fri, 18 May 2018 21:30:03 +0200
Subject: [PATCH 243/575] d3-color : adress last comments

---
 types/d3-color/index.d.ts | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/types/d3-color/index.d.ts b/types/d3-color/index.d.ts
index a616543bfe..931ac29b96 100644
--- a/types/d3-color/index.d.ts
+++ b/types/d3-color/index.d.ts
@@ -108,12 +108,9 @@ export interface LabColorFactory extends Function {
 /**
  * Constructs a new Lab color with the specified l value and a = b = 0.
  */
-export type GrayColorFactory = (l: number, opacity?: number) => LabColor;
-
-// Using the interface creates an error
-// export interface GrayColorFactory extends Function {
-//     (l: number, opacity?: number): LabColor;
-// }
+export interface GrayColorFactory {
+    (l: number, opacity?: number): LabColor;
+}
 
 export interface HCLColor extends Color {
     h: number;
@@ -132,7 +129,7 @@ export interface HCLColorFactory extends Function {
     readonly prototype: HCLColor;
 }
 
-export interface LCHColorFactory extends Function {
+export interface LCHColorFactory {
     (l: number, c: number, h: number, opacity?: number): HCLColor;
     (cssColorSpecifier: string): HCLColor;
     (color: ColorSpaceObject | ColorCommonInstance): HCLColor;

From 1606c6c190ffb54ab983021ae260165dbbb83714 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Fri, 18 May 2018 21:46:44 +0200
Subject: [PATCH 244/575] d3-color : use type instead of interface

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

diff --git a/types/d3-color/index.d.ts b/types/d3-color/index.d.ts
index 931ac29b96..56812a6bdb 100644
--- a/types/d3-color/index.d.ts
+++ b/types/d3-color/index.d.ts
@@ -32,7 +32,7 @@ export interface ColorCommonInstance {
      * Returns a hexadecimal string representing this color.
      * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
      */
-   hex(): string;
+    hex(): string;
 }
 
 export interface Color {
@@ -108,9 +108,7 @@ export interface LabColorFactory extends Function {
 /**
  * Constructs a new Lab color with the specified l value and a = b = 0.
  */
-export interface GrayColorFactory {
-    (l: number, opacity?: number): LabColor;
-}
+export type GrayColorFactory = (l: number, opacity?: number) => LabColor;
 
 export interface HCLColor extends Color {
     h: number;

From 842e9d0a6a010803c25cfac6b9af273f5653d842 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Fri, 18 May 2018 13:30:45 -0700
Subject: [PATCH 245/575] Adding Office.js Shared API enum descriptions

---
 types/office-js/index.d.ts | 1921 ++++++++++++++++++++++++++++++++++--
 1 file changed, 1826 insertions(+), 95 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 0ff10134b5..599ad89993 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -31,90 +31,115 @@ declare namespace Office {
     export function initialize(reason: InitializationReason): void;
     /**
     * Ensures that the Office JavaScript APIs are ready to be called by the add-in. If the framework hasn't initialized yet, the callback or promise will wait until the Office host is ready to accept API calls.
-    * Note that though this API is intended to be used inside an Office add-in, it can also be used outside the add-in.  In that case, once Office.js determines that it is running outside of an Office host application, it will call the callback and resolve the promise with "null" for both the host and platform.
+    * Note that though this API is intended to be used inside an Office add-in, it can also be used outside the add-in. In that case, once Office.js determines that it is running outside of an Office host application, it will call the callback and resolve the promise with "null" for both the host and platform.
     * @param callback - An optional callback method, that will receive the host and platform info. Alternatively, rather than use a callback, an add-in may simply wait for the Promise returned by the function to resolve.
     * @returns A Promise that contains the host and platform info, once initialization is completed.
     */
     export function onReady(callback?: (info: { host: HostType, platform: PlatformType }) => any): Promise<{ host: HostType, platform: PlatformType }>;
     /**
      * Indicates if the large namespace for objects will be used or not.
-     * @param useShortNamespace  Indicates if 'true' that the short namespace will be used
+     * @param useShortNamespace Indicates if 'true' that the short namespace will be used
      */
     export function useShortNamespace(useShortNamespace: boolean): void;
     // Enumerations
+    /**
+     * Specifies the result of an asynchronous call. 
+     * @remarks
+     * Returned by the status property of the AsyncResult object.
+     * 
+     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+     */
     export enum AsyncResultStatus {
         /**
-         * Operation succeeded
+         * The call succeeded.
          */
         Succeeded,
         /**
-         * Operation failed, check error object
+         * The call failed, check the error object.
          */
         Failed
     }
+    /**
+     * Specifies whether the add-in was just inserted or was already contained in the document.
+     * 
+     * @remarks
+     * Hosts: Excel, Project, Word
+     */
     export enum InitializationReason {
         /**
-         * Indicates the app was just inserted in the document
+         * The add-in was just inserted into the document.
          */
         Inserted,
         /**
-         * Indicates if the extension already existed in the document
+         * The add-in is already part of the document that was opened.
          */
         DocumentOpened
     }
+    /**
+     * Specifies the host Office application in which the add-in is running.
+     * 
+     * @remarks
+     * Hosts: Excel, Word, PowerPoint, Outlook, OneNote, Project, Access
+     */
     export enum HostType {
         /**
-         * Host is Word
+         * The Office host is Microsoft Word.
          */
         Word,
         /**
-         * Host is Excel
+         * The Office host is Microsoft Excel.
          */
         Excel,
         /**
-         * Host is PowerPoint
+         * The Office host is Microsoft PowerPoint.
          */
         PowerPoint,
         /**
-         * Host is Outlook
+         * The Office host is Microsoft Outlook.
          */
         Outlook,
         /**
-         * Host is OneNote
+         * The Office host is Microsoft OneNote.
          */
         OneNote,
         /**
-         * Host is Project
+         * The Office host is Microsoft Project.
          */
         Project,
         /**
-         * Host is Access
+         * The Office host is Microsoft Access.
          */
         Access
     }
+    /**
+     * Specifies the OS or other platform on which the Office host application is running.
+     * 
+     * @remarks
+     * Hosts: Excel, Word, PowerPoint, Outlook, OneNote, Project, Access
+     */
     export enum PlatformType {
         /**
-         * Platform is PC
+         * The platform is PC (Windows).
          */
         PC,
         /**
-         * Platform is Web
+         * The platform is Office Online.
          */
         OfficeOnline,
         /**
-         * Platform is Mac
+         * The platform is Mac.
          */
         Mac,
         /**
-         * Platform is iOS
+         * The platform an iOS device.
          */
         iOS,
         /**
-         * Platform is Android
+         * The platform is an Android device.
          */
         Android,
         /**
-         * Platform is Winrt
+         * The platform is WinRT.
          */
         Universal
     }
@@ -154,6 +179,7 @@ declare namespace Office {
      * 
      * @remarks
      * The Error object is accessed from the AsyncResult object that is returned in the function passed as the callback argument of an asynchronous data operation, such as the setSelectedDataAsync method of the Document object.
+     * 
      * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
      */
     export interface Error {
@@ -176,26 +202,26 @@ declare namespace Office {
     export interface UI {
         /**
         * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
-        * @param startAddress Accepts the initial HTTPS Url that opens in the dialog.
+        * @param startAddress - Accepts the initial HTTPS URL that opens in the dialog.
         */
         displayDialogAsync(startAddress: string): void;
         /**
         * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
-        * @param startAddress Accepts the initial HTTPS Url that opens in the dialog.
-        * @param options Optional. Accepts a DialogOptions object to define dialog behaviors.
+        * @param startAddress - Accepts the initial HTTPS URL that opens in the dialog.
+        * @param options - Optional. Accepts a DialogOptions object to define dialog behaviors.
         */
         displayDialogAsync(startAddress: string, options: DialogOptions): void;
         /**
         * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
-        * @param startAddress Accepts the initial HTTPS Url that opens in the dialog.
-        * @param callback Optional. Accepts a callback method to handle the dialog creation attempt.
+        * @param startAddress - Accepts the initial HTTPS URL that opens in the dialog.
+        * @param callback - Optional. Accepts a callback method to handle the dialog creation attempt.
         */
         displayDialogAsync(startAddress: string, callback: (result: AsyncResult) => void): void;
         /**
         * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
-        * @param startAddress Accepts the initial HTTPS Url that opens in the dialog.
-        * @param options Optional. Accepts a DialogOptions object to define dialog behaviors.
-        * @param callback Optional. Accepts a callback method to handle the dialog creation attempt.
+        * @param startAddress - Accepts the initial HTTPS URL that opens in the dialog.
+        * @param options - Optional. Accepts a DialogOptions object to define dialog behaviors.
+        * @param callback - Optional. Accepts a callback method to handle the dialog creation attempt.
         */
         displayDialogAsync(startAddress: string, options: DialogOptions, callback: (result: AsyncResult) => void): void;
         /**
@@ -205,10 +231,15 @@ declare namespace Office {
         messageParent(messageObject: any): void;
         /**
          * Closes the UI container where the JavaScript is executing.
+         * 
          * The behavior of this method is specified by the following:
+         * 
          * - Called from a UI-less command button: No effect. Any dialog opened by displayDialogAsync will remain open.
+         * 
          * - Called from a taskpane: The taskpane will close. Any dialog opened by displayDialogAsync will also close. If the taskpane supports pinning and was pinned by the user, it will be un-pinned.
+         * 
          * - Called from a module extension: No effect.
+         * 
          * Hosts: Outlook - Minimum requirement set: Mailbox 1.5
          */
         closeContainer(): void;
@@ -230,13 +261,13 @@ declare namespace Office {
     export interface Auth {
         /**
         * Obtains an access token from AAD V 2.0 endpoint to grant the Office host application access to the add-in's web application.
-        * @param callback Optional. Accepts a callback method to handle the token acquisition attempt. If AsyncResult.status is "succeeded", then AsyncResult.value is the raw AAD v. 2.0-formatted access token.
+        * @param callback - Optional. Accepts a callback method to handle the token acquisition attempt. If AsyncResult.status is "succeeded", then AsyncResult.value is the raw AAD v. 2.0-formatted access token.
         */
         getAccessTokenAsync(callback: (result: AsyncResult) => void): void;
         /**
         * Obtains an access token from AAD V 2.0 endpoint to grant the Office host application access to the add-in's web application.
-        * @param options Optional. Accepts an AuthOptions object to define sign-on behaviors.
-        * @param callback Optional. Accepts a callback method to handle the token acquisition attempt. If AsyncResult.status is "succeeded", then AsyncResult.value is the raw AAD v. 2.0-formatted access token.
+        * @param options - Optional. Accepts an AuthOptions object to define sign-on behaviors.
+        * @param callback - Optional. Accepts a callback method to handle the token acquisition attempt. If AsyncResult.status is "succeeded", then AsyncResult.value is the raw AAD v. 2.0-formatted access token.
         */
         getAccessTokenAsync(options: AuthOptions, callback: (result: AsyncResult) => void): void;
 
@@ -289,75 +320,126 @@ declare namespace Office {
      */
     export function select(expression: string, callback?: (result: AsyncResult) => void): Binding;
     // Enumerations
+    /**
+     * Specifies the state of the active view of the document, for example, whether the user can edit the document.
+     * @remarks
+     * Hosts: PowerPoint
+     */
     export enum ActiveView {
+        /**
+         * The active view of the host application only lets the user read the content in the document.
+         */
         Read,
+        /**
+         * The active view of the host application lets the user edit the content in the document.
+         */
         Edit
     }
+    /**
+     * Specifies the type of the binding object that should be returned.
+     * @remarks
+     * Hosts: Access, Excel, Word
+     */
     export enum BindingType {
         /**
-         * Text based Binding
+         * Plain text. Data is returned as a run of characters.
          */
         Text,
         /**
-         * Matrix based Binding
+         * Tabular data without a header row. Data is returned as an array of arrays, for example in this form: [[row1column1, row1column2],[row2column1, row2column2]]
          */
         Matrix,
         /**
-         * Table based Binding
+         * Tabular data with a header row. Data is returned as a TableData object.
          */
         Table
     }
+    /**
+     * Specifies how to coerce data returned or set by the invoked method.
+     * 
+     * @remarks
+     * PowerPoint supports only Office.CoercionType.Text, Office.CoercionType.Image, and Office.CoercionType.SlideRange. Project supports only Office.CoercionType.Text.
+     * 
+     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+     */
     export enum CoercionType {
         /**
-         * Coerce as Text
+         * Return or set data as text (string).Data is returned or set as a one-dimensional run of characters.
          */
         Text,
         /**
-         * Coerce as Matrix
+         * Return or set data as tabular data with no headers. Data is returned or set as an array of arrays containing one-dimensional runs of characters. For example, three rows of  string values in two columns would be: [["R1C1", "R1C2"], ["R2C1", "R2C2"], ["R3C1", "R3C2"]].
+         * @remarks
+         * Only applies to data in Excel and Word.
          */
         Matrix,
         /**
-         * Coerce as Table
+         * Return or set data as tabular data with optional headers. Data is returned or set as an array of arrays with optional headers.
+         * @remarks
+         * Only applies to data in Access, Excel and Word.
          */
         Table,
         /**
-         * Coerce as HTML
+         * Return or set data as HTML.
+         * @remarks
+         * Only applies to data in add-ins for Word and Outlook add-ins for Outlook (compose mode).
          */
         Html,
         /**
-         * Coerce as Office Open XML
+         * Return or set data as Office Open XML.
+         * @remarks
+         * Only applies to data in Word.
          */
         Ooxml,
         /**
-         * Coerce as JSON object containing an array of the ids, titles, and indexes of the selected slides.
+         * Return a JSON object that contains an array of the ids, titles, and indexes of the selected slides.For example,  {"slides":[{"id":257,"title":"Slide 2","index":2},{"id":256,"title":"Slide 1","index":1}]} for a selection of two slides.
+         * @remarks
+         * Only applies to data in PowerPoint when calling the Document.getSelectedData method to get the current slide or selected range of slides.
          */
         SlideRange,
         /**
-        * Coerce as Image
+        * Data is returned or set as an image stream.
+        * @remarks
+        * Only applies to data in Excel, Word and PowerPoint.
         */
         Image
     }
+    /**
+     * Specifies whether the document in the associated application is read-only or read-write. 
+     * @remarks
+     * Returned by the mode property of the Document object.
+     * 
+     * Hosts: Excel, PowerPoint, Project, Word
+     */
     export enum DocumentMode {
         /**
-         * Document in Read Only Mode
+         * The document is read-only.
          */
         ReadOnly,
         /**
-         * Document in Read/Write Mode
+         * The document can be read and written to.
          */
         ReadWrite
     }
+    /**
+     * Specifies the kind of event that was raised. Returned by the type property of an EventNameEventArgs object.
+     * 
+     * @remarks
+     * Add-ins for Project support the Office.EventType.ResourceSelectionChanged, Office.EventType.TaskSelectionChanged, and Office.EventType.ViewSelectionChanged event types.
+     * 
+     * Hosts: Access, Excel, PowerPoint, Project, Word
+     */
     export enum EventType {
         /**
-         * Occurs when the user changes the current view of the document.
+         * A Document.ActiveViewChanged event was raised.
          */
         ActiveViewChanged,
         /**
-         * Triggers when a binding level data change happens
+         * A Binding.BindingDataChanged event was raised.
          */
         BindingDataChanged,
         /**
-         *  Triggers when a binding level selection happens
+         * A Binding.BindingSelectionChanged event was raised.
          */
         BindingSelectionChanged,
         /**
@@ -373,7 +455,7 @@ declare namespace Office {
          */
         DocumentSelectionChanged,
         /**
-         * Triggers when the active item changes
+         * A Document.SelectionChanged event was raised.
          */
         ItemChanged,
         /**
@@ -389,7 +471,7 @@ declare namespace Office {
          */
         NodeReplaced,
         /**
-         * Triggers when settings change in a co-Auth session.
+         * A Settings.settingsChanged event was raised.
          */
         SettingsChanged,
         /**
@@ -397,7 +479,7 @@ declare namespace Office {
          */
         TaskSelectionChanged,
         /**
-         *  Triggers when a Resource selection happens in Project.
+         * Triggers when a Resource selection happens in Project.
          */
         ResourceSelectionChanged,
         /**
@@ -405,30 +487,48 @@ declare namespace Office {
          */
         ViewSelectionChanged
     }
+    /**
+     * Specifies the format in which to return the document.
+     * 
+     * @remarks
+     * Hosts: PowerPoint, Word
+     */
     export enum FileType {
         /**
-         * Returns the file as plain text
+         * Returns only the text of the document as a string. (Word only)
          */
         Text,
         /**
-         * Returns the file as a byte array
+         * Returns the entire document (.pptx or .docx) in Office Open XML (OOXML) format as a byte array.
          */
         Compressed,
         /**
-         * Returns the file in PDF format as a byte array
+         * Returns the entire document in PDF format as a byte array.
          */
         Pdf
     }
+    /**
+     * Specifies whether filtering from the host application is applied when the data is retrieved.
+     * 
+     * @remarks
+     * Hosts: Excel, Project, Word
+     */
     export enum FilterType {
         /**
-         * Returns all items
+         * Return all data (not filtered by the host application).
          */
         All,
         /**
-         * Returns only visible items
+         * Return only the visible data (as filtered by the host application).
          */
         OnlyVisible
     }
+    /**
+     * Specifies the type of place or object to navigate to.
+     * 
+     * @remarks
+     * Hosts: Excel, PowerPoint, Word
+     */
     export enum GoToType {
         /**
          * Goes to a binding object using the specified binding id.
@@ -444,7 +544,7 @@ declare namespace Office {
          */
         Slide,
         /**
-         * Goes to the specified index by slide number or enum Office.Index
+         * Goes to the specified index by slide number or Office.Index
          */
         Index
     }
@@ -454,18 +554,38 @@ declare namespace Office {
         Next,
         Previous
     }
+    /**
+     * Specifies whether to select (highlight) the location to navigate to (when using the Document.goToByIdAsync method).
+     * 
+     * @remarks
+     * Hosts: Excel, PowerPoint, Word
+     */
     export enum SelectionMode {
         Default,
+        /**
+         * The location will be selected (highlighted).
+         */
         Selected,
+        /**
+         * The cursor is moved the beginning of the location.
+         */
         None
     }
+    /**
+     * Specifies whether values, such as numbers and dates, returned by the invoked method are returned with their formatting applied.
+     * 
+     * @remarks
+     * For example, if the valueFormat parameter is specified as "formatted", a number formatted as currency, or a date formatted as mm/dd/yy in the host application will have its formatting preserved. If the valueFormat parameter is specified as "unformatted", a date will be returned in its underlying sequential serial number form.
+     * 
+     * Hosts: Excel, Project, Word
+     */
     export enum ValueFormat {
         /**
-         * Returns items without format
+         * Return unformatted data.
          */
         Unformatted,
         /**
-         * Returns items with format
+         * Return formatted data.
          */
         Formatted
     }
@@ -833,6 +953,7 @@ declare namespace Office {
      * 
      * @remarks
      * Access the File object with the AsyncResult.value property in the callback function passed to the Document.getFileAsync method.
+     * 
      * Hosts: PowerPoint, Word
      */
     export interface File {
@@ -844,23 +965,26 @@ declare namespace Office {
         size: number;
         /**
          * Gets the number of slices into which the file is divided.
-         * @remarks
+         * @remarks 
          * Hosts: PowerPoint, Word
          */
         sliceCount: number;
         /**
          * Closes the document file.
+         * @remarks
          * No more than two documents are allowed to be in memory; otherwise the Document.getFileAsync operation will fail. Use the File.closeAsync method to close the file when you are finished working with it.
+         * 
          * Hosts: PowerPoint, Word
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
          * In the callback function passed to the closeAsync method, you can use the properties of the AsyncResult object to return the following information.
-         * Property - Use to...
-         * AsyncResult.value - Always returns undefined because there is no object or data to retrieve.
-         * AsyncResult.status - Determine the success or failure of the operation.
-         * AsyncResult.error - Access an Error object that provides error information if the operation failed.
-         * AsyncResult.asyncContext - Access your user-defined  object or value, if you passed one as the asyncContext parameter.
+         * |Property |Use to...|
+         * |---------|---------|
+         * |AsyncResult.value|Always returns undefined because there is no object or data to retrieve.|
+         * |AsyncResult.status|Determine the success or failure of the operation.|
+         * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
+         * |AsyncResult.asyncContext|Access your user-defined object or value, if you passed one as the asyncContext parameter.|
          */
         closeAsync(callback?: (result: AsyncResult) => void): void;
         /**
@@ -872,11 +996,12 @@ declare namespace Office {
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
          * In the callback function passed to the getSliceAsync method, you can use the properties of the AsyncResult object to return the following information.
-         * Property - Use to...
-         * AsyncResult.value - Access the Slice object.
-         * AsyncResult.status - Determine the success or failure of the operation.
-         * AsyncResult.error - Access an Error object that provides error information if the operation failed.
-         * AsyncResult.asyncContext - Access your user-defined  object or value, if you passed one as the asyncContext parameter.
+         * |Property |Use to...|
+         * |---------|---------|
+         * |AsyncResult.value|Access the Slice object.|
+         * |AsyncResult.status|Determine the success or failure of the operation.|
+         * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
+         * |AsyncResult.asyncContext|Access your user-defined object or value, if you passed one as the asyncContext parameter.|
          */
         getSliceAsync(sliceIndex: number, callback?: (result: AsyncResult) => void): void;
     }
@@ -895,8 +1020,11 @@ declare namespace Office {
      * 
      * @remarks
      * The settings created by using the methods of the Settings object are saved per add-in and per document. That is, they are available only to the add-in that created them, and only from the document in which they are saved.
+     * 
      * The name of a setting is a string, while the value can be a string, number, boolean, null, object, or array.
+     * 
      * The Settings object is automatically loaded as part of the Document object, and is available by calling the settings property of that object when the add-in is activated. The developer is responsible for calling the saveAsync method after adding or deleting settings to save the settings in the document.
+     * 
      * Hosts: Access, Excel, PowerPoint, Word
      */
     export interface Settings {
@@ -904,21 +1032,25 @@ declare namespace Office {
          * Adds an event handler for the settingsChanged event.
          * @remarks
          * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
-         * Important: Your add-in's code can register a handler for the settingsChanged event when the add-in is running with any Excel client, but the event will fire only when the add-in is loaded with a spreadsheet that is opened in Excel Online, and more than one user is editing the spreadsheet (co-authoring). Therefore, effectively the settingsChanged event is supported only in Excel Online in co-authoring scenarios.
+         * 
+         * > [!IMPORTANT]
+         * > Your add-in's code can register a handler for the settingsChanged event when the add-in is running with any Excel client, but the event will fire only when the add-in is loaded with a spreadsheet that is opened in Excel Online, and more than one user is editing the spreadsheet (co-authoring). Therefore, effectively the settingsChanged event is supported only in Excel Online in co-authoring scenarios.
+         * 
          * Hosts: Excel
          * @param eventType Specifies the type of event to add. Required.
          * @param handler The event handler function to add. Required.
          * @param options Specifies any of the following optional parameters.
-         * @param asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         *        asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
          * In the callback function passed to the addHandlerAsync method, you can use the properties of the AsyncResult object to return the following information.
-         * Property - Use to...
-         * AsyncResult.value - Always returns undefined because there is no data or object to retrieve when adding an event handler.
-         * AsyncResult.status - Determine the success or failure of the operation.
-         * AsyncResult.error - Access an Error object that provides error information if the operation failed.
-         * AsyncResult.asyncContext - Access your user-defined object or value, if you passed one as the asyncContext parameter.
+         * |Property |Use to...|
+         * |---------|---------|
+         * |AsyncResult.value|Always returns undefined because there is no data or object to retrieve when adding an event handler.|
+         * |AsyncResult.status|Determine the success or failure of the operation.|
+         * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
+         * |AsyncResult.asyncContext|Access your user-defined object or value, if you passed one as the asyncContext parameter.|
          */
         addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
@@ -934,23 +1066,27 @@ declare namespace Office {
          * @remarks
          * This method is useful in Word and PowerPoint coauthoring scenarios when multiple instances of the same add-in are working against the same document. Because each add-in is working against an in-memory copy of the settings loaded from the document at the time the user opened it, the settings values used by each user can get out of sync. This can happen whenever an instance of the add-in calls the Settings.saveAsync method to persist all of that user's settings to the document. Calling the refreshAsync method from the event handler for the settingsChanged event of the add-in will refresh the settings values for all users.
          * The refreshAsync method can be called from add-ins created for Excel, but since it doesn't support coauthoring there is no reason to do so.
+         * 
          * Hosts: Access, Excel, PowerPoint, Word
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
          * In the callback function passed to the refreshAsync method, you can use the properties of the AsyncResult object to return the following information.
-         * Property - Use to...
-         * AsyncResult.value - Access a Settings object with the refreshed values.
-         * AsyncResult.status - Determine the success or failure of the operation.
-         * AsyncResult.error - Access an Error object that provides error information if the operation failed.
-         * AsyncResult.asyncContext - Access your user-defined  object or value, if you passed one as the asyncContext parameter.
+         * |Property |Use to...|
+         * |---------|---------|
+         * |AsyncResult.value|Access a Settings object with the refreshed values.|
+         * |AsyncResult.status|Determine the success or failure of the operation.|
+         * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
+         * |AsyncResult.asyncContext|Access your user-defined  object or value, if you passed one as the asyncContext parameter.|
          */
         refreshAsync(callback?: (result: AsyncResult) => void): void;
         /**
          * Removes the specified setting.
          * @remarks
          * null is a valid value for a setting. Therefore, assigning null to the setting will not remove it from the settings property bag.
-         * Important: Be aware that the Settings.remove method affects only the in-memory copy of the settings property bag. To persist the removal of the specified setting in the document, at some point after calling the Settings.remove method and before the add-in is closed, you must call the Settings.saveAsync method.
+         * 
+         * > [!IMPORTANT]
+         * > Be aware that the Settings.remove method affects only the in-memory copy of the settings property bag. To persist the removal of the specified setting in the document, at some point after calling the Settings.remove method and before the add-in is closed, you must call the Settings.saveAsync method.
          * Hosts: Access, Excel, PowerPoint, Word
          * @param settingName The case-sensitive name of the setting to remove.
          */
@@ -959,11 +1095,12 @@ declare namespace Office {
          * Removes an event handler for the settingsChanged event.
          * @remarks
          * If the optional handler parameter is omitted when calling the removeHandlerAsync method, all event handlers for the specified eventType will be removed.
+         * 
          * Hosts: Access, Excel, PowerPoint
          * @param eventType Specifies the type of event to remove. Required.
          * @param options Specifies any of the following optional parameters.
-         * @param handler: Specifies the name of the handler to remove.
-         * @param asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param handler Specifies the name of the handler to remove.
+         *        asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
@@ -974,28 +1111,35 @@ declare namespace Office {
          * Persists the in-memory copy of the settings property bag in the document.
          * @remarks
          * Any settings previously saved by an add-in are loaded when it is initialized, so during the lifetime of the session you can just use the set and get methods to work with the in-memory copy of the settings property bag. When you want to persist the settings so that they are available the next time the add-in is used, use the saveAsync method.
-         * Note: The saveAsync method persists the in-memory settings property bag into the document file; however, the changes to the document file itself are saved only when the user (or AutoRecover setting) saves the document to the file system.
-         * The refreshAsync method is only useful in coauthoring scenarios (which are only supported in Word) when other instances of the same add-in might change the settings and those changes should be made available to all instances.
+         * 
+         * > [!NOTE]
+         * > The saveAsync method persists the in-memory settings property bag into the document file; however, the changes to the document file itself are saved only when the user (or AutoRecover setting) saves the document to the file system.
+         * > The refreshAsync method is only useful in coauthoring scenarios (which are only supported in Word) when other instances of the same add-in might change the settings and those changes should be made available to all instances.
+         * 
          * Hosts: Access, Excel, PowerPoint, Word
          * @param options Syntax example: {overwriteIfStale:false}
-         * @param overwriteIfStale: Indicates whether the setting will be replaced if stale.
-         * @param asyncContext: Object keeping state for the callback
+         * @param overwriteIfStale Indicates whether the setting will be replaced if stale.
+         *        asyncContext: Object keeping state for the callback
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
          * In the callback function passed to the saveAsync method, you can use the properties of the AsyncResult object to return the following information.
-         * Property - Use to...
-         * AsyncResult.value - Always returns  undefined because there is no object or data to retrieve.
-         * AsyncResult.status - Determine the success or failure of the operation.
-         * AsyncResult.error - Access an Error object that provides error information if the operation failed.
-         * AsyncResult.asyncContext - Access your user-defined  object or value, if you passed one as the asyncContext parameter.
+         * |Property |Use to...|
+         * |---------|---------|
+         * |AsyncResult.value|Always returns undefined because there is no object or data to retrieve.|
+         * |AsyncResult.status|Determine the success or failure of the operation.|
+         * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
+         * |AsyncResult.asyncContext|Access your user-defined object or value, if you passed one as the asyncContext parameter.|
          */
         saveAsync(callback?: (result: AsyncResult) => void): void;
         /**
          * Sets or creates the specified setting.
          * @remarks
          * The set method creates a new setting of the specified name if it does not already exist, or sets an existing setting of the specified name in the in-memory copy of the settings property bag. After you call the Settings.saveAsync method, the value is stored in the document as the serialized JSON representation of its data type. A maximum of 2MB is available for the settings of each add-in.
-         * Important: Be aware that the Settings.set method affects only the in-memory copy of the settings property bag. To make sure that additions or changes to settings will be available to your add-in the next time the document is opened, at some point after calling the Settings.set method and before the add-in is closed, you must call the Settings.saveAsync method to persist settings in the document.
+         * 
+         * > [!IMPORTANT]
+         * > Be aware that the Settings.set method affects only the in-memory copy of the settings property bag. To make sure that additions or changes to settings will be available to your add-in the next time the document is opened, at some point after calling the Settings.set method and before the add-in is closed, you must call the Settings.saveAsync method to persist settings in the document.
+         * 
          * Hosts: Access, Excel, PowerPoint, Word
          * @param settingName The case-sensitive name of the setting to set or create.
          * @param value Specifies the value to be stored.
@@ -1006,6 +1150,7 @@ declare namespace Office {
      * Represents a slice of a document file.
      * @remarks
      * The Slice object is accessed with the File.getSliceAsync method.
+     * 
      * Hosts: PowerPoint, Word
      */
     export interface Slice {
@@ -1013,6 +1158,7 @@ declare namespace Office {
          * Gets the raw data of the file slice in Office.FileType.Text ("text") or Office.FileType.Compressed ("compressed") format as specified by the fileType parameter of the call to the Document.getFileAsync method.
          * @remarks
          * Files in the "compressed" format will return a byte array that can be transformed to a base64-encoded string if required.
+         * 
          * Hosts: PowerPoint, Word
          */
         data: any;
@@ -1035,7 +1181,7 @@ declare namespace Office {
         rowCount: number;
         /**
          * Adds the specified columns to the table
-         * @param tableData  A TableData object with the headers and rows
+         * @param tableData A TableData object with the headers and rows
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: Object keeping state for the callback
          * @param callback The optional callback method
@@ -1043,7 +1189,7 @@ declare namespace Office {
         addColumnsAsync(tableData: TableData | any[][], options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Adds the specified rows to the table
-         * @param rows  A 2D array with the rows to add
+         * @param rows A 2D array with the rows to add
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: Object keeping state for the callback
          * @param callback The optional callback method
@@ -1104,546 +1250,2131 @@ declare namespace Office {
          * Gets or sets the headers of the table.
          * @remarks
          * To specify headers, you must specify an array of arrays that corresponds to the structure of the table. For example, to specify headers for a two-column table you would set the header property to [['header1', 'header2']].
+         * 
          * If you specify null for the headers property (or leaving the property empty when you construct a TableData object), the following results occur when your code executes:
+         * 
          * - If you insert a new table, the default column headers for the table are created.
+         * 
          * - If you overwrite or update an existing table, the existing headers are not altered.
+         * 
          * Hosts: Excel, Word
          */
         headers: any[];
         /**
          * Gets or sets the rows in the table. Returns an array of arrays that contains the data in the table. Returns an empty array ``, if there are no rows.
+         * @remarks
          * To specify rows, you must specify an array of arrays that corresponds to the structure of the table. For example, to specify two rows of string values in a two-column table you would set the rows property to [['a', 'b'], ['c', 'd']].
+         * 
          * If you specify null for the rows property (or leave the property empty when you construct a TableData object), the following results occur when your code executes:
+         * 
          * - If you insert a new table, a blank row will be inserted.
+         * 
          * - If you overwrite or update an existing table, the existing rows are not altered.
+         * 
          * Hosts: Excel, Word
          */
         rows: any[][];
     }
+    /**
+     * Specifies enumerated values for the cells: property in the cellFormat parameter of [table formatting methods](https://dev.office.com/reference/docs/excel/format-tables-in-add-ins-for-excel.htm).
+     * 
+     * @remarks
+     * Hosts: Excel
+     */
     export enum Table {
+        /**
+         * The entire table, including column headers, data, and totals (if any).
+         */
         All,
+        /**
+         * Only the data (no headers and totals).
+         */
         Data,
+        /**
+         * Only the header row.
+         */
         Headers
     }
     export interface TextBinding extends Binding { }
+    /**
+     * Specifies the project fields that are available as a parameter for the getProjectFieldAsync method.
+     * 
+     * @remarks
+     * A ProjectProjectFields constant can be used as a parameter of the getProjectFieldAsync method.
+     * 
+     * Hosts: Project
+     */
     export enum ProjectProjectFields {
+        /**
+         * The number of digits after the decimal for the currency.
+         */
         CurrencyDigits,
+        /**
+         * The currency symbol.
+         */
         CurrencySymbol,
+        /**
+         * The placement of the currency symbol: Not specified = -1; Before the value with no space ($0) = 0; After the value with no space (0$) = 1; Before the value with a space ($ 0) = 2; After the value with a space (0 $) = 3.
+         */
         CurrencySymbolPosition,
         DurationUnits,
+        /**
+         * The GUID of the project.
+         */
         GUID,
+        /**
+         * The project finish date.
+         */
         Finish,
+        /**
+         * The project start date.
+         */
         Start,
+        /**
+         * Specifies whether the project is read-only.
+         */
         ReadOnly,
+        /**
+         * The project version.
+         */
         VERSION,
+        /**
+         * The work units of the project, such as days or hours.
+         */
         WorkUnits,
+        /**
+         * The Project Web App URL, for projects that are stored in Project Server.
+         */
         ProjectServerUrl,
+        /**
+         * The SharePoint URL, for projects that are synchronized with a SharePoint list.
+         */
         WSSUrl,
+        /**
+         * The name of the SharePoint list, for projects that are synchronized with a tasks list.
+         */
         WSSList
     }
+    /**
+     * Specifies the resource fields that are available as a parameter for the getResourceFieldAsync method.
+     * 
+     * @remarks
+     * A ProjectResourceFields constant can be used as a parameter of the getResourceFieldAsync method.
+     * 
+     * For more information about working with fields in Project, see [Available fields](https://support.office.com/article/Available-fields-reference-615a4563-1cc3-40f4-b66f-1b17e793a460) reference. In Project Help, search for Available fields.
+     */
     export enum ProjectResourceFields {
+        /**
+         * The accrual method that defines how a task accrues the cost of the resource: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Accrual,
+        /**
+         * The calculated actual cost of the resource for assignments in the project.
+         */
         ActualCost,
+        /**
+         * The actual overtime cost for a resource.
+         */
         ActualOvertimeCost,
+        /**
+         * The actual overtime work for a resource, in minutes.
+         */
         ActualOvertimeWork,
+        /**
+         * The actual overtime work for the resource that has been protected (made read-only).
+         */
         ActualOvertimeWorkProtected,
+        /**
+         * The actual work that the resource has done on assignments in the project.
+         */
         ActualWork,
+        /**
+         * The actual work for the resource that has been protected (made read-only).
+         */
         ActualWorkProtected,
+        /**
+         * The name of the base calendar for the resource.
+         */
         BaseCalendar,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline10BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline10BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline10Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline10Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline1BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline1BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline1Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline1Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline2BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline2BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline2Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline2Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline3BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline3BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline3Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline3Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline4BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline4BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline4Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline4Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline5BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline5BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline5Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline5Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline6BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline6BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline6Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline6Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline7BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline7BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline7Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline7Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline8BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline8BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline8Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline8Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline9BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline9BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline9Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline9Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         BaselineBudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         BaselineBudgetWork,
+        /**
+         * The baseline cost for the resource for assignments in the project.
+         */
         BaselineCost,
+        /**
+         * The baseline work for the resource for assignments in the project, in minutes.
+         */
         BaselineWork,
+        /**
+         * The budget cost for the resource.
+         */
         BudgetCost,
+        /**
+         * The budget work for the resource.
+         */
         BudgetWork,
+        /**
+         * The GUID of the resource calendar.
+         */
         ResourceCalendarGUID,
+        /**
+         * The code value of the resource.
+         */
         Code,
+        /**
+         * A cost field for the resource.
+         */
         Cost1,
+        /**
+         * A cost field for the resource.
+         */
         Cost10,
+        /**
+         * A cost field for the resource.
+         */
         Cost2,
+        /**
+         * A cost field for the resource.
+         */
         Cost3,
+        /**
+         * A cost field for the resource.
+         */
         Cost4,
+        /**
+         * A cost field for the resource.
+         */
         Cost5,
+        /**
+         * A cost field for the resource.
+         */
         Cost6,
+        /**
+         * A cost field for the resource.
+         */
         Cost7,
+        /**
+         * A cost field for the resource.
+         */
         Cost8,
+        /**
+         * A cost field for the resource.
+         */
         Cost9,
+        /**
+         * The date the resource was created.
+         */
         ResourceCreationDate,
+        /**
+         * A date field for the resource.
+         */
         Date1,
+        /**
+         * A date field for the resource.
+         */
         Date10,
+        /**
+         * A date field for the resource.
+         */
         Date2,
+        /**
+         * A date field for the resource.
+         */
         Date3,
+        /**
+         * A date field for the resource.
+         */
         Date4,
+        /**
+         * A date field for the resource.
+         */
         Date5,
+        /**
+         * A date field for the resource.
+         */
         Date6,
+        /**
+         * A date field for the resource.
+         */
         Date7,
+        /**
+         * A date field for the resource.
+         */
         Date8,
+        /**
+         * A date field for the resource.
+         */
         Date9,
+        /**
+         * A duration field for the resource.
+         */
         Duration1,
+        /**
+         * A duration field for the resource.
+         */
         Duration10,
+        /**
+         * A duration field for the resource.
+         */
         Duration2,
+        /**
+         * A duration field for the resource.
+         */
         Duration3,
+        /**
+         * A duration field for the resource.
+         */
         Duration4,
+        /**
+         * A duration field for the resource.
+         */
         Duration5,
+        /**
+         * A duration field for the resource.
+         */
         Duration6,
+        /**
+         * A duration field for the resource.
+         */
         Duration7,
+        /**
+         * A duration field for the resource.
+         */
         Duration8,
+        /**
+         * A duration field for the resource.
+         */
         Duration9,
+        /**
+         * The email address of the resource.
+         */
         Email,
+        /**
+         * The end date of the resource availability.
+         */
         End,
+        /**
+         * A finish field for the task.
+         */
         Finish1,
+        /**
+         * A finish field for the task.
+         */
         Finish10,
+        /**
+         * A finish field for the task.
+         */
         Finish2,
+        /**
+         * A finish field for the task.
+         */
         Finish3,
+        /**
+         * A finish field for the task.
+         */
         Finish4,
+        /**
+         * A finish field for the task.
+         */
         Finish5,
+        /**
+         * A finish field for the task.
+         */
         Finish6,
+        /**
+         * A finish field for the task.
+         */
         Finish7,
+        /**
+         * A finish field for the task.
+         */
         Finish8,
+        /**
+         * A finish field for the task.
+         */
         Finish9,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag10,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag1,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag11,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag12,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag13,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag14,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag15,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag16,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag17,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag18,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag19,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag2,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag20,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag3,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag4,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag5,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag6,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag7,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag8,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag9,
+        /**
+         * The group the resource belongs to.
+         */
         Group,
+        /**
+         * The percentage of work units that the resource has assigned in the project. If the resource is working full-time on the project, Units = 100.
+         */
         Units,
+        /**
+         * The name of the resource.
+         */
         Name,
+        /**
+         * The text value of the notes regarding the resource.
+         */
         Notes,
+        /**
+         * A number field for the resource.
+         */
         Number1,
+        /**
+         * A number field for the resource.
+         */
         Number10,
+        /**
+         * A number field for the resource.
+         */
         Number11,
+        /**
+         * A number field for the resource.
+         */
         Number12,
+        /**
+         * A number field for the resource.
+         */
         Number13,
+        /**
+         * A number field for the resource.
+         */
         Number14,
+        /**
+         * A number field for the resource.
+         */
         Number15,
+        /**
+         * A number field for the resource.
+         */
         Number16,
+        /**
+         * A number field for the resource.
+         */
         Number17,
+        /**
+         * A number field for the resource.
+         */
         Number18,
+        /**
+         * A number field for the resource.
+         */
         Number19,
+        /**
+         * A number field for the resource.
+         */
         Number2,
+        /**
+         * A number field for the resource.
+         */
         Number20,
+        /**
+         * A number field for the resource.
+         */
         Number3,
+        /**
+         * A number field for the resource.
+         */
         Number4,
+        /**
+         * A number field for the resource.
+         */
         Number5,
+        /**
+         * A number field for the resource.
+         */
         Number6,
+        /**
+         * A number field for the resource.
+         */
         Number7,
+        /**
+         * A number field for the resource.
+         */
         Number8,
+        /**
+         * A number field for the resource.
+         */
         Number9,
+        /**
+         * The overtime cost for a resource.
+         */
         OvertimeCost,
+        /**
+         * The overtime rate for a resource.
+         */
         OvertimeRate,
+        /**
+         * The overtime work for a resource.
+         */
         OvertimeWork,
+        /**
+         * The percentage of work complete for a resource.
+         */
         PercentWorkComplete,
+        /**
+         * The cost per use of the resource.
+         */
         CostPerUse,
+        /**
+         * Indicates whether the resource is a generic resource (identified by skill rather than by name).
+         */
         Generic,
+        /**
+         * Indicates whether the resource is overallocated.
+         */
         OverAllocated,
+        /**
+         * The amount of regular work for the resource.
+         */
         RegularWork,
+        /**
+         * The remaining cost for the resource.
+         */
         RemainingCost,
+        /**
+         * The remaining overtime cost for the resource.
+         */
         RemainingOvertimeCost,
+        /**
+         * The remaining overtime work for the resource, in minutes.
+         */
         RemainingOvertimeWork,
+        /**
+         * The remaining work for the resource, in minutes.
+         */
         RemainingWork,
+        /**
+         * The ID of the resource.
+         */
         ResourceGUID,
+        /**
+         * The total cost of the resource.
+         */
         Cost,
+        /**
+         * The total work for the resource, in minutes.
+         */
         Work,
+        /**
+         * The start date for the resource.
+         */
         Start,
+        /**
+         * A start field for the resource.
+         */
         Start1,
+        /**
+         * A start field for the resource.
+         */
         Start10,
+        /**
+         * A start field for the resource.
+         */
         Start2,
+        /**
+         * A start field for the resource.
+         */
         Start3,
+        /**
+         * A start field for the resource.
+         */
         Start4,
+        /**
+         * A start field for the resource.
+         */
         Start5,
+        /**
+         * A start field for the resource.
+         */
         Start6,
+        /**
+         * A start field for the resource.
+         */
         Start7,
+        /**
+         * A start field for the resource.
+         */
         Start8,
+        /**
+         * A start field for the resource.
+         */
         Start9,
+        /**
+         * The standard rate of pay for the resource, in cost per hour.
+         */
         StandardRate,
+        /**
+         * A text field for the resource.
+         */
         Text1,
+        /**
+         * A text field for the resource.
+         */
         Text10,
+        /**
+         * A text field for the resource.
+         */
         Text11,
+        /**
+         * A text field for the resource.
+         */
         Text12,
+        /**
+         * A text field for the resource.
+         */
         Text13,
+        /**
+         * A text field for the resource.
+         */
         Text14,
+        /**
+         * A text field for the resource.
+         */
         Text15,
+        /**
+         * A text field for the resource.
+         */
         Text16,
+        /**
+         * A text field for the resource.
+         */
         Text17,
+        /**
+         * A text field for the resource.
+         */
         Text18,
+        /**
+         * A text field for the resource.
+         */
         Text19,
+        /**
+         * A text field for the resource.
+         */
         Text2,
+        /**
+         * A text field for the resource.
+         */
         Text20,
+        /**
+         * A text field for the resource.
+         */
         Text21,
+        /**
+         * A text field for the resource.
+         */
         Text22,
+        /**
+         * A text field for the resource.
+         */
         Text23,
+        /**
+         * A text field for the resource.
+         */
         Text24,
+        /**
+         * A text field for the resource.
+         */
         Text25,
+        /**
+         * A text field for the resource.
+         */
         Text26,
+        /**
+         * A text field for the resource.
+         */
         Text27,
+        /**
+         * A text field for the resource.
+         */
         Text28,
+        /**
+         * A text field for the resource.
+         */
         Text29,
+        /**
+         * A text field for the resource.
+         */
         Text3,
+        /**
+         * A text field for the resource.
+         */
         Text30,
+        /**
+         * A text field for the resource.
+         */
         Text4,
+        /**
+         * A text field for the resource.
+         */
         Text5,
+        /**
+         * A text field for the resource.
+         */
         Text6,
+        /**
+         * A text field for the resource.
+         */
         Text7,
+        /**
+         * A text field for the resource.
+         */
         Text8,
+        /**
+         * A text field for the resource.
+         */
         Text9
     }
+    /**
+     * Specifies the task fields that are available as a parameter for the getTaskFieldAsync method.
+     * 
+     * @remarks
+     * A ProjectTaskFields constant can be used as a parameter of the getTaskFieldAsync method.
+     * 
+     * For more information about working with fields in Project, see the [Available fields](https://support.office.com/article/Available-fields-reference-615a4563-1cc3-40f4-b66f-1b17e793a460) reference. In Project Help, search for Available fields.
+     * 
+     * Hosts: Project
+     */
     export enum ProjectTaskFields {
+        /**
+         * The current actual cost for the task.
+         */
         ActualCost,
+        /**
+         * The actual duration of the task, in minutes.
+         */
         ActualDuration,
+        /**
+         * The actual finish date of the task.
+         */
         ActualFinish,
+        /**
+         * The actual overtime cost for the task.
+         */
         ActualOvertimeCost,
+        /**
+         * The actual overtime work for the task, in minutes.
+         */
         ActualOvertimeWork,
+        /**
+         * The actual start date of the task.
+         */
         ActualStart,
+        /**
+         * The actual work for the task, in minutes.
+         */
         ActualWork,
+        /**
+         * A text field for the task.
+         */
         Text1,
+        /**
+         * A text field for the task.
+         */
         Text10,
+        /**
+         * A finish field for the task.
+         */
         Finish10,
+        /**
+         * A start field for the task.
+         */
         Start10,
+        /**
+         * A text field for the task.
+         */
         Text11,
+        /**
+         * A text field for the task.
+         */
         Text12,
+        /**
+         * A text field for the task.
+         */
         Text13,
+        /**
+         * A text field for the task.
+         */
         Text14,
+        /**
+         * A text field for the task.
+         */
         Text15,
+        /**
+         * A text field for the task.
+         */
         Text16,
+        /**
+         * A text field for the task.
+         */
         Text17,
+        /**
+         * A text field for the task.
+         */
         Text18,
+        /**
+         * A text field for the task.
+         */
         Text19,
+        /**
+         * A finish field for the task.
+         */
         Finish1,
+        /**
+         * A start field for the task.
+         */
         Start1,
+        /**
+         * A text field for the task.
+         */
         Text2,
+        /**
+         * A text field for the task.
+         */
         Text20,
+        /**
+         * A text field for the task.
+         */
         Text21,
+        /**
+         * A text field for the task.
+         */
         Text22,
+        /**
+         * A text field for the task.
+         */
         Text23,
+        /**
+         * A text field for the task.
+         */
         Text24,
+        /**
+         * A text field for the task.
+         */
         Text25,
+        /**
+         * A text field for the task.
+         */
         Text26,
+        /**
+         * A text field for the task.
+         */
         Text27,
+        /**
+         * A text field for the task.
+         */
         Text28,
+        /**
+         * A text field for the task.
+         */
         Text29,
+        /**
+         * A finish field for the task.
+         */
         Finish2,
+        /**
+         * A start field for the task.
+         */
         Start2,
+        /**
+         * A text field for the task.
+         */
         Text3,
+        /**
+         * A text field for the task.
+         */
         Text30,
+        /**
+         * A finish field for the task.
+         */
         Finish3,
+        /**
+         * A start field for the task.
+         */
         Start3,
+        /**
+         * A text field for the task.
+         */
         Text4,
+        /**
+         * A finish field for the task.
+         */
         Finish4,
+        /**
+         * A start field for the task.
+         */
         Start4,
+        /**
+         * A text field for the task.
+         */
         Text5,
+        /**
+         * A finish field for the task.
+         */
         Finish5,
+        /**
+         * A start field for the task.
+         */
         Start5,
+        /**
+         * A text field for the task.
+         */
         Text6,
+        /**
+         * A finish field for the task.
+         */
         Finish6,
+        /**
+         * A start field for the task.
+         */
         Start6,
+        /**
+         * A text field for the task.
+         */
         Text7,
+        /**
+         * A finish field for the task.
+         */
         Finish7,
+        /**
+         * A start field for the task.
+         */
         Start7,
+        /**
+         * A text field for the task.
+         */
         Text8,
+        /**
+         * A finish field for the task.
+         */
         Finish8,
+        /**
+         * A start field for the task.
+         */
         Start8,
+        /**
+         * A text field for the task.
+         */
         Text9,
+        /**
+         * A finish field for the task.
+         */
         Finish9,
+        /**
+         * A start field for the task.
+         */
         Start9,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline10BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline10BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline10Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline10Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline10Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline10FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline10FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline10Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline10Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline1BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline1BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline1Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline1Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline1Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline1FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline1FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline1Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline1Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline2BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline2BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline2Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline2Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline2Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline2FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline2FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline2Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline2Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline3BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline3BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline3Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline3Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline3Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline3FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline3FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Basline3Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline3Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline4BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline4BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline4Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline4Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline4Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline4FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline4FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline4Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline4Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline5BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline5BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline5Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline5Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline5Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline5FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline5FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline5Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline5Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline6BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline6BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline6Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline6Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline6Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline6FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline6FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline6Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline6Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline7BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline7BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline7Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline7Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline7Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline7FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline7FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline7Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline7Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline8BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline8BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline8Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline8Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline8Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline8FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline8FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline8Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline8Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline9BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline9BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline9Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline9Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline9Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline9FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline9FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline9Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline9Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         BaselineBudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         BaselineBudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         BaselineCost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         BaselineDuration,
+        /**
+         * The finish date for the baseline task.
+         */
         BaselineFinish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         BaselineFixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         BaselineFixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         BaselineStart,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         BaselineWork,
+        /**
+         * The budget cost for the task.
+         */
         BudgetCost,
         BudgetFixedCost,
-        BudgetFixedWork,
+        BudgetFixedWork, 
+        /**
+        * The budget work for the task, in hours.
+        */
         BudgetWork,
+        /**
+         * The GUID of the task calendar.
+         */
         TaskCalendarGUID,
+        /**
+         * A constraint date for the task.
+         */
         ConstraintDate,
+        /**
+         * A constraint type for the task: As Soon As Possible = 0, As Late As Possible = 1, Must Start On = 2, Must Finish On = 3, Start No Earlier Than = 4, Start No Later Than = 5, Finish No Earlier Than = 6, Finish No Later Than = 7.
+         */
         ConstraintType,
+        /**
+         * A cost field of the task.
+         */
         Cost1,
+        /**
+         * A cost field of the task.
+         */
         Cost10,
+        /**
+         * A cost field of the task.
+         */
         Cost2,
+        /**
+         * A cost field of the task.
+         */
         Cost3,
+        /**
+         * A cost field of the task.
+         */
         Cost4,
+        /**
+         * A cost field of the task.
+         */
         Cost5,
+        /**
+         * A cost field of the task.
+         */
         Cost6,
+        /**
+         * A cost field of the task.
+         */
         Cost7,
+        /**
+         * A cost field of the task.
+         */
         Cost8,
+        /**
+         * A cost field of the task.
+         */
         Cost9,
+        /**
+         * A date field of the task.
+         */
         Date1,
+        /**
+         * A date field of the task.
+         */
         Date10,
+        /**
+         * A date field of the task.
+         */
         Date2,
+        /**
+         * A date field of the task.
+         */
         Date3,
+        /**
+         * A date field of the task.
+         */
         Date4,
+        /**
+         * A date field of the task.
+         */
         Date5,
+        /**
+         * A date field of the task.
+         */
         Date6,
+        /**
+         * A date field of the task.
+         */
         Date7,
+        /**
+         * A date field of the task.
+         */
         Date8,
+        /**
+         * A date field of the task.
+         */
         Date9,
+        /**
+         * The deadline for a task.
+         */
         Deadline,
+        /**
+         * A duration field of the task.
+         */
         Duration1,
+        /**
+         * A duration field of the task.
+         */
         Duration10,
+        /**
+         * A duration field of the task.
+         */
         Duration2,
+        /**
+         * A duration field of the task.
+         */
         Duration3,
+        /**
+         * A duration field of the task.
+         */
         Duration4,
+        /**
+         * A duration field of the task.
+         */
         Duration5,
+        /**
+         * A duration field of the task.
+         */
         Duration6,
+        /**
+         * A duration field of the task.
+         */
         Duration7,
+        /**
+         * A duration field of the task.
+         */
         Duration8,
+        /**
+         * A duration field of the task.
+         */
         Duration9,
+        /**
+         * A duration field of the task.
+         */
         Duration,
+        /**
+         * The method for calculating earned value for the task.
+         */
         EarnedValueMethod,
+        /**
+         * The duration between the Early Finish and Late Finish dates for the task, in minutes.
+         */
         FinishSlack,
+        /**
+         * The fixed cost for the task.
+         */
         FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         FixedCostAccrual,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag10,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag1,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag11,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag12,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag13,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag14,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag15,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag16,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag17,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag18,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag19,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag2,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag20,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag3,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag4,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag5,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag6,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag7,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag8,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag9,
+        /**
+         * The amount of time that the task can be delayed without delaying its successor tasks.
+         */
         FreeSlack,
+        /**
+         * Indicates whether the task has rollup subtasks.
+         */
         HasRollupSubTasks,
+        /**
+         * The index of the selected task. After the project summary task, the index of the first task in a project is 1.
+         */
         ID,
+        /**
+         * The name of the task.
+         */
         Name,
+        /**
+         * The text value of the notes regarding the task.
+         */
         Notes,
+        /**
+         * A number field for the task.
+         */
         Number1,
+        /**
+         * A number field for the task.
+         */
         Number10,
+        /**
+         * A number field for the task.
+         */
         Number11,
+        /**
+         * A number field for the task.
+         */
         Number12,
+        /**
+         * A number field for the task.
+         */
         Number13,
+        /**
+         * A number field for the task.
+         */
         Number14,
+        /**
+         * A number field for the task.
+         */
         Number15,
+        /**
+         * A number field for the task.
+         */
         Number16,
+        /**
+         * A number field for the task.
+         */
         Number17,
+        /**
+         * A number field for the task.
+         */
         Number18,
+        /**
+         * A number field for the task.
+         */
         Number19,
+        /**
+         * A number field for the task.
+         */
         Number2,
+        /**
+         * A number field for the task.
+         */
         Number20,
+        /**
+         * A number field for the task.
+         */
         Number3,
+        /**
+         * A number field for the task.
+         */
         Number4,
+        /**
+         * A number field for the task.
+         */
         Number5,
+        /**
+         * A number field for the task.
+         */
         Number6,
+        /**
+         * A number field for the task.
+         */
         Number7,
+        /**
+         * A number field for the task.
+         */
         Number8,
+        /**
+         * A number field for the task.
+         */
         Number9,
+        /**
+         * The scheduled (as opposed to actual) duration of the task.
+         */
         ScheduledDuration,
+        /**
+         * The scheduled (as opposed to actual) finish date of the task.
+         */
         ScheduledFinish,
+        /**
+         * The scheduled (as opposed to actual) start date of the task.
+         */
         ScheduledStart,
+        /**
+         * The level of the task in the outline hierarchy.
+         */
         OutlineLevel,
+        /**
+         * The overtime cost for the task.
+         */
         OvertimeCost,
+        /**
+         * The overtime work for the task.
+         */
         OvertimeWork,
+        /**
+         * The percent complete status of the task.
+         */
         PercentComplete,
+        /**
+         * The percentage of work completed for the task.
+         */
         PercentWorkComplete,
+        /**
+         * The IDs of the task's predecessors.
+         */
         Predecessors,
+        /**
+         * The finish date of a task before leveling occurred.
+         */
         PreleveledFinish,
+        /**
+         * The start date of a task before leveling occurred.
+         */
         PreleveledStart,
+        /**
+         * The priority of the task, with values from 0 (low) to 1000 (high). The default priority value is 500.
+         */
         Priority,
+        /**
+         * Indicates whether the task is active.
+         */
         Active,
+        /**
+         * Indicates whether the task is on the critical path.
+         */
         Critical,
+        /**
+         * Indicates whether the task is a milestone.
+         */
         Milestone,
+        /**
+         * Indicates whether any assignments for a task are overallocated.
+         */
         Overallocated,
+        /**
+         * Indicates whether subtask information is rolled up to the summary task bar.
+         */
         IsRollup,
+        /**
+         * Indicates whether the task is a summary task.
+         */
         Summary,
+        /**
+         * The amount of regular work for the task.
+         */
         RegularWork,
+        /**
+         * The remaining cost for the task.
+         */
         RemainingCost,
+        /**
+         * The remaining duration for the task, in minutes.
+         */
         RemainingDuration,
+        /**
+         * The remaining overtime cost for the task.
+         */
         RemainingOvertimeCost,
+        /**
+         * The remaining work for the task, in minutes.
+         */
         RemainingWork,
+        /**
+         * The names of the resources assigned to a task.
+         */
         ResourceNames,
+        /**
+         * The total cost of the task.
+         */
         Cost,
+        /**
+         * The finish date of the task.
+         */
         Finish,
+        /**
+         * The start date of the task.
+         */
         Start,
+        /**
+         * The total person-hours scheduled for the task, in minutes.
+         */
         Work,
+        /**
+         * The duration between the Early Start and Late Start dates for the task.
+         */
         StartSlack,
+        /**
+         * The status of the task: Complete = 0, on schedule = 1, late = 2, future task = 3, status not available = 4.
+         */
         Status,
+        /**
+         * The IDs of the task's successors.
+         */
         Successors,
+        /**
+         * The enterprise resource responsible for accepting or rejecting assignment progress updates for the task.
+         */
         StatusManager,
+        /**
+         * The total slack time for the task, in minutes.
+         */
         TotalSlack,
+        /**
+         * The GUID of the task.
+         */
         TaskGUID,
+        /**
+         * The way the task is calculated: Fixed units = 0, fixed duration = 1, fixed work = 2.
+         */
         Type,
+        /**
+         * The work breakdown structure code of the task.
+         */
         WBS,
+        /**
+         * The work breakdown structure codes of the task predecessors, separated by the list separator.
+         */
         WBSPREDECESSORS,
+        /**
+         * The work breakdown structure codes of the task successors, separated by the list separator.
+         */
         WBSSUCCESSORS,
+        /**
+         * The ID of the task in a SharePoint list, for a project that is synchronized with a SharePoint tasks list.
+         */
         WSSID
     }
+    /**
+     * Specifies the types of views that the getSelectedViewAsync method can recognize.
+     * 
+     * @remarks
+     * The getSelectedViewAsync method returns the ProjectViewTypes constant value and name that corresponds to the active view.
+     * 
+     * Hosts: Project
+     */
     export enum ProjectViewTypes {
+        /**
+         * The Gantt chart view.
+         */
         Gantt,
+        /**
+         * The Network Diagram view.
+         */
         NetworkDiagram,
+        /**
+         * The Task Diagram view.
+         */
         TaskDiagram,
+        /**
+         * The Task form view.
+         */
         TaskForm,
+        /**
+         * The Task Sheet view.
+         */
         TaskSheet,
+        /**
+         * The Resource Form view.
+         */
         ResourceForm,
+        /**
+         * The Resource Sheet view.
+         */
         ResourceSheet,
+        /**
+         * The Resource Graph view.
+         */
         ResourceGraph,
+        /**
+         * The Team Planner view.
+         */
         TeamPlanner,
+        /**
+         * The Task Details view.
+         */
         TaskDetails,
+        /**
+         * The Task Name Form view.
+         */
         TaskNameForm,
+        /**
+         * The Resource Names view.
+         */
         ResourceNames,
+        /**
+         * The Calendar view.
+         */
         Calendar,
+        /**
+         * The Task Usage view.
+         */
         TaskUsage,
+        /**
+         * The Resource Usage view.
+         */
         ResourceUsage,
+        /**
+         * The Timeline view.
+         */
         Timeline
     }
     // Objects

From 53a14e969e2489a736b455ccb8da00bdce27b8b9 Mon Sep 17 00:00:00 2001
From: Yukine <blazylp@gmail.com>
Date: Fri, 18 May 2018 22:33:05 +0200
Subject: [PATCH 246/575] update snekfetch typings to 4.0.0 release

---
 types/snekfetch/index.d.ts | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/types/snekfetch/index.d.ts b/types/snekfetch/index.d.ts
index ac77f8a572..643c376c5a 100644
--- a/types/snekfetch/index.d.ts
+++ b/types/snekfetch/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for snekfetch 3.6
+// Type definitions for snekfetch 4.0
 // Project: https://github.com/GusCaplan/snekfetch
 // Definitions by: Iker Pérez Brunelli <https://github.com/DarkerTV>
 //                 Shayne Hartford <https://github.com/ShayBox>
@@ -8,19 +8,23 @@
 
 /// <reference types="node" />
 
-import { ClientRequest } from 'http';
+import { ClientRequest, Agent } from 'http';
 import { Readable } from 'stream';
 
 declare namespace Snekfetch {
     interface SnekfetchOptions {
         headers?: { [key: string]: any };
-        data?: any;
+        data?: object | string | Buffer;
+        agent?: Agent | boolean;
+        qs?: object;
+        query?: object | string;
+        redirect?: boolean;
     }
 
-    interface Result {
+    interface SnekfetchResponse {
         request: ClientRequest;
-        body: Buffer;
-        text: string;
+        body: string | object | Buffer;
+        raw: Buffer;
         ok: boolean;
         headers: { [key: string]: any };
         status: number;
@@ -37,7 +41,6 @@ declare namespace Snekfetch {
         | 'HEAD'
         | 'LINK'
         | 'LOCK'
-        | 'M-SEARCH'
         | 'MERGE'
         | 'MKACTIVITY'
         | 'MKCALENDAR'
@@ -54,13 +57,13 @@ declare namespace Snekfetch {
         | 'REBIND'
         | 'REPORT'
         | 'SEARCH'
+        | 'SOURCE'
         | 'SUBSCRIBE'
         | 'TRACE'
         | 'UNBIND'
         | 'UNLINK'
         | 'UNLOCK'
-        | 'UNSUBSCRIBE'
-        | 'BREW';
+        | 'UNSUBSCRIBE';
 }
 
 declare class Snekfetch extends Readable {
@@ -69,7 +72,7 @@ declare class Snekfetch extends Readable {
 
     data: any;
     request: ClientRequest;
-    readonly response: Snekfetch.Result | null;
+    readonly response: Snekfetch.SnekfetchResponse | null;
 
     constructor(method: Snekfetch.methods, url: string, opts?: Snekfetch.SnekfetchOptions);
 
@@ -83,7 +86,6 @@ declare class Snekfetch extends Readable {
     static head(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
     static link(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
     static lock(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
-    static msearch(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
     static merge(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
     static mkactivity(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
     static mkcalendar(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
@@ -100,13 +102,13 @@ declare class Snekfetch extends Readable {
     static rebind(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
     static report(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
     static search(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static source(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
     static subscribe(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
     static trace(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
     static unbind(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
     static unlink(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
     static unlock(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
     static unsubscribe(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
-    static brew(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
 
     query(name: string | { [key: string]: string | string[] }, value?: string): Snekfetch;
 
@@ -116,13 +118,13 @@ declare class Snekfetch extends Readable {
 
     send(data?: string|Buffer|object): Snekfetch;
 
-    then(): Promise<Snekfetch.Result>;
-    then<T>(resolver: (res: Snekfetch.Result) => T, rejector?: (err: Error) => any): Promise<T>;
+    then(): Promise<Snekfetch.SnekfetchResponse>;
+    then<T>(resolver: (res: Snekfetch.SnekfetchResponse) => T, rejector?: (err: Error) => any): Promise<T>;
 
-    catch(rejector: (err: Error) => any): Promise<Snekfetch.Result>;
+    catch(rejector: (err: Error) => any): Promise<Snekfetch.SnekfetchResponse>;
 
-    end(): Promise<Snekfetch.Result>;
-    end<T>(cb: (err: Error | null, res: Snekfetch.Result | Error | null) => T): Promise<T>;
+    end(): Promise<Snekfetch.SnekfetchResponse>;
+    end<T>(cb: (err: Error | null, res: Snekfetch.SnekfetchResponse | Error | null) => T): Promise<T>;
 }
 
 export = Snekfetch;

From c755eb27cffb448bbdf2ce6737d32bb4b04fdf4a Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Fri, 18 May 2018 14:16:29 -0700
Subject: [PATCH 247/575] Mainly the bindings APIs

---
 types/office-js/index.d.ts | 263 ++++++++++++++++++++++++++++++++-----
 1 file changed, 230 insertions(+), 33 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index cee60e05fc..2aa0de0bb1 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -116,10 +116,53 @@ declare namespace Office {
         Universal
     }
     // Objects
-    export interface AsyncResult {
+        /**
+		* An object which encapsulates the result of an asynchronous request, including status and error information if the request failed.
+		* 
+        * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
+        *
+        * **Last changed in**: 1.1
+        * 
+        * @remarks
+        * When the function you pass to the `callback` parameter of an "Async" method executes, it receives an AsyncResult object that you can access from the `callback` function's only parameter.
+		*/
+        export interface AsyncResult {
+        /**
+        * Gets the user-defined item passed to the optional `asyncContext` parameter of the invoked method in the same state as it was passed in. This the user-defined item (which can be of any JavaScript type: String, Number, Boolean, Object, Array, Null, or Undefined) passed to the optional `asyncContext` parameter of the invoked method. Returns Undefined, if you didn't pass anything to the asyncContext parameter.
+        * 
+        * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
+        * 
+        * **Last changed in**: 1.1
+        */
         asyncContext: any;
+        /**
+        * Gets the [AsyncResultStatus](office.asyncresultstatus.md) of the asynchronous operation.
+        * 
+        * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
+        * 
+        * **Last changed in**: 1.1
+        */
         status: AsyncResultStatus;
+        /**
+        * Gets an [Error](office.error.md) object that provides a description of the error, if any error occurred.
+        * 
+        * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
+        * 
+        * **Last changed in**: 1.1
+        */
         error: Error;
+        /**
+        * Gets the payload or content of this asynchronous operation, if any.
+        * 
+        * Note: What the value property returns for a particular "Async" method varies depending on the purpose and context of that method. To determine what is returned by the value property for an "Async" method, refer to the "Callback value" section of the method's topic. For a complete listing of the "Async" methods, see the Remarks section of the AsyncResult object topic.
+        * 
+        * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
+        * 
+        * **Last changed in**: 1.1
+        * 
+        * @remarks
+        * You access the AsyncResult object in the function passed as the argument to the callback parameter of an "Async" method, such as the `getSelectedDataAsync` and `setSelectedDataAsync` methods of the Document object.
+        */
         value: any;
     }
     export interface Context {
@@ -351,11 +394,27 @@ declare namespace Office {
          */
         ActiveViewChanged,
         /**
-         * Triggers when a binding level data change happens
+         * Occurs when data within the binding is changed.
+         * 
+         * Hosts: Access, Excel, Word
+         * 
+         * Last changed in: 1.1
+         * 
+         * @remarks
+         * To add an event handler for the BindingDataChanged event of a binding, use the addHandlerAsync method of the Binding object. The event handler receives an argument of type BindingDataChangedEventArgs.
          */
         BindingDataChanged,
         /**
-         *  Triggers when a binding level selection happens
+         * Occurs when the selection is changed within the binding.
+         * 
+         * Hosts: Access, Excel, Word
+         * 
+         * Available in Requirement set: BindingEvents
+         * 
+         * Last changed in: 1.1
+         * 
+         * @remarks
+         * To add an event handler for the BindingSelectionChanged event of a binding, use the addHandlerAsync method of the Binding object. The event handler receives an argument of type BindingSelectionChangedEventArgs.
          */
         BindingSelectionChanged,
         /**
@@ -468,53 +527,150 @@ declare namespace Office {
         Formatted
     }
     // Objects
+    /**
+    * Represents a binding to a section of the document.
+    * 
+    * **Hosts**: Access, Excel, Word
+    * 
+    * **Available in Requirement sets**: MatrixBinding, TableBinding, TextBinding
+    * 
+    * **Last changed in**: 1.1
+    * 
+    * @remarks
+    * The Binding object exposes the functionality possessed by all bindings regardless of type.
+    * 
+    * The Binding object is never called directly. It is the abstract parent class of the objects that represent each type of binding: MatrixBinding, TableBinding, or TextBinding. All three of these objects inherit the getDataAsync and setDataAsync methods from the Binding object that enable to you interact with the data in the binding. They also inherit the id and type properties for querying those property values. Additionally, the MatrixBinding and TableBinding objects expose additional methods for matrix- and table-specific features, such as counting the number of rows and columns.
+    */
     export interface Binding {
+        /**
+        * Get the Document object associated with the binding.
+        * 
+        * **Hosts**: Access, Excel, Word
+        * 
+        * **Last changed in**: 1.1
+        */
         document: Document;
         /**
-         * Id of the Binding
+         * A string that uniquely identifies this binding among the bindings in the same Document object.
+         * 
+         * Hosts: Access, Excel, Word
+         * 
+         * Last changed in: 1.1
          */
         id: string;
+        /**
+		* Gets the type of the binding.
+		* 
+        * **Hosts**: Access, Excel, Word
+        
+		* **Last changed in**: 1.1
+		*/
         type: BindingType;
         /**
-         * Adds an event handler to the object using the specified event type.
-         * @param eventType The event type. For binding it can be 'bindingDataChanged' and 'bindingSelectionChanged'
-         * @param handler The name of the handler
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * Adds an event handler to the object for the specified event type.
+         * 
+         * @remarks
+         * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
+         * 
+         * @param eventType The event type. For example, for bindings, it can be **Office.EventType.BindingSelectionChanged**, **Office.EventType.BindingDataChanged**, or the corresponding text values of these enumerations.
+         * @param handler The event handler function to add.
+         * @param options  { asyncContext: context } Where context is an object of any type that keeps state for the callback.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Returns the current selection.
-         * @param options Syntax example: {coercionType: 'matrix,'valueFormat: 'formatted', filterType:'all'}
-         *       coercionType: The expected shape of the selection. If not specified returns the bindingType shape. Use Office.CoercionType or text value.
-         *       valueFormat: Get data with or without format. Use Office.ValueFormat or text value.
-         *       startRow: Used in partial get for table/matrix. Indicates the start row.
-         *       startColumn: Used in partial get for table/matrix. Indicates the start column.
-         *       rowCount: Used in partial get for table/matrix. Indicates the number of rows from the start row.
-         *       columnCount: Used in partial get for table/matrix. Indicates the number of columns from the start column.
-         *       filterType: Get the visible or all the data. Useful when filtering data. Use Office.FilterType or text value.
+         * Returns the data contained within the binding.
+         * 
+         * Hosts: Access, Excel, Word
+         * 
+         * Available in Requirement sets: MatrixBindings, TableBindings, TextBindings
+         * 
+         * Last changed in: 1.1
+         * 
+         * @remarks
+         * When called from a MatrixBinding or TableBinding, the getDataAsync method will return a subset of the bound values if the optional startRow, startColumn, rowCount, and columnCount parameters are specified (and they specify a contiguous and valid range).
+         * 
+         * @param options An object with any of the following (example: {coercionType: 'matrix, 'valueFormat: 'formatted', filterType:'all'}):
+         * 
+         *       coercionType: The expected shape of the selection. Use Office.CoercionType or text value. Default: The original, uncoerced type of the binding.
+         * 
+         *       valueFormat: Specifies whether values, such as numbers and dates, are returned with their formatting applied. Use Office.ValueFormat or text value. Default: Unformatted data.
+         * 
+         *       startRow: For table or matrix bindings, specifies the zero-based starting row for a subset of the data in the binding. Default is first row.
+         * 
+         *       startColumn: For table or matrix bindings, specifies the zero-based starting column for a subset of the data in the binding. Default is first column.
+         * 
+         *       rowCount: For table or matrix bindings, specifies the number of rows offset from the startRow. Default is all subsequent rows.
+         * 
+         *       columnCount: For table or matrix bindings, specifies the number of columns offset from the startColumn. Default is all subsequent columns.
+         * 
+         *       filterType: Specify whether to get only the visible (filtered in) data or all the data (default is all). Useful when filtering data. Use Office.FilterType or text value.
+         * 
          *       asyncContext: Object keeping state for the callback
+         * 
+         *       rows: Only for table bindings in content add-ins for Access. Specifies the pre-defined string "thisRow" to get data in the currently selected row.
+
          * @param callback The optional callback method
          */
         getDataAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Removes an event handler from the object using the specified event type.
+         * Removes the specified handler from the binding for the specified event type.
+         * 
+         * **Hosts**: Access, Excel, Word
+         * 
+         * **Available in Requirement set**: BindingEvents
+         * 
+         * **Last changed in**: 1.1
+         * 
          * @param eventType The event type. For binding can be 'bindingDataChanged' and 'bindingSelectionChanged'
-         * @param options Syntax example: {handler:eventHandler}
-         *       handler: Indicates a specific handler to be removed, if not specified all handlers are removed
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * @param options An object with any of the following:
+         * 
+         *       handler: The handler to be removed, if not specified all handlers are removed.
+         * 
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * 
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Writes the specified data into the current selection.
-         * @param data The data to be set. Either a string or value, 2d array or TableData object
-         * @param options Syntax example: {coercionType:Office.CoercionType.Matrix} or {coercionType: 'matrix'}
+         * Writes data to the bound section of the document represented by the specified binding object.
+         * 
+         * **Hosts**: Access, Excel, Word
+         * 
+         * **Available in Requirement sets**: MatrixBindings, TableBindings, TextBindings
+         * 
+         * **Last changed in**: 1.1
+         * 
+         * @param data The data to be set in the current selection. Possible data types by host:
+         * 
+         *        string: Excel, Excel Online, Word, and Word Online only
+         * 
+         *        array of arrays: Excel and Word only
+         * 
+         *        [TableData](office.tabledata.md): Access, Excel, and Word only
+         * 
+         *        HTML: Word and Word Online only
+         * 
+         *        Office Open XML: Word only
+         * 
+         * @param options Any of the following:
+         * 
+         *       cellFormat: For an inserted table, a list of key-value pairs that specify a range of columns, rows, or cells and the cell formatting to apply to that range.
+         * 
          *       coercionType: Explicitly sets the shape of the data object. Use Office.CoercionType or text value. If not supplied is inferred from the data type.
-         *       startRow: Used in partial set for table/matrix. Indicates the start row.
-         *       startColumn: Used in partial set for table/matrix. Indicates the start column.
-         *       asyncContext: Object keeping state for the callback
+         * 
+         *       columns: Only for table bindings in content add-ins for Access. Array of strings. Specifies the column names.
+         * 
+         *       rows: Only for table bindings in content add-ins for Access. **Office.TableRange.ThisRow** Specifies the pre-defined string "thisRow" to set data in the currently selected row.
+         * 
+         *       startRow: Specifies the zero-based starting row for a subset of the data in the binding. Only for table or matrix bindings. If omitted, data is set starting in the first row.
+         * 
+         *       startColumn: Specifies the zero-based starting column for a subset of the data. Only for table or matrix bindings. If omitted, data is set starting in the first column.
+         * 
+         *       tableOptions: For an inserted table, a list of key-value pairs that specify table formatting options, such as header row, total row, and banded rows.
+         * 
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * 
          * @param callback The optional callback method
          */
         setDataAsync(data: TableData | any, options?: any, callback?: (result: AsyncResult) => void): void;
@@ -847,8 +1003,38 @@ declare namespace Office {
          */
         url: string
     }
+    /**
+    * Represents a binding in two dimensions of rows and columns.
+    * 
+    * **Hosts**: Excel, Word
+    * 
+    * **Available in Requirement set**: MatrixBindings
+    * 
+    * **Last changed in**: 1.1
+    * 
+    * @remarks
+    * The MatrixBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object.
+    */
     export interface MatrixBinding extends Binding {
+        /**
+		* Gets the number of columns in the matrix data structure, as an integer value.
+		* 
+        * **Hosts**: Access, Excel, PowerPoint, Project, Word
+        * 
+        * Available in Requirement set: MatrixBindings
+        *
+		* **Last changed in**: 1.1
+		*/
         columnCount: number;
+        /**
+		* Gets the number of rows in the matrix data structure, as an integer value.
+		* 
+        * **Hosts**: Access, Excel, PowerPoint, Project, Word
+        * 
+        * Available in Requirement set: MatrixBindings
+        *
+		* **Last changed in**: 1.1
+		*/
         rowCount: number;
     }
     export interface Settings {
@@ -3083,22 +3269,33 @@ declare namespace Excel {
         /**
          *
          * Gets the Binding object that represents the binding that raised the SelectionChanged event.
+         * 
+         * **Hosts:** Access, Excel, Word
          *
          * [Api set: ExcelApi 1.2]
          */
         binding: Excel.Binding;
         /**
          *
-         * Gets the number of columns selected.
+         * Gets the number of columns selected. The number of columns selected. If a single cell is selected returns 1.
          *
          * [Api set: ExcelApi 1.2]
+         * 
+         * @remarks
+         * If the user makes a non-contiguous selection, the count for the last contiguous selection within the binding is returned.
+         * 
+         * For Word, this property will work only for bindings of BindingType "table". If the binding is of type "matrix", null is returned. Also, the call will fail if the table contains merged cells, because the structure of the table must be uniform for this property to work correctly.
          */
         columnCount: number;
         /**
-         *
-         * Gets the number of rows selected.
+         * Gets the number of columns selected. The number of columns selected. If a single cell is selected returns 1.
          *
          * [Api set: ExcelApi 1.2]
+         * 
+         * @remarks
+         * If the user makes a non-contiguous selection, the count for the last contiguous selection within the binding is returned.
+         * 
+         * For Word, this property will work only for bindings of BindingType "table". If the binding is of type "matrix", null is returned. Also, the call will fail if the table contains merged cells, because the structure of the table must be uniform for this property to work correctly.
          */
         rowCount: number;
         /**

From 88dcf587649c88e8734b33ce16e528fd5a9cd288 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Fri, 18 May 2018 14:16:57 -0700
Subject: [PATCH 248/575] Remove dependency on types not in ES5

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 9a9fc544e2..cdf49f39e1 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -6205,25 +6205,25 @@ declare module "util" {
         export function isInt8Array(object: any): object is Int8Array;
         export function isInt16Array(object: any): object is Int16Array;
         export function isInt32Array(object: any): object is Int32Array;
-        export function isMap(object: any): object is Map<any, any>;
+        export function isMap(object: any): boolean;
         export function isMapIterator(object: any): boolean;
         export function isNativeError(object: any): object is Error;
         export function isNumberObject(object: any): object is Number;
-        export function isPromise(object: any): object is Promise<any>;
+        export function isPromise(object: any): boolean;
         export function isProxy(object: any): boolean;
         export function isRegExp(object: any): object is RegExp;
-        export function isSet(object: any): object is Set<any>;
+        export function isSet(object: any): boolean;
         export function isSetIterator(object: any): boolean;
         export function isSharedArrayBuffer(object: any): boolean;
-        export function isStringObject(object: any): object is String;
-        export function isSymbolObject(object: any): object is Symbol;
+        export function isStringObject(object: any): boolean;
+        export function isSymbolObject(object: any): boolean;
         export function isTypedArray(object: any): object is Uint8Array | Uint8ClampedArray | Uint16Array | Uint32Array | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array;
         export function isUint8Array(object: any): object is Uint8Array;
         export function isUint8ClampedArray(object: any): object is Uint8ClampedArray;
         export function isUint16Array(object: any): object is Uint16Array;
         export function isUint32Array(object: any): object is Uint32Array;
-        export function isWeakMap(object: any): object is WeakMap<any, any>;
-        export function isWeakSet(object: any): object is WeakSet<any>;
+        export function isWeakMap(object: any): boolean;
+        export function isWeakSet(object: any): boolean;
         export function isWebAssemblyCompiledModule(object: any): boolean;
     }
 

From 83fb93d4f8e9667531e6c4ab5f20317ecf7482bc Mon Sep 17 00:00:00 2001
From: krasevych <krasevych@users.noreply.github.com>
Date: Sat, 19 May 2018 00:17:43 +0300
Subject: [PATCH 249/575] Add def for setAssetPrefix

there is Dynamic assetPrefix: https://github.com/zeit/next.js#dynamic-assetprefix
example: https://github.com/zeit/next.js/blob/373661aafae5707efb4e6645544d047b2fd0b04f/test/integration/custom-server/server.js
---
 types/next/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 036e9f58ce..34bdba9047 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -36,6 +36,7 @@ declare namespace next {
     }
 
     interface Server {
+        setAssetPrefix: (cdnUrl: string) => void;
         handleRequest(
             req: http.IncomingMessage,
             res: http.ServerResponse,

From 1def6a9af5379a95ea7c32e0e24a41b4fc6e8052 Mon Sep 17 00:00:00 2001
From: Charles Salmon <crs97@uclive.ac.nz>
Date: Sat, 19 May 2018 12:26:35 +1200
Subject: [PATCH 250/575] Add definitions for `react-youtube-embed`.

---
 types/react-youtube-embed/index.d.ts             | 16 ++++++++++++++++
 .../react-youtube-embed-tests.tsx                |  4 ++++
 types/react-youtube-embed/tsconfig.json          | 16 ++++++++++++++++
 types/react-youtube-embed/tslint.json            |  1 +
 4 files changed, 37 insertions(+)
 create mode 100644 types/react-youtube-embed/index.d.ts
 create mode 100644 types/react-youtube-embed/react-youtube-embed-tests.tsx
 create mode 100644 types/react-youtube-embed/tsconfig.json
 create mode 100644 types/react-youtube-embed/tslint.json

diff --git a/types/react-youtube-embed/index.d.ts b/types/react-youtube-embed/index.d.ts
new file mode 100644
index 0000000000..28088b4de3
--- /dev/null
+++ b/types/react-youtube-embed/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for react-youtube-embed 1.0
+// Project: https://github.com/escaladesports/react-youtube-embed#readme
+// Definitions by: Charles Salmon <https://github.com/charles-salmon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from "react";
+
+export interface YouTubeEmbedProps {
+    id: string;
+    aspectRatio?: string;
+    prependSrc?: string;
+    appendSrc?: string;
+    width?: number;
+}
+
+export default class YouTubeEmbed extends React.Component<YouTubeEmbedProps> {}
diff --git a/types/react-youtube-embed/react-youtube-embed-tests.tsx b/types/react-youtube-embed/react-youtube-embed-tests.tsx
new file mode 100644
index 0000000000..f520c4646b
--- /dev/null
+++ b/types/react-youtube-embed/react-youtube-embed-tests.tsx
@@ -0,0 +1,4 @@
+import * as React from "react";
+import YouTubeEmbed from "react-youtube-embed";
+
+const YouTubeEmbedExample = () => <YouTubeEmbed id="XlcOr7pWdFo" />;
diff --git a/types/react-youtube-embed/tsconfig.json b/types/react-youtube-embed/tsconfig.json
new file mode 100644
index 0000000000..0daaa332ed
--- /dev/null
+++ b/types/react-youtube-embed/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "react-youtube-embed-tests.tsx"]
+}
diff --git a/types/react-youtube-embed/tslint.json b/types/react-youtube-embed/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-youtube-embed/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From d56f5132940af577e615e68ce5e510526c8ee871 Mon Sep 17 00:00:00 2001
From: Charles Salmon <crs97@uclive.ac.nz>
Date: Sat, 19 May 2018 12:41:29 +1200
Subject: [PATCH 251/575] Add TS version and set `strictFunctionTypes` on
 `react-youtube-embed`.

---
 types/react-youtube-embed/index.d.ts    | 1 +
 types/react-youtube-embed/tsconfig.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/types/react-youtube-embed/index.d.ts b/types/react-youtube-embed/index.d.ts
index 28088b4de3..9fcb2f81cb 100644
--- a/types/react-youtube-embed/index.d.ts
+++ b/types/react-youtube-embed/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/escaladesports/react-youtube-embed#readme
 // Definitions by: Charles Salmon <https://github.com/charles-salmon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
 
 import * as React from "react";
 
diff --git a/types/react-youtube-embed/tsconfig.json b/types/react-youtube-embed/tsconfig.json
index 0daaa332ed..eb57aecf6c 100644
--- a/types/react-youtube-embed/tsconfig.json
+++ b/types/react-youtube-embed/tsconfig.json
@@ -5,6 +5,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "jsx": "react",
         "typeRoots": ["../"],

From 0496d0f94f491809a07b4f0a4cf88fdeb8f91b48 Mon Sep 17 00:00:00 2001
From: Ozum <ozum@ozum.net>
Date: Sat, 19 May 2018 12:26:06 +0300
Subject: [PATCH 252/575] create schwifty definitions

---
 types/schwifty/index.d.1.ts      | 83 ++++++++++++++++++++++++++++++++
 types/schwifty/index.d.ts        | 70 +++++++++++++++++++++++++++
 types/schwifty/package.json      |  6 +++
 types/schwifty/schwifty-tests.ts | 38 +++++++++++++++
 types/schwifty/test/dog.ts       | 14 ++++++
 types/schwifty/test/plugin.ts    | 18 +++++++
 types/schwifty/tsconfig.json     | 17 +++++++
 types/schwifty/tslint.json       |  1 +
 8 files changed, 247 insertions(+)
 create mode 100644 types/schwifty/index.d.1.ts
 create mode 100644 types/schwifty/index.d.ts
 create mode 100644 types/schwifty/package.json
 create mode 100644 types/schwifty/schwifty-tests.ts
 create mode 100644 types/schwifty/test/dog.ts
 create mode 100644 types/schwifty/test/plugin.ts
 create mode 100644 types/schwifty/tsconfig.json
 create mode 100644 types/schwifty/tslint.json

diff --git a/types/schwifty/index.d.1.ts b/types/schwifty/index.d.1.ts
new file mode 100644
index 0000000000..0580e5e1fb
--- /dev/null
+++ b/types/schwifty/index.d.1.ts
@@ -0,0 +1,83 @@
+// Type definitions for schwifty 4.0.
+// Project: https://github.com/hapipal/schwifty
+// Definitions by: ozum <https://github.com/ozum>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+// HELP WANTED: If possible, find a better way to define Server.models, Request.models and ResponseToolkit.models
+// They are dynamic types extended from SchwiftyModel.
+
+import * as Objection from "objection";
+import * as Joi from "joi";
+import {
+    Server,
+    Request,
+    ResponseToolkit,
+    Plugin,
+    ServerRegisterPluginObject
+} from "hapi";
+import * as Knex from "knex";
+
+type Model = typeof SchwiftyModel | typeof Objection.Model;
+
+declare class SchwiftyModel extends Objection.Model {
+    static getJoiSchema(patch?: boolean): Joi.Schema;
+    joiSchema: Joi.Schema;
+}
+
+interface RegistrationOptions {
+    knex?: Knex | Knex.Config;
+    models?: Array<Model> | string;
+    migrationsDir?: string;
+    teardownOnStop?: boolean;
+    migrateOnStart?: boolean | "latest" | "rollback";
+}
+
+interface SchwiftyExtras {
+    assertCompatible: (
+        ModelA: typeof SchwiftyModel,
+        ModelB: typeof SchwiftyModel,
+        message?: string
+    ) => void | Error;
+    Model: typeof SchwiftyModel;
+}
+
+declare const Schwifty: Plugin<RegistrationOptions> & SchwiftyExtras;
+
+export const plugin: Plugin<RegistrationOptions>;
+
+//export = Schwifty;
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                      Hapi Decorations                                     +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
+/**
+ * Merge decorations into hapi objects.
+ */
+declare module "hapi" {
+    interface Server {
+        schwifty: (
+            config:
+                | Model
+                | Array<Model>
+                | {
+                      knex: Knex | Knex.Config;
+                      models: Array<Model>;
+                      migrationsDir: string;
+                  }
+        ) => void;
+        knex: () => Knex;
+        models: (all?: boolean) => { [key: string]: typeof SchwiftyModel };
+    }
+
+    interface Request {
+        knex: () => Knex;
+        models: (all?: boolean) => { [key: string]: typeof SchwiftyModel };
+    }
+
+    interface ResponseToolkit {
+        knex: () => Knex;
+        models: (all?: boolean) => { [key: string]: typeof SchwiftyModel };
+    }
+}
diff --git a/types/schwifty/index.d.ts b/types/schwifty/index.d.ts
new file mode 100644
index 0000000000..e95de1af55
--- /dev/null
+++ b/types/schwifty/index.d.ts
@@ -0,0 +1,70 @@
+// Type definitions for schwifty 4.0
+// Project: https://github.com/hapipal/schwifty
+// Definitions by: ozum <https://github.com/ozum>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+// HELP NEEDED: If possible, find a better way to define Server.models, Request.models and ResponseToolkit.models
+// They are dynamic types extended from SchwiftyModel.
+
+import * as Objection from "objection";
+import * as Joi from "joi";
+import { Server, Request, ResponseToolkit, Plugin } from "hapi";
+import * as Knex from "knex";
+
+export type ModelClass = typeof Model | typeof Objection.Model;
+
+export class Model extends Objection.Model {
+    static getJoiSchema(patch?: boolean): Joi.Schema;
+    joiSchema: Joi.Schema;
+}
+
+export interface RegistrationOptions {
+    knex?: Knex | Knex.Config;
+    models?: ModelClass[] | string;
+    migrationsDir?: string;
+    teardownOnStop?: boolean;
+    migrateOnStart?: boolean | "latest" | "rollback";
+}
+
+export function assertCompatible(
+    ModelA: typeof Model,
+    ModelB: typeof Model,
+    message?: string
+): void | Error;
+
+export const plugin: Plugin<RegistrationOptions>;
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +                      Hapi Decorations                                     +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
+/**
+ * Merge decorations into hapi objects.
+ */
+declare module "hapi" {
+    interface Server {
+        schwifty: (
+            config:
+                | ModelClass
+                | ModelClass[]
+                | {
+                      knex: Knex | Knex.Config;
+                      models: ModelClass[];
+                      migrationsDir: string;
+                  }
+        ) => void;
+        knex: () => Knex;
+        models: (all?: boolean) => { [key: string]: typeof Model };
+    }
+
+    interface Request {
+        knex: () => Knex;
+        models: (all?: boolean) => { [key: string]: typeof Model };
+    }
+
+    interface ResponseToolkit {
+        knex: () => Knex;
+        models: (all?: boolean) => { [key: string]: typeof Model };
+    }
+}
diff --git a/types/schwifty/package.json b/types/schwifty/package.json
new file mode 100644
index 0000000000..37b2fc1558
--- /dev/null
+++ b/types/schwifty/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "objection": "^1.1.8"
+    }
+}
diff --git a/types/schwifty/schwifty-tests.ts b/types/schwifty/schwifty-tests.ts
new file mode 100644
index 0000000000..afdcda5441
--- /dev/null
+++ b/types/schwifty/schwifty-tests.ts
@@ -0,0 +1,38 @@
+import * as Hapi from "hapi";
+import * as Joi from "joi";
+import * as Schwifty from "schwifty";
+import DogClass from "./test/dog";
+
+(async () => {
+    const server = new Hapi.Server({ port: 3000 });
+
+    await server.register(Schwifty);
+    await server.register({
+        plugin: Schwifty.plugin,
+        options: {
+            knex: {
+                client: "sqlite3",
+                useNullAsDefault: true,
+                connection: {
+                    filename: ":memory:"
+                }
+            }
+        }
+    });
+
+    Schwifty.assertCompatible(DogClass, DogClass);
+    // Register a model with schwifty...
+
+    server.schwifty(DogClass);
+
+    await server.initialize();
+    const Dog: typeof DogClass = server.models().Dog;
+
+    await Dog.query().insert({ name: "Guinness" });
+
+    // ... then start the server!
+
+    await server.start();
+
+    console.log(`Now, go find some dogs at ${server.info.uri}!`);
+})();
diff --git a/types/schwifty/test/dog.ts b/types/schwifty/test/dog.ts
new file mode 100644
index 0000000000..33fe2402e3
--- /dev/null
+++ b/types/schwifty/test/dog.ts
@@ -0,0 +1,14 @@
+import * as Joi from "joi";
+import * as Schwifty from "schwifty";
+
+export default class Dog extends Schwifty.Model {
+    static tableName = "Dog";
+
+    joiSchema: Joi.Schema = Joi.object({
+        id: Joi.number(),
+        name: Joi.string()
+    });
+
+    id?: number;
+    name?: string;
+}
diff --git a/types/schwifty/test/plugin.ts b/types/schwifty/test/plugin.ts
new file mode 100644
index 0000000000..0b3e9b189b
--- /dev/null
+++ b/types/schwifty/test/plugin.ts
@@ -0,0 +1,18 @@
+import * as Hapi from "hapi";
+import * as Schwifty from "schwifty";
+import DogModel from "./dog";
+
+exports.plugin = {
+    register: async (
+        server: Hapi.Server,
+        options: { Model: Schwifty.Model }
+    ) => {
+        await server.register(Schwifty);
+
+        if (options.Model) {
+            Schwifty.assertCompatible(options.Model, DogModel);
+        }
+
+        server.schwifty(options.Model || DogModel);
+    }
+};
diff --git a/types/schwifty/tsconfig.json b/types/schwifty/tsconfig.json
new file mode 100644
index 0000000000..ff73409893
--- /dev/null
+++ b/types/schwifty/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "target": "es6",
+        "strictFunctionTypes": true
+    },
+    "files": ["index.d.ts", "schwifty-tests.ts"]
+}
diff --git a/types/schwifty/tslint.json b/types/schwifty/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/schwifty/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 48fc5d3017122927680094e06d6b1e5041f1fb9f Mon Sep 17 00:00:00 2001
From: Ozum <ozum@ozum.net>
Date: Sat, 19 May 2018 12:52:04 +0300
Subject: [PATCH 253/575] delete package.json

---
 types/schwifty/index.d.1.ts      | 83 --------------------------------
 types/schwifty/package.json      |  6 ---
 types/schwifty/schwifty-tests.ts |  8 +--
 types/schwifty/test/plugin.ts    |  2 +-
 types/schwifty/tsconfig.json     |  7 ++-
 5 files changed, 11 insertions(+), 95 deletions(-)
 delete mode 100644 types/schwifty/index.d.1.ts
 delete mode 100644 types/schwifty/package.json

diff --git a/types/schwifty/index.d.1.ts b/types/schwifty/index.d.1.ts
deleted file mode 100644
index 0580e5e1fb..0000000000
--- a/types/schwifty/index.d.1.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-// Type definitions for schwifty 4.0.
-// Project: https://github.com/hapipal/schwifty
-// Definitions by: ozum <https://github.com/ozum>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
-
-// HELP WANTED: If possible, find a better way to define Server.models, Request.models and ResponseToolkit.models
-// They are dynamic types extended from SchwiftyModel.
-
-import * as Objection from "objection";
-import * as Joi from "joi";
-import {
-    Server,
-    Request,
-    ResponseToolkit,
-    Plugin,
-    ServerRegisterPluginObject
-} from "hapi";
-import * as Knex from "knex";
-
-type Model = typeof SchwiftyModel | typeof Objection.Model;
-
-declare class SchwiftyModel extends Objection.Model {
-    static getJoiSchema(patch?: boolean): Joi.Schema;
-    joiSchema: Joi.Schema;
-}
-
-interface RegistrationOptions {
-    knex?: Knex | Knex.Config;
-    models?: Array<Model> | string;
-    migrationsDir?: string;
-    teardownOnStop?: boolean;
-    migrateOnStart?: boolean | "latest" | "rollback";
-}
-
-interface SchwiftyExtras {
-    assertCompatible: (
-        ModelA: typeof SchwiftyModel,
-        ModelB: typeof SchwiftyModel,
-        message?: string
-    ) => void | Error;
-    Model: typeof SchwiftyModel;
-}
-
-declare const Schwifty: Plugin<RegistrationOptions> & SchwiftyExtras;
-
-export const plugin: Plugin<RegistrationOptions>;
-
-//export = Schwifty;
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- +                      Hapi Decorations                                     +
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-
-/**
- * Merge decorations into hapi objects.
- */
-declare module "hapi" {
-    interface Server {
-        schwifty: (
-            config:
-                | Model
-                | Array<Model>
-                | {
-                      knex: Knex | Knex.Config;
-                      models: Array<Model>;
-                      migrationsDir: string;
-                  }
-        ) => void;
-        knex: () => Knex;
-        models: (all?: boolean) => { [key: string]: typeof SchwiftyModel };
-    }
-
-    interface Request {
-        knex: () => Knex;
-        models: (all?: boolean) => { [key: string]: typeof SchwiftyModel };
-    }
-
-    interface ResponseToolkit {
-        knex: () => Knex;
-        models: (all?: boolean) => { [key: string]: typeof SchwiftyModel };
-    }
-}
diff --git a/types/schwifty/package.json b/types/schwifty/package.json
deleted file mode 100644
index 37b2fc1558..0000000000
--- a/types/schwifty/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "objection": "^1.1.8"
-    }
-}
diff --git a/types/schwifty/schwifty-tests.ts b/types/schwifty/schwifty-tests.ts
index afdcda5441..39d06c6f09 100644
--- a/types/schwifty/schwifty-tests.ts
+++ b/types/schwifty/schwifty-tests.ts
@@ -1,7 +1,7 @@
 import * as Hapi from "hapi";
 import * as Joi from "joi";
 import * as Schwifty from "schwifty";
-import DogClass from "./test/dog";
+import DogModel from "./test/dog";
 
 (async () => {
     const server = new Hapi.Server({ port: 3000 });
@@ -20,13 +20,13 @@ import DogClass from "./test/dog";
         }
     });
 
-    Schwifty.assertCompatible(DogClass, DogClass);
+    Schwifty.assertCompatible(DogModel, DogModel);
     // Register a model with schwifty...
 
-    server.schwifty(DogClass);
+    server.schwifty(DogModel);
 
     await server.initialize();
-    const Dog: typeof DogClass = server.models().Dog;
+    const Dog: typeof DogModel = server.models().Dog;
 
     await Dog.query().insert({ name: "Guinness" });
 
diff --git a/types/schwifty/test/plugin.ts b/types/schwifty/test/plugin.ts
index 0b3e9b189b..e2523f7161 100644
--- a/types/schwifty/test/plugin.ts
+++ b/types/schwifty/test/plugin.ts
@@ -5,7 +5,7 @@ import DogModel from "./dog";
 exports.plugin = {
     register: async (
         server: Hapi.Server,
-        options: { Model: Schwifty.Model }
+        options: { Model: typeof Schwifty.Model }
     ) => {
         await server.register(Schwifty);
 
diff --git a/types/schwifty/tsconfig.json b/types/schwifty/tsconfig.json
index ff73409893..d7117c5fd2 100644
--- a/types/schwifty/tsconfig.json
+++ b/types/schwifty/tsconfig.json
@@ -13,5 +13,10 @@
         "target": "es6",
         "strictFunctionTypes": true
     },
-    "files": ["index.d.ts", "schwifty-tests.ts"]
+    "files": [
+        "index.d.ts",
+        "schwifty-tests.ts",
+        "test/dog.ts",
+        "test/plugin.ts"
+    ]
 }

From 8dbab0928bf397905711bba79473622af9822ab2 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentl@theodo.fr>
Date: Sat, 19 May 2018 14:22:25 +0200
Subject: [PATCH 254/575] Remove layoutProps

---
 types/react-native/legacy-properties.d.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/types/react-native/legacy-properties.d.ts b/types/react-native/legacy-properties.d.ts
index eae30f65c7..ab87361485 100644
--- a/types/react-native/legacy-properties.d.ts
+++ b/types/react-native/legacy-properties.d.ts
@@ -1,5 +1,4 @@
 import {
-    LayoutProps,
     TextProps,
     TextPropsIOS,
     TextPropsAndroid,
@@ -77,9 +76,6 @@ declare module "react-native" {
      * The following lines ensure compatibility with *Properties and should be removed in the future
      */
 
-    /** @deprecated Use LayoutProps */
-    export type LayoutProperties = LayoutProps;
-
     /** @deprecated Use TextProps */
     export type TextProperties = TextProps;
 

From ee04278cb856cc5ca1f906ff6f0713d6bf24b838 Mon Sep 17 00:00:00 2001
From: Dmitrii Sorin <info@staypositive.ru>
Date: Sun, 20 May 2018 10:22:33 +1000
Subject: [PATCH 255/575] Add multiple forgotten mocha API methods

---
 types/mocha/index.d.ts     | 293 ++++++++++++++++++++++++++++++-------
 types/mocha/mocha-tests.ts |  34 +++--
 2 files changed, 259 insertions(+), 68 deletions(-)

diff --git a/types/mocha/index.d.ts b/types/mocha/index.d.ts
index 0e066791eb..2dd6bb2c21 100644
--- a/types/mocha/index.d.ts
+++ b/types/mocha/index.d.ts
@@ -5,10 +5,28 @@
 //                 jt000 <https://github.com/jt000>
 //                 Vadim Macagon <https://github.com/enlight>
 //                 Andrew Bradley <https://github.com/cspotcode>
+//                 Dmitrii Sorin <https://github.com/1999>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-interface MochaSetupOptions {
+/**
+ * Mocha is using node.js EventEmitter for its internal classes
+ * But when it's executed in the browser environment it bundles a 3rd party EventEmitter in its code
+ * Also node.js EventEmitter brings its globals which cannot be used in the browser environment.
+ * So it's unsafe to reference node EventEmitter here, that's why we have a generic interface for EventEmitter.
+ *
+ * @see https://github.com/DefinitelyTyped/DefinitelyTyped/pull/25117#issuecomment-383404187
+ */
+declare class GenericEventEmitter {
+    addListener(event: string, listener: (...args: any[]) => void): GenericEventEmitter;
+    on(event: string, listener: (...args: any[]) => void): GenericEventEmitter;
+    once(event: string, listener: (...args: any[]) => void): GenericEventEmitter;
+    removeListener(event: string, listener: (...args: any[]) => void): GenericEventEmitter;
+    removeAllListeners(event?: string): GenericEventEmitter;
+    emit(event: string, ...args: any[]): boolean;
+  }
+
+  interface MochaSetupOptions {
     // milliseconds to wait before considering a test slow
     slow?: number;
 
@@ -35,61 +53,67 @@ interface MochaSetupOptions {
 
     // require modules before running tests
     require?: string[];
-}
 
-declare const mocha: Mocha;
-declare const describe: Mocha.IContextDefinition;
-declare const xdescribe: Mocha.IContextDefinition;
-// alias for `describe`
-declare const context: Mocha.IContextDefinition;
-// alias for `describe`
-declare const suite: Mocha.IContextDefinition;
-declare const it: Mocha.ITestDefinition;
-declare const xit: Mocha.ITestDefinition;
-// alias for `it`
-declare const test: Mocha.ITestDefinition;
-declare const specify: Mocha.ITestDefinition;
+    asyncOnly?: boolean;
+    delay?: boolean;
+    files?: string[];
+    forbidOnly?: boolean;
+    forbidPending?: boolean;
+    fullStackTrace?: boolean;
+    hasOnly?: boolean;
+  }
 
-// Used with the --delay flag; see https://mochajs.org/#hooks
-declare function run(): void;
+  declare const mocha: Mocha;
+  declare const describe: Mocha.IContextDefinition;
+  declare const xdescribe: Mocha.IContextDefinition;
+  // alias for `describe`
+  declare const context: Mocha.IContextDefinition;
+  // alias for `describe`
+  declare const suite: Mocha.IContextDefinition;
+  declare const it: Mocha.ITestDefinition;
+  declare const xit: Mocha.ITestDefinition;
+  // alias for `it`
+  declare const test: Mocha.ITestDefinition;
+  declare const specify: Mocha.ITestDefinition;
 
-type MochaDone = (error?: any) => void;
+  // Used with the --delay flag; see https://mochajs.org/#hooks
+  declare function run(): void;
 
-declare function setup(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
-declare function teardown(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
-declare function suiteSetup(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
-declare function suiteTeardown(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
-declare function before(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
-declare function before(description: string, callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
-declare function after(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
-declare function after(description: string, callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
-declare function beforeEach(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
-declare function beforeEach(description: string, callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
-declare function afterEach(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
-declare function afterEach(description: string, callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+  type MochaDone = (error?: any) => void;
 
-interface ReporterConstructor {
+  declare function setup(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+  declare function teardown(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+  declare function suiteSetup(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+  declare function suiteTeardown(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+  declare function before(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+  declare function before(description: string, callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+  declare function after(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+  declare function after(description: string, callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+  declare function beforeEach(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+  declare function beforeEach(description: string, callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+  declare function afterEach(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+  declare function afterEach(description: string, callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+
+  interface ReporterConstructor {
     new(runner: Mocha.IRunner, options: any): any;
-}
+  }
 
-declare class Mocha {
+  declare class Mocha {
     currentTest: Mocha.ITestDefinition;
     suite: Mocha.ISuite;
+    files: string[];
+    options: MochaSetupOptions;
 
-    constructor(options?: {
-        grep?: RegExp;
-        ui?: string;
-        reporter?: string | ReporterConstructor;
-        timeout?: number;
-        reporterOptions?: any;
-        slow?: number;
-        bail?: boolean;
-    });
+    constructor(options?: MochaSetupOptions);
 
+    asyncOnly(): Mocha;
+    asyncOnly(value: boolean): Mocha;
+    delay(): Mocha;
+    forbidOnly(): Mocha;
+    forbidPending(): Mocha;
+    fullTrace(): Mocha;
     /** Setup mocha with the given interface. */
     setup(interface: Mocha.Interface): Mocha;
-    /** Setup mocha with the given options. */
-    setup(options: MochaSetupOptions): Mocha;
     bail(value?: boolean): Mocha;
     addFile(file: string): Mocha;
     /** Sets reporter by name, defaults to "spec". */
@@ -117,15 +141,22 @@ declare class Mocha {
     timeout(value: number): Mocha;
     slow(value: number): Mocha;
     enableTimeouts(value: boolean): Mocha;
-    asyncOnly(value: boolean): Mocha;
     noHighlighting(value: boolean): Mocha;
     /** Runs tests and invokes `onComplete()` when finished. */
     run(onComplete?: (failures: number) => void): Mocha.IRunner;
     loadFiles(cb?: () => any): void;
-}
 
-// merge the Mocha class declaration with a module
-declare namespace Mocha {
+    // internals exposed via exports.*
+    Runnable: Mocha.Runnable;
+    Context: Mocha.Context;
+    Runner: Mocha.Runner;
+    Suite: Mocha.Suite;
+    Hook: Mocha.Hook;
+    Test: Mocha.Test;
+  }
+
+  // merge the Mocha class declaration with a module
+  declare namespace Mocha {
     /** Third-party declarations that want to add new interfaces can contribute names here */
     interface InterfaceContributions {
         bdd: any;
@@ -136,6 +167,22 @@ declare namespace Mocha {
 
     type Interface = keyof InterfaceContributions;
 
+    interface IContext {
+        _runnable?: IRunnable;
+        test?: IRunnable;
+
+        runnable(): IRunnable | undefined;
+        runnable(runnable: IRunnable): IContext;
+        timeout(): number;
+        timeout(timeout: number): IContext;
+        enableTimeouts(enableTimeouts: boolean): IContext;
+        slow(slow: number): IContext;
+        skip(): IContext;
+        retries(): number;
+        retries(retries: number): IContext;
+        inspect(): string;
+    }
+
     interface ISuiteCallbackContext {
         timeout(ms: number | string): this;
         retries(n: number): this;
@@ -157,7 +204,7 @@ declare namespace Mocha {
     }
 
     /** Partial interface for Mocha's `Runnable` class. */
-    interface IRunnable {
+    interface IRunnable extends GenericEventEmitter {
         title: string;
         fn: Function;
         async: boolean;
@@ -169,22 +216,49 @@ declare namespace Mocha {
 
     /** Partial interface for Mocha's `Suite` class. */
     interface ISuite {
+        ctx: IContext;
         parent: ISuite;
+        root: boolean;
         title: string;
         suites: ISuite[];
+        tests: ITest[];
 
+        _beforeEach: IHook[];
+        _beforeAll: IHook[];
+        _afterEach: IHook[];
+        _afterAll: IHook[];
+
+        bail(): boolean;
+        bail(bail: boolean): ISuite;
         fullTitle(): string;
+        retries(): number;
+        retries(retries: number): ISuite;
+        slow(): number;
+        slow(slow: number): ISuite;
+        timeout(): number;
+        timeout(timeout: number): ISuite;
     }
 
     /** Partial interface for Mocha's `Test` class. */
     interface ITest extends IRunnable {
+        body?: string;
+        file?: string;
         parent: ISuite;
         pending: boolean;
         state: 'failed' | 'passed' | undefined;
+        type: 'test';
 
         fullTitle(): string;
     }
 
+    interface IHook extends IRunnable {
+        ctx?: IContext;
+        parent?: ISuite;
+        type: 'hook';
+
+        error(err: Error): void;
+    }
+
     interface IBeforeAndAfterContext extends IHookCallbackContext {
         currentTest: ITest;
     }
@@ -201,12 +275,19 @@ declare namespace Mocha {
     }
 
     /** Partial interface for Mocha's `Runner` class. */
-    interface IRunner {
+    interface IRunner extends GenericEventEmitter {
+        asyncOnly?: boolean;
         stats?: IStats;
         started: boolean;
         suite: ISuite;
         total: number;
         failures: number;
+        forbidOnly?: boolean;
+        forbidPending?: boolean;
+        fullStackTrace?: boolean;
+        hasOnly?: boolean;
+        ignoreLeaks?: boolean;
+
         grep: (re: string, invert: boolean) => this;
         grepTotal: (suite: ISuite) => number;
         globals: (arr: ReadonlyArray<string>) => this | string[];
@@ -231,6 +312,7 @@ declare namespace Mocha {
 
     namespace reporters {
         class Base {
+            runner: IRunner;
             stats: IStats;
 
             constructor(runner: IRunner);
@@ -326,8 +408,115 @@ declare namespace Mocha {
     function afterEach(callback: (this: IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
     /** Only available when invoked via the mocha CLI */
     function afterEach(description: string, callback: (this: IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
-}
 
-declare module "mocha" {
+    class Runnable extends GenericEventEmitter {
+        new(title: string, fn: () => any): IRunnable;
+    }
+
+    class Context implements IContext {
+        constructor();
+
+        _runnable?: IRunnable;
+        test?: IRunnable;
+
+        runnable(): IRunnable | undefined;
+        runnable(runnable: IRunnable): IContext;
+        timeout(): number;
+        timeout(timeout: number): IContext;
+        enableTimeouts(enableTimeouts: boolean): IContext;
+        slow(slow: number): IContext;
+        skip(): IContext;
+        retries(): number;
+        retries(retries: number): IContext;
+        inspect(): string;
+    }
+
+    class Runner extends GenericEventEmitter implements IRunner {
+        constructor(suite: ISuite, delay: boolean);
+
+        asyncOnly?: boolean;
+        stats?: IStats;
+        started: boolean;
+        suite: ISuite;
+        total: number;
+        failures: number;
+        forbidOnly?: boolean;
+        forbidPending?: boolean;
+        fullStackTrace?: boolean;
+        hasOnly?: boolean;
+        ignoreLeaks?: boolean;
+
+        grep: (re: string, invert: boolean) => this;
+        grepTotal: (suite: ISuite) => number;
+        globals: (arr: ReadonlyArray<string>) => this | string[];
+        abort: () => this;
+        run: (fn?: (failures: number) => void) => this;
+    }
+
+    class Suite extends GenericEventEmitter implements ISuite {
+        constructor(title: string, parentContext: IContext);
+
+        ctx: IContext;
+        parent: ISuite;
+        root: boolean;
+        title: string;
+        suites: ISuite[];
+        tests: ITest[];
+
+        _beforeEach: IHook[];
+        _beforeAll: IHook[];
+        _afterEach: IHook[];
+        _afterAll: IHook[];
+
+        bail(): boolean;
+        bail(bail: boolean): ISuite;
+        fullTitle(): string;
+        retries(): number;
+        retries(retries: number): ISuite;
+        slow(): number;
+        slow(slow: number): ISuite;
+        timeout(): number;
+        timeout(timeout: number): ISuite;
+    }
+
+    class Hook extends Runnable implements IHook {
+        constructor(title: string, fn: () => any);
+
+        async: boolean;
+        ctx?: IContext;
+        duration?: number;
+        fn: Function;
+        parent?: ISuite;
+        sync: boolean;
+        timedOut: boolean;
+        timeout(n: number | string): this;
+        title: string;
+        type: 'hook';
+
+        error(err: Error): void;
+    }
+
+    class Test extends Runnable implements ITest {
+        constructor(title: string, fn: () => any);
+
+        async: boolean;
+        body?: string;
+        duration?: number;
+        file?: string;
+        fn: Function;
+        parent: ISuite;
+        pending: boolean;
+        state: 'failed' | 'passed' | undefined;
+        sync: boolean;
+        timedOut: boolean;
+        timeout(n: number | string): this;
+        title: string;
+        type: 'test';
+
+        fullTitle(): string;
+    }
+  }
+
+  declare module "mocha" {
     export = Mocha;
-}
+  }
diff --git a/types/mocha/mocha-tests.ts b/types/mocha/mocha-tests.ts
index f2fa323f19..ec9b238d80 100644
--- a/types/mocha/mocha-tests.ts
+++ b/types/mocha/mocha-tests.ts
@@ -7,9 +7,12 @@ import {
     describe as importedDescribe,
     it as importedIt,
     xdescribe as importedXdescribe,
-    xit as importedXit
+    xit as importedXit,
 } from 'mocha';
 
+// tslint:disable-next-line
+import * as Mocha from 'mocha';
+
 // Warning!!
 // Don't refer node.d.ts!!
 // See #22510.
@@ -454,55 +457,55 @@ function test_reporter_function() {
 }
 
 function test_setup_slow_option() {
-    mocha.setup({ slow: 25 });
+    new Mocha({ slow: 25 });
 }
 
 function test_setup_timeout_option() {
-    mocha.setup({ timeout: 25 });
+    new Mocha({ timeout: 25 });
 }
 
 function test_setup_globals_option() {
-    mocha.setup({ globals: ['mocha'] });
+    new Mocha({ globals: ['mocha'] });
 }
 
 function test_setup_ui_option() {
-    mocha.setup({ ui: 'bdd' });
+    new Mocha({ ui: 'bdd' });
 }
 
 function test_setup_reporter_string_option() {
-    mocha.setup({ reporter: 'html' });
+    new Mocha({ reporter: 'html' });
 }
 
 function test_setup_require_stringArray_option() {
-    mocha.setup({ require: ['ts-node/register'] });
+    new Mocha({ require: ['ts-node/register'] });
 }
 
 function test_setup_reporter_function_option() {
-    mocha.setup({ reporter: class { } });
+    new Mocha({ reporter: class { } });
 }
 
 function test_setup_bail_option() {
-    mocha.setup({ bail: false });
+    new Mocha({ bail: false });
 }
 
 function test_setup_ignore_leaks_option() {
-    mocha.setup({ ignoreLeaks: false });
+    new Mocha({ ignoreLeaks: false });
 }
 
 function test_setup_grep_string_option() {
-    mocha.setup({ grep: "describe" });
+    new Mocha({ grep: "describe" });
 }
 
 function test_setup_grep_regex_option() {
-    mocha.setup({ grep: new RegExp('describe') });
+    new Mocha({ grep: new RegExp('describe') });
 }
 
 function test_setup_grep_regex_literal_option() {
-    mocha.setup({ grep: /(expect|should)/i });
+    new Mocha({ grep: /(expect|should)/i });
 }
 
 function test_setup_all_options() {
-    mocha.setup({
+    new Mocha({
         slow: 25,
         timeout: 25,
         ui: 'bdd',
@@ -524,8 +527,7 @@ function test_growl() {
 }
 
 function test_chaining() {
-    mocha
-        .setup({ slow: 25 })
+    new Mocha({ slow: 25 })
         .growl()
         .reporter('html')
         .reporter(class { });

From 176ec5a72986c115775193316378d3ea692b0b6c Mon Sep 17 00:00:00 2001
From: Thomas Wanzek <t808@Toms-MacBook-Pro.local>
Date: Sat, 19 May 2018 23:51:18 -0400
Subject: [PATCH 256/575] doc(d3-color): complete JSDoc comments

---
 types/d3-color/index.d.ts | 412 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 409 insertions(+), 3 deletions(-)

diff --git a/types/d3-color/index.d.ts b/types/d3-color/index.d.ts
index 56812a6bdb..05cd974c1f 100644
--- a/types/d3-color/index.d.ts
+++ b/types/d3-color/index.d.ts
@@ -23,20 +23,60 @@ export type ColorSpaceObject = RGBColor | HSLColor | LabColor | HCLColor | Cubeh
  * e.g. in d3-hsv). This interface
  */
 export interface ColorCommonInstance {
+    /**
+     * Returns true if and only if the color is displayable on standard hardware.
+     * For example, this returns false for an RGB color if any channel value is less than zero or greater than 255, or if the opacity is not in the range [0, 1].
+     */
     displayable(): boolean;
+    /**
+     * Returns a string representing this color according to the CSS Object Model specification,
+     * such as rgb(247, 234, 186) or rgba(247, 234, 186, 0.2).
+     * If this color is not displayable, a suitable displayable color is returned instead.
+     * For example, RGB channel values greater than 255 are clamped to 255.
+     */
     toString(): string;
+    /**
+     * Returns a brighter copy of this color. If k is specified, it controls how much brighter the returned color should be.
+     * If k is not specified, it defaults to 1. The behavior of this method is dependent on the implementing color space.
+     *
+     * @param k A color space dependent number to determine, how much brighter the returned color should be.
+     */
     brighter(k?: number): this;
+    /**
+     * Returns a darker copy of this color. If k is specified, it controls how much darker the returned color should be.
+     * If k is not specified, it defaults to 1. The behavior of this method is dependent on the implementing color space.
+     *
+     * @param k A color space dependent number to determine, how much darker the returned color should be.
+     */
     darker(k?: number): this;
+    /**
+     * Returns the RGB equivalent of this color. For RGB colors, that’s "this".
+     */
     rgb(): RGBColor;
     /**
      * Returns a hexadecimal string representing this color.
-     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
+     * If this color is not displayable, a suitable displayable color is returned instead.
+     * For example, RGB channel values greater than 255 are clamped to 255.
      */
     hex(): string;
 }
 
+/**
+ * A Color object which serves as a base class for
+ * colorspace-specific sub-class implementations.
+ */
 export interface Color {
+    /**
+     * Returns true if and only if the color is displayable on standard hardware.
+     * For example, this returns false for an RGB color if any channel value is less than zero or greater than 255, or if the opacity is not in the range [0, 1].
+     */
     displayable(): boolean; // Note: While this method is used in prototyping for colors of specific colorspaces, it should not be called directly, as 'this.rgb' would not be implemented on Color
+    /**
+     * Returns a string representing this color according to the CSS Object Model specification,
+     * such as rgb(247, 234, 186) or rgba(247, 234, 186, 0.2).
+     * If this color is not displayable, a suitable displayable color is returned instead.
+     * For example, RGB channel values greater than 255 are clamped to 255.
+     */
     toString(): string; // Note: While this method is used in prototyping for colors of specific colorspaces, it should not be called directly, as 'this.rgb' would not be implemented on Color
     /**
      * Returns a hexadecimal string representing this color.
@@ -45,18 +85,62 @@ export interface Color {
     hex(): string;
 }
 
+/**
+ * A Color factory object, which may also be used with instanceof to test if an object is a color instance.
+ */
 export interface ColorFactory extends Function {
+    /**
+     * Parses the specified CSS Color Module Level 3 specifier string, returning an RGB or HSL color.
+     * If the specifier was not valid, null is returned.
+     *
+     * @param cssColorSpecifier A CSS Color Module Level 3 specifier string.
+     */
     (cssColorSpecifier: string): RGBColor | HSLColor | null;
+    /**
+     * Converts the provided color instance and returns an RGB or HSL color.
+     *
+     * @param color A permissible color space instance.
+     */
     (color: ColorSpaceObject | ColorCommonInstance): RGBColor | HSLColor;
+    /**
+     * Prototype of the factory, which can be used for instanceof testing
+     */
     readonly prototype: Color;
 }
 
+/**
+ * An RGB color object.
+ */
 export interface RGBColor extends Color {
+    /**
+     * Value of red channel
+     */
     r: number;
+    /**
+     * Value of green channel
+     */
     g: number;
+    /**
+     * Value of blue channel
+     */
     b: number;
+    /**
+     * Opacity value
+     */
     opacity: number;
+    /**
+     * Returns a brighter copy of this color. If k is specified, it controls how much brighter the returned color should be.
+     * If k is not specified, it defaults to 1.
+     *
+     * @param k A color space dependent number to determine, how much brighter the returned color should be.
+     */
     brighter(k?: number): this;
+    /**
+     * Returns a darker copy of this color. If k is specified, it controls how much darker the returned color should be.
+     * If k is not specified, it defaults to 1.
+     *
+     * @param k A color space dependent number to determine, how much darker the returned color should be.
+     */
     darker(k?: number): this;
     /**
      * Returns the RGB equivalent of this color.
@@ -64,89 +148,382 @@ export interface RGBColor extends Color {
     rgb(): this;
 }
 
+/**
+ * An RGB color factory object, which may also be used with instanceof to test if an object
+ * is an RGB color instance.
+ */
 export interface RGBColorFactory extends Function {
+    /**
+     * Constructs a new RGB color based on the specified channel values and opacity.
+     *
+     * @param r Red channel value.
+     * @param g Green channel value.
+     * @param b Blue channel value.
+     * @param opacity Optional opacity value, defaults to 1.
+     */
     (r: number, g: number, b: number, opacity?: number): RGBColor;
+    /**
+     * Parses the specified CSS Color Module Level 3 specifier string, returning an RGB color.
+     * If the specifier was not valid, null is returned.
+     *
+     * @param cssColorSpecifier A CSS Color Module Level 3 specifier string.
+     */
     (cssColorSpecifier: string): RGBColor;
+    /**
+     * Converts the provided color instance and returns an RGB color. The color instance is converted to the RGB color space using color.rgb.
+     * Note that unlike color.rgb this method always returns a new instance, even if color is already an RGB color.
+     *
+     * @param color A permissible color space instance.
+     */
     (color: ColorSpaceObject | ColorCommonInstance): RGBColor;
+    /**
+     * Prototype of the factory, which can be used for instanceof testing
+     */
     readonly prototype: RGBColor;
 }
 
+/**
+ * An HSL color object.
+ */
 export interface HSLColor extends Color {
+    /**
+     * Hue channel value.
+     */
     h: number;
+    /**
+     * Saturation channel value.
+     */
     s: number;
+    /**
+     * Lightness channel value.
+     */
     l: number;
+    /**
+     * Opacity value.
+     */
     opacity: number;
+    /**
+     * Returns a brighter copy of this color. If k is specified, it controls how much brighter the returned color should be.
+     * If k is not specified, it defaults to 1.
+     *
+     * @param k A color space dependent number to determine, how much brighter the returned color should be.
+     */
     brighter(k?: number): this;
+    /**
+     * Returns a darker copy of this color. If k is specified, it controls how much darker the returned color should be.
+     * If k is not specified, it defaults to 1.
+     *
+     * @param k A color space dependent number to determine, how much darker the returned color should be.
+     */
     darker(k?: number): this;
+    /**
+     * Returns the RGB color equivalent of this color.
+     */
     rgb(): RGBColor;
 }
 
+/**
+ * An HSL color factory object, which may also be used with instanceof to test if an object
+ * is an HSL color instance.
+ */
 export interface HSLColorFactory extends Function {
+    /**
+     * Constructs a new HSL color based on the specified channel values and opacity.
+     *
+     * @param h Hue channel value.
+     * @param s Saturation channel value.
+     * @param l Lightness channel value.
+     * @param opacity Optional opacity value, defaults to 1.
+     */
     (h: number, s: number, l: number, opacity?: number): HSLColor;
+    /**
+     * Parses the specified CSS Color Module Level 3 specifier string, returning an HSL color.
+     * If the specifier was not valid, null is returned.
+     *
+     * @param cssColorSpecifier A CSS Color Module Level 3 specifier string.
+     */
     (cssColorSpecifier: string): HSLColor;
+    /**
+     * Converts the provided color instance and returns an HSL color.
+     * The color instance is converted to the RGB color space using color.rgb and then converted to HSL.
+     * (Colors already in the HSL color space skip the conversion to RGB.)
+     *
+     * @param color A permissible color space instance.
+     */
     (color: ColorSpaceObject | ColorCommonInstance): HSLColor;
+    /**
+     * Prototype of the factory, which can be used for instanceof testing
+     */
     readonly prototype: HSLColor;
 }
 
+/**
+ * A Lab (CIELAB) color object.
+ */
 export interface LabColor extends Color {
+    /**
+     * Lightness typically in the range [0, 100].
+     */
     l: number;
+    /**
+     * Position between red/magenta and green typically in [-160, +160].
+     */
     a: number;
+    /**
+     * Position between yellow and blue typically in [-160, +160].
+     */
     b: number;
+    /**
+     * Opacity value
+     */
     opacity: number;
+    /**
+     * Returns a brighter copy of this color. If k is specified, it controls how much brighter the returned color should be.
+     * If k is not specified, it defaults to 1.
+     *
+     * @param k A color space dependent number to determine, how much brighter the returned color should be.
+     */
     brighter(k?: number): this;
+    /**
+     * Returns a darker copy of this color. If k is specified, it controls how much darker the returned color should be.
+     * If k is not specified, it defaults to 1.
+     *
+     * @param k A color space dependent number to determine, how much darker the returned color should be.
+     */
     darker(k?: number): this;
+    /**
+     * Returns the RGB color equivalent of this color.
+     */
     rgb(): RGBColor;
 }
 
+/**
+ * A Lab (CIELAB) color factory object, which may also be used with instanceof to test if an object
+ * is a Lab color instance.
+ */
 export interface LabColorFactory extends Function {
+    /**
+     * Constructs a new Lab color based on the specified channel values and opacity.
+     *
+     * @param l Lightness typically in the range [0, 100].
+     * @param a Position between red/magenta and green typically in [-160, +160].
+     * @param b Position between yellow and blue typically in [-160, +160].
+     * @param opacity Optional opacity value, defaults to 1.
+     */
     (l: number, a: number, b: number, opacity?: number): LabColor;
+    /**
+     * Parses the specified CSS Color Module Level 3 specifier string, returning a Lab color.
+     * If the specifier was not valid, null is returned.
+     *
+     * @param cssColorSpecifier A CSS Color Module Level 3 specifier string.
+     */
     (cssColorSpecifier: string): LabColor;
+    /**
+     * Converts the provided color instance and returns a Lab color.
+     * The color instance is converted to the RGB color space using color.rgb and then converted to Lab.
+     * (Colors already in the Lab color space skip the conversion to RGB,
+     * and colors in the HCL color space are converted directly to Lab.)
+     *
+     * @param color A permissible color space instance.
+     */
     (color: ColorSpaceObject | ColorCommonInstance): LabColor;
+    /**
+     * Prototype of the factory, which can be used for instanceof testing
+     */
     readonly prototype: LabColor;
 }
 
 /**
- * Constructs a new Lab color with the specified l value and a = b = 0.
+ * A gray color factory for Lab (CIELAB) colors.
  */
-export type GrayColorFactory = (l: number, opacity?: number) => LabColor;
+export type GrayColorFactory =
+    /**
+     * Constructs a new Lab color with the specified l value and a = b = 0.
+     *
+     * @param l Lightness typically in the range [0, 100].
+     * @param opacity Optional opacity value, defaults to 1.
+     */
+    (l: number, opacity?: number) => LabColor;
 
+/**
+ * An HCL (CIELCH) color object.
+ */
 export interface HCLColor extends Color {
+    /**
+     * Hue channel value typically in [0, 360).
+     */
     h: number;
+    /**
+     * Chroma channel value typically in [0, 230].
+     */
     c: number;
+    /**
+     * Luminance channel value typically in the range [0, 100].
+     */
     l: number;
+    /**
+     * Opacity value
+     */
     opacity: number;
+    /**
+     * Returns a brighter copy of this color. If k is specified, it controls how much brighter the returned color should be.
+     * If k is not specified, it defaults to 1.
+     *
+     * @param k A color space dependent number to determine, how much brighter the returned color should be.
+     */
     brighter(k?: number): this;
+    /**
+     * Returns a darker copy of this color. If k is specified, it controls how much darker the returned color should be.
+     * If k is not specified, it defaults to 1.
+     *
+     * @param k A color space dependent number to determine, how much darker the returned color should be.
+     */
     darker(k?: number): this;
+    /**
+     * Returns the RGB color equivalent of this color.
+     */
     rgb(): RGBColor;
 }
 
+/**
+ * An HCL (CIELCH) color factory object, which may also be used with instanceof to test if an object
+ * is an HCL color instance.
+ */
 export interface HCLColorFactory extends Function {
+    /**
+     * Constructs a new HCL color based on the specified channel values and opacity.
+     *
+     * @param h Hue channel value typically in [0, 360).
+     * @param c Chroma channel value typically in [0, 230].
+     * @param l Luminance channel value typically in the range [0, 100].
+     * @param opacity Optional opacity value, defaults to 1.
+     */
     (h: number, l: number, c: number, opacity?: number): HCLColor;
+    /**
+     * Parses the specified CSS Color Module Level 3 specifier string, returning an HCL color.
+     * If the specifier was not valid, null is returned.
+     *
+     * @param cssColorSpecifier A CSS Color Module Level 3 specifier string.
+     */
     (cssColorSpecifier: string): HCLColor;
+    /**
+     * Converts the provided color instance and returns an HCL color.
+     * The color instance is converted to the RGB color space using color.rgb and then converted to HCL.
+     * (Colors already in the HCL color space skip the conversion to RGB,
+     * and colors in the Lab color space are converted directly to HCL.)
+     *
+     * @param color A permissible color space instance.
+     */
     (color: ColorSpaceObject | ColorCommonInstance): HCLColor;
+    /**
+     * Prototype of the factory, which can be used for instanceof testing
+     */
     readonly prototype: HCLColor;
 }
 
+/**
+ * An LCH (CIELCH) color factory function to create an HCL color object.
+ */
 export interface LCHColorFactory {
+    /**
+     * Constructs a new HCL color based on the specified channel values and opacity.
+     *
+     * @param l Luminance channel value typically in the range [0, 100].
+     * @param c Chroma channel value typically in [0, 230].
+     * @param h Hue channel value typically in [0, 360).
+     * @param opacity Optional opacity value, defaults to 1.
+     */
     (l: number, c: number, h: number, opacity?: number): HCLColor;
+    /**
+     * Parses the specified CSS Color Module Level 3 specifier string, returning an HCL color.
+     * If the specifier was not valid, null is returned.
+     *
+     * @param cssColorSpecifier A CSS color Module Level 3 specifier string.
+     */
     (cssColorSpecifier: string): HCLColor;
+    /**
+     * Converts the provided color instance and returns an HCL color.
+     * The color instance is converted to the RGB color space using color.rgb and then converted to HCL.
+     * (Colors already in the HCL color space skip the conversion to RGB,
+     * and colors in the Lab color space are converted directly to HCL.)
+     *
+     * @param color A permissible color space instance.
+     */
     (color: ColorSpaceObject | ColorCommonInstance): HCLColor;
 }
 
+/**
+ * Dave Green’s Cubehelix color object.
+ */
 export interface CubehelixColor extends Color {
+    /**
+     * Hue channel value.
+     */
     h: number;
+    /**
+     * Saturation channel value.
+     */
     s: number;
+    /**
+     * Lightness channel value.
+     */
     l: number;
+    /**
+     * Opacity value.
+     */
     opacity: number;
+    /**
+     * Returns a brighter copy of this color. If k is specified, it controls how much brighter the returned color should be.
+     * If k is not specified, it defaults to 1.
+     *
+     * @param k A color space dependent number to determine, how much brighter the returned color should be.
+     */
     brighter(k?: number): this;
+    /**
+     * Returns a darker copy of this color. If k is specified, it controls how much darker the returned color should be.
+     * If k is not specified, it defaults to 1.
+     *
+     * @param k A color space dependent number to determine, how much darker the returned color should be.
+     */
     darker(k?: number): this;
+    /**
+     * Returns the RGB color equivalent of this color.
+     */
     rgb(): RGBColor;
 }
 
+/**
+ * A color factory object for Dave Green's Cubehelix colors, which may also be used with instanceof to test if an object
+ * is a Cubehelix color instance.
+ */
 export interface CubehelixColorFactory extends Function {
+    /**
+     * Constructs a new Cubehelix color based on the specified channel values and opacity.
+     *
+     * @param h Hue channel value.
+     * @param s Saturation channel value.
+     * @param l Lightness channel value.
+     * @param opacity Optional opacity value, defaults to 1.
+     */
     (h: number, s: number, l: number, opacity?: number): CubehelixColor;
+    /**
+     * Parses the specified CSS Color Module Level 3 specifier string, returning an Cubehelix color.
+     * If the specifier was not valid, null is returned.
+     *
+     * @param cssColorSpecifier A CSS Color Module Level 3 specifier string.
+     */
     (cssColorSpecifier: string): CubehelixColor;
+    /**
+     * Converts the provided color instance and returns a Cubehelix color.
+     * The color instance is specified, it is converted to the RGB color space using color.rgb and then converted to Cubehelix.
+     * (Colors already in the Cubehelix color space skip the conversion to RGB.)
+     *
+     * @param color A permissible color space instance.
+     */
     (color: ColorSpaceObject | ColorCommonInstance): CubehelixColor;
+    /**
+     * Prototype of the factory, which can be used for instanceof testing
+     */
     readonly prototype: CubehelixColor;
 }
 
@@ -154,18 +531,47 @@ export interface CubehelixColorFactory extends Function {
 // Color object factories
 // --------------------------------------------------------------------------
 
+/**
+ * A Color factory object, which may also be used with instanceof to test if an object is a color instance.
+ */
 export const color: ColorFactory;
 
+/**
+ * An RGB color factory object, which may also be used with instanceof to test if an object
+ * is an RGB color instance.
+ */
 export const rgb: RGBColorFactory;
 
+/**
+ * An HSL color factory object, which may also be used with instanceof to test if an object
+ * is an HSL color instance.
+ */
 export const hsl: HSLColorFactory;
 
+/**
+ * A Lab (CIELAB) color factory object, which may also be used with instanceof to test if an object
+ * is a Lab color instance.
+ */
 export const lab: LabColorFactory;
 
+/**
+ * A gray color factory for Lab (CIELAB) colors.
+ */
 export const gray: GrayColorFactory;
 
+/**
+ * An HCL (CIELCH) color factory object, which may also be used with instanceof to test if an object
+ * is an HCL color instance.
+ */
 export const hcl: HCLColorFactory;
 
+/**
+ * An LCH (CIELCH) color factory function to create an HCL color object.
+ */
 export const lch: LCHColorFactory;
 
+/**
+ * A color factory object for Dave Green's Cubehelix colors, which may also be used with instanceof to test if an object
+ * is a Cubehelix color instance.
+ */
 export const cubehelix: CubehelixColorFactory;

From 21696eb97be89c931508dd055edb8cc20c971a78 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Sun, 20 May 2018 09:05:44 +0200
Subject: [PATCH 257/575] Universal Coordinated Time -> Coordinated Universal
 Time

---
 types/d3-time/index.d.ts | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/types/d3-time/index.d.ts b/types/d3-time/index.d.ts
index b8aa2f12aa..270d64d33c 100644
--- a/types/d3-time/index.d.ts
+++ b/types/d3-time/index.d.ts
@@ -444,10 +444,10 @@ export const timeYear: CountableTimeInterval;
  */
 export function timeYears(start: Date, stop: Date, step?: number): Date[];
 
-// utc Universal Coordinated Time ----------------------------------------------------------
+// utc Coordinated Universal Time ----------------------------------------------------------
 
 /**
- * Milliseconds Interval in Universal Coordinated Time (UTC); the shortest available time unit.
+ * Milliseconds Interval in Coordinated Universal Time (UTC); the shortest available time unit.
  */
 export const utcMillisecond: CountableTimeInterval;
 
@@ -461,7 +461,7 @@ export const utcMillisecond: CountableTimeInterval;
 export function utcMilliseconds(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Seconds Interval in Universal Coordinated Time (UTC); seconds (e.g., 01:23:45.0000 AM); 1,000 milliseconds.
+ * Seconds Interval in Coordinated Universal Time (UTC); seconds (e.g., 01:23:45.0000 AM); 1,000 milliseconds.
  */
 export const utcSecond: CountableTimeInterval;
 
@@ -475,7 +475,7 @@ export const utcSecond: CountableTimeInterval;
 export function utcSeconds(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Minutes Interval in Universal Coordinated Time (UTC); minutes (e.g., 01:02:00 AM); 60 seconds.
+ * Minutes Interval in Coordinated Universal Time (UTC); minutes (e.g., 01:02:00 AM); 60 seconds.
  * Note that ECMAScript ignores leap seconds.
  */
 export const utcMinute: CountableTimeInterval;
@@ -490,7 +490,7 @@ export const utcMinute: CountableTimeInterval;
 export function utcMinutes(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Hours Interval in Universal Coordinated Time (UTC); Hours (e.g., 01:00 AM); 60 minutes.
+ * Hours Interval in Coordinated Universal Time (UTC); Hours (e.g., 01:00 AM); 60 minutes.
  */
 export const utcHour: CountableTimeInterval;
 
@@ -504,7 +504,7 @@ export const utcHour: CountableTimeInterval;
 export function utcHours(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Days Interval in Universal Coordinated Time (UTC); days (e.g., February 7, 2012 at 12:00 AM); 24 hours.
+ * Days Interval in Coordinated Universal Time (UTC); days (e.g., February 7, 2012 at 12:00 AM); 24 hours.
  */
 export const utcDay: CountableTimeInterval;
 
@@ -533,7 +533,7 @@ export const utcWeek: CountableTimeInterval;
 export function utcWeeks(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Week Interval for Sunday-based weeks in Universal Coordinated Time (UTC) (e.g., February 5, 2012 at 12:00 AM).
+ * Week Interval for Sunday-based weeks in Coordinated Universal Time (UTC) (e.g., February 5, 2012 at 12:00 AM).
  * 7 days and 168 hours.
  */
 export const utcSunday: CountableTimeInterval;
@@ -548,7 +548,7 @@ export const utcSunday: CountableTimeInterval;
 export function utcSundays(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Week Interval for Monday-based weeks in Universal Coordinated Time (UTC) (e.g., February 6, 2012 at 12:00 AM).
+ * Week Interval for Monday-based weeks in Coordinated Universal Time (UTC) (e.g., February 6, 2012 at 12:00 AM).
  * 7 days and 168 hours.
  */
 export const utcMonday: CountableTimeInterval;
@@ -563,7 +563,7 @@ export const utcMonday: CountableTimeInterval;
 export function utcMondays(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Week Interval for Tuesday-based weeks in Universal Coordinated Time (UTC) (e.g., February 7, 2012 at 12:00 AM).
+ * Week Interval for Tuesday-based weeks in Coordinated Universal Time (UTC) (e.g., February 7, 2012 at 12:00 AM).
  * 7 days and 168 hours.
  */
 export const utcTuesday: CountableTimeInterval;
@@ -578,7 +578,7 @@ export const utcTuesday: CountableTimeInterval;
 export function utcTuesdays(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Week Interval for Wednesday-based weeks in Universal Coordinated Time (UTC) (e.g., February 8, 2012 at 12:00 AM).
+ * Week Interval for Wednesday-based weeks in Coordinated Universal Time (UTC) (e.g., February 8, 2012 at 12:00 AM).
  * 7 days and 168 hours.
  */
 export const utcWednesday: CountableTimeInterval;
@@ -593,7 +593,7 @@ export const utcWednesday: CountableTimeInterval;
 export function utcWednesdays(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Week Interval for Thursday-based weeks in Universal Coordinated Time (UTC) (e.g., February 9, 2012 at 12:00 AM).
+ * Week Interval for Thursday-based weeks in Coordinated Universal Time (UTC) (e.g., February 9, 2012 at 12:00 AM).
  * 7 days and 168 hours.
  */
 export const utcThursday: CountableTimeInterval;
@@ -608,7 +608,7 @@ export const utcThursday: CountableTimeInterval;
 export function utcThursdays(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Week Interval for Friday-based weeks in Universal Coordinated Time (UTC) (e.g., February 10, 2012 at 12:00 AM).
+ * Week Interval for Friday-based weeks in Coordinated Universal Time (UTC) (e.g., February 10, 2012 at 12:00 AM).
  * 7 days and 168 hours.
  */
 export const utcFriday: CountableTimeInterval;
@@ -623,7 +623,7 @@ export const utcFriday: CountableTimeInterval;
 export function utcFridays(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Week Interval for Saturday-based weeks in Universal Coordinated Time (UTC) (e.g., February 11, 2012 at 12:00 AM).
+ * Week Interval for Saturday-based weeks in Coordinated Universal Time (UTC) (e.g., February 11, 2012 at 12:00 AM).
  * 7 days and 168 hours.
  */
 export const utcSaturday: CountableTimeInterval;
@@ -638,7 +638,7 @@ export const utcSaturday: CountableTimeInterval;
 export function utcSaturdays(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Month Interval in Universal Coordinated Time (UTC); months (e.g., February 1, 2012 at 12:00 AM); ranges from 28 to 31 days.
+ * Month Interval in Coordinated Universal Time (UTC); months (e.g., February 1, 2012 at 12:00 AM); ranges from 28 to 31 days.
  */
 export const utcMonth: CountableTimeInterval;
 
@@ -652,7 +652,7 @@ export const utcMonth: CountableTimeInterval;
 export function utcMonths(start: Date, stop: Date, step?: number): Date[];
 
 /**
- * Year Interval in Universal Coordinated Time (UTC); years (e.g., January 1, 2012 at 12:00 AM); ranges from 365 to 366 days.
+ * Year Interval in Coordinated Universal Time (UTC); years (e.g., January 1, 2012 at 12:00 AM); ranges from 365 to 366 days.
  */
 export const utcYear: CountableTimeInterval;
 

From 3c05f46d3010db8f0cee41b33a4712f6382f65e5 Mon Sep 17 00:00:00 2001
From: Alessio Paccoia <alessio.paccoia@cubbit.net>
Date: Sun, 20 May 2018 13:00:58 +0200
Subject: [PATCH 258/575] Add ps-tree types

---
 types/ps-tree/index.d.ts       | 21 +++++++++++++++++++++
 types/ps-tree/ps-tree-tests.ts |  8 ++++++++
 types/ps-tree/tsconfig.json    | 22 ++++++++++++++++++++++
 types/ps-tree/tslint.json      |  1 +
 4 files changed, 52 insertions(+)
 create mode 100644 types/ps-tree/index.d.ts
 create mode 100644 types/ps-tree/ps-tree-tests.ts
 create mode 100644 types/ps-tree/tsconfig.json
 create mode 100644 types/ps-tree/tslint.json

diff --git a/types/ps-tree/index.d.ts b/types/ps-tree/index.d.ts
new file mode 100644
index 0000000000..7dad700315
--- /dev/null
+++ b/types/ps-tree/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for ps-tree 1.1
+// Project: http://github.com/indexzero/ps-tree
+// Definitions by: Alessio Paccoia <https://github.com/alessiopcc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace ps_tree {
+    interface PS {
+        COMMAND: string;
+        PPID: string;
+        PID: string;
+        STAT: string;
+    }
+    
+    const prototype: {
+    };
+}
+
+declare function ps_tree(pid: number, callback: (error: Error, children: ReadonlyArray<ps_tree.PS>) => void): void;
+
+export as namespace ps_tree;
+export = ps_tree;
diff --git a/types/ps-tree/ps-tree-tests.ts b/types/ps-tree/ps-tree-tests.ts
new file mode 100644
index 0000000000..308900e6e2
--- /dev/null
+++ b/types/ps-tree/ps-tree-tests.ts
@@ -0,0 +1,8 @@
+import * as ps_tree from "ps-tree";
+
+ps_tree(1, (error: Error, children: ps_tree.PS[]) => {
+    children[0].COMMAND; // $ExpectType string
+    children[0].PID; // $ExpectType string
+    children[0].PPID; // $ExpectType string
+    children[0].STAT; // $ExpectType string
+}); // $ExpectType void
diff --git a/types/ps-tree/tsconfig.json b/types/ps-tree/tsconfig.json
new file mode 100644
index 0000000000..b8a7b33b11
--- /dev/null
+++ b/types/ps-tree/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",
+        "ps-tree-tests.ts"
+    ]
+}
diff --git a/types/ps-tree/tslint.json b/types/ps-tree/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ps-tree/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e943205cf93f0a7a77616215223c79872298cd7f Mon Sep 17 00:00:00 2001
From: Christian Rackerseder <git@echooff.de>
Date: Sun, 20 May 2018 13:16:02 +0200
Subject: [PATCH 259/575] Add definitons for loadjs

---
 types/loadjs/index.d.ts               | 38 +++++++++++++++++++++++++++
 types/loadjs/test/loadjs-tests.ts     | 23 ++++++++++++++++
 types/loadjs/test/loadjs-umd-tests.ts | 17 ++++++++++++
 types/loadjs/tsconfig.json            | 24 +++++++++++++++++
 types/loadjs/tslint.json              |  1 +
 5 files changed, 103 insertions(+)
 create mode 100644 types/loadjs/index.d.ts
 create mode 100644 types/loadjs/test/loadjs-tests.ts
 create mode 100644 types/loadjs/test/loadjs-umd-tests.ts
 create mode 100644 types/loadjs/tsconfig.json
 create mode 100644 types/loadjs/tslint.json

diff --git a/types/loadjs/index.d.ts b/types/loadjs/index.d.ts
new file mode 100644
index 0000000000..c8e3fc0d80
--- /dev/null
+++ b/types/loadjs/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for loadjs 3.5
+// Project: https://github.com/muicss/loadjs
+// Definitions by: Christian Rackerseder <https://github.com/screendriver>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace loadjs;
+
+export = loadjs;
+
+declare function loadjs(file: string, loaded: loadjs.LoadedFn): void;
+declare function loadjs(files: string[], loaded: loadjs.LoadedFn): void;
+declare function loadjs(files: string[], bundleId: string): void;
+declare function loadjs(files: string[], bundleId: string, loaded: loadjs.LoadedFn): void;
+declare function loadjs(files: string[], bundleId: string, options: loadjs.LoadOptions): void;
+
+declare namespace loadjs {
+    export type LoadedFn = () => void;
+
+    export interface LoadOptions {
+        before?(path: string, scriptEl: string): void;
+        success?(): void;
+        error?(depsNotFound: string): void;
+        async?: boolean;
+        numRetries?: number;
+    }
+
+    export interface ReadyOptions {
+        success?(): void;
+        error?(depsNotFound: string): void;
+    }
+
+    export function ready(bundleId: string, callback: LoadedFn): void;
+    export function ready(bundleIds: string[], callback: LoadedFn): void;
+    export function ready(bundleId: string, options: ReadyOptions): void;
+    export function isDefined(bundleId: string): boolean;
+    export function done(bundleId: string): void;
+    export function reset(): void;
+}
diff --git a/types/loadjs/test/loadjs-tests.ts b/types/loadjs/test/loadjs-tests.ts
new file mode 100644
index 0000000000..0168130361
--- /dev/null
+++ b/types/loadjs/test/loadjs-tests.ts
@@ -0,0 +1,23 @@
+import * as importedLoadJs from 'loadjs';
+
+const loadOptions: importedLoadJs.LoadOptions = {
+    before: (path, scriptEl) => {},
+    success: () => {},
+    error: (pathsNotFound) => {},
+    async: true,
+    numRetries: 3
+};
+
+const readyOptions: importedLoadJs.ReadyOptions = {
+    success: () => {},
+    error: (depsNotFound) => {},
+};
+
+importedLoadJs('/path/to/foo.js', () => {});
+importedLoadJs(['/path/to/foo.js', '/path/to/bar.js'], () => {});
+importedLoadJs(['/path/to/foo.js', '/path/to/bar.js'], 'foobar');
+importedLoadJs.ready('foobar', () => {});
+importedLoadJs.ready(['foo', 'bar'], () => {});
+importedLoadJs.isDefined('foobar');
+importedLoadJs(['/path/to/foo.js', '/path/to/bar.js'], 'foobar', loadOptions);
+importedLoadJs.ready('foobar', readyOptions);
diff --git a/types/loadjs/test/loadjs-umd-tests.ts b/types/loadjs/test/loadjs-umd-tests.ts
new file mode 100644
index 0000000000..1a35f04c43
--- /dev/null
+++ b/types/loadjs/test/loadjs-umd-tests.ts
@@ -0,0 +1,17 @@
+loadjs('/path/to/foo.js', () => {});
+loadjs(['/path/to/foo.js', '/path/to/bar.js'], () => {});
+loadjs(['/path/to/foo.js', '/path/to/bar.js'], 'foobar');
+loadjs.ready('foobar', () => {});
+loadjs.ready(['foo', 'bar'], () => {});
+loadjs.isDefined('foobar');
+loadjs(['/path/to/foo.js', '/path/to/bar.js'], 'foobar', {
+    before: (path, scriptEl) => {},
+    success: () => {},
+    error: (pathsNotFound) => {},
+    async: true,
+    numRetries: 3
+});
+loadjs.ready('foobar', {
+    success: () => {},
+    error: (depsNotFound) => {},
+});
diff --git a/types/loadjs/tsconfig.json b/types/loadjs/tsconfig.json
new file mode 100644
index 0000000000..b60931cce6
--- /dev/null
+++ b/types/loadjs/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",
+        "test/loadjs-tests.ts",
+        "test/loadjs-umd-tests.ts"
+    ]
+}
diff --git a/types/loadjs/tslint.json b/types/loadjs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/loadjs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From bf9421504a3f2c2c6cc51e67dbd0c612d2a8384a Mon Sep 17 00:00:00 2001
From: Alessio Paccoia <alessio.paccoia@cubbit.net>
Date: Sun, 20 May 2018 13:19:42 +0200
Subject: [PATCH 260/575] Fix tests and tsc

---
 types/ps-tree/index.d.ts       | 2 +-
 types/ps-tree/ps-tree-tests.ts | 5 +++--
 types/ps-tree/tsconfig.json    | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/types/ps-tree/index.d.ts b/types/ps-tree/index.d.ts
index 7dad700315..a915c9f547 100644
--- a/types/ps-tree/index.d.ts
+++ b/types/ps-tree/index.d.ts
@@ -10,7 +10,7 @@ declare namespace ps_tree {
         PID: string;
         STAT: string;
     }
-    
+
     const prototype: {
     };
 }
diff --git a/types/ps-tree/ps-tree-tests.ts b/types/ps-tree/ps-tree-tests.ts
index 308900e6e2..9af8b9f53c 100644
--- a/types/ps-tree/ps-tree-tests.ts
+++ b/types/ps-tree/ps-tree-tests.ts
@@ -1,8 +1,9 @@
 import * as ps_tree from "ps-tree";
 
-ps_tree(1, (error: Error, children: ps_tree.PS[]) => {
+ps_tree(1, () => {}); // $ExpectType void
+ps_tree(1, (error: Error, children: ReadonlyArray<ps_tree.PS>) => {
     children[0].COMMAND; // $ExpectType string
     children[0].PID; // $ExpectType string
     children[0].PPID; // $ExpectType string
     children[0].STAT; // $ExpectType string
-}); // $ExpectType void
+});
diff --git a/types/ps-tree/tsconfig.json b/types/ps-tree/tsconfig.json
index b8a7b33b11..4f3bd8dcfc 100644
--- a/types/ps-tree/tsconfig.json
+++ b/types/ps-tree/tsconfig.json
@@ -6,6 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
+        "strictFunctionTypes": true,
         "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [

From eb594099352ddf5e8ba34a7765dfe4d4773c40a7 Mon Sep 17 00:00:00 2001
From: Ford Hurley <ford.hurley@gmail.com>
Date: Sun, 20 May 2018 09:50:27 -0400
Subject: [PATCH 261/575] THREE.BufferGeometry.setFromPoints accepts Vector2s
 as well

The documentation shows examples of this, e.g.:

https://threejs.org/docs/#api/extras/curves/EllipseCurve

The source code shows how it handles an array of either type:

https://github.com/mrdoob/three.js/blob/2f2e5f731/src/core/BufferGeometry.js#L352
---
 types/three/three-core.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index a7f7950a48..216ceb18a7 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -873,7 +873,7 @@ export class BufferGeometry extends EventDispatcher {
     center(): BufferGeometry;
 
     setFromObject(object: Object3D): BufferGeometry;
-    setFromPoints(points: Vector3[]): BufferGeometry;
+    setFromPoints(points: Vector3[]|Vector2[]): BufferGeometry;
     updateFromObject(object: Object3D): void;
 
     fromGeometry(geometry: Geometry, settings?: any): BufferGeometry;

From 7ebaf74cde2ff2dc199ff8923676e55bf7b21fe8 Mon Sep 17 00:00:00 2001
From: Christian Rackerseder <git@echooff.de>
Date: Sun, 20 May 2018 17:00:56 +0200
Subject: [PATCH 262/575] Fix linting errors

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

diff --git a/types/loadjs/index.d.ts b/types/loadjs/index.d.ts
index c8e3fc0d80..e68875e53a 100644
--- a/types/loadjs/index.d.ts
+++ b/types/loadjs/index.d.ts
@@ -2,21 +2,19 @@
 // Project: https://github.com/muicss/loadjs
 // Definitions by: Christian Rackerseder <https://github.com/screendriver>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
 
 export as namespace loadjs;
 
 export = loadjs;
 
-declare function loadjs(file: string, loaded: loadjs.LoadedFn): void;
-declare function loadjs(files: string[], loaded: loadjs.LoadedFn): void;
-declare function loadjs(files: string[], bundleId: string): void;
-declare function loadjs(files: string[], bundleId: string, loaded: loadjs.LoadedFn): void;
-declare function loadjs(files: string[], bundleId: string, options: loadjs.LoadOptions): void;
+declare function loadjs(files: string | string[], bundleIdOrLoaded: string | loadjs.LoadedFn): void;
+declare function loadjs(files: string[], bundleId: string, optionsOrCallback: loadjs.LoadOptions | loadjs.LoadedFn): void;
 
 declare namespace loadjs {
-    export type LoadedFn = () => void;
+    type LoadedFn = () => void;
 
-    export interface LoadOptions {
+    interface LoadOptions {
         before?(path: string, scriptEl: string): void;
         success?(): void;
         error?(depsNotFound: string): void;
@@ -24,15 +22,13 @@ declare namespace loadjs {
         numRetries?: number;
     }
 
-    export interface ReadyOptions {
+    interface ReadyOptions {
         success?(): void;
         error?(depsNotFound: string): void;
     }
 
-    export function ready(bundleId: string, callback: LoadedFn): void;
-    export function ready(bundleIds: string[], callback: LoadedFn): void;
-    export function ready(bundleId: string, options: ReadyOptions): void;
-    export function isDefined(bundleId: string): boolean;
-    export function done(bundleId: string): void;
-    export function reset(): void;
+    function ready(bundleIds: string | string[], optionsOrCallback: ReadyOptions | LoadedFn): void;
+    function isDefined(bundleId: string): boolean;
+    function done(bundleId: string): void;
+    function reset(): void;
 }

From b0ebc93ab3e4ad62c0a535a1c16383b9b73761a0 Mon Sep 17 00:00:00 2001
From: GlenCFL <glencfl@gmail.com>
Date: Sun, 20 May 2018 11:07:44 -0400
Subject: [PATCH 263/575] [atom] support version 1.27

---
 types/atom/atom-tests.ts |  68 +++++++++++++++++--
 types/atom/index.d.ts    | 142 ++++++++++++++++++++++-----------------
 2 files changed, 143 insertions(+), 67 deletions(-)

diff --git a/types/atom/atom-tests.ts b/types/atom/atom-tests.ts
index 57420d5059..d6de0ef802 100644
--- a/types/atom/atom-tests.ts
+++ b/types/atom/atom-tests.ts
@@ -1327,6 +1327,8 @@ function testMarkerLayer() {
     markers = markerLayer.findMarkers({ containsRange: [[0, 0], pos] });
     markers = markerLayer.findMarkers({ containsRange: [[0, 0], [0, 0]] });
 
+    str = markerLayer.getRole();
+
     // Marker creation
     marker = markerLayer.markRange(range);
     marker = markerLayer.markRange([pos, pos]);
@@ -1950,32 +1952,54 @@ function testSelection() {
     selection.insertText("Replacement", { autoDecreaseIndent: true });
     selection.insertText("Replacement", { normalizeLineEndings: true });
     selection.insertText("Replacement", { undo: "skip" });
+    selection.insertText("Replacement", { bypassReadOnly: true });
     selection.insertText("Replacement", { select: true, autoIndent: true,
         autoIndentNewline: true, autoDecreaseIndent: true, normalizeLineEndings: true,
-        undo: "skip", preserveTrailingLineIndentation: false });
+        undo: "skip", preserveTrailingLineIndentation: false, bypassReadOnly: false });
 
     selection.backspace();
+    selection.backspace({ bypassReadOnly: true });
     selection.deleteToPreviousWordBoundary();
+    selection.deleteToPreviousWordBoundary({ bypassReadOnly: false });
     selection.deleteToNextWordBoundary();
+    selection.deleteToNextWordBoundary({ bypassReadOnly: true });
     selection.deleteToBeginningOfWord();
+    selection.deleteToBeginningOfWord({ bypassReadOnly: false });
     selection.deleteToBeginningOfLine();
+    selection.deleteToBeginningOfLine({ bypassReadOnly: true });
     selection.delete();
+    selection.delete({ bypassReadOnly: false });
     selection.deleteToEndOfLine();
+    selection.deleteToEndOfLine({ bypassReadOnly: true });
     selection.deleteToEndOfWord();
+    selection.deleteToEndOfWord({ bypassReadOnly: false });
     selection.deleteToBeginningOfSubword();
+    selection.deleteToBeginningOfSubword({ bypassReadOnly: true });
     selection.deleteToEndOfSubword();
+    selection.deleteToEndOfSubword({ bypassReadOnly: false });
     selection.deleteSelectedText();
+    selection.deleteSelectedText({ bypassReadOnly: true });
     selection.deleteLine();
+    selection.deleteLine({ bypassReadOnly: false });
     selection.joinLines();
+    selection.joinLines({ bypassReadOnly: true });
     selection.outdentSelectedRows();
+    selection.outdentSelectedRows({ bypassReadOnly: false });
     selection.autoIndentSelectedRows();
+    selection.autoIndentSelectedRows({ bypassReadOnly: true });
     selection.toggleLineComments();
+    selection.toggleLineComments({ bypassReadOnly: false });
     selection.cutToEndOfLine();
+    selection.cutToEndOfLine(true);
+    selection.cutToEndOfLine(undefined, { bypassReadOnly: true });
     selection.cutToEndOfBufferLine();
+    selection.cutToEndOfBufferLine(true);
+    selection.cutToEndOfBufferLine(false, { bypassReadOnly: false });
 
     selection.cut();
     selection.cut(true);
     selection.cut(true, true);
+    selection.cut(undefined, undefined, { bypassReadOnly: true });
 
     selection.copy();
     selection.copy(true);
@@ -1983,6 +2007,7 @@ function testSelection() {
 
     selection.fold();
     selection.indentSelectedRows();
+    selection.indentSelectedRows({ bypassReadOnly: false });
 
     // Managing multiple selections
     selection.addSelectionBelow();
@@ -2143,6 +2168,8 @@ function testTextBuffer() {
         num = nextRow;
     }
 
+    bool = buffer.hasAstral();
+
     // Mutating Text
     range = buffer.setText("Test");
     buffer.setTextViaDiff("Test");
@@ -2232,9 +2259,13 @@ function testTextBuffer() {
 
     // History
     bool = buffer.undo();
+    bool = buffer.undo({ selectionsMarkerLayer: markerLayer });
     bool = buffer.redo();
+    bool = buffer.redo({ selectionsMarkerLayer: markerLayer });
 
-    num = buffer.transact<number>(500, (): number => 42);
+    num = buffer.transact(500, (): number => 42);
+    num = buffer.transact({ groupingInterval: 500, selectionsMarkerLayer: markerLayer },
+        (): number => 42);
 
     buffer.clearUndoStack();
     num = buffer.createCheckpoint();
@@ -2434,6 +2465,8 @@ function testTextEditor() {
 
     // Mutating Text
     editor.setText("Test");
+    editor.setText("Test", {});
+    editor.setText("Text", { bypassReadOnly: true });
 
     range = editor.setTextInBufferRange(range, "Test");
     range = editor.setTextInBufferRange([pos, pos], "Test");
@@ -2443,7 +2476,7 @@ function testTextEditor() {
     range = editor.setTextInBufferRange(range, "Test", {});
     range = editor.setTextInBufferRange([pos, pos], "Test", { normalizeLineEndings: true });
     range = editor.setTextInBufferRange(range, "Test", { normalizeLineEndings: true,
-        undo: "skip" });
+        undo: "skip", bypassReadOnly: false });
 
     editor.insertText("Test");
     editor.insertText("Test", {});
@@ -2455,27 +2488,45 @@ function testTextEditor() {
     editor.insertText("Test", { undo: "skip" });
     editor.insertText("Text", { autoDecreaseIndent: false, autoIndent: false,
         autoIndentNewline: false, normalizeLineEndings: false, select: false,
-        undo: "skip", preserveTrailingLineIndentation: true });
+        undo: "skip", preserveTrailingLineIndentation: true, bypassReadOnly: true });
 
     editor.insertNewline();
+    editor.insertNewline({ bypassReadOnly: false });
     editor.delete();
+    editor.delete({ bypassReadOnly: true });
     editor.backspace();
+    editor.backspace({ bypassReadOnly: false });
     editor.mutateSelectedText((selection, index) => { selection.clear(); });
     editor.transpose();
+    editor.transpose({ bypassReadOnly: true });
     editor.upperCase();
+    editor.upperCase({ bypassReadOnly: false });
     editor.lowerCase();
+    editor.lowerCase({ bypassReadOnly: true });
     editor.toggleLineCommentsInSelection();
+    editor.toggleLineCommentsInSelection({ bypassReadOnly: false });
     editor.insertNewlineBelow();
+    editor.insertNewlineBelow({ bypassReadOnly: true });
     editor.insertNewlineAbove();
+    editor.insertNewlineAbove({ bypassReadOnly: false });
     editor.deleteToBeginningOfWord();
+    editor.deleteToBeginningOfWord({ bypassReadOnly: true });
     editor.deleteToPreviousWordBoundary();
+    editor.deleteToPreviousWordBoundary({ bypassReadOnly: false });
     editor.deleteToNextWordBoundary();
+    editor.deleteToNextWordBoundary({ bypassReadOnly: true });
     editor.deleteToBeginningOfSubword();
+    editor.deleteToBeginningOfSubword({ bypassReadOnly: false });
     editor.deleteToEndOfSubword();
+    editor.deleteToEndOfSubword({ bypassReadOnly: true });
     editor.deleteToBeginningOfLine();
+    editor.deleteToBeginningOfLine({ bypassReadOnly: false });
     editor.deleteToEndOfLine();
+    editor.deleteToEndOfLine({ bypassReadOnly: true });
     editor.deleteToEndOfWord();
+    editor.deleteToEndOfWord({ bypassReadOnly: false });
     editor.deleteLine();
+    editor.deleteLine({ bypassReadOnly: true });
 
     // History
     editor.undo();
@@ -2923,9 +2974,12 @@ function testTextEditor() {
     editor.setIndentationForBufferRow(42, 42, { preserveLeadingWhitespace: true });
 
     editor.indentSelectedRows();
+    editor.indentSelectedRows({ bypassReadOnly: false });
     editor.outdentSelectedRows();
+    editor.outdentSelectedRows({ bypassReadOnly: true });
     num = editor.indentLevelForLine("Test");
     editor.autoIndentSelectedRows();
+    editor.autoIndentSelectedRows({ bypassReadOnly: false });
 
     // Grammars
     grammar = editor.getGrammar();
@@ -2942,6 +2996,7 @@ function testTextEditor() {
     // Clipboard Operations
     editor.copySelectedText();
     editor.cutSelectedText();
+    editor.cutSelectedText({ bypassReadOnly: true });
 
     editor.pasteText();
     editor.pasteText({});
@@ -2951,11 +3006,14 @@ function testTextEditor() {
     editor.pasteText({ normalizeLineEndings: true });
     editor.pasteText({ select: true });
     editor.pasteText({ undo: "skip" });
+    editor.pasteText({ bypassReadOnly: false });
     editor.pasteText({ autoIndentNewline: true, autoIndent: true, autoDecreaseIndent: true,
-        normalizeLineEndings: true, select: true, undo: "skip" });
+        normalizeLineEndings: true, select: true, undo: "skip", bypassReadOnly: true });
 
     editor.cutToEndOfLine();
+    editor.cutToEndOfLine({ bypassReadOnly: false });
     editor.cutToEndOfBufferLine();
+    editor.cutToEndOfBufferLine({ bypassReadOnly: true });
 
     // Folds
     editor.foldCurrentRow();
diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index 3cee95ace5..77b79fbed2 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Atom 1.26
+// Type definitions for Atom 1.27
 // Project: https://github.com/atom/atom
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
 //                 smhxx <https://github.com/smhxx>
@@ -7,7 +7,7 @@
 // TypeScript Version: 2.3
 
 // NOTE: only those classes exported within this file should be retain that status below.
-// https://github.com/atom/atom/blob/v1.26.0/exports/atom.js
+// https://github.com/atom/atom/blob/v1.27.0/exports/atom.js
 
 /// <reference types="node" />
 
@@ -1004,6 +1004,9 @@ export interface MarkerLayer {
     /** Find markers in the layer conforming to the given parameters. */
     findMarkers(params: FindMarkerOptions): Marker[];
 
+    /** Get the role of the marker layer e.g. "atom.selection". */
+    getRole(): string;
+
     // Marker Creation
     /** Create a marker with the given range. */
     markRange(range: RangeCompatible, options?: { reversed?: boolean, invalidate?:
@@ -1525,29 +1528,29 @@ export class TextEditor {
 
     // Mutating Text
     /** Replaces the entire contents of the buffer with the given string. */
-    setText(text: string): void;
+    setText(text: string, options?: ReadonlyEditOptions): void;
 
     /** Set the text in the given Range in buffer coordinates. */
     setTextInBufferRange(range: RangeCompatible, text: string, options?:
-        TextEditOptions): Range;
+        TextEditOptions & ReadonlyEditOptions): Range;
 
     /* For each selection, replace the selected text with the given text. */
-    insertText(text: string, options?: TextInsertionOptions): Range|false;
+    insertText(text: string, options?: TextInsertionOptions & ReadonlyEditOptions): Range|false;
 
     /** For each selection, replace the selected text with a newline. */
-    insertNewline(): void;
+    insertNewline(options?: ReadonlyEditOptions): void;
 
     /**
      *  For each selection, if the selection is empty, delete the character following
      *  the cursor. Otherwise delete the selected text.
      */
-    delete(): void;
+    delete(options?: ReadonlyEditOptions): void;
 
     /**
      *  For each selection, if the selection is empty, delete the character preceding
      *  the cursor. Otherwise delete the selected text.
      */
-    backspace(): void;
+    backspace(options?: ReadonlyEditOptions): void;
 
     /**
      *  Mutate the text of all the selections in a single transaction.
@@ -1561,89 +1564,89 @@ export class TextEditor {
      *  If the selection is empty, the characters preceding and following the cursor
      *  are swapped. Otherwise, the selected characters are reversed.
      */
-    transpose(): void;
+    transpose(options?: ReadonlyEditOptions): void;
 
     /**
      *  Convert the selected text to upper case.
      *  For each selection, if the selection is empty, converts the containing word
      *  to upper case. Otherwise convert the selected text to upper case.
      */
-    upperCase(): void;
+    upperCase(options?: ReadonlyEditOptions): void;
 
     /**
      *  Convert the selected text to lower case.
      *  For each selection, if the selection is empty, converts the containing word
      *  to upper case. Otherwise convert the selected text to upper case.
      */
-    lowerCase(): void;
+    lowerCase(options?: ReadonlyEditOptions): void;
 
     /**
      *  Toggle line comments for rows intersecting selections.
      *  If the current grammar doesn't support comments, does nothing.
      */
-    toggleLineCommentsInSelection(): void;
+    toggleLineCommentsInSelection(options?: ReadonlyEditOptions): void;
 
     /** For each cursor, insert a newline at beginning the following line. */
-    insertNewlineBelow(): void;
+    insertNewlineBelow(options?: ReadonlyEditOptions): void;
 
     /** For each cursor, insert a newline at the end of the preceding line. */
-    insertNewlineAbove(): void;
+    insertNewlineAbove(options?: ReadonlyEditOptions): void;
 
     /**
      *  For each selection, if the selection is empty, delete all characters of the
      *  containing word that precede the cursor. Otherwise delete the selected text.
      */
-    deleteToBeginningOfWord(): void;
+    deleteToBeginningOfWord(options?: ReadonlyEditOptions): void;
 
     /**
      *  Similar to ::deleteToBeginningOfWord, but deletes only back to the previous
      *  word boundary.
      */
-    deleteToPreviousWordBoundary(): void;
+    deleteToPreviousWordBoundary(options?: ReadonlyEditOptions): void;
 
     /** Similar to ::deleteToEndOfWord, but deletes only up to the next word boundary. */
-    deleteToNextWordBoundary(): void;
+    deleteToNextWordBoundary(options?: ReadonlyEditOptions): void;
 
     /**
      *  For each selection, if the selection is empty, delete all characters of the
      *  containing subword following the cursor. Otherwise delete the selected text.
      */
-    deleteToBeginningOfSubword(): void;
+    deleteToBeginningOfSubword(options?: ReadonlyEditOptions): void;
 
     /**
      *  For each selection, if the selection is empty, delete all characters of the
      *  containing subword following the cursor. Otherwise delete the selected text.
      */
-    deleteToEndOfSubword(): void;
+    deleteToEndOfSubword(options?: ReadonlyEditOptions): void;
 
     /**
      *  For each selection, if the selection is empty, delete all characters of the
      *  containing line that precede the cursor. Otherwise delete the selected text.
      */
-    deleteToBeginningOfLine(): void;
+    deleteToBeginningOfLine(options?: ReadonlyEditOptions): void;
 
     /**
      *  For each selection, if the selection is not empty, deletes the selection
      *  otherwise, deletes all characters of the containing line following the cursor.
      *  If the cursor is already at the end of the line, deletes the following newline.
      */
-    deleteToEndOfLine(): void;
+    deleteToEndOfLine(options?: ReadonlyEditOptions): void;
 
     /**
      *  For each selection, if the selection is empty, delete all characters of the
      *  containing word following the cursor. Otherwise delete the selected text.
      */
-    deleteToEndOfWord(): void;
+    deleteToEndOfWord(options?: ReadonlyEditOptions): void;
 
     /** Delete all lines intersecting selections. */
-    deleteLine(): void;
+    deleteLine(options?: ReadonlyEditOptions): void;
 
     // History
     /** Undo the last change. */
-    undo(): void;
+    undo(options?: ReadonlyEditOptions): void;
 
     /** Redo the last change. */
-    redo(): void;
+    redo(options?: ReadonlyEditOptions): void;
 
     /**
      *  Batch multiple operations as a single undo/redo step.
@@ -2284,10 +2287,10 @@ export class TextEditor {
         { preserveLeadingWhitespace?: boolean }): void;
 
     /** Indent rows intersecting selections by one level. */
-    indentSelectedRows(): void;
+    indentSelectedRows(options?: ReadonlyEditOptions): void;
 
     /** Outdent rows intersecting selections by one level. */
-    outdentSelectedRows(): void;
+    outdentSelectedRows(options?: ReadonlyEditOptions): void;
 
     /**
      *  Get the indentation level of the given line of text.
@@ -2298,7 +2301,7 @@ export class TextEditor {
     indentLevelForLine(line: string): number;
 
     /** Indent rows intersecting selections based on the grammar's suggested indent level. */
-    autoIndentSelectedRows(): void;
+    autoIndentSelectedRows(options?: ReadonlyEditOptions): void;
 
     // Grammars
     /** Get the current Grammar of this editor. */
@@ -2328,7 +2331,7 @@ export class TextEditor {
     copySelectedText(): void;
 
     /** For each selection, cut the selected text. */
-    cutSelectedText(): void;
+    cutSelectedText(options?: ReadonlyEditOptions): void;
 
     /**
      *  For each selection, replace the selected text with the contents of the clipboard.
@@ -2336,19 +2339,19 @@ export class TextEditor {
      *  each selection will be replaced with the content of the corresponding clipboard
      *  selection text.
      */
-    pasteText(options?: TextInsertionOptions): void;
+    pasteText(options?: TextInsertionOptions & ReadonlyEditOptions): void;
 
     /**
      *  For each selection, if the selection is empty, cut all characters of the
      *  containing screen line following the cursor. Otherwise cut the selected text.
      */
-    cutToEndOfLine(): void;
+    cutToEndOfLine(options?: ReadonlyEditOptions): void;
 
     /**
      *  For each selection, if the selection is empty, cut all characters of the
      *  containing buffer line following the cursor. Otherwise cut the selected text.
      */
-    cutToEndOfBufferLine(): void;
+    cutToEndOfBufferLine(options?: ReadonlyEditOptions): void;
 
     // Folds
     /**
@@ -3322,7 +3325,7 @@ export class Directory {
     /** Returns a boolean, always false. */
     isFile(): this is File;
 
-    /** Returns a roolean, always true. */
+    /** Returns a boolean, always true. */
     isDirectory(): this is Directory;
 
     /** Returns a boolean indicating whether or not this is a symbolic link. */
@@ -4716,107 +4719,107 @@ export interface Selection {
 
     // Modifying the selected text
     /** Replaces text at the current selection. */
-    insertText(text: string, options?: TextInsertionOptions): void;
+    insertText(text: string, options?: TextInsertionOptions & ReadonlyEditOptions): void;
 
     /**
      *  Removes the first character before the selection if the selection is empty
      *  otherwise it deletes the selection.
      */
-    backspace(): void;
+    backspace(options?: ReadonlyEditOptions): void;
 
     /**
      *  Removes the selection or, if nothing is selected, then all characters from
      *  the start of the selection back to the previous word boundary.
      */
-    deleteToPreviousWordBoundary(): void;
+    deleteToPreviousWordBoundary(options?: ReadonlyEditOptions): void;
 
     /**
      *  Removes the selection or, if nothing is selected, then all characters from
      *  the start of the selection up to the next word boundary.
      */
-    deleteToNextWordBoundary(): void;
+    deleteToNextWordBoundary(options?: ReadonlyEditOptions): void;
 
     /**
      *  Removes from the start of the selection to the beginning of the current
      *  word if the selection is empty otherwise it deletes the selection.
      */
-    deleteToBeginningOfWord(): void;
+    deleteToBeginningOfWord(options?: ReadonlyEditOptions): void;
 
     /**
      *  Removes from the beginning of the line which the selection begins on all
      *  the way through to the end of the selection.
      */
-    deleteToBeginningOfLine(): void;
+    deleteToBeginningOfLine(options?: ReadonlyEditOptions): void;
 
     /**
      *  Removes the selection or the next character after the start of the selection
      *  if the selection is empty.
      */
-    delete(): void;
+    delete(options?: ReadonlyEditOptions): void;
 
     /**
      *  If the selection is empty, removes all text from the cursor to the end of
      *  the line. If the cursor is already at the end of the line, it removes the following
      *  newline. If the selection isn't empty, only deletes the contents of the selection.
      */
-    deleteToEndOfLine(): void;
+    deleteToEndOfLine(options?: ReadonlyEditOptions): void;
 
     /**
      *  Removes the selection or all characters from the start of the selection to
      *  the end of the current word if nothing is selected.
      */
-    deleteToEndOfWord(): void;
+    deleteToEndOfWord(options?: ReadonlyEditOptions): void;
 
     /**
      *  Removes the selection or all characters from the start of the selection to
      *  the end of the current word if nothing is selected.
      */
-    deleteToBeginningOfSubword(): void;
+    deleteToBeginningOfSubword(options?: ReadonlyEditOptions): void;
 
     /**
      *  Removes the selection or all characters from the start of the selection to
      *  the end of the current word if nothing is selected.
      */
-    deleteToEndOfSubword(): void;
+    deleteToEndOfSubword(options?: ReadonlyEditOptions): void;
 
     /** Removes only the selected text. */
-    deleteSelectedText(): void;
+    deleteSelectedText(options?: ReadonlyEditOptions): void;
 
     /**
      *  Removes the line at the beginning of the selection if the selection is empty
      *  unless the selection spans multiple lines in which case all lines are removed.
      */
-    deleteLine(): void;
+    deleteLine(options?: ReadonlyEditOptions): void;
 
     /**
      *  Joins the current line with the one below it. Lines will be separated by a single space.
      *  If there selection spans more than one line, all the lines are joined together.
      */
-    joinLines(): void;
+    joinLines(options?: ReadonlyEditOptions): void;
 
     /** Removes one level of indent from the currently selected rows. */
-    outdentSelectedRows(): void;
+    outdentSelectedRows(options?: ReadonlyEditOptions): void;
 
     /**
      *  Sets the indentation level of all selected rows to values suggested by the
      *  relevant grammars.
      */
-    autoIndentSelectedRows(): void;
+    autoIndentSelectedRows(options?: ReadonlyEditOptions): void;
 
     /**
      *  Wraps the selected lines in comments if they aren't currently part of a comment.
      *  Removes the comment if they are currently wrapped in a comment.
      */
-    toggleLineComments(): void;
+    toggleLineComments(options?: ReadonlyEditOptions): void;
 
     /** Cuts the selection until the end of the screen line. */
-    cutToEndOfLine(): void;
+    cutToEndOfLine(maintainClipboard?: boolean, options?: ReadonlyEditOptions): void;
 
     /** Cuts the selection until the end of the buffer line. */
-    cutToEndOfBufferLine(): void;
+    cutToEndOfBufferLine(maintainClipboard?: boolean, options?: ReadonlyEditOptions): void;
 
     /** Copies the selection to the clipboard and then deletes it. */
-    cut(maintainClipboard?: boolean, fullLine?: boolean): void;
+    cut(maintainClipboard?: boolean, fullLine?: boolean, options?: ReadonlyEditOptions): void;
 
     /** Copies the current selection to the clipboard. */
     copy(maintainClipboard?: boolean, fullLine?: boolean): void;
@@ -4825,7 +4828,7 @@ export interface Selection {
     fold(): void;
 
     /** If the selection spans multiple rows, indent all of them. */
-    indentSelectedRows(): void;
+    indentSelectedRows(options?: ReadonlyEditOptions): void;
 
     // Managing multiple selections
     /** Moves the selection down one row. */
@@ -5134,6 +5137,12 @@ export class TextBuffer {
      */
     nextNonBlankRow(startRow: number): number|null;
 
+    /**
+     *  Return true if the buffer contains any astral-plane Unicode characters that
+     *  are encoded as surrogate pairs.
+     */
+    hasAstral(): boolean;
+
     // Mutating Text
     /** Replace the entire contents of the buffer with the given text. */
     setText(text: string): Range;
@@ -5172,7 +5181,7 @@ export class TextBuffer {
 
     // Markers
     /** Create a layer to contain a set of related markers. */
-    addMarkerLayer(options?: { maintainHistory?: boolean, persistent?: boolean }):
+    addMarkerLayer(options?: { maintainHistory?: boolean, persistent?: boolean, role?: string }):
         MarkerLayer;
 
     /**
@@ -5210,16 +5219,18 @@ export class TextBuffer {
      *  Undo the last operation. If a transaction is in progress, aborts it.
      *  @return A boolean of whether or not a change was made.
      */
-    undo(): boolean;
+    undo(options?: { selectionsMarkerLayer?: MarkerLayer }): boolean;
 
     /**
      *  Redo the last operation.
      *  @return A boolean of whether or not a change was made.
      */
-    redo(): boolean;
+    redo(options?: { selectionsMarkerLayer?: MarkerLayer }): boolean;
 
     /** Batch multiple operations as a single undo/redo step. */
-    transact<T>(groupingInterval: number, fn: () => T): T;
+    transact<T>(optionsOrInterval: number | { groupingInterval?: number,
+        selectionsMarkerLayer?: MarkerLayer }, fn: () => T): T;
+    /** Batch multiple operations as a single undo/redo step. */
     transact<T>(fn: () => T): T;
 
     /**
@@ -5237,20 +5248,22 @@ export class TextBuffer {
      *  `::revertToCheckpoint` and `::groupChangesSinceCheckpoint`.
      *  @return A checkpoint ID value.
      */
-    createCheckpoint(): number;
+    createCheckpoint(options?: { selectionsMarkerLayer?: MarkerLayer }): number;
 
     /**
      *  Revert the buffer to the state it was in when the given checkpoint was created.
      *  @return A boolean indicating whether the operation succeeded.
      */
-    revertToCheckpoint(checkpoint: number): boolean;
+    revertToCheckpoint(checkpoint: number, options?: { selectionsMarkerLayer: MarkerLayer }):
+        boolean;
 
     /**
      *  Group all changes since the given checkpoint into a single transaction for
      *  purposes of undo/redo.
      *  @return A boolean indicating whether the operation succeeded.
      */
-    groupChangesSinceCheckpoint(checkpoint: number): boolean;
+    groupChangesSinceCheckpoint(checkpoint: number, options?:
+        { selectionsMarkerLayer: MarkerLayer }): boolean;
 
     /**
      *  Group the last two text changes for purposes of undo/redo.
@@ -5828,7 +5841,7 @@ export interface TextEditorObservedEvent {
 // information under certain contexts.
 
 // NOTE: the config schema with these defaults can be found here:
-//   https://github.com/atom/atom/blob/v1.26.0/src/config-schema.js
+//   https://github.com/atom/atom/blob/v1.27.0/src/config-schema.js
 /**
  *  Allows you to strongly type Atom configuration variables. Additional key:value
  *  pairings merged into this interface will result in configuration values under
@@ -6413,6 +6426,11 @@ export interface ProcessOptions extends NodeProcessOptions {
     autoStart?: boolean;
 }
 
+export interface ReadonlyEditOptions {
+    /** Whether the readonly protections on the text editor should be ignored. */
+    bypassReadOnly?: boolean;
+}
+
 export interface ScanContextOptions {
     /** The number of lines before the matched line to include in the results object. */
     leadingContextLineCount?: number;

From 18b3cf6e7412f754bf9f43c4d44e149c74f50c6b Mon Sep 17 00:00:00 2001
From: AndersonFriaca <afriacaxd@gmail.com>
Date: Sun, 20 May 2018 15:51:51 -0400
Subject: [PATCH 264/575] Types for JQuery Slugify

---
 types/jquery-slugify/index.d.ts              | 33 ++++++++++++++++++++
 types/jquery-slugify/jquery-slugify-tests.ts |  7 +++++
 types/jquery-slugify/tsconfig.json           | 25 +++++++++++++++
 types/jquery-slugify/tslint.json             |  1 +
 4 files changed, 66 insertions(+)
 create mode 100644 types/jquery-slugify/index.d.ts
 create mode 100644 types/jquery-slugify/jquery-slugify-tests.ts
 create mode 100644 types/jquery-slugify/tsconfig.json
 create mode 100644 types/jquery-slugify/tslint.json

diff --git a/types/jquery-slugify/index.d.ts b/types/jquery-slugify/index.d.ts
new file mode 100644
index 0000000000..2bb0da56e1
--- /dev/null
+++ b/types/jquery-slugify/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for jquery-slugify 1.2
+// Project: https://github.com/madflow/jquery-slugify
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+export type Options = Partial<{
+    preSlug: ((source: string) => string);
+    postSlug: ((source: string) => string);
+    slugFunc: ((input: string, options: Options) => string);
+    separator: string;
+    lang: string | boolean;
+    symbols: boolean;
+    maintainCase: boolean;
+    titleCase: string[] | boolean;
+    truncate: number;
+    uric: boolean;
+    uricNoSlash: boolean;
+    mark: boolean;
+    custom: string[];
+}>;
+
+declare global {
+    interface JQuery {
+        slugify(source: string, options?: Options): JQuery;
+    }
+
+    interface JQueryStatic {
+        slugify(source: string, options?: Options): string;
+    }
+}
diff --git a/types/jquery-slugify/jquery-slugify-tests.ts b/types/jquery-slugify/jquery-slugify-tests.ts
new file mode 100644
index 0000000000..af19a4b635
--- /dev/null
+++ b/types/jquery-slugify/jquery-slugify-tests.ts
@@ -0,0 +1,7 @@
+$.slugify("jquery slugify");
+
+$('#slug-target').slugify('#slug-source');
+
+$("#slug-target").slugify("#slug-source", {
+  separator: '_'
+});
diff --git a/types/jquery-slugify/tsconfig.json b/types/jquery-slugify/tsconfig.json
new file mode 100644
index 0000000000..1b5b101efc
--- /dev/null
+++ b/types/jquery-slugify/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-slugify-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery-slugify/tslint.json b/types/jquery-slugify/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/jquery-slugify/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file

From 8f6bd06104b6512e9820145454ed241ea56ea664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarnay=20K=C3=A1lm=C3=A1n?= <kalmi@users.noreply.github.com>
Date: Sun, 20 May 2018 21:54:47 +0200
Subject: [PATCH 265/575] [react-aria-menubutton] onSelection is optional since
 5.1.1

no other api changes since 5.0 according to the project's change log
---
 types/react-aria-menubutton/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/react-aria-menubutton/index.d.ts b/types/react-aria-menubutton/index.d.ts
index 52a77e7435..6866719f3c 100644
--- a/types/react-aria-menubutton/index.d.ts
+++ b/types/react-aria-menubutton/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-aria-menubutton 5.0
+// Type definitions for react-aria-menubutton 5.1.1
 // Project: https://github.com/davidtheclark/react-aria-menubutton
 // Definitions by: Muhammad Fawwaz Orabi <https://github.com/forabi>
 //                 Chris Rohlfs <https://github.com/crohlfs>
@@ -19,7 +19,7 @@ export interface WrapperProps<T extends HTMLElement>
 	 * It will be passed the value of the selected `MenuItem` and
 	 * the React `SyntheticEvent`.
 	 */
-	onSelection(value: any, event: React.SyntheticEvent<T>): any;
+	onSelection?(value: any, event: React.SyntheticEvent<T>): any;
 
 	/**
 	 * A callback to run when the menu is opened or closed.

From eb62b43bcfe2a1ec98c99dc2224d7fe23f3c7e5d Mon Sep 17 00:00:00 2001
From: Karim Alibhai <karim@foko.co>
Date: Sun, 20 May 2018 16:07:19 -0400
Subject: [PATCH 266/575] Fix: loopback async function types

---
 types/loopback/index.d.ts | 653 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 620 insertions(+), 33 deletions(-)

diff --git a/types/loopback/index.d.ts b/types/loopback/index.d.ts
index 087ce2aadd..05a3730d79 100644
--- a/types/loopback/index.d.ts
+++ b/types/loopback/index.d.ts
@@ -18,6 +18,13 @@ import { NextFunction, RequestHandler } from "express";
 
 declare function l(): l.LoopBackApplication;
 declare namespace l {
+      /**
+       * General type for a callback to an async function.
+       */
+      type CallbackWithoutResult = (err: Error | null) => any
+      type CallbackWithResult<T = any> = (err: Error | null, result: T) => any
+      type CallbackWithMultipleResults<T, G> = (err: Error | null, arg0: T, arg1: G) => any
+
       /**
        * The `App` object represents a Loopback application
        * The App object extends [Express](expressjs.com/api.html#express) and
@@ -1183,7 +1190,16 @@ declare namespace l {
              * @param {any} options An optional options object to pass to underlying data-access calls.
              * @param  {() => void} callback Callback function
              */
-            static bulkUpdate(updates: any[], options: any, callback?: () => void): Promise<void> | void;
+            static bulkUpdate(updates: any[], options: any, callback: CallbackWithoutResult): void;
+
+            /**
+             * Apply an update list
+             * **Note: this is not atomic*
+             * @param  {Array} updates An updates list, usually from [createUpdates()](#persistedmodel-createupdates).
+             * @param {any} options An optional options object to pass to underlying data-access calls.
+             * @param  {() => void} callback Callback function
+             */
+            static bulkUpdate(updates: any[], options: any): Promise<void>;
 
             /**
              * Get the changes to a model since the specified checkpoint. Provide a filter object
@@ -1194,13 +1210,29 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {Array} changes An Array of [Change](#change) objects
              */
-            static changes(since: number, filter: any, callback?: (err: Error, changes: any[]) => void): Promise<any[]> | void;
+            static changes(since: number, filter: any, callback: CallbackWithResult): void;
+
+            /**
+             * Get the changes to a model since the specified checkpoint. Provide a filter object
+             * to reduce the number of results returned.
+             * @param  {number} since Return only changes since this checkpoint.
+             * @param  {any}   filter   Include only changes that match this filter, the same as for [#persistedmodel-find](find()).
+             * @callback {() => void} callback Callback function called with `(err, changes)` arguments.
+             * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
+             * @param {Array} changes An Array of [Change](#change) objects
+             */
+            static changes(since: number, filter: any): Promise<any[]>;
 
             /**
              * Create a checkpoint
              * @param  {() => void} callback
              */
-            static checkpoint(callback?: () => void): Promise<void> | void;
+            static checkpoint(callback?: () => void): void;
+
+            /**
+             * Create a checkpoint
+             */
+            static checkpoint(): Promise<void>;
 
             /**
              * Return the number of records that match the optional "where" filter.
@@ -1214,7 +1246,21 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {number} count number of instances updated
              */
-            static count(where?: any, callback?: (err: Error, count: number) => void): Promise<number> | void;
+            static count(where: any, callback: CallbackWithResult<number>): void;
+
+            /**
+             * Return the number of records that match the optional "where" filter.
+             * @param {any} [where] Optional where filter, like
+             * ```
+             * { key: val, key2: {gt: 'val2'}, ...}
+             * ```
+             * <br/>See
+             * [Where filter](docs.strongloop.com/display/LB/Where+filter#Wherefilter-Whereclauseforothermethods).
+             * @callback {() => void} callback Callback function called with `(err, count)` arguments.  Required.
+             * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
+             * @param {number} count number of instances updated
+             */
+            static count(where?: any): Promise<number>;
 
             /**
              * Create new instance of Model, and save to database
@@ -1223,14 +1269,28 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {any} models Model instances or null
              */
-            static create<T = any>(data?: any|any[], callback?: (err: Error, models: T|T[]) => void): Promise<T|T[]> | void;
+            static create<T = any>(data: any | any[], callback: CallbackWithResult<T | T[] | null>): void;
+
+            /**
+             * Create new instance of Model, and save to database
+             * @param {any}|[{any}] data Optional data argument.  Can be either a single model instance or an Array of instances
+             * @returns {T | T[]} Model instances or null
+             */
+            static create<T = any>(data?: any|any[]): Promise<T | T[] | null>;
 
             /**
              * Create a change stream. See here for more info http://loopback.io/doc/en/lb2/Realtime-server-sent-events.html
              * @param {any} options Only changes to models matching this where filter will be included in the ChangeStream.
              * @param {() => void} callback
              */
-            static createChangeStream(options: {where: any}, callback?: (err: Error, changes: any) => void): Promise<any> | void;
+            static createChangeStream(options: {where: any}, callback: CallbackWithResult<any>): void;
+
+            /**
+             * Create a change stream. See here for more info http://loopback.io/doc/en/lb2/Realtime-server-sent-events.html
+             * @param {any} options Only changes to models matching this where filter will be included in the ChangeStream.
+             * @returns {any} changes
+             */
+            static createChangeStream(options: {where: any}): Promise<any>;
 
             /**
              * Create an update list (for `Model.bulkUpdate()`) from a delta list
@@ -1238,7 +1298,14 @@ declare namespace l {
              * @param  {Array}    deltas
              * @param  {() => void} callback
              */
-            static createUpdates(deltas: any[], callback?: () => void): Promise<void> | void;
+            static createUpdates(deltas: any[], callback: CallbackWithoutResult): void;
+
+            /**
+             * Create an update list (for `Model.bulkUpdate()`) from a delta list
+             * (result of `Change.diff()`)
+             * @param  {Array}    deltas
+             */
+            static createUpdates(deltas: any[]): Promise<void>;
 
             /**
              * Get the current checkpoint ID
@@ -1246,7 +1313,13 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {number} currentCheckpointId Current checkpoint ID
              */
-            static currentCheckpoint(callback?: (err: Error, currentCheckpointId: number) => void): Promise<number> | void;
+            static currentCheckpoint(callback: CallbackWithResult<number>): void;
+            
+            /**
+             * Get the current checkpoint ID
+             * @returns {Promise<number>} resolves to currentCheckpointId
+             */
+            static currentCheckpoint(): Promise<number>;
 
             /**
              * Destroy all model instances that match the optional `where` specification
@@ -1262,7 +1335,20 @@ declare namespace l {
              * @param {any} info Additional information about the command outcome.
              * @param {number} info.count number of instances (rows, documents) destroyed
              */
-            static destroyAll(where?: any, callback?: (err: Error, info: any, infoCount: number) => void): Promise<{ info: any, infoCount: number}> | void;
+            static destroyAll(where: any, callback: CallbackWithMultipleResults<any, number>): void;
+
+            /**
+             * Destroy all model instances that match the optional `where` specification
+             * @param {any} [where] Optional where filter, like:
+             * ```
+             * {key: val, key2: {gt: 'val2'}, ...}
+             * ```
+             * <br/>See
+             * [Where filter](docs.strongloop.com/display/LB/Where+filter#Wherefilter-Whereclauseforothermethods)
+             *
+             * @returns {Promise<{ count: number }>} number of instances (rows, documents) destroyed
+             */
+            static destroyAll(where?: any): Promise<{ info: any, infoCount: number}>;
 
             /**
              * Destroy model instance with the specified ID.
@@ -1270,7 +1356,13 @@ declare namespace l {
              * @callback {() => void} callback Callback function called with `(err)` arguments.  Required.
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object)
              */
-            static destroyById(id: any, callback?: (err: Error) => void): Promise<void> | void;
+            static destroyById(id: any, callback: CallbackWithoutResult): void;
+
+            /**
+             * Destroy model instance with the specified ID.
+             * @param {*} id The ID value of model instance to delete.
+             */
+            static destroyById(id: any): Promise<void>;
 
             /**
              * Get a set of deltas and conflicts since the given checkpoint
@@ -1281,7 +1373,15 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {any} result any with `deltas` and `conflicts` properties; see [Change.diff()](#change-diff) for details
              */
-            static diff(since: number, remoteChanges: any[], callback?: (err: Error, result: any) => void): Promise<any> | void;
+            static diff(since: number, remoteChanges: any[], callback: CallbackWithResult<any>): void;
+
+            /**
+             * Get a set of deltas and conflicts since the given checkpoint
+             * See [Change.diff()](#change-diff) for details
+             * @param  {number}  since  Find deltas since this checkpoint.
+             * @param  {Array}  remoteChanges  An Array of change objects.
+             */
+            static diff(since: number, remoteChanges: any[]): Promise<any>;
 
             /**
              * Enable the tracking of changes made to the model. Usually for replication.
@@ -1295,7 +1395,24 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {boolean} exists True if the instance with the specified ID exists; false otherwise
              */
-            static exists(id: any, callback?: (err: Error, exists: boolean) => void): Promise<boolean> | void;
+            static exists(id: any, callback: CallbackWithResult<boolean>): void;
+
+            /**
+             * Check whether a model instance exists in database
+             * @param {id} id Identifier of object (primary key value)
+             */
+            static exists(id: any): Promise<boolean>;
+
+            /**
+             * Find all model instances that match `filter` specification.
+             * See [Querying models](docs.strongloop.com/display/LB/Querying+models)
+             * @callback {() => void} callback Callback function called with `(err, returned-instances)` arguments.    Required.
+             * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
+             * @param {Array} models Model instances matching the filter, or null if none found
+             */
+            static find<T = any>(
+                  callback: CallbackWithResult<T[]>
+            ): void;
 
             /**
              * Find all model instances that match `filter` specification.
@@ -1322,8 +1439,60 @@ declare namespace l {
              * @param {Array} models Model instances matching the filter, or null if none found
              */
             static find<T = any>(
-                  filter?: {fields?: string|any|any[]; include?: string|any|any[]; limit?: number; order?: string; skip?: number; where?: any; },
-                  callback?: (err: Error, models: any[]) => void): Promise<T[]> | void;
+                  filter: {
+                        fields?: string|any|any[];
+                        include?: string|any|any[];
+                        limit?: number;
+                        order?: string;
+                        skip?: number;
+                        where?: any;
+                  },
+                  callback: CallbackWithResult<T[]>
+            ): void;
+            
+            /**
+             * Find all model instances that match `filter` specification.
+             * See [Querying models](docs.strongloop.com/display/LB/Querying+models)
+             * @options {any} [filter] Optional Filter JSON object; see below.
+             * @property {string|any|Array} fields Identify fields to include in return result.
+             * <br/>See [Fields filter](docs.strongloop.com/display/LB/Fields+filter).
+             * @property {string|any|Array} include  See PersistedModel.include documentation.
+             * <br/>See [Include filter](docs.strongloop.com/display/LB/Include+filter).
+             * @property {number} limit Maximum number of instances to return.
+             * <br/>See [Limit filter](docs.strongloop.com/display/LB/Limit+filter).
+             * @property {string} order Sort order: either "ASC" for ascending or "DESC" for descending.
+             * <br/>See [Order filter](docs.strongloop.com/display/LB/Order+filter).
+             * @property {number} skip number of results to skip.
+             * <br/>See [Skip filter](docs.strongloop.com/display/LB/Skip+filter).
+             * @property {any} where Where clause, like
+             * ```
+             * { where: { key: val, key2: {gt: 'val2'}, ...} }
+             * ```
+             * <br/>See
+             * [Where filter](docs.strongloop.com/display/LB/Where+filter#Wherefilter-Whereclauseforqueries)
+             */
+            static find<T = any>(
+                  filter?: {
+                        fields?: string|any|any[];
+                        include?: string|any|any[];
+                        limit?: number;
+                        order?: string;
+                        skip?: number;
+                        where?: any;
+                  }
+            ): Promise<T[]>;
+
+            /**
+             * Find object by ID with an optional filter for include/fields
+             * @param {*} id Primary key value
+             * @callback {() => void} callback Callback function called with `(err, instance)` arguments.  Required.
+             * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
+             * @param {any} instance Model instance matching the specified ID or null if no instance matches
+             */
+            static findById<T = any>(
+                  id: any,
+                  callback: CallbackWithResult<T>
+            ): void;
 
             /**
              * Find object by ID with an optional filter for include/fields
@@ -1337,7 +1506,43 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {any} instance Model instance matching the specified ID or null if no instance matches
              */
-            static findById<T = any>(id: any, filter?: {fields?: string|any|any[]; include?: string|any|any[]; }, callback?: (err: Error, instance: T) => void): Promise<T> | void;
+            static findById<T = any>(
+                  id: any,
+                  filter: {
+                        fields?: string|any|any[];
+                        include?: string|any|any[];
+                  },
+                  callback: CallbackWithResult<T>
+            ): void;
+            
+            /**
+             * Find object by ID with an optional filter for include/fields
+             * @param {*} id Primary key value
+             * @options {any} [filter] Optional Filter JSON object; see below.
+             * @property {string|any|Array} fields Identify fields to include in return result.
+             * <br/>See [Fields filter](docs.strongloop.com/display/LB/Fields+filter).
+             * @property {string|any|Array} include  See PersistedModel.include documentation.
+             * <br/>See [Include filter](docs.strongloop.com/display/LB/Include+filter).
+             */
+            static findById<T = any>(
+                  id: any,
+                  filter?: {
+                        fields?: string|any|any[];
+                        include?: string|any|any[];
+                  },
+            ): Promise<T>;
+
+            /**
+             * Find one model instance that matches `filter` specification.
+             * Same as `find`, but limited to one result;
+             * Returns object, not collection
+             * @callback {() => void} callback Callback function called with `(err, returned-instance)` arguments.  Required.
+             * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
+             * @param {Array} model First model instance that matches the filter or null if none found
+             */
+            static findOne<T = any>(
+                  callback: CallbackWithResult<T>
+            ): void;
 
             /**
              * Find one model instance that matches `filter` specification.
@@ -1363,14 +1568,63 @@ declare namespace l {
              * @param {Array} model First model instance that matches the filter or null if none found
              */
             static findOne<T = any>(
-                  filter?: {
+                  filter: {
                         fields?: string|any|any[];
                         include?: string|any|any[];
                         order?: string;
                         skip?: number;
                         where?: any;
                   },
-                  callback?: (err: Error, instance: T) => void): Promise<T> | void;
+                  callback: CallbackWithResult<T>
+            ): void;
+
+            /**
+             * Find one model instance that matches `filter` specification.
+             * Same as `find`, but limited to one result;
+             * Returns object, not collection
+             * @options {any} [filter] Optional Filter JSON object; see below.
+             * @property {string|any|Array} fields Identify fields to include in return result.
+             * <br/>See [Fields filter](docs.strongloop.com/display/LB/Fields+filter).
+             * @property {string|any|Array} include  See PersistedModel.include documentation.
+             * <br/>See [Include filter](docs.strongloop.com/display/LB/Include+filter).
+             * @property {string} order Sort order: either "ASC" for ascending or "DESC" for descending.
+             * <br/>See [Order filter](docs.strongloop.com/display/LB/Order+filter).
+             * @property {number} skip number of results to skip.
+             * <br/>See [Skip filter](docs.strongloop.com/display/LB/Skip+filter).
+             * @property {any} where Where clause, like
+             * ```
+             * {where: { key: val, key2: {gt: 'val2'}, ...} }
+             * ```
+             * <br/>See
+             * [Where filter](docs.strongloop.com/display/LB/Where+filter#Wherefilter-Whereclauseforqueries)
+             */
+            static findOne<T = any>(
+                  filter?: {
+                        fields?: string|any|any[];
+                        include?: string|any|any[];
+                        order?: string;
+                        skip?: number;
+                        where?: any;
+                  }
+            ): Promise<T>;
+
+            /**
+             * Finds one record matching the optional filter object. If not found, creates
+             * the object using the data provided as second argument. In this sense it is
+             * the same as `find`, but limited to one object. Returns an object, not
+             * collection. If you don't provide the filter object argument, it tries to
+             * locate an existing object that matches the `data` argument
+             *
+             * @param {any} data Data to insert if object matching the `where` filter is not found.
+             * @callback {() => void} callback Callback function called with `cb(err, instance, created)` arguments.  Required.
+             * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
+             * @param {any} instance Model instance matching the `where` filter, if found.
+             * @param {boolean} created True if the instance matching the `where` filter was created
+             */
+            static findOrCreate<T = any>(
+                  data: any,
+                  callback: CallbackWithMultipleResults<T, boolean>
+            ): void;
 
             /**
              * Finds one record matching the optional filter object. If not found, creates
@@ -1404,7 +1658,7 @@ declare namespace l {
              */
             static findOrCreate<T = any>(
                   data: any,
-                  filter?: {
+                  filter: {
                         fields?: string | any | any[];
                         include?: string | any | any[];
                         limit?: number;
@@ -1412,7 +1666,46 @@ declare namespace l {
                         skip?: number;
                         where?: any;
                   },
-                  callback?: (err: Error, instance: any, created: boolean) => void): Promise<{instance: T, created: boolean}> | void;
+                  callback: CallbackWithMultipleResults<T, boolean>
+            ): void;
+
+            /**
+             * Finds one record matching the optional filter object. If not found, creates
+             * the object using the data provided as second argument. In this sense it is
+             * the same as `find`, but limited to one object. Returns an object, not
+             * collection. If you don't provide the filter object argument, it tries to
+             * locate an existing object that matches the `data` argument
+             *
+             * @options {any} [filter] Optional Filter object; see below.
+             * @property {string|any|Array} fields Identify fields to include in return result.
+             * <br/>See [Fields filter](docs.strongloop.com/display/LB/Fields+filter).
+             * @property {string|any|Array} include  See PersistedModel.include documentation.
+             * <br/>See [Include filter](docs.strongloop.com/display/LB/Include+filter).
+             * @property {number} limit Maximum number of instances to return.
+             * <br/>See [Limit filter](docs.strongloop.com/display/LB/Limit+filter).
+             * @property {string} order Sort order: either "ASC" for ascending or "DESC" for descending.
+             * <br/>See [Order filter](docs.strongloop.com/display/LB/Order+filter).
+             * @property {number} skip number of results to skip.
+             * <br/>See [Skip filter](docs.strongloop.com/display/LB/Skip+filter).
+             * @property {any} where Where clause, like
+             * ```
+             * {where: {key: val, key2: {gt: val2}, ...}}
+             * ```
+             * <br/>See
+             * [Where filter](docs.strongloop.com/display/LB/Where+filter#Wherefilter-Whereclauseforqueries).
+             * @param {any} data Data to insert if object matching the `where` filter is not found.
+             */
+            static findOrCreate<T = any>(
+                  data: any,
+                  filter?: {
+                        fields?: string | any | any[];
+                        include?: string | any | any[];
+                        limit?: number;
+                        order?: string;
+                        skip?: number;
+                        where?: any;
+                  }
+            ): Promise<{instance: T, created: boolean}>;
 
             /**
              * Get the `Change` model.
@@ -1432,7 +1725,12 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {string} sourceId Source identifier for the model or dataSource
              */
-            static getSourceId(callback?: (err: Error, sourceId: string) => void): Promise<string> | void;
+            static getSourceId(callback: CallbackWithResult<string>): void;
+
+            /**
+             * Get the source identifier for this model or dataSource
+             */
+            static getSourceId(): Promise<string>;
 
             /**
              * Handle a change error. Override this method in a subclassing model to customize
@@ -1447,7 +1745,29 @@ declare namespace l {
              * @callback {() => void} callback
              * @param {Error} er
              */
-            static rectifyChange(id: any, callback?: (err: Error) => void): Promise<void> | void;
+            static rectifyChange(id: any, callback: CallbackWithoutResult): void;
+
+            /**
+             * Specify that a change to the model with the given ID has occurred
+             * @param {*} id The ID of the model that has changed.
+             */
+            static rectifyChange(id: any): Promise<void>;
+
+            /**
+             * Replace attributes for a model instance whose id is the first input
+             * argument and persist it into the datasource.
+             * Performs validation before replacing
+             * @param {*} id The ID value of model instance to replace.
+             * @param {any} data Data to replace.
+             * @callback {() => void} callback Callback function called with `(err, instance)` arguments.
+             * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
+             * @param {any} instance Replaced instance
+             */
+            static replaceById<T = any>(
+                  id: any,
+                  data: any,
+                  callback: CallbackWithResult<T>
+            ): void;
 
             /**
              * Replace attributes for a model instance whose id is the first input
@@ -1461,7 +1781,45 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {any} instance Replaced instance
              */
-            static replaceById<T = any>(id: any, data: any, options?: {validate: boolean; }, callback?: (err: Error, instance: T) => void): Promise<T> | void;
+            static replaceById<T = any>(
+                  id: any,
+                  data: any,
+                  options: {
+                        validate: boolean;
+                  },
+                  callback: CallbackWithResult<T>
+            ): void;
+
+            /**
+             * Replace attributes for a model instance whose id is the first input
+             * argument and persist it into the datasource.
+             * Performs validation before replacing
+             * @param {*} id The ID value of model instance to replace.
+             * @param {any} data Data to replace.
+             * @options {any} [options] Options for replace
+             * @property {boolean} validate Perform validation before saving.  Default is true.
+             */
+            static replaceById<T = any>(
+                  id: any,
+                  data: any,
+                  options?: {
+                        validate: boolean;
+                  }
+            ): Promise<T>;
+
+            /**
+             * Replace or insert a model instance; replace existing record if one is found,
+             * such that parameter `data.id` matches `id` of model instance; otherwise,
+             * insert a new record.
+             * @param {any} data The model instance data.
+             * @callback {() => void} callback Callback function called with `cb(err, obj)` signature.
+             * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
+             * @param {any} model Replaced model instance.
+             */
+            static replaceOrCreate<T = any>(
+                  data: any,
+                  callback: CallbackWithResult<T>
+            ): void;
 
             /**
              * Replace or insert a model instance; replace existing record if one is found,
@@ -1474,7 +1832,28 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {any} model Replaced model instance.
              */
-            static replaceOrCreate<T = any>(data: any, options?: {validate: boolean; }, callback?: (err: Error, instance: T) => void): Promise<T> | void;
+            static replaceOrCreate<T = any>(
+                  data: any,
+                  options: {
+                        validate: boolean;
+                  },
+                  callback: CallbackWithResult<T>
+            ): void;
+
+            /**
+             * Replace or insert a model instance; replace existing record if one is found,
+             * such that parameter `data.id` matches `id` of model instance; otherwise,
+             * insert a new record.
+             * @param {any} data The model instance data.
+             * @options {any} [options] Options for replaceOrCreate
+             * @property {boolean} validate Perform validation before saving.  Default is true.
+             */
+            static replaceOrCreate<T = any>(
+                  data: any,
+                  options?: {
+                        validate: boolean;
+                  }
+            ): Promise<T>;
 
             /**
              * Replicate changes since the given checkpoint to the given target model
@@ -1485,7 +1864,7 @@ declare namespace l {
              * @callback {() => void} [callback] Callback function called with `(err, conflicts)` arguments.
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {Conflict[]} conflicts A list of changes that could not be replicated due to conflicts.
-             * @param {any] checkpoints The new checkpoints to use as the "since"
+             * @param {any} checkpoints The new checkpoints to use as the "since"
              * argument for the next replication
              */
             static replicate(
@@ -1496,6 +1875,18 @@ declare namespace l {
                   callback?: (err: Error, conflicts: Conflict[], param: any) => void
             ): Promise<{conflicts: Conflict[], params: any}> | void;
 
+            /**
+             * Update multiple instances that match the where clause.
+             * @callback {() => void} callback Callback function called with `(err, info)` arguments.  Required.
+             * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
+             * @param {any} info Additional information about the command outcome.
+             * @param {number} info.count number of instances (rows, documents) updated.
+             *
+             */
+            static updateAll(
+                  callback: CallbackWithMultipleResults<any, number>
+            ): void;
+
             /**
              * Update multiple instances that match the where clause.
              *
@@ -1521,7 +1912,65 @@ declare namespace l {
              * @param {number} info.count number of instances (rows, documents) updated.
              *
              */
-            static updateAll(where?: any, data?: any, callback?: (err: Error, info: any, infoCount: number) => void): Promise<number> | void;
+            static updateAll(
+                  whereOrData: any,
+                  callback: CallbackWithMultipleResults<any, number>
+            ): void;
+
+            /**
+             * Update multiple instances that match the where clause.
+             *
+             * Example:
+             *
+             * ```js
+             * Employee.updateAll({managerId: 'x001'}, {managerId: 'x002'}, function(err, info) {
+             *     ...
+             * });
+             * ```
+             *
+             * @param {any} [where] Optional `where` filter, like
+             * ```
+             * { key: val, key2: {gt: 'val2'}, ...}
+             * ```
+             * <br/>see
+             * [Where filter](docs.strongloop.com/display/LB/Where+filter#Wherefilter-Whereclauseforothermethods).
+             * @param {any} data any containing data to replace matching instances, if any.
+             *
+             * @callback {() => void} callback Callback function called with `(err, info)` arguments.  Required.
+             * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
+             * @param {any} info Additional information about the command outcome.
+             * @param {number} info.count number of instances (rows, documents) updated.
+             *
+             */
+            static updateAll(
+                  where: any,
+                  data: any,
+                  callback: CallbackWithMultipleResults<any, number>
+            ): void;
+
+            /**
+             * Update multiple instances that match the where clause.
+             *
+             * Example:
+             *
+             * ```js
+             * Employee.updateAll({managerId: 'x001'}, {managerId: 'x002'}, function(err, info) {
+             *     ...
+             * });
+             * ```
+             *
+             * @param {any} [where] Optional `where` filter, like
+             * ```
+             * { key: val, key2: {gt: 'val2'}, ...}
+             * ```
+             * <br/>see
+             * [Where filter](docs.strongloop.com/display/LB/Where+filter#Wherefilter-Whereclauseforothermethods).
+             * @param {any} data any containing data to replace matching instances, if any.
+             */
+            static updateAll(
+                  where?: any,
+                  data?: any
+            ): Promise<number>;
 
             /**
              * Update or insert a model instance
@@ -1530,7 +1979,21 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {any} model Updated model instance
              */
-            static upsert<T = any>(data: any, callback?: (err: Error, instance: T) => void): Promise<T> | void;
+            static upsert<T = any>(
+                  data: any,
+                  callback: CallbackWithResult<T>
+            ): void;
+
+            /**
+             * Update or insert a model instance
+             * @param {any} data The model instance data to insert.
+             * @callback {() => void} callback Callback function called with `cb(err, obj)` signature.
+             * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
+             * @param {any} model Updated model instance
+             */
+            static upsert<T = any>(
+                  data: any
+            ): Promise<T>;
 
             /**
              * Update or insert a model instance based on the search criteria.
@@ -1548,14 +2011,40 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {any} model Updated model instance
              */
-            static upsertWithWhere<T = any>(data: any, callback?: (err: Error, instance: T) => void): Promise<T> | void;
+            static upsertWithWhere<T = any>(
+                  data: any,
+                  callback: CallbackWithResult<T>
+            ): void;
+
+            /**
+             * Update or insert a model instance based on the search criteria.
+             * If there is a single instance retrieved, update the retrieved model.
+             * Creates a new model if no model instances were found.
+             * Returns an error if multiple instances are found.
+             * * @param {any} [where]  `where` filter, like
+             * ```
+             * { key: val, key2: {gt: 'val2'}, ...}
+             * ```
+             * <br/>see
+             * [Where filter](docs.strongloop.com/display/LB/Where+filter#Wherefilter-Whereclauseforothermethods).
+             * @param {any} data The model instance data to insert.
+             */
+            static upsertWithWhere<T = any>(
+                  data: any
+            ): Promise<T>;
 
             /**
              * Deletes the model from persistence.
              * Triggers `destroy` hook (async) before and after destroying object.
              * @param {() => void} callback Callback function
              */
-            destroy(callback?: () => void): Promise<void>  | void;
+            destroy(callback: CallbackWithoutResult): void;
+
+            /**
+             * Deletes the model from persistence.
+             * Triggers `destroy` hook (async) before and after destroying object.
+             */
+            destroy(): Promise<void>;
 
             /**
              * Get the `id` value for the `PersistedModel`
@@ -1581,7 +2070,25 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {any} instance Model instance
              */
-            reload<T = any>(callback: (err: Error, instance: T) => void): Promise<T> | void;
+            reload<T = any>(callback: CallbackWithResult<T>): void;
+
+            /**
+             * Reload object from persistence.  Requires `id` member of `object` to be able to call `find`.
+             */
+            reload<T = any>(): Promise<T>;
+
+            /**
+             * Replace attributes for a model instance and persist it into the datasource.
+             * Performs validation before replacing
+             * @param {any} data Data to replace.
+             * @callback {() => void} callback Callback function called with `(err, instance)` arguments.
+             * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
+             * @param {any} instance Replaced instance
+             */
+            replaceAttributes<T = any>(
+                  data: any,
+                  callback: CallbackWithResult<T>
+            ): void;
 
             /**
              * Replace attributes for a model instance and persist it into the datasource.
@@ -1593,7 +2100,38 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {any} instance Replaced instance
              */
-            replaceAttributes<T = any>(data: any, options?: {validate: boolean}, callback?: (err: Error, instance: T) => void): Promise<T> | void;
+            replaceAttributes<T = any>(
+                  data: any,
+                  options: {
+                        validate: boolean
+                  },
+                  callback: CallbackWithResult<T>
+            ): void;
+
+            /**
+             * Replace attributes for a model instance and persist it into the datasource.
+             * Performs validation before replacing
+             * @param {any} data Data to replace.
+             * @options {any} [options] Options for replace
+             * @property {boolean} validate Perform validation before saving.  Default is true.
+             */
+            replaceAttributes<T = any>(
+                  data: any,
+                  options?: {
+                        validate: boolean
+                  }
+            ): Promise<T>;
+
+            /**
+             * Save model instance. If the instance doesn't have an ID, then calls [create](#persistedmodelcreatedata-cb) instead.
+             * Triggers: validate, save, update, or create.
+             * @callback {() => void} callback Optional callback function called with `(err, obj)` arguments.
+             * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
+             * @param {any} instance Model instance saved or created
+             */
+            save<T = any>(
+                  callback: CallbackWithResult<T>
+            ): void;
 
             /**
              * Save model instance. If the instance doesn't have an ID, then calls [create](#persistedmodelcreatedata-cb) instead.
@@ -1606,7 +2144,28 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {any} instance Model instance saved or created
              */
-            save<T = any>(options?: {validate: boolean; throws: boolean}, callback?: (err: Error, instance: T) => void): Promise<T> | void;
+            save<T = any>(
+                  options: {
+                        validate: boolean;
+                        throws: boolean
+                  },
+                  callback: CallbackWithResult<T>
+            ): void;
+
+            /**
+             * Save model instance. If the instance doesn't have an ID, then calls [create](#persistedmodelcreatedata-cb) instead.
+             * Triggers: validate, save, update, or create.
+             * @options {any} [options] See below.
+             * @property {boolean} validate Perform validation before saving.  Default is true.
+             * @property {boolean} throws If true, throw a validation error; WARNING: This can crash Node.
+             * If false, report the error via callback.  Default is false.
+             */
+            save<T = any>(
+                  options?: {
+                        validate: boolean;
+                        throws: boolean
+                  }
+            ): Promise<T>;
 
             /**
              * Set the correct `id` property for the `PersistedModel`. Uses the `setId` method if the model is attached to
@@ -1625,7 +2184,22 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {any} instance Updated instance
              */
-            updateAttribute<T = any>(name: string, value: any, callback?: (err: Error, instance: T) => void): Promise<T> | void;
+            updateAttribute<T = any>(
+                  name: string,
+                  value: any,
+                  callback: CallbackWithResult<T>
+            ): void;
+
+            /**
+             * Update a single attribute.
+             * Equivalent to `updateAttributes({name: 'value'}, cb)
+             * @param {string} name Name of property.
+             * @param {any} value Value of property.
+             */
+            updateAttribute<T = any>(
+                  name: string,
+                  value: any
+            ): Promise<T>;
 
             /**
              * Update set of attributes.  Performs validation before updating
@@ -1635,7 +2209,19 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {any} instance Updated instance
              */
-            updateAttributes<T = any>(data: any, callback?: (err: Error, instance: T) => void): Promise<T> | void;
+            updateAttributes<T = any>(
+                  data: any,
+                  callback: CallbackWithResult<T>
+            ): void;
+
+            /**
+             * Update set of attributes.  Performs validation before updating
+             * Triggers: `validation`, `save` and `update` hooks
+             * @param {any} data Data to update.
+             */
+            updateAttributes<T = any>(
+                  data: any
+            ): Promise<T>;
 
             // **NOTE** Deprecate for v3.x
             // /**
@@ -1688,6 +2274,7 @@ declare namespace l {
             // */
             // createany(options: any, optionsWhere: any, callback: (err: Error, changes: any) => void): void;
       }
+      // END OF PERSISTED MODEL
 
       /**
        * Serve the LoopBack favicon.

From 7e99b9efc855d9b3051581f7f74affe04bdce2c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarnay=20K=C3=A1lm=C3=A1n?= <kalmi@users.noreply.github.com>
Date: Sun, 20 May 2018 22:10:13 +0200
Subject: [PATCH 267/575] [react-aria-menubutton] drop patch version to make CI
 happy

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

diff --git a/types/react-aria-menubutton/index.d.ts b/types/react-aria-menubutton/index.d.ts
index 6866719f3c..f7a4ef7de0 100644
--- a/types/react-aria-menubutton/index.d.ts
+++ b/types/react-aria-menubutton/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-aria-menubutton 5.1.1
+// Type definitions for react-aria-menubutton 5.1
 // Project: https://github.com/davidtheclark/react-aria-menubutton
 // Definitions by: Muhammad Fawwaz Orabi <https://github.com/forabi>
 //                 Chris Rohlfs <https://github.com/crohlfs>

From 156c92a61094798a99289ce9aa1eacc18aabb6b5 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sun, 20 May 2018 13:12:58 -0700
Subject: [PATCH 268/575] adding missing documentation for many APIs

---
 types/office-js/index.d.ts | 3321 ++++++++++++++++++++++++++++++++----
 1 file changed, 2982 insertions(+), 339 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 2aa0de0bb1..58c574e126 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -15,11 +15,20 @@ Copyright (c) Microsoft Corporation
 ////////////////////////////////////////////////////////////////
 
 declare namespace Office {
+    /**
+    * Provides a container for APIs that are still in Preview, not released for use in production add-ins.
+    */
     export var Preview: {
+        /**
+         * Initializes the use of custom JavaScript functions in Excel.
+         */
         startCustomFunctions(): Promise<void>;
     }
 
     export var Promise: PromiseConstructor;
+    /**
+     * Gets the Context object that represents the runtime environment of the add-in and provides access to the top-level objects of the API.
+     */
     export var context: Context;
     /**
      * This method is called after the Office API was loaded.
@@ -28,163 +37,232 @@ declare namespace Office {
     export function initialize(reason: InitializationReason): void;
     /**
     * Ensures that the Office JavaScript APIs are ready to be called by the add-in. If the framework hasn't initialized yet, the callback or promise will wait until the Office host is ready to accept API calls.
-    * Note that though this API is intended to be used inside an Office add-in, it can also be used outside the add-in.  In that case, once Office.js determines that it is running outside of an Office host application, it will call the callback and resolve the promise with "null" for both the host and platform.
+    * Note that though this API is intended to be used inside an Office add-in, it can also be used outside the add-in. In that case, once Office.js determines that it is running outside of an Office host application, it will call the callback and resolve the promise with "null" for both the host and platform.
     * @param callback - An optional callback method, that will receive the host and platform info. Alternatively, rather than use a callback, an add-in may simply wait for the Promise returned by the function to resolve.
     * @returns A Promise that contains the host and platform info, once initialization is completed.
     */
     export function onReady(callback?: (info: { host: HostType, platform: PlatformType }) => any): Promise<{ host: HostType, platform: PlatformType }>;
     /**
      * Indicates if the large namespace for objects will be used or not.
-     * @param useShortNamespace  Indicates if 'true' that the short namespace will be used
+     * @param useShortNamespace Indicates if 'true' that the short namespace will be used
      */
     export function useShortNamespace(useShortNamespace: boolean): void;
     // Enumerations
+    /**
+     * Specifies the result of an asynchronous call. 
+     * @remarks
+     * Returned by the status property of the AsyncResult object.
+     * 
+     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+     */
     export enum AsyncResultStatus {
         /**
-         * Operation succeeded
+         * The call succeeded.
          */
         Succeeded,
         /**
-         * Operation failed, check error object
+         * The call failed, check the error object.
          */
         Failed
     }
+    /**
+     * Specifies whether the add-in was just inserted or was already contained in the document.
+     * 
+     * @remarks
+     * Hosts: Excel, Project, Word
+     */
     export enum InitializationReason {
         /**
-         * Indicates the app was just inserted in the document
+         * The add-in was just inserted into the document.
          */
         Inserted,
         /**
-         * Indicates if the extension already existed in the document
+         * The add-in is already part of the document that was opened.
          */
         DocumentOpened
     }
+    /**
+     * Specifies the host Office application in which the add-in is running.
+     * 
+     * @remarks
+     * Hosts: Excel, Word, PowerPoint, Outlook, OneNote, Project, Access
+     */
     export enum HostType {
         /**
-         * Host is Word
+         * The Office host is Microsoft Word.
          */
         Word,
         /**
-         * Host is Excel
+         * The Office host is Microsoft Excel.
          */
         Excel,
         /**
-         * Host is PowerPoint
+         * The Office host is Microsoft PowerPoint.
          */
         PowerPoint,
         /**
-         * Host is Outlook
+         * The Office host is Microsoft Outlook.
          */
         Outlook,
         /**
-         * Host is OneNote
+         * The Office host is Microsoft OneNote.
          */
         OneNote,
         /**
-         * Host is Project
+         * The Office host is Microsoft Project.
          */
         Project,
         /**
-         * Host is Access
+         * The Office host is Microsoft Access.
          */
         Access
     }
+    /**
+     * Specifies the OS or other platform on which the Office host application is running.
+     * 
+     * @remarks
+     * Hosts: Excel, Word, PowerPoint, Outlook, OneNote, Project, Access
+     */
     export enum PlatformType {
         /**
-         * Platform is PC
+         * The platform is PC (Windows).
          */
         PC,
         /**
-         * Platform is Web
+         * The platform is Office Online.
          */
         OfficeOnline,
         /**
-         * Platform is Mac
+         * The platform is Mac.
          */
         Mac,
         /**
-         * Platform is iOS
+         * The platform an iOS device.
          */
         iOS,
         /**
-         * Platform is Android
+         * The platform is an Android device.
          */
         Android,
         /**
-         * Platform is Winrt
+         * The platform is WinRT.
          */
         Universal
     }
     // Objects
         /**
 		* An object which encapsulates the result of an asynchronous request, including status and error information if the request failed.
-		* 
-        * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
-        *
-        * **Last changed in**: 1.1
-        * 
+		*         
         * @remarks
+        * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+        *
+        * Last changed in: 1.1
+        * 
         * When the function you pass to the `callback` parameter of an "Async" method executes, it receives an AsyncResult object that you can access from the `callback` function's only parameter.
 		*/
         export interface AsyncResult {
         /**
         * Gets the user-defined item passed to the optional `asyncContext` parameter of the invoked method in the same state as it was passed in. This the user-defined item (which can be of any JavaScript type: String, Number, Boolean, Object, Array, Null, or Undefined) passed to the optional `asyncContext` parameter of the invoked method. Returns Undefined, if you didn't pass anything to the asyncContext parameter.
+        *         
+        * @remarks
+        * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
         * 
-        * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
-        * 
-        * **Last changed in**: 1.1
+        * Last changed in: 1.1
         */
         asyncContext: any;
         /**
         * Gets the [AsyncResultStatus](office.asyncresultstatus.md) of the asynchronous operation.
         * 
-        * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
+        * @remarks
+        * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
         * 
-        * **Last changed in**: 1.1
+        * Last changed in: 1.1
         */
         status: AsyncResultStatus;
         /**
         * Gets an [Error](office.error.md) object that provides a description of the error, if any error occurred.
         * 
-        * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
+        * @remarks
+        * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
         * 
-        * **Last changed in**: 1.1
+        * Last changed in: 1.1
         */
         error: Error;
         /**
         * Gets the payload or content of this asynchronous operation, if any.
+        
+        * @remarks
+        * You access the AsyncResult object in the function passed as the argument to the callback parameter of an "Async" method, such as the `getSelectedDataAsync` and `setSelectedDataAsync` methods of the Document object.
         * 
         * Note: What the value property returns for a particular "Async" method varies depending on the purpose and context of that method. To determine what is returned by the value property for an "Async" method, refer to the "Callback value" section of the method's topic. For a complete listing of the "Async" methods, see the Remarks section of the AsyncResult object topic.
         * 
-        * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
+        * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
         * 
-        * **Last changed in**: 1.1
-        * 
-        * @remarks
-        * You access the AsyncResult object in the function passed as the argument to the callback parameter of an "Async" method, such as the `getSelectedDataAsync` and `setSelectedDataAsync` methods of the Document object.
+        * Last changed in: 1.1
         */
         value: any;
     }
+    /**
+    * Represents the runtime environment of the add-in and provides access to key objects of the API.
+    * 
+    * @remarks
+    * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+    *
+    * Last changed in: 1.1
+    */
     export interface Context {
+        /**
+        * Provides information and access to the signed-in user.
+        */ 
         auth: Auth;
+        /**
+        * Gets the locale (language) specified by the user for editing the document or item.
+        */
         contentLanguage: string;
+        /**
+        * Gets the locale (language) specified by the user for the UI of the Office host application.
+        */
         displayLanguage: string;
+        /**
+        * 
+        */
         license: string;
+        /**
+        * Provides access to the properties for Office theme colors.
+        */
         officeTheme: OfficeTheme;
+        /**
+        * Provides access to the properties for Office theme colors.
+        */
         touchEnabled: boolean;
+        /**
+        * Provides objects and methods that you can use to create and manipulate UI components, such as dialog boxes.
+        */
         ui: UI;
+        /**
+        * Contains the host in which the add-in (web application) is running in. Possible values are: Word, Excel, PowerPoint
+        */
         host: HostType;
+        /**
+        * Provides the platform on which the add-in is running. Possible values are: PC, OfficeOnline, Mac, iOS, Android, Universal
+        */
         platform: PlatformType;
+        /**
+        * 
+        */
         diagnostics: {
             host: HostType;
             platform: PlatformType;
             version: string;
         };
+        /**
+        * Provides a method for determining what requirement sets are supported on the current host and platform.
+        */
         requirements: {
             /**
              * Check if the specified requirement set is supported by the host Office application.
-             * @param name - Set name. e.g.: "MatrixBindings".
-             * @param minVersion - The minimum required version.
+             * @param name - Set name; e.g., "MatrixBindings".
+             * @param minVersion - The minimum required version; e.g., "1.4".
              */
             isSetSupported(name: string, minVersion?: number): boolean;
         }
@@ -192,7 +270,10 @@ declare namespace Office {
     /**
      * Provides specific information about an error that occurred during an asynchronous data operation.
      * 
-     * Remarks: The Error object is accessed from the AsyncResult object that is returned in the function passed as the callback argument of an asynchronous data operation, such as the setSelectedDataAsync method of the Document object.
+     * @remarks
+     * The Error object is accessed from the AsyncResult object that is returned in the function passed as the callback argument of an asynchronous data operation, such as the setSelectedDataAsync method of the Document object.
+     * 
+     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
      */
     export interface Error {
         /**
@@ -208,49 +289,74 @@ declare namespace Office {
          */
         name: string;
     }
+    /**
+     * Provides objects and methods that you can use to create and manipulate UI components, such as dialog boxes, in your Office Add-ins. 
+     */
     export interface UI {
         /**
-        * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
-        * @param startAddress Accepts the initial HTTPS Url that opens in the dialog.
+        * Displays a dialog to show or collect information from the user or to facilitate Web navigation. 
+		*         
+        * @remarks
+        * Hosts: Word, Excel, Outlook, PowerPoint
+        * 
+        * Requirement sets: DialogApi, Mailbox 1.4
+        * 
+        * Last changed in: DialogApi 1.1, Mailbox 1.4
+        * 
+        * The initial page must be on the same domain as the parent page (the startAddress parameter). After the initial page loads, you can go to other domains.
+        * 
+        * Any page calling office.context.ui.messageParent must also be on the same domain as the parent page.
+        * 
+        * The following design considerations apply to dialog boxes:
+        * 
+        * - An Office Add-in can have only one dialog box open at any time.
+        * 
+        * - Every dialog box can be moved and resized by the user.
+        * 
+        * - Every dialog box is centered on the screen when opened.
+        * 
+        * - Dialog boxes appear on top of the host application and in the order in which they were created.
+        * 
+        * Use a dialog box to:
+        * 
+        * - Display authentication pages to collect user credentials.
+        * 
+        * - Display an error/progress/input screen from a ShowTaspane or ExecuteAction command.
+        * 
+        * - Temporarily increase the surface area that a user has available to complete a task.
+        * 
+        * Do not use a dialog box to interact with a document. Use a task pane instead.
+        *
+        * @param startAddress - Accepts the initial HTTPS URL that opens in the dialog.
+        * @param options - Optional. An object that has any of the following properties:
+        * 
+        *         displayInIframe: Determines whether the dialog box should be displayed within an IFrame. This setting is only applicable in Office Online clients, and is ignored by other platforms. If false (default), the dialog will be displayed as a new browser window (pop-up). Recommended for authentication pages that cannot be displayed in an IFrame. If true, the dialog will be displayed as a floating overlay with an IFrame. This is best for user experience and performance.
+        * 
+        *         height: Defines the height of the dialog box as a percentage of the current display. The default value is 80%. The minimum resolution is 150 pixels.
+        * 
+        *         width: Defines the width of the dialog box as a percentage of the current display. The default value is 80%. The minimum resolution is 250 pixels.
+        * 
+        * @param callback - Optional. Accepts a callback method to handle the dialog creation attempt. If successful, the AsyncResult.value is a DialogHandler object.
         */
-        displayDialogAsync(startAddress: string): void;
+        displayDialogAsync(startAddress: string, options?: DialogOptions, callback?: (result: AsyncResult) => void): void;
         /**
-        * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
-        * @param startAddress Accepts the initial HTTPS Url that opens in the dialog.
-        * @param options Optional. Accepts a DialogOptions object to define dialog behaviors.
-        */
-        displayDialogAsync(startAddress: string, options: DialogOptions): void;
-        /**
-        * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
-        * @param startAddress Accepts the initial HTTPS Url that opens in the dialog.
-        * @param callback Optional. Accepts a callback method to handle the dialog creation attempt.
-        */
-        displayDialogAsync(startAddress: string, callback: (result: AsyncResult) => void): void;
-        /**
-        * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
-        * @param startAddress Accepts the initial HTTPS Url that opens in the dialog.
-        * @param options Optional. Accepts a DialogOptions object to define dialog behaviors.
-        * @param callback Optional. Accepts a callback method to handle the dialog creation attempt.
-        */
-        displayDialogAsync(startAddress: string, options: DialogOptions, callback: (result: AsyncResult) => void): void;
-
-        /**
-         * Synchronously delivers a message from the dialog to its parent add-in.
+         * Delivers a message from the dialog box to its parent/opener page. The page calling this API must be on the same domain as the parent. 
          * @param messageObject Accepts a message from the dialog to deliver to the add-in.
          */
         messageParent(messageObject: any): void;
         /**
          * Closes the UI container where the JavaScript is executing.
-         *
-         * Supported hosts: Outlook - Minimum requirement set: Mailbox 1.5
-         *
+         * 
+         * @remarks
          * The behavior of this method is specified by the following:
-         *
-         * Called from a UI-less command button: No effect. Any dialog opened by displayDialogAsync will remain open.
-         *
-         * Called from a taskpane: The taskpane will close. Any dialog opened by displayDialogAsync will also close. If the taskpane supports pinning and was pinned by the user, it will be un-pinned.
-         *
-         * Called from a module extension: No effect.
+         * 
+         * - Called from a UI-less command button: No effect. Any dialog opened by displayDialogAsync will remain open.
+         * 
+         * - Called from a taskpane: The taskpane will close. Any dialog opened by displayDialogAsync will also close. If the taskpane supports pinning and was pinned by the user, it will be un-pinned.
+         * 
+         * - Called from a module extension: No effect.
+         * 
+         * Hosts: Excel, Word, PowerPoint, Outlook (Minimum requirement set: Mailbox 1.5)
          */
         closeContainer(): void;
     }
@@ -271,15 +377,20 @@ declare namespace Office {
     export interface Auth {
         /**
         * Obtains an access token from AAD V 2.0 endpoint to grant the Office host application access to the add-in's web application.
-        * @param callback Optional. Accepts a callback method to handle the token acquisition attempt. If AsyncResult.status is "succeeded", then AsyncResult.value is the raw AAD v. 2.0-formatted access token.
+        * 
+        * @remarks
+        * Hosts: Excel, OneNote, Outlook, PowerPoint, Word
+        * 
+        * Requirement sets: IdentityAPI
+        * 
+        * Last changed in: 1.1
+        * 
+        * 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 to handle the token acquisition attempt. If AsyncResult.status is "succeeded", then AsyncResult.value is the raw AAD v. 2.0-formatted access token.
         */
-        getAccessTokenAsync(callback: (result: AsyncResult) => void): void;
-        /**
-        * Obtains an access token from AAD V 2.0 endpoint to grant the Office host application access to the add-in's web application.
-        * @param options Optional. Accepts an AuthOptions object to define sign-on behaviors.
-        * @param callback Optional. Accepts a callback method to handle the token acquisition attempt. If AsyncResult.status is "succeeded", then AsyncResult.value is the raw AAD v. 2.0-formatted access token.
-        */
-        getAccessTokenAsync(options: AuthOptions, callback: (result: AsyncResult) => void): void;
+        getAccessTokenAsync(options?: AuthOptions, callback?: (result: AsyncResult) => void): void;
 
     }
     export interface AuthOptions {
@@ -330,90 +441,141 @@ declare namespace Office {
      */
     export function select(expression: string, callback?: (result: AsyncResult) => void): Binding;
     // Enumerations
+    /**
+     * Specifies the state of the active view of the document, for example, whether the user can edit the document.
+     * @remarks
+     * Hosts: PowerPoint
+     */
     export enum ActiveView {
+        /**
+         * The active view of the host application only lets the user read the content in the document.
+         */
         Read,
+        /**
+         * The active view of the host application lets the user edit the content in the document.
+         */
         Edit
     }
+    /**
+     * Specifies the type of the binding object that should be returned.
+     * @remarks
+     * Hosts: Access, Excel, Word
+     */
     export enum BindingType {
         /**
-         * Text based Binding
+         * Plain text. Data is returned as a run of characters.
          */
         Text,
         /**
-         * Matrix based Binding
+         * Tabular data without a header row. Data is returned as an array of arrays, for example in this form: [[row1column1, row1column2],[row2column1, row2column2]]
          */
         Matrix,
         /**
-         * Table based Binding
+         * Tabular data with a header row. Data is returned as a TableData object.
          */
         Table
     }
+    /**
+     * Specifies how to coerce data returned or set by the invoked method.
+     * 
+     * @remarks
+     * PowerPoint supports only Office.CoercionType.Text, Office.CoercionType.Image, and Office.CoercionType.SlideRange. Project supports only Office.CoercionType.Text.
+     * 
+     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+     */
     export enum CoercionType {
         /**
-         * Coerce as Text
+         * Return or set data as text (string).Data is returned or set as a one-dimensional run of characters.
          */
         Text,
         /**
-         * Coerce as Matrix
+         * Return or set data as tabular data with no headers. Data is returned or set as an array of arrays containing one-dimensional runs of characters. For example, three rows of  string values in two columns would be: [["R1C1", "R1C2"], ["R2C1", "R2C2"], ["R3C1", "R3C2"]].
+         * @remarks
+         * Only applies to data in Excel and Word.
          */
         Matrix,
         /**
-         * Coerce as Table
+         * Return or set data as tabular data with optional headers. Data is returned or set as an array of arrays with optional headers.
+         * @remarks
+         * Only applies to data in Access, Excel and Word.
          */
         Table,
         /**
-         * Coerce as HTML
+         * Return or set data as HTML.
+         * @remarks
+         * Only applies to data in add-ins for Word and Outlook add-ins for Outlook (compose mode).
          */
         Html,
         /**
-         * Coerce as Office Open XML
+         * Return or set data as Office Open XML.
+         * @remarks
+         * Only applies to data in Word.
          */
         Ooxml,
         /**
-         * Coerce as JSON object containing an array of the ids, titles, and indexes of the selected slides.
+         * Return a JSON object that contains an array of the ids, titles, and indexes of the selected slides.For example,  {"slides":[{"id":257,"title":"Slide 2","index":2},{"id":256,"title":"Slide 1","index":1}]} for a selection of two slides.
+         * @remarks
+         * Only applies to data in PowerPoint when calling the Document.getSelectedData method to get the current slide or selected range of slides.
          */
         SlideRange,
         /**
-        * Coerce as Image
+        * Data is returned or set as an image stream.
+        * @remarks
+        * Only applies to data in Excel, Word and PowerPoint.
         */
         Image
     }
+    /**
+     * Specifies whether the document in the associated application is read-only or read-write. 
+     * @remarks
+     * Returned by the mode property of the Document object.
+     * 
+     * Hosts: Excel, PowerPoint, Project, Word
+     */
     export enum DocumentMode {
         /**
-         * Document in Read Only Mode
+         * The document is read-only.
          */
         ReadOnly,
         /**
-         * Document in Read/Write Mode
+         * The document can be read and written to.
          */
         ReadWrite
     }
+    /**
+     * Specifies the kind of event that was raised. Returned by the type property of an EventNameEventArgs object.
+     * 
+     * @remarks
+     * Add-ins for Project support the Office.EventType.ResourceSelectionChanged, Office.EventType.TaskSelectionChanged, and Office.EventType.ViewSelectionChanged event types.
+     * 
+     * Hosts: Access, Excel, PowerPoint, Project, Word
+     */
     export enum EventType {
         /**
-         * Occurs when the user changes the current view of the document.
+         * A Document.ActiveViewChanged event was raised.
          */
         ActiveViewChanged,
         /**
          * Occurs when data within the binding is changed.
          * 
+         * @remarks
          * Hosts: Access, Excel, Word
          * 
          * Last changed in: 1.1
          * 
-         * @remarks
          * To add an event handler for the BindingDataChanged event of a binding, use the addHandlerAsync method of the Binding object. The event handler receives an argument of type BindingDataChangedEventArgs.
          */
         BindingDataChanged,
         /**
          * Occurs when the selection is changed within the binding.
          * 
+         * @remarks
          * Hosts: Access, Excel, Word
          * 
          * Available in Requirement set: BindingEvents
          * 
          * Last changed in: 1.1
          * 
-         * @remarks
          * To add an event handler for the BindingSelectionChanged event of a binding, use the addHandlerAsync method of the Binding object. The event handler receives an argument of type BindingSelectionChangedEventArgs.
          */
         BindingSelectionChanged,
@@ -430,7 +592,7 @@ declare namespace Office {
          */
         DocumentSelectionChanged,
         /**
-         * Triggers when the active item changes
+         * A Document.SelectionChanged event was raised.
          */
         ItemChanged,
         /**
@@ -446,7 +608,7 @@ declare namespace Office {
          */
         NodeReplaced,
         /**
-         * Triggers when settings change in a co-Auth session.
+         * A Settings.settingsChanged event was raised.
          */
         SettingsChanged,
         /**
@@ -454,7 +616,7 @@ declare namespace Office {
          */
         TaskSelectionChanged,
         /**
-         *  Triggers when a Resource selection happens in Project.
+         * Triggers when a Resource selection happens in Project.
          */
         ResourceSelectionChanged,
         /**
@@ -462,30 +624,48 @@ declare namespace Office {
          */
         ViewSelectionChanged
     }
+    /**
+     * Specifies the format in which to return the document.
+     * 
+     * @remarks
+     * Hosts: PowerPoint, Word
+     */
     export enum FileType {
         /**
-         * Returns the file as plain text
+         * Returns only the text of the document as a string. (Word only)
          */
         Text,
         /**
-         * Returns the file as a byte array
+         * Returns the entire document (.pptx or .docx or .xslx) in Office Open XML (OOXML) format as a byte array.
          */
         Compressed,
         /**
-         * Returns the file in PDF format as a byte array
+         * Returns the entire document in PDF format as a byte array.
          */
         Pdf
     }
+    /**
+     * Specifies whether filtering from the host application is applied when the data is retrieved.
+     * 
+     * @remarks
+     * Hosts: Excel, Project, Word
+     */
     export enum FilterType {
         /**
-         * Returns all items
+         * Return all data (not filtered by the host application).
          */
         All,
         /**
-         * Returns only visible items
+         * Return only the visible data (as filtered by the host application).
          */
         OnlyVisible
     }
+    /**
+     * Specifies the type of place or object to navigate to.
+     * 
+     * @remarks
+     * Hosts: Excel, PowerPoint, Word
+     */
     export enum GoToType {
         /**
          * Goes to a binding object using the specified binding id.
@@ -501,7 +681,7 @@ declare namespace Office {
          */
         Slide,
         /**
-         * Goes to the specified index by slide number or enum Office.Index
+         * Goes to the specified index by slide number or Office.Index
          */
         Index
     }
@@ -511,18 +691,38 @@ declare namespace Office {
         Next,
         Previous
     }
+    /**
+     * Specifies whether to select (highlight) the location to navigate to (when using the Document.goToByIdAsync method).
+     * 
+     * @remarks
+     * Hosts: Excel, PowerPoint, Word
+     */
     export enum SelectionMode {
         Default,
+        /**
+         * The location will be selected (highlighted).
+         */
         Selected,
+        /**
+         * The cursor is moved the beginning of the location.
+         */
         None
     }
+    /**
+     * Specifies whether values, such as numbers and dates, returned by the invoked method are returned with their formatting applied.
+     * 
+     * @remarks
+     * For example, if the valueFormat parameter is specified as "formatted", a number formatted as currency, or a date formatted as mm/dd/yy in the host application will have its formatting preserved. If the valueFormat parameter is specified as "unformatted", a date will be returned in its underlying sequential serial number form.
+     * 
+     * Hosts: Excel, Project, Word
+     */
     export enum ValueFormat {
         /**
-         * Returns items without format
+         * Return unformatted data.
          */
         Unformatted,
         /**
-         * Returns items with format
+         * Return formatted data.
          */
         Formatted
     }
@@ -530,13 +730,13 @@ declare namespace Office {
     /**
     * Represents a binding to a section of the document.
     * 
-    * **Hosts**: Access, Excel, Word
-    * 
-    * **Available in Requirement sets**: MatrixBinding, TableBinding, TextBinding
-    * 
-    * **Last changed in**: 1.1
-    * 
     * @remarks
+    * Hosts: Access, Excel, Word
+    * 
+    * Available in Requirement sets: MatrixBinding, TableBinding, TextBinding
+    * 
+    * Last changed in: 1.1
+    * 
     * The Binding object exposes the functionality possessed by all bindings regardless of type.
     * 
     * The Binding object is never called directly. It is the abstract parent class of the objects that represent each type of binding: MatrixBinding, TableBinding, or TextBinding. All three of these objects inherit the getDataAsync and setDataAsync methods from the Binding object that enable to you interact with the data in the binding. They also inherit the id and type properties for querying those property values. Additionally, the MatrixBinding and TableBinding objects expose additional methods for matrix- and table-specific features, such as counting the number of rows and columns.
@@ -545,14 +745,16 @@ declare namespace Office {
         /**
         * Get the Document object associated with the binding.
         * 
-        * **Hosts**: Access, Excel, Word
+        *@remarks
+        * Hosts: Access, Excel, Word
         * 
-        * **Last changed in**: 1.1
+        * Last changed in: 1.1
         */
         document: Document;
         /**
          * A string that uniquely identifies this binding among the bindings in the same Document object.
          * 
+         *@remarks
          * Hosts: Access, Excel, Word
          * 
          * Last changed in: 1.1
@@ -561,9 +763,10 @@ declare namespace Office {
         /**
 		* Gets the type of the binding.
 		* 
-        * **Hosts**: Access, Excel, Word
-        
-		* **Last changed in**: 1.1
+        *@remarks
+        * Hosts: Access, Excel, Word
+        *
+		* Last changed in: 1.1
 		*/
         type: BindingType;
         /**
@@ -581,13 +784,13 @@ declare namespace Office {
         /**
          * Returns the data contained within the binding.
          * 
+         *@remarks
          * Hosts: Access, Excel, Word
          * 
          * Available in Requirement sets: MatrixBindings, TableBindings, TextBindings
          * 
          * Last changed in: 1.1
          * 
-         * @remarks
          * When called from a MatrixBinding or TableBinding, the getDataAsync method will return a subset of the bound values if the optional startRow, startColumn, rowCount, and columnCount parameters are specified (and they specify a contiguous and valid range).
          * 
          * @param options An object with any of the following (example: {coercionType: 'matrix, 'valueFormat: 'formatted', filterType:'all'}):
@@ -609,18 +812,19 @@ declare namespace Office {
          *       asyncContext: Object keeping state for the callback
          * 
          *       rows: Only for table bindings in content add-ins for Access. Specifies the pre-defined string "thisRow" to get data in the currently selected row.
-
+         *
          * @param callback The optional callback method
          */
         getDataAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes the specified handler from the binding for the specified event type.
          * 
-         * **Hosts**: Access, Excel, Word
+         *@remarks
+         * Hosts: Access, Excel, Word
          * 
-         * **Available in Requirement set**: BindingEvents
+         * Available in Requirement set: BindingEvents
          * 
-         * **Last changed in**: 1.1
+         * Last changed in: 1.1
          * 
          * @param eventType The event type. For binding can be 'bindingDataChanged' and 'bindingSelectionChanged'
          * @param options An object with any of the following:
@@ -635,11 +839,12 @@ declare namespace Office {
         /**
          * Writes data to the bound section of the document represented by the specified binding object.
          * 
-         * **Hosts**: Access, Excel, Word
+         *@remarks
+         * Hosts: Access, Excel, Word
          * 
-         * **Available in Requirement sets**: MatrixBindings, TableBindings, TextBindings
+         * Available in Requirement sets: MatrixBindings, TableBindings, TextBindings
          * 
-         * **Last changed in**: 1.1
+         * Last changed in: 1.1
          * 
          * @param data The data to be set in the current selection. Possible data types by host:
          * 
@@ -675,297 +880,827 @@ declare namespace Office {
          */
         setDataAsync(data: TableData | any, options?: any, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+    * Represents the bindings the add-in has within the document.
+    * 
+    *@remarks
+    * Hosts: 
+    * 
+    * Last changed in: 1.1
+    */
     export interface Bindings {
+        /**
+		* Gets a Document object that represents the document associated with this set of bindings.
+		* 
+        *remarks
+        * Hosts: Access, Excel, Word
+        *
+		* Last changed in: 1.1
+		*/
         document: Document;
         /**
-         * Creates a binding against a named object in the document
+         * Creates a binding against a named object in the document.
+		 * 
+         *@remarks
+         * Hosts: Access, Excel, Word
+         * 
+         * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
+         * 
+         * For Excel, the itemName parameter can refer to a named range or a table.
+         * 
+         * By default, adding a table in Excel assigns the name "Table1" for the first table you add, "Table2" for the second table you add, and so on. To assign a meaningful name for a table in the Excel UI, use the Table Name property on the Table Tools | Design tab of the ribbon.
+         * 
+         *     Note: In Excel, when specifying a table as a named item, you must fully qualify the name to include the worksheet name in the name of the table in this format: "Sheet1!Table1"
+         * 
+         * For Word, the itemName parameter refers to the Title property of a Rich Text content control. (You can't bind to content controls other than the Rich Text content control.)
+         * 
+         * By default, a content control has no Title value assigned. To assign a meaningful name in the Word UI, after inserting a Rich Text content control from the Controls group on the Developer tab of the ribbon, use the Properties command in the Controls group to display the Content Control Properties dialog box. Then set the Title property of the content control to the name you want to reference from your code.
+         * 
+         *     Note: In Word, if there are multiple Rich Text content controls with the same Title property value (name), and you try to bind to one these content controls with this method (by specifying its name as the itemName parameter), the operation will fail.
+         * 
          * @param itemName Name of the bindable object in the document. For Example 'MyExpenses' table in Excel."
-         * @param bindingType The Office BindingType for the data
-         * @param options Syntax example: {id: "BindingID"}
-         *       id: Name of the binding, autogenerated if not supplied.
-         *       asyncContext: Object keeping state for the callback
-         *       columns: The string[] of the columns involved in the binding
-         * @param callback The optional callback method
+         * @param bindingType The Office BindingType for the data. The method returns null if the selected object cannot be coerced into the specified type.
+         * @param options An object like {id: "BindingID"} that has any of the following properties:
+         * 
+         *       id: Unique name of the binding. Autogenerated if not supplied.
+         * 
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * 
+         *       columns: The string[] of the columns involved in the binding.
+         * 
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addFromNamedItemAsync(itemName: string, bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Create a binding by prompting the user to make a selection on the document.
-         * @param bindingType The Office BindingType for the data
-         * @param options addFromPromptAsyncOptions- e.g. {promptText: "Please select data", id: "mySales"}
-         *       promptText: Greet your users with a friendly word.
-         *       asyncContext: Object keeping state for the callback
-         *       id: Identifier.
-         *       sampleData: A TableData that gives sample table in the Dialog.TableData.Headers is [][] of string.
-         * @param callback The optional callback method
+         * 
+         *@remarks
+         * Hosts: Access, Excel
+         * 
+         * Available in Requirement set: Not in a set
+         * 
+         * Last changed in: 1.1
+         * 
+         * Adds a binding object of the specified type to the Bindings collection, which will be identified with the supplied id. The method fails if the specified selection cannot be bound.
+         * 
+         * @param bindingType Specifies the type of the binding object to create. Required. Returns null if the selected object cannot be coerced into the specified type.
+         * @param options An object like {promptText: "Please select data", id: "mySales"} with any of the following properties:
+         * 
+         *       promptText: Specifies the string to display in the prompt UI that tells the user what to select. Limited to 200 characters. If no promptText argument is passed, "Please make a selection" is displayed.
+         * 
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * 
+         *       id: Specifies the unique name to be used to identify the new binding object.If no argument is passed for the id parameter, the Binding.id is autogenerated.
+         * 
+         *       sampleData: Specifies a table of sample data displayed in the prompt UI as an example of the kinds of fields (columns) that can be bound by your add-in. The headers provided in the TableData object specify the labels used in the field selection UI. Optional. Note: This parameter is used only in add-ins for Access. It is ignored if provided when calling the method in an add-in for Excel.
+         * 
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addFromPromptAsync(bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Create a binding based on what the user's current selection.
-         * @param bindingType The Office BindingType for the data
-         * @param options addFromSelectionAsyncOptions- e.g. {id: "BindingID"}
-         *       id: Identifier.
-         *       asyncContext: Object keeping state for the callback
+         * Create a binding based on the user's current selection.
+         * 
+         *@remarks
+         * Hosts: Access, Excel, Word
+         * 
+         * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
+         * 
+         * Last changed in: 1.1
+         * 
+         * Adds the specified type of binding object to the Bindings collection, which will be identified with the supplied id.
+         * 
+         * Note In Excel, if you call the addFromSelectionAsync method passing in the Binding.id of an existing binding, the Binding.type of that binding is used, and its type cannot be changed by specifying a different value for the bindingType parameter.If you need to use an existing id and change the bindingType, call the Bindings.releaseByIdAsync method first to release the binding, and then call the addFromSelectionAsync method to reestablish the binding with a new type.
+         * 
+         * @param bindingType Specifies the type of the binding object to create. Required. Returns null if the selected object cannot be coerced into the specified type.
+         * @param options An object like {id: "BindingID"} with any of the following properties:
+         * 
+         *       id: Specifies the unique name to be used to identify the new binding object.If no argument is passed for the id parameter, the Binding.id is autogenerated.
+         * 
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * 
          *       columns: The string[] of the columns involved in the binding
+         * 
          *       sampleData: A TableData that gives sample table in the Dialog.TableData.Headers is [][] of string.
-         * @param callback The optional callback method
+         * 
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addFromSelectionAsync(bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Gets an array with all the binding objects in the document.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * Gets all bindings that were previously created.
+         * 
+         *@remarks
+         * Hosts: Access, Excel, Word
+         * 
+         * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
+         * 
+         * Last changed in: 1.1
+         * 
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getAllAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Retrieves a binding based on its Name
-         * @param id The binding id
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
+         * 
+         *@remarks
+         * Hosts: Access, Excel, Word
+         * 
+         * Available in Requirement set: CustomXmlParts, MatrixBindings, TableBindings, TextBindings
+         * 
+         * Last changed in: 1.1
+         * 
+         * Fails if the specified id does not exist.
+         * 
+         * @param id Specifies the unique name of the binding object. Required.
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+          */
         getByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes the binding from the document
-         * @param id The binding id
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * 
+         *@remarks
+         * Hosts: Access, Excel, Word
+         * 
+         * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
+         * 
+         * Last changed in: 1.1
+         * 
+         * Fails if the specified id does not exist.
+         * 
+         * @param id Specifies the unique name to be used to identify the binding object. Required.
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         releaseByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+    * Represents the runtime environment of the add-in and provides access to key objects of the API.
+    * 
+    *@remarks
+    * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+    *
+    * Last changed in: 1.1
+    */
     export interface Context {
+        /**
+         * Gets an object that represents the document the content or task pane add-in is interacting with.
+         */
         document: Document;
     }
+    /**
+     * Represents an XML node in a tree in a document.
+     * 
+     *@remarks
+     * Hosts: Word
+     * 
+     * Available in Requirement set: CustomXmlParts
+     * 
+     * Last changed in: 1.1
+     */
     export interface CustomXmlNode {
+        /**
+         * Gets the base name of the node without the namespace prefix, if one exists.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * Last changed in: 1.1
+         */
         baseName: string;
+        /**
+         * Retrieves the string GUID of the CustomXMLPart.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * Last changed in: 1.1
+         */
         namespaceUri: string;
+        /**
+         * Gets the type of the CustomXMLNode.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * Last changed in: 1.1
+         */
         nodeType: string;
         /**
-         * Gets the nodes associated with the xPath expression.
-         * @param xPath The xPath expression
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * Gets the nodes associated with the XPath expression.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * Last changed in: 1.1
+         * 
+         * @param xPath The XPath expression that specifies the nodes to get. Required.
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getNodesAsync(xPath: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the node value.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * Last changed in: 1.1
+         * 
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getNodeValueAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Asynchronously gets the text of an XML node in a custom XML part.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * Gets the text of an XML node in a custom XML part.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * Last changed in: 1.2
+         * 
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getTextAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the node's XML.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * Last changed in: 1.1
+         * 
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getXmlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets the node value.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * Last changed in: 1.1
+         * 
          * @param value The value to be set on the node
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         setNodeValueAsync(value: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously sets the text of an XML node in a custom XML part.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * Last changed in: 1.2
+         * 
          * @param text Required. The text value of the XML node.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+        */
         setTextAsync(text: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets the node XML.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * Last changed in: 1.1
+         * 
          * @param xml The XML to be set on the node
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+        */
         setXmlAsync(xml: string, options?: any, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+     * Represents a single CustomXMLPart in a CustomXMLParts collection.
+     * 
+     *@remarks
+     * Hosts: Word
+     * 
+     * Available in Requirement set: CustomXmlParts
+     * 
+     * Last changed in: 1.1
+     */
     export interface CustomXmlPart {
+        /**
+         * True, if the custom XML part is built in; otherwise false.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * Last changed in: 1.1         * 
+         */
         builtIn: boolean;
+        /**
+         * Gets the GUID of the CustomXMLPart.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * Last changed in: 1.1         * 
+         */
         id: string;
+        /**
+         * Gets the set of namespace prefix mappings (CustomXMLPrefixMappings) used against the current CustomXMLPart.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * Last changed in: 1.1         * 
+         */
         namespaceManager: CustomXmlPrefixMappings;
         /**
          * Adds an event handler to the object using the specified event type.
-         * @param eventType The event type. For CustomXmlPartNode it can be 'nodeDeleted', 'nodeInserted' or 'nodeReplaced'
-         * @param handler The name of the handler
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * 
+         *@remarks
+         * Hosts: Word
+         *  
+         * Last changed in: 1.1
+         * 
+         * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
+         * 
+         * @param eventType Specifies the type of event to add. Required. For a CustomXmlPart object event, the eventType parameter can be specified as Office.EventType.DataNodeDeleted, Office.EventType.DataNodeInserted, Office.EventType.DataNodeReplaced, or the corresponding text values of these enumerations.
+         * @param handler The event handler function to add, whose only parameter is of type NodeDeletedEventArgs, NodeInsertedEventArgs, or NodeReplaceEventArgs. Required.
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        addHandlerAsync(eventType: EventType, handler?: (result: any) => void, options?: any, callback?: (result: AsyncResult) => void): void;
+        addHandlerAsync(eventType: EventType, handler: (result: any) => void, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Deletes the Custom XML Part.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         *  
+         * Last changed in: 1.1
+         * 
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         deleteAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Gets the nodes associated with the xPath expression.
-         * @param xPath The xPath expression
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
+         * Asynchronously gets any CustomXmlNodes in this custom XML part which match the specified XPath.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         *  
+         * Last changed in: 1.1
+         * 
+         * @param xPath An XPath expression that specifies the nodes you want returned. Required.
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+        */
         getNodesAsync(xPath: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Gets the XML for the Custom XML Part.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
+         * Asynchronously gets the XML inside this custom XML part.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         *  
+         * Last changed in: 1.1
+         * 
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+        */
         getXmlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Removes an event handler from the object using the specified event type.
-         * @param eventType The event type. For CustomXmlPartNode it can be 'nodeDeleted', 'nodeInserted' or 'nodeReplaced'
-         * @param options Syntax example: {handler:eventHandler}
-         *       handler: Indicates a specific handler to be removed, if not specified all handlers are removed
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * Removes an event handler for the specified event type.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         *  
+         * Last changed in: 1.1
+         * 
+         * @param eventType Specifies the type of event to remove. Required.For a CustomXmlPart object event, the eventType parameter can be specified as Office.EventType.DataNodeDeleted, Office.EventType.DataNodeInserted, Office.EventType.DataNodeReplaced, or the corresponding text values of these enumerations.
+         * @param handler The event handler function to remove. If not specified, all event handlers for the specified eventType will be removed.
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
+        removeHandlerAsync(eventType: EventType, handler?: (result: any) => void, options?: any, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+     * Represents a collection of CustomXmlPart objects.
+     * 
+     *@remarks
+     * Hosts: Word
+     * 
+     * Available in Requirement set: CustomXmlParts
+     * 
+     * Last changed in: 1.1
+     */
     export interface CustomXmlParts {
         /**
          * Asynchronously adds a new custom XML part to a file.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         *  
+         * Last changed in: 1.1
+         * 
          * @param xml The XML to add to the newly created custom XML part.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addAsync(xml: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the specified custom XML part by its id.
-         * @param id The id of the custom XML part.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         *  
+         * Last changed in: 1.1
+         * 
+         * @param id The GUID of the custom XML part, including opening and closing braces. 
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the specified custom XML part(s) by its namespace.
-         * @param ns  The namespace to search.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         *  
+         * Last changed in: 1.1
+         * 
+         * @param ns  The namespace URI.
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
+        */
         getByNamespaceAsync(ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+     * Represents a collection of CustomXmlPart objects.
+     * 
+     *@remarks
+     * Hosts: Word
+     * 
+     * Last changed in: 1.1
+     */
     export interface CustomXmlPrefixMappings {
         /**
-         * Adds a namespace.
-         * @param prefix The namespace prefix
-         * @param ns The namespace URI
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * Asynchronously adds a prefix to namespace mapping to use when querying an item.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * Last changed in: 1.1
+         * 
+         * If no namespace is assigned to the requested prefix, the method returns an empty string ("").
+         * 
+         * @param prefix Specifies the prefix to add to the prefix mapping list. Required.
+         * @param ns Specifies the namespace URI to assign to the newly added prefix. Required.
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addNamespaceAsync(prefix: string, ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Gets a namespace  with the specified prefix
-         * @param prefix The namespace prefix
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * Asynchronously gets the namespace mapped to the specified prefix.
+         * 
+         *@remarks
+         * Hosts: Word
+         *
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * Last changed in: 1.1
+         * 
+         * If the prefix already exists in the namespace manager, this method will overwrite the mapping of that prefix except when the prefix is one added or used by the data store internally, in which case it will return an error.
+         * 
+         * @param prefix TSpecifies the prefix to get the namespace for. Required.
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getNamespaceAsync(prefix: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Gets a prefix  for  the specified URI
-         * @param ns The namespace URI
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
+         * Asynchronously gets the prefix for the specified namespace.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * Last changed in: 1.1
+         * 
+         * If no prefix is assigned to the requested namespace, the method returns an empty string (""). If there are multiple prefixes specified in the namespace manager, the method returns the first prefix that matches the supplied namespace.
+         * 
+         * @param ns Specifies the namespace to get the prefix for. Required.
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+        */
         getPrefixAsync(ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+     * An abstract class that represents the document the add-in is interacting with.
+     * 
+     *@remarks
+     * Hosts: Access, Excel, PowerPoint, Project, Word
+     * 
+     * Last changed in: 1.1
+     */
     export interface Document {
+        /**
+         * Gets an object that provides access to the bindings defined in the document.
+         * 
+         *@remarks
+         * Hosts: Access, Excel, Word
+         * 
+         * Last changed in: 1.1 
+         * 
+         * You don't instantiate the Document object directly in your script. To call members of the Document object to interact with the current document or worksheet, use Office.context.document in your script.
+         */
         bindings: Bindings;
+        /**
+         * Gets an object that represents the custom XML parts in the document.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Last changed in: 1.1
+         */
         customXmlParts: CustomXmlParts;
+        /**
+         * Gets the mode the document is in.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Last changed in: 1.1
+         */
         mode: DocumentMode;
+        /**
+         * Gets an object that represents the saved custom settings of the content or task pane add-in for the current document.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Last changed in: 1.1
+         */
         settings: Settings;
+        /**
+         * Gets the URL of the document that the host application currently has open. Returns null if the URL is unavailable.
+         * 
+         *@remarks
+         * Hosts: Word
+         * 
+         * Last changed in: 1.1
+         */
         url: string;
         /**
-         * Adds an event handler for the specified event type.
-         * @param eventType The event type. For document can be 'DocumentSelectionChanged'
-         * @param handler The name of the handler
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * Adds an event handler for a Document object event.
+         * 
+         *@remarks
+         * Hosts: Excel, PowerPoint, Project, Word
+         * 
+         * Available in Requirement set: DocumentEvents
+         * 
+         * Last changed in: 1.1
+         * 
+         * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
+         * 
+         * @param eventType For a Document object event, the eventType parameter can be specified as Office.EventType.Document.SelectionChanged or Office.EventType.Document.ActiveViewChanged, or the corresponding text value of this enumeration.
+         * @param handler The event handler function to add, whose only parameter is of type DocumentSelectionChangedEventArgs. Required.
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Returns the current view of the presentation.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
+         * Returns the state of the current view of the presentation (edit or read).
+         *
+         *@remarks
+         * Hosts: Excel, PowerPoint, Word
+         * 
+         * Available in Requirement set: ActiveView
+         * 
+         * Last changed in: 1.1
+         * 
+         * Can trigger an event when the view changes.
+         * 
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+        */
         getActiveViewAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Gets the entire file in slices of up to 4MB.
+         * Returns the entire document file in slices of up to 4194304 bytes (4 MB). For add-ins for iOS, file slice is supported up to 65536 (64 KB). Note that specifying file slice size of above permitted limit will result in an "Internal Error" failure.
+         * 
+         *@remarks
+         * Hosts: Excel, PowerPoint, Word
+         *
+         * Available in Requirement set: File
+         * 
+         * Last changed in: 1.1
+         * 
+         * For add-ins running in Office host applications other than Office for iOS, the getFileAsync method supports getting files in slices of up to 4194304 bytes (4 MB). For add-ins running in Office for iOS apps, the getFileAsync method supports getting files in slices of up to 65536 (64 KB).
+         * 
+         * The fileType parameter can be specified by using the FileType enumeration or text values. But the possible values vary with the host: 
+         * 
+         * Excel Online, Win32, Mac, and iOS: Office.FileType.Compressed
+         * 
+         * PowerPoint on Windows desktop, Mac, and iPad, and PowerPoint Online: Office.FileType.Compressed, Office.FileType.Pdf
+         * 
+         * Word on Windows desktop, Word on Mac, and Word Online: Office.FileType.Compressed, Office.FileType.Pdf, Office.FileType.Text
+         *
+         * Word on iPad: Office.FileType.Compressed, Office.FileType.Text
+         * 
          * @param fileType The format in which the file will be returned
-         * @param options Syntax example: {sliceSize:1024}
+         * @param options An object like {sliceSize:1024} that has any of the following properties:
+         * 
          *       sliceSize: Specifies the desired slice size (in bytes) up to 4MB. If not specified a default slice size of 4MB will be used.
+         * 
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * 
          * @param callback The optional callback method
          */
         getFileAsync(fileType: FileType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets file properties of the current document.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
-         */
+         * 
+         *@remarks
+         * Hosts: Excel, PowerPoint, Word
+         * 
+         * Available in Requirement set: not in a set
+         * 
+         * Last changed in: 1.1
+         * 
+         * You get the file's URL with the url property ( asyncResult.value.url).
+         * 
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+        */
         getFilePropertiesAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Returns the current selection.
-         * @param coercionType The expected shape of the selection.
-         * @param options Syntax example: {valueFormat: 'formatted', filterType:'all'}
+         * Reads the data contained in the current selection in the document.
+         * 
+         *@remarks
+         * Hosts: Access, Excel, PowerPoint, Project, Word
+         * 
+         * Available in Requirement set: Selection
+         * 
+         * Last changed in: 1.1
+         * 
+         * The possible values for the coercionType parameter vary by the host:
+         * 
+         * Excel, Excel Online, PowerPoint, PowerPoint Online, Word, and Word Online only: Office.CoercionType.Text (string)
+         * 
+         * Excel, Word, and Word Online only: Office.CoercionType.Matrix (array of arrays)
+         * 
+         * Access, Excel, Word, and Word Online only: Office.CoercionType.Table (TableData object)
+         * 
+         * Word only: Office.CoercionType.Html
+         * 
+         * Word and Word Online only: Office.CoercionType.Ooxml (Office Open XML)
+         * 
+         * PowerPoint and PowerPoint Online only: Office.CoercionType.SlideRange
+         * 
+         * @param coercionType The type of data structure to return. 
+         * @param options An object like {valueFormat: 'formatted', filterType:'all'} that has any of the following properties:
+         * 
          *       valueFormat: Get data with or without format. Use Office.ValueFormat or text value.
-         *       filterType: Get the visible or all the data. Useful when filtering data. Use Office.FilterType or text value.
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * 
+         *       filterType: Get the visible or all the data. Useful when filtering data. Use Office.FilterType or text value. This parameter is ignored in Word documents.
+         * 
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * 
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getSelectedDataAsync(coercionType: CoercionType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Goes to the specified object or location in the document.
+         * 
+         *@remarks
+         * Hosts: Excel, PowerPoint, Word
+         * 
+         * Available in Requirement set: not in a set
+         * 
+         * Last changed in: 1.1
+         * 
+         * PowerPoint doesn't support the goToByIdAsync method in Master Views.
+         * 
+         * The behavior caused by the selectionMode option varies by host:
+         * 
+         * In Excel: Office.SelectionMode.Selected selects all content in the binding, or named item. Office.SelectionMode.None for text bindings, selects the cell; for matrix bindings, table bindings, and named items, selects the first data cell (not first cell in header row for tables).
+         * 
+         * In PowerPoint: Office.SelectionMode.Selected selects the slide title or first textbox on the slide. Office.SelectionMode.None Doesn't select anything.
+         * 
+         * In Word: Office.SelectionMode.Selected selects all content in the binding. Office.SelectionMode.None for text bindings, moves the cursor to the beginning of the text; for matrix bindings and table bindings, selects the first data cell (not first cell in header row for tables).
+         * 
          * @param id The identifier of the object or location to go to.
          * @param goToType The type of the location to go to.
-         * @param options Syntax example: {asyncContext:context}
-         *       selectionMode: Use Office.SelectionMode or text value.
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * @param options An object like {asyncContext:context} with any of the following values:
+         * 
+         *       selectionMode: Specifies whether the location specified by the id parameter is selected (highlighted). Use Office.SelectionMode or text value. See Remarks for more.
+         * 
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * 
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         goToByIdAsync(id: string | number, goToType: GoToType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes an event handler for the specified event type.
-         * @param eventType The event type. For document can be 'DocumentSelectionChanged'
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         *       handler: The name of the handler. If not specified all handlers are removed
-         * @param callback The optional callback method
+         * 
+         *@remarks
+         * Hosts: Excel, PowerPoint, Project, Word
+         * 
+         * Available in Requirement set: DocumentEvents
+         * 
+         * Last changed in: 1.1
+         * @param eventType The event type. For document can be 'Document.SelectionChanged' or 'Document.ActiveViewChanged'.
+         * @param options An object like Syntax example: {asyncContext:context} that has any of the following properties:
+         * 
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * 
+         *       handler: The name of the handler. If not specified all handlers are removed.
+         * 
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Writes the specified data into the current selection.
-         * @param data The data to be set. Either a string or value, 2d array or TableData object
-         * @param options Syntax example: {coercionType:Office.CoercionType.Matrix} or {coercionType: 'matrix'}
+         * 
+         *@remarks
+         * Hosts: Access, Excel, PowerPoint, Project, Word, Word Online
+         * 
+         * Available in Requirement set: Selection
+         * 
+         * Last changed in: 1.1
+         * 
+         * The possible CoercionTypes that can be used for the data parameter, or for the coercionType option, vary by host:
+         * 
+         * Office.CoercionType.Text: Excel, Word, PowerPoint
+         * 
+         * Office.CoercionType.Matrix: Excel, Word
+         * 
+         * Office.CoercionType.Table: Access, Excel, Word
+         * 
+         * Office.CoercionType.Html: Word
+         * 
+         * Office.CoercionType.Ooxml: Word
+         * 
+         * Office.CoercionType.Image: Excel, Word, PowerPoint
+         * 
+         * @param data The data to be set. Either a string or CoercionType value, 2d array or TableData object.
+         * @param options An object like {coercionType:Office.CoercionType.Matrix} with any of the following properties:
+         * 
          *       coercionType: Explicitly sets the shape of the data object. Use Office.CoercionType or text value. If not supplied is inferred from the data type.
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * 
+         *       tableOptions: For an inserted table, a list of key-value pairs that specify table formatting options, such as header row, total row, and banded rows 
+         * 
+         *       cellFormat: For an inserted table, a list of key-value pairs that specify a range of columns, rows, or cells and the cell formatting to apply to that range
+         * 
+         *       imageLeft: (number) This option is applicable for inserting images. Indicates the insert location in relation to the left side of the slide for PowerPoint, and its relation to the currently selected cell in Excel. This value is ignored for Word. This value is in points.
+         * 
+         *       imageTop: (number) This option is applicable for inserting images. Indicates the insert location in relation to the top of the slide for PowerPoint, and its relation to the currently selected cell in Excel. This value is ignored for Word. This value is in points.
+         * 
+         *       imageWidth: (number) This option is applicable for inserting images. Indicates the image width. If this option is provided without the imageHeight, the image will scale to match the value of the image width. If both image width and image height are provided, the image will be resized accordingly. If neither the image height or width is provided, the default image size and aspect ratio will be used. This value is in points.
+         * 
+         *       imageHeight: (number) This option is applicable for inserting images. Indicates the image height. If this option is provided without the imageWidth, the image will scale to match the value of the image height. If both image width and image height are provided, the image will be resized accordingly. If neither the image height or width is provided, the default image size and aspect ratio will be used. This value is in points.
+         * 
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         setSelectedDataAsync(data: string | TableData | any[][], options?: any, callback?: (result: AsyncResult) => void): void;
     }
@@ -982,18 +1717,60 @@ declare namespace Office {
          */
         type: EventType;
     }
+    /**
+     * Represents the document file associated with an Office Add-in.
+     * 
+     * @remarks
+     * Access the File object with the AsyncResult.value property in the callback function passed to the Document.getFileAsync method.
+     * 
+     * Hosts: PowerPoint, Word
+     */
     export interface File {
+        /**
+         * Gets the document file size in bytes.
+         * @remarks
+         * Hosts: PowerPoint, Word
+         */
         size: number;
+        /**
+         * Gets the number of slices into which the file is divided.
+         * @remarks 
+         * Hosts: PowerPoint, Word
+         */
         sliceCount: number;
         /**
-         * Closes the File.
-         * @param callback The optional callback method
+         * Closes the document file.
+         * @remarks
+         * No more than two documents are allowed to be in memory; otherwise the Document.getFileAsync operation will fail. Use the File.closeAsync method to close the file when you are finished working with it.
+         * 
+         * Hosts: PowerPoint, Word
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
+         * @remarks
+         * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
+         * In the callback function passed to the closeAsync method, you can use the properties of the AsyncResult object to return the following information.
+         * |Property |Use to...|
+         * |---------|---------|
+         * |AsyncResult.value|Always returns undefined because there is no object or data to retrieve.|
+         * |AsyncResult.status|Determine the success or failure of the operation.|
+         * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
+         * |AsyncResult.asyncContext|Access your user-defined object or value, if you passed one as the asyncContext parameter.|
          */
         closeAsync(callback?: (result: AsyncResult) => void): void;
         /**
-         * Gets the specified slice.
-         * @param sliceIndex The index of the slice to be retrieved
-         * @param callback The optional callback method
+         * Returns the specified slice.
+         * @remarks
+         * Hosts: PowerPoint, Word
+         * @param sliceIndex Specifies the zero-based index of the slice to be retrieved. Required.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
+         * @remarks
+         * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
+         * In the callback function passed to the getSliceAsync method, you can use the properties of the AsyncResult object to return the following information.
+         * |Property |Use to...|
+         * |---------|---------|
+         * |AsyncResult.value|Access the Slice object.|
+         * |AsyncResult.status|Determine the success or failure of the operation.|
+         * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
+         * |AsyncResult.asyncContext|Access your user-defined object or value, if you passed one as the asyncContext parameter.|
          */
         getSliceAsync(sliceIndex: number, callback?: (result: AsyncResult) => void): void;
     }
@@ -1006,684 +1783,2538 @@ declare namespace Office {
     /**
     * Represents a binding in two dimensions of rows and columns.
     * 
-    * **Hosts**: Excel, Word
+    *@remarks
+         * Hosts: Excel, Word
     * 
-    * **Available in Requirement set**: MatrixBindings
+    * Available in Requirement set: MatrixBindings
     * 
-    * **Last changed in**: 1.1
+    * Last changed in: 1.1
     * 
-    * @remarks
     * The MatrixBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object.
     */
     export interface MatrixBinding extends Binding {
         /**
 		* Gets the number of columns in the matrix data structure, as an integer value.
 		* 
-        * **Hosts**: Access, Excel, PowerPoint, Project, Word
+        *@remarks
+        * Hosts: Access, Excel, PowerPoint, Project, Word
         * 
         * Available in Requirement set: MatrixBindings
         *
-		* **Last changed in**: 1.1
+		* Last changed in: 1.1
 		*/
         columnCount: number;
         /**
 		* Gets the number of rows in the matrix data structure, as an integer value.
 		* 
-        * **Hosts**: Access, Excel, PowerPoint, Project, Word
+        *@remarks
+        * Hosts: Access, Excel, PowerPoint, Project, Word
         * 
         * Available in Requirement set: MatrixBindings
         *
-		* **Last changed in**: 1.1
+		* Last changed in: 1.1
 		*/
         rowCount: number;
     }
+    /**
+     * Represents custom settings for a task pane or content add-in that are stored in the host document as name/value pairs.
+     * 
+     * @remarks
+     * The settings created by using the methods of the Settings object are saved per add-in and per document. That is, they are available only to the add-in that created them, and only from the document in which they are saved.
+     * 
+     * The name of a setting is a string, while the value can be a string, number, boolean, null, object, or array.
+     * 
+     * The Settings object is automatically loaded as part of the Document object, and is available by calling the settings property of that object when the add-in is activated. The developer is responsible for calling the saveAsync method after adding or deleting settings to save the settings in the document.
+     * 
+     * Hosts: Access, Excel, PowerPoint, Word
+     */
     export interface Settings {
         /**
-         * Adds an event handler for the object using the specified event type.
-         * @param eventType The event type. For settings can be 'settingsChanged'
-         * @param handler The name of the handler
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * Adds an event handler for the settingsChanged event.
+         * @remarks
+         * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
+         * 
+         * > [!IMPORTANT]
+         * > Your add-in's code can register a handler for the settingsChanged event when the add-in is running with any Excel client, but the event will fire only when the add-in is loaded with a spreadsheet that is opened in Excel Online, and more than one user is editing the spreadsheet (co-authoring). Therefore, effectively the settingsChanged event is supported only in Excel Online in co-authoring scenarios.
+         * 
+         * Hosts: Excel
+         * @param eventType Specifies the type of event to add. Required.
+         * @param handler The event handler function to add. Required.
+         * @param options Specifies any of the following optional parameters.
+         *        asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @remarks
+         * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
+         * In the callback function passed to the addHandlerAsync method, you can use the properties of the AsyncResult object to return the following information.
+         * |Property |Use to...|
+         * |---------|---------|
+         * |AsyncResult.value|Always returns undefined because there is no data or object to retrieve when adding an event handler.|
+         * |AsyncResult.status|Determine the success or failure of the operation.|
+         * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
+         * |AsyncResult.asyncContext|Access your user-defined object or value, if you passed one as the asyncContext parameter.|
          */
         addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Retrieves the setting with the specified name.
-         * @param settingName The name of the setting
+         * Retrieves the specified setting.
+         * @remarks
+         * Hosts: Access, Excel, PowerPoint, Word
+         * @param settingName The case-sensitive name of the setting to retrieve.
+         * @returns An object that has property names mapped to JSON serialized values.
          */
         get(name: string): any;
         /**
-         * Gets the latest version of the settings object.
-         * @param callback The optional callback method
+         * Reads all settings persisted in the document and refreshes the content or task pane add-in's copy of those settings held in memory.
+         * @remarks
+         * This method is useful in Word and PowerPoint coauthoring scenarios when multiple instances of the same add-in are working against the same document. Because each add-in is working against an in-memory copy of the settings loaded from the document at the time the user opened it, the settings values used by each user can get out of sync. This can happen whenever an instance of the add-in calls the Settings.saveAsync method to persist all of that user's settings to the document. Calling the refreshAsync method from the event handler for the settingsChanged event of the add-in will refresh the settings values for all users.
+         * The refreshAsync method can be called from add-ins created for Excel, but since it doesn't support coauthoring there is no reason to do so.
+         * 
+         * Hosts: Access, Excel, PowerPoint, Word
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @remarks
+         * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
+         * In the callback function passed to the refreshAsync method, you can use the properties of the AsyncResult object to return the following information.
+         * |Property |Use to...|
+         * |---------|---------|
+         * |AsyncResult.value|Access a Settings object with the refreshed values.|
+         * |AsyncResult.status|Determine the success or failure of the operation.|
+         * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
+         * |AsyncResult.asyncContext|Access your user-defined  object or value, if you passed one as the asyncContext parameter.|
          */
         refreshAsync(callback?: (result: AsyncResult) => void): void;
         /**
-         * Removes the setting with the specified name.
-         * @param settingName The name of the setting
+         * Removes the specified setting.
+         * @remarks
+         * null is a valid value for a setting. Therefore, assigning null to the setting will not remove it from the settings property bag.
+         * 
+         * > [!IMPORTANT]
+         * > Be aware that the Settings.remove method affects only the in-memory copy of the settings property bag. To persist the removal of the specified setting in the document, at some point after calling the Settings.remove method and before the add-in is closed, you must call the Settings.saveAsync method.
+         * Hosts: Access, Excel, PowerPoint, Word
+         * @param settingName The case-sensitive name of the setting to remove.
          */
         remove(name: string): void;
         /**
-         * Removes an event handler for the specified event type.
-         * @param eventType The event type. For settings can be 'settingsChanged'
-         * @param options Syntax example: {handler:eventHandler}
-         *       handler: Indicates a specific handler to be removed, if not specified all handlers are removed
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * Removes an event handler for the settingsChanged event.
+         * @remarks
+         * If the optional handler parameter is omitted when calling the removeHandlerAsync method, all event handlers for the specified eventType will be removed.
+         * 
+         * Hosts: Access, Excel, PowerPoint
+         * @param eventType Specifies the type of event to remove. Required.
+         * @param options Specifies any of the following optional parameters.
+         * @param handler Specifies the name of the handler to remove.
+         *        asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @remarks
+         * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
+         * In the callback function passed to the removeHandlerAsync method, you can use the properties of the AsyncResult object to return the following information.
          */
         removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Saves all settings.
+         * Persists the in-memory copy of the settings property bag in the document.
+         * @remarks
+         * Any settings previously saved by an add-in are loaded when it is initialized, so during the lifetime of the session you can just use the set and get methods to work with the in-memory copy of the settings property bag. When you want to persist the settings so that they are available the next time the add-in is used, use the saveAsync method.
+         * 
+         * > [!NOTE]
+         * > The saveAsync method persists the in-memory settings property bag into the document file; however, the changes to the document file itself are saved only when the user (or AutoRecover setting) saves the document to the file system.
+         * > The refreshAsync method is only useful in coauthoring scenarios (which are only supported in Word) when other instances of the same add-in might change the settings and those changes should be made available to all instances.
+         * 
+         * Hosts: Access, Excel, PowerPoint, Word
          * @param options Syntax example: {overwriteIfStale:false}
-         *       overwriteIfStale: Indicates whether the setting will be replaced if stale.
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * @param overwriteIfStale Indicates whether the setting will be replaced if stale.
+         *        asyncContext: Object keeping state for the callback
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
+         * @remarks
+         * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
+         * In the callback function passed to the saveAsync method, you can use the properties of the AsyncResult object to return the following information.
+         * |Property |Use to...|
+         * |---------|---------|
+         * |AsyncResult.value|Always returns undefined because there is no object or data to retrieve.|
+         * |AsyncResult.status|Determine the success or failure of the operation.|
+         * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
+         * |AsyncResult.asyncContext|Access your user-defined object or value, if you passed one as the asyncContext parameter.|
          */
         saveAsync(callback?: (result: AsyncResult) => void): void;
         /**
-         * Sets a value for the setting with the specified name.
-         * @param settingName The name of the setting
-         * @param value The value for the setting
+         * Sets or creates the specified setting.
+         * @remarks
+         * The set method creates a new setting of the specified name if it does not already exist, or sets an existing setting of the specified name in the in-memory copy of the settings property bag. After you call the Settings.saveAsync method, the value is stored in the document as the serialized JSON representation of its data type. A maximum of 2MB is available for the settings of each add-in.
+         * 
+         * > [!IMPORTANT]
+         * > Be aware that the Settings.set method affects only the in-memory copy of the settings property bag. To make sure that additions or changes to settings will be available to your add-in the next time the document is opened, at some point after calling the Settings.set method and before the add-in is closed, you must call the Settings.saveAsync method to persist settings in the document.
+         * 
+         * Hosts: Access, Excel, PowerPoint, Word
+         * @param settingName The case-sensitive name of the setting to set or create.
+         * @param value Specifies the value to be stored.
          */
         set(name: string, value: any): void;
     }
+    /**
+     * Represents a slice of a document file.
+     * @remarks
+     * The Slice object is accessed with the File.getSliceAsync method.
+     * 
+     * Hosts: PowerPoint, Word
+     */
     export interface Slice {
+        /**
+         * Gets the raw data of the file slice in Office.FileType.Text ("text") or Office.FileType.Compressed ("compressed") format as specified by the fileType parameter of the call to the Document.getFileAsync method.
+         * @remarks
+         * Files in the "compressed" format will return a byte array that can be transformed to a base64-encoded string if required.
+         * 
+         * Hosts: PowerPoint, Word
+         */
         data: any;
+        /**
+         * Gets the zero-based index of the file slice.
+         * @remarks
+         * Hosts: PowerPoint, Word
+         */
         index: number;
+        /**
+         * Gets the size of the slice in bytes.
+         * @remarks
+         * Hosts: PowerPoint, Word
+         */
         size: number;
     }
+    /**
+    * Represents a binding in two dimensions of rows and columns, optionally with headers.
+    * 
+    *@remarks
+    * Hosts: Access, Excel, PowerPoint, Project, Word
+    * 
+    * Available in Requirement set: TableBindings
+    * 
+    * Last changed in: 1.1
+    * 
+    * The TableBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object.
+    * 
+    * For Excel, note that after you establish a table binding in Excel, each new row a user adds to the table is automatically included in the binding and rowCount increases.
+    */
     export interface TableBinding extends Binding {
+        /**
+		* Gets the number of columns in the TableBinding, as an integer value.
+		* 
+        *@remarks
+        * Hosts: Access, Excel,Word
+        * 
+        * Available in Requirement set: TableBindings
+        *
+		* Last changed in: 1.1
+		*/
         columnCount: number;
+        /**
+		* True, if the table has headers; otherwise false.
+		* 
+        *@remarks
+        * Hosts: Access, Excel, PowerPoint, Project, Word
+        * 
+        * Available in Requirement set: TableBindings
+        *
+		* Last changed in: 1.1
+		*/
         hasHeaders: boolean;
+         /**
+		* Gets the number of rows in the TableBinding, as an integer value.
+		* 
+        *@remarks
+        * Hosts: Access, Excel,Word
+        * 
+        * Available in Requirement set: TableBindings
+        *
+        * Last changed in: 1.1
+        *
+        * When you insert an empty table by selecting a single row in Excel 2013 and Excel Online (using Table on the Insert tab), both Office host applications create a single row of headers followed by a single blank row. However, if your add-in's script creates a binding for this newly inserted table (for example, by using the addFromSelectionAsync method), and then checks the value of the rowCount property, the value returned will differ depending whether the spreadsheet is open in Excel 2013 or Excel Online.
+
+        * - In Excel on the desktop, rowCount will return 0 (the blank row following the headers is not counted).
+        * 
+        * - In Excel Online, rowCount will return 1 (the blank row following the headers is counted).
+        * 
+        * You can work around this difference in your script by checking if rowCount == 1, and if so, then checking if the row contains all empty strings.
+        * 
+        * In content add-ins for Access, for performance reasons the rowCount property always returns -1.
+		*/
         rowCount: number;
         /**
-         * Adds the specified columns to the table
-         * @param tableData  A TableData object with the headers and rows
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * Adds the specified data to the table as additional columns.
+         * 
+         *@remarks
+         * Hosts: Excel, Word
+         * 
+         * Available in Requirement set: TableBindings
+         * 
+         * Last changed in: 1.0
+         * 
+         * To add one or more columns specifying the values of the data and headers, pass a TableData object as the data parameter. To add one or more columns specifying only the data, pass an array of arrays ("matrix") as the data parameter.
+         * 
+         * The success or failure of an addColumnsAsync operation is atomic. That is, the entire add columns operation must succeed, or it will be completely rolled back (and the AsyncResult.status property returned to the callback will report failure):
+         * 
+         *  - Each row in the array you pass as the data argument must have the same number of rows as the table being updated. If not, the entire operation will fail.
+         * 
+         *  - Each row and cell in the array must successfully add that row or cell to the table in the newly added column(s). If any row or cell fails to be set for any reason, the entire operation will fail.
+         * 
+         *  - If you pass a TableData object as the data argument, the number of header rows must match that of the table being updated.
+         * 
+         * Additional remark for Excel Online: The total number of cells in the TableData object passed to the data parameter can't exceed 20,000 in a single call to this method.
+         *         
+         * @param tableData An array of arrays ("matrix") or a TableData object that contains one or more columns of data to add to the table. Required.
+         * @param options The object like {asyncContext:context}, where context is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addColumnsAsync(tableData: TableData | any[][], options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Adds the specified rows to the table
-         * @param rows  A 2D array with the rows to add
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * Adds the specified data to the table as additional rows.
+         * 
+         *@remarks
+         * Hosts: Access, Excel, Word
+         * 
+         * Available in Requirement set: TableBindings
+         * 
+         * Last changed in: 1.1
+         * 
+         * To add one or more columns specifying the values of the data and headers, pass a TableData object as the data parameter. To add one or more columns specifying only the data, pass an array of arrays ("matrix") as the data parameter.
+         * 
+         * The success or failure of an addRowsAsync operation is atomic. That is, the entire add columns operation must succeed, or it will be completely rolled back (and the AsyncResult.status property returned to the callback will report failure):
+         * 
+         *  - Each row in the array you pass as the data argument must have the same number of columns as the table being updated. If not, the entire operation will fail.
+         * 
+         *  - Each column and cell in the array must successfully add that column or cell to the table in the newly added rows(s). If any column or cell fails to be set for any reason, the entire operation will fail.
+         * 
+         *  - If you pass a TableData object as the data argument, the number of header rows must match that of the table being updated.
+         * 
+         * Additional remark for Excel Online: The total number of cells in the TableData object passed to the data parameter can't exceed 20,000 in a single call to this method.
+         *         
+         * @param rows An array of arrays ("matrix") or a TableData object that contains one or more rows of data to add to the table. Required.
+         * @param options The object like {asyncContext:context}, where context is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addRowsAsync(rows: TableData | any[][], options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Clears the table
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * Deletes all non-header rows and their values in the table, shifting appropriately for the host application.
+         * 
+         *@remarks
+         * Hosts: Access, Excel, Word
+         * 
+         * Available in Requirement set: TableBindings
+         * 
+         * Last changed in: 1.1
+         * 
+         * In Excel, if the table has no header row, this method will delete the table itself.
+         *  
+         * @param options The object like {asyncContext:context}, where context is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         deleteAllDataValuesAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Clears formatting on the bound table.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *
+         *@remarks
+         * Hosts: Excel
+         * 
+         * Available in Requirement set: Not in a set
+         * 
+         * Last changed in: 1.1
+         * 
+         * See [Format tables in add-ins for Excel](https://docs.microsoft.com/en-us/office/dev/add-ins/excel/excel-add-ins-tables#format-a-table) for more information.
+         * 
+         * @param options The object like {asyncContext:context}, where context is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         clearFormatsAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the formatting on specified items in the table.
          * @param cellReference An object literal containing name-value pairs that specify the range of cells to get formatting from.
          * @param formats An array specifying the format properties to get.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * @param options The object {asyncContext:context}, where context is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getFormatsAsync(cellReference?: any, formats?: any[], options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets formatting on specified items and data in the table.
+         * 
+         *@remarks
+         * Hosts: Excel
+         * 
+         * Available in Requirement set: Not in a set
+         * 
+		 * Last changed in: 1.1
+         * 
          * @param formatsInfo Array elements are themselves three-element arrays:[target, type, formats]
+         * 
          *       target: The identifier of the item to format. String.
+         * 
          *       type: The kind of item to format. String.
+         * 
          *       formats: An object literal containing a list of property name-value pairs that define the formatting to apply.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * 
+         * @param options The object {asyncContext:context}, where context is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         setFormatsAsync(formatsInfo?: any[], options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Updates table formatting options on the bound table.
+         *
+		 *@remarks
+         * Hosts: Excel
+         * 
+         * Available in Requirement set: Not in a set
+         * 
+		 * Last changed in: 1.1
+         * 
          * @param tableOptions An object literal containing a list of property name-value pairs that define the table options to apply.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         * @param options The object {asyncContext:context}, where context is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         setTableOptionsAsync(tableOptions: any, options?: any, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+     * Represents the data in a table or a TableBinding.
+     * @remarks
+     * Hosts: Excel, Word
+     */
     export class TableData {
         constructor(rows: any[][], headers: any[]);
         constructor();
+        /**
+         * Gets or sets the headers of the table.
+         * @remarks
+         * To specify headers, you must specify an array of arrays that corresponds to the structure of the table. For example, to specify headers for a two-column table you would set the header property to [['header1', 'header2']].
+         * 
+         * If you specify null for the headers property (or leaving the property empty when you construct a TableData object), the following results occur when your code executes:
+         * 
+         * - If you insert a new table, the default column headers for the table are created.
+         * 
+         * - If you overwrite or update an existing table, the existing headers are not altered.
+         * 
+         * Hosts: Excel, Word
+         */
         headers: any[];
+        /**
+         * Gets or sets the rows in the table. Returns an array of arrays that contains the data in the table. Returns an empty array ``, if there are no rows.
+         * @remarks
+         * To specify rows, you must specify an array of arrays that corresponds to the structure of the table. For example, to specify two rows of string values in a two-column table you would set the rows property to [['a', 'b'], ['c', 'd']].
+         * 
+         * If you specify null for the rows property (or leave the property empty when you construct a TableData object), the following results occur when your code executes:
+         * 
+         * - If you insert a new table, a blank row will be inserted.
+         * 
+         * - If you overwrite or update an existing table, the existing rows are not altered.
+         * 
+         * Hosts: Excel, Word
+         */
         rows: any[][];
     }
+    /**
+     * Specifies enumerated values for the cells: property in the cellFormat parameter of [table formatting methods](https://dev.office.com/reference/docs/excel/format-tables-in-add-ins-for-excel.htm).
+     * 
+     * @remarks
+     * Hosts: Excel
+     */
     export enum Table {
+        /**
+         * The entire table, including column headers, data, and totals (if any).
+         */
         All,
+        /**
+         * Only the data (no headers and totals).
+         */
         Data,
+        /**
+         * Only the header row.
+         */
         Headers
     }
+    /**
+    * Represents a bound text selection in the document.
+    * 
+    *@remarks
+    * Hosts: Access, Excel, PowerPoint, Project, Word
+    * 
+    * Available in Requirement set: TextBindings
+    * 
+    * Last changed in: 1.1
+    * 
+    * The TextBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object. It does not implement any additional properties or methods of its own.
+    */
     export interface TextBinding extends Binding { }
+    /**
+     * Specifies the project fields that are available as a parameter for the getProjectFieldAsync method.
+     * 
+     * @remarks
+     * A ProjectProjectFields constant can be used as a parameter of the getProjectFieldAsync method.
+     * 
+     * Hosts: Project
+     */
     export enum ProjectProjectFields {
+        /**
+         * The number of digits after the decimal for the currency.
+         */
         CurrencyDigits,
+        /**
+         * The currency symbol.
+         */
         CurrencySymbol,
+        /**
+         * The placement of the currency symbol: Not specified = -1; Before the value with no space ($0) = 0; After the value with no space (0$) = 1; Before the value with a space ($ 0) = 2; After the value with a space (0 $) = 3.
+         */
         CurrencySymbolPosition,
         DurationUnits,
+        /**
+         * The GUID of the project.
+         */
         GUID,
+        /**
+         * The project finish date.
+         */
         Finish,
+        /**
+         * The project start date.
+         */
         Start,
+        /**
+         * Specifies whether the project is read-only.
+         */
         ReadOnly,
+        /**
+         * The project version.
+         */
         VERSION,
+        /**
+         * The work units of the project, such as days or hours.
+         */
         WorkUnits,
+        /**
+         * The Project Web App URL, for projects that are stored in Project Server.
+         */
         ProjectServerUrl,
+        /**
+         * The SharePoint URL, for projects that are synchronized with a SharePoint list.
+         */
         WSSUrl,
+        /**
+         * The name of the SharePoint list, for projects that are synchronized with a tasks list.
+         */
         WSSList
     }
+    /**
+     * Specifies the resource fields that are available as a parameter for the getResourceFieldAsync method.
+     * 
+     * @remarks
+     * A ProjectResourceFields constant can be used as a parameter of the getResourceFieldAsync method.
+     * 
+     * For more information about working with fields in Project, see [Available fields](https://support.office.com/article/Available-fields-reference-615a4563-1cc3-40f4-b66f-1b17e793a460) reference. In Project Help, search for Available fields.
+     */
     export enum ProjectResourceFields {
+        /**
+         * The accrual method that defines how a task accrues the cost of the resource: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Accrual,
+        /**
+         * The calculated actual cost of the resource for assignments in the project.
+         */
         ActualCost,
+        /**
+         * The actual overtime cost for a resource.
+         */
         ActualOvertimeCost,
+        /**
+         * The actual overtime work for a resource, in minutes.
+         */
         ActualOvertimeWork,
+        /**
+         * The actual overtime work for the resource that has been protected (made read-only).
+         */
         ActualOvertimeWorkProtected,
+        /**
+         * The actual work that the resource has done on assignments in the project.
+         */
         ActualWork,
+        /**
+         * The actual work for the resource that has been protected (made read-only).
+         */
         ActualWorkProtected,
+        /**
+         * The name of the base calendar for the resource.
+         */
         BaseCalendar,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline10BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline10BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline10Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline10Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline1BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline1BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline1Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline1Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline2BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline2BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline2Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline2Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline3BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline3BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline3Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline3Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline4BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline4BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline4Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline4Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline5BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline5BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline5Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline5Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline6BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline6BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline6Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline6Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline7BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline7BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline7Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline7Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline8BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline8BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline8Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline8Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         Baseline9BudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         Baseline9BudgetWork,
+        /**
+         * The cost for the baseline resource.
+         */
         Baseline9Cost,
+        /**
+         * The work for the baseline resource, in minutes.
+         */
         Baseline9Work,
+        /**
+         * The budget cost for the baseline resource.
+         */
         BaselineBudgetCost,
+        /**
+         * The budget work for the baseline resource, in hours.
+         */
         BaselineBudgetWork,
+        /**
+         * The baseline cost for the resource for assignments in the project.
+         */
         BaselineCost,
+        /**
+         * The baseline work for the resource for assignments in the project, in minutes.
+         */
         BaselineWork,
+        /**
+         * The budget cost for the resource.
+         */
         BudgetCost,
+        /**
+         * The budget work for the resource.
+         */
         BudgetWork,
+        /**
+         * The GUID of the resource calendar.
+         */
         ResourceCalendarGUID,
+        /**
+         * The code value of the resource.
+         */
         Code,
+        /**
+         * A cost field for the resource.
+         */
         Cost1,
+        /**
+         * A cost field for the resource.
+         */
         Cost10,
+        /**
+         * A cost field for the resource.
+         */
         Cost2,
+        /**
+         * A cost field for the resource.
+         */
         Cost3,
+        /**
+         * A cost field for the resource.
+         */
         Cost4,
+        /**
+         * A cost field for the resource.
+         */
         Cost5,
+        /**
+         * A cost field for the resource.
+         */
         Cost6,
+        /**
+         * A cost field for the resource.
+         */
         Cost7,
+        /**
+         * A cost field for the resource.
+         */
         Cost8,
+        /**
+         * A cost field for the resource.
+         */
         Cost9,
+        /**
+         * The date the resource was created.
+         */
         ResourceCreationDate,
+        /**
+         * A date field for the resource.
+         */
         Date1,
+        /**
+         * A date field for the resource.
+         */
         Date10,
+        /**
+         * A date field for the resource.
+         */
         Date2,
+        /**
+         * A date field for the resource.
+         */
         Date3,
+        /**
+         * A date field for the resource.
+         */
         Date4,
+        /**
+         * A date field for the resource.
+         */
         Date5,
+        /**
+         * A date field for the resource.
+         */
         Date6,
+        /**
+         * A date field for the resource.
+         */
         Date7,
+        /**
+         * A date field for the resource.
+         */
         Date8,
+        /**
+         * A date field for the resource.
+         */
         Date9,
+        /**
+         * A duration field for the resource.
+         */
         Duration1,
+        /**
+         * A duration field for the resource.
+         */
         Duration10,
+        /**
+         * A duration field for the resource.
+         */
         Duration2,
+        /**
+         * A duration field for the resource.
+         */
         Duration3,
+        /**
+         * A duration field for the resource.
+         */
         Duration4,
+        /**
+         * A duration field for the resource.
+         */
         Duration5,
+        /**
+         * A duration field for the resource.
+         */
         Duration6,
+        /**
+         * A duration field for the resource.
+         */
         Duration7,
+        /**
+         * A duration field for the resource.
+         */
         Duration8,
+        /**
+         * A duration field for the resource.
+         */
         Duration9,
+        /**
+         * The email address of the resource.
+         */
         Email,
+        /**
+         * The end date of the resource availability.
+         */
         End,
+        /**
+         * A finish field for the task.
+         */
         Finish1,
+        /**
+         * A finish field for the task.
+         */
         Finish10,
+        /**
+         * A finish field for the task.
+         */
         Finish2,
+        /**
+         * A finish field for the task.
+         */
         Finish3,
+        /**
+         * A finish field for the task.
+         */
         Finish4,
+        /**
+         * A finish field for the task.
+         */
         Finish5,
+        /**
+         * A finish field for the task.
+         */
         Finish6,
+        /**
+         * A finish field for the task.
+         */
         Finish7,
+        /**
+         * A finish field for the task.
+         */
         Finish8,
+        /**
+         * A finish field for the task.
+         */
         Finish9,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag10,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag1,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag11,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag12,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag13,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag14,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag15,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag16,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag17,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag18,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag19,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag2,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag20,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag3,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag4,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag5,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag6,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag7,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag8,
+        /**
+         * A Boolean flag field for the resource.
+         */
         Flag9,
+        /**
+         * The group the resource belongs to.
+         */
         Group,
+        /**
+         * The percentage of work units that the resource has assigned in the project. If the resource is working full-time on the project, Units = 100.
+         */
         Units,
+        /**
+         * The name of the resource.
+         */
         Name,
+        /**
+         * The text value of the notes regarding the resource.
+         */
         Notes,
+        /**
+         * A number field for the resource.
+         */
         Number1,
+        /**
+         * A number field for the resource.
+         */
         Number10,
+        /**
+         * A number field for the resource.
+         */
         Number11,
+        /**
+         * A number field for the resource.
+         */
         Number12,
+        /**
+         * A number field for the resource.
+         */
         Number13,
+        /**
+         * A number field for the resource.
+         */
         Number14,
+        /**
+         * A number field for the resource.
+         */
         Number15,
+        /**
+         * A number field for the resource.
+         */
         Number16,
+        /**
+         * A number field for the resource.
+         */
         Number17,
+        /**
+         * A number field for the resource.
+         */
         Number18,
+        /**
+         * A number field for the resource.
+         */
         Number19,
+        /**
+         * A number field for the resource.
+         */
         Number2,
+        /**
+         * A number field for the resource.
+         */
         Number20,
+        /**
+         * A number field for the resource.
+         */
         Number3,
+        /**
+         * A number field for the resource.
+         */
         Number4,
+        /**
+         * A number field for the resource.
+         */
         Number5,
+        /**
+         * A number field for the resource.
+         */
         Number6,
+        /**
+         * A number field for the resource.
+         */
         Number7,
+        /**
+         * A number field for the resource.
+         */
         Number8,
+        /**
+         * A number field for the resource.
+         */
         Number9,
+        /**
+         * The overtime cost for a resource.
+         */
         OvertimeCost,
+        /**
+         * The overtime rate for a resource.
+         */
         OvertimeRate,
+        /**
+         * The overtime work for a resource.
+         */
         OvertimeWork,
+        /**
+         * The percentage of work complete for a resource.
+         */
         PercentWorkComplete,
+        /**
+         * The cost per use of the resource.
+         */
         CostPerUse,
+        /**
+         * Indicates whether the resource is a generic resource (identified by skill rather than by name).
+         */
         Generic,
+        /**
+         * Indicates whether the resource is overallocated.
+         */
         OverAllocated,
+        /**
+         * The amount of regular work for the resource.
+         */
         RegularWork,
+        /**
+         * The remaining cost for the resource.
+         */
         RemainingCost,
+        /**
+         * The remaining overtime cost for the resource.
+         */
         RemainingOvertimeCost,
+        /**
+         * The remaining overtime work for the resource, in minutes.
+         */
         RemainingOvertimeWork,
+        /**
+         * The remaining work for the resource, in minutes.
+         */
         RemainingWork,
+        /**
+         * The ID of the resource.
+         */
         ResourceGUID,
+        /**
+         * The total cost of the resource.
+         */
         Cost,
+        /**
+         * The total work for the resource, in minutes.
+         */
         Work,
+        /**
+         * The start date for the resource.
+         */
         Start,
+        /**
+         * A start field for the resource.
+         */
         Start1,
+        /**
+         * A start field for the resource.
+         */
         Start10,
+        /**
+         * A start field for the resource.
+         */
         Start2,
+        /**
+         * A start field for the resource.
+         */
         Start3,
+        /**
+         * A start field for the resource.
+         */
         Start4,
+        /**
+         * A start field for the resource.
+         */
         Start5,
+        /**
+         * A start field for the resource.
+         */
         Start6,
+        /**
+         * A start field for the resource.
+         */
         Start7,
+        /**
+         * A start field for the resource.
+         */
         Start8,
+        /**
+         * A start field for the resource.
+         */
         Start9,
+        /**
+         * The standard rate of pay for the resource, in cost per hour.
+         */
         StandardRate,
+        /**
+         * A text field for the resource.
+         */
         Text1,
+        /**
+         * A text field for the resource.
+         */
         Text10,
+        /**
+         * A text field for the resource.
+         */
         Text11,
+        /**
+         * A text field for the resource.
+         */
         Text12,
+        /**
+         * A text field for the resource.
+         */
         Text13,
+        /**
+         * A text field for the resource.
+         */
         Text14,
+        /**
+         * A text field for the resource.
+         */
         Text15,
+        /**
+         * A text field for the resource.
+         */
         Text16,
+        /**
+         * A text field for the resource.
+         */
         Text17,
+        /**
+         * A text field for the resource.
+         */
         Text18,
+        /**
+         * A text field for the resource.
+         */
         Text19,
+        /**
+         * A text field for the resource.
+         */
         Text2,
+        /**
+         * A text field for the resource.
+         */
         Text20,
+        /**
+         * A text field for the resource.
+         */
         Text21,
+        /**
+         * A text field for the resource.
+         */
         Text22,
+        /**
+         * A text field for the resource.
+         */
         Text23,
+        /**
+         * A text field for the resource.
+         */
         Text24,
+        /**
+         * A text field for the resource.
+         */
         Text25,
+        /**
+         * A text field for the resource.
+         */
         Text26,
+        /**
+         * A text field for the resource.
+         */
         Text27,
+        /**
+         * A text field for the resource.
+         */
         Text28,
+        /**
+         * A text field for the resource.
+         */
         Text29,
+        /**
+         * A text field for the resource.
+         */
         Text3,
+        /**
+         * A text field for the resource.
+         */
         Text30,
+        /**
+         * A text field for the resource.
+         */
         Text4,
+        /**
+         * A text field for the resource.
+         */
         Text5,
+        /**
+         * A text field for the resource.
+         */
         Text6,
+        /**
+         * A text field for the resource.
+         */
         Text7,
+        /**
+         * A text field for the resource.
+         */
         Text8,
+        /**
+         * A text field for the resource.
+         */
         Text9
     }
+    /**
+     * Specifies the task fields that are available as a parameter for the getTaskFieldAsync method.
+     * 
+     * @remarks
+     * A ProjectTaskFields constant can be used as a parameter of the getTaskFieldAsync method.
+     * 
+     * For more information about working with fields in Project, see the [Available fields](https://support.office.com/article/Available-fields-reference-615a4563-1cc3-40f4-b66f-1b17e793a460) reference. In Project Help, search for Available fields.
+     * 
+     * Hosts: Project
+     */
     export enum ProjectTaskFields {
+        /**
+         * The current actual cost for the task.
+         */
         ActualCost,
+        /**
+         * The actual duration of the task, in minutes.
+         */
         ActualDuration,
+        /**
+         * The actual finish date of the task.
+         */
         ActualFinish,
+        /**
+         * The actual overtime cost for the task.
+         */
         ActualOvertimeCost,
+        /**
+         * The actual overtime work for the task, in minutes.
+         */
         ActualOvertimeWork,
+        /**
+         * The actual start date of the task.
+         */
         ActualStart,
+        /**
+         * The actual work for the task, in minutes.
+         */
         ActualWork,
+        /**
+         * A text field for the task.
+         */
         Text1,
+        /**
+         * A text field for the task.
+         */
         Text10,
+        /**
+         * A finish field for the task.
+         */
         Finish10,
+        /**
+         * A start field for the task.
+         */
         Start10,
+        /**
+         * A text field for the task.
+         */
         Text11,
+        /**
+         * A text field for the task.
+         */
         Text12,
+        /**
+         * A text field for the task.
+         */
         Text13,
+        /**
+         * A text field for the task.
+         */
         Text14,
+        /**
+         * A text field for the task.
+         */
         Text15,
+        /**
+         * A text field for the task.
+         */
         Text16,
+        /**
+         * A text field for the task.
+         */
         Text17,
+        /**
+         * A text field for the task.
+         */
         Text18,
+        /**
+         * A text field for the task.
+         */
         Text19,
+        /**
+         * A finish field for the task.
+         */
         Finish1,
+        /**
+         * A start field for the task.
+         */
         Start1,
+        /**
+         * A text field for the task.
+         */
         Text2,
+        /**
+         * A text field for the task.
+         */
         Text20,
+        /**
+         * A text field for the task.
+         */
         Text21,
+        /**
+         * A text field for the task.
+         */
         Text22,
+        /**
+         * A text field for the task.
+         */
         Text23,
+        /**
+         * A text field for the task.
+         */
         Text24,
+        /**
+         * A text field for the task.
+         */
         Text25,
+        /**
+         * A text field for the task.
+         */
         Text26,
+        /**
+         * A text field for the task.
+         */
         Text27,
+        /**
+         * A text field for the task.
+         */
         Text28,
+        /**
+         * A text field for the task.
+         */
         Text29,
+        /**
+         * A finish field for the task.
+         */
         Finish2,
+        /**
+         * A start field for the task.
+         */
         Start2,
+        /**
+         * A text field for the task.
+         */
         Text3,
+        /**
+         * A text field for the task.
+         */
         Text30,
+        /**
+         * A finish field for the task.
+         */
         Finish3,
+        /**
+         * A start field for the task.
+         */
         Start3,
+        /**
+         * A text field for the task.
+         */
         Text4,
+        /**
+         * A finish field for the task.
+         */
         Finish4,
+        /**
+         * A start field for the task.
+         */
         Start4,
+        /**
+         * A text field for the task.
+         */
         Text5,
+        /**
+         * A finish field for the task.
+         */
         Finish5,
+        /**
+         * A start field for the task.
+         */
         Start5,
+        /**
+         * A text field for the task.
+         */
         Text6,
+        /**
+         * A finish field for the task.
+         */
         Finish6,
+        /**
+         * A start field for the task.
+         */
         Start6,
+        /**
+         * A text field for the task.
+         */
         Text7,
+        /**
+         * A finish field for the task.
+         */
         Finish7,
+        /**
+         * A start field for the task.
+         */
         Start7,
+        /**
+         * A text field for the task.
+         */
         Text8,
+        /**
+         * A finish field for the task.
+         */
         Finish8,
+        /**
+         * A start field for the task.
+         */
         Start8,
+        /**
+         * A text field for the task.
+         */
         Text9,
+        /**
+         * A finish field for the task.
+         */
         Finish9,
+        /**
+         * A start field for the task.
+         */
         Start9,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline10BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline10BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline10Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline10Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline10Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline10FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline10FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline10Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline10Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline1BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline1BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline1Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline1Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline1Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline1FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline1FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline1Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline1Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline2BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline2BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline2Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline2Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline2Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline2FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline2FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline2Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline2Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline3BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline3BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline3Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline3Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline3Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline3FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline3FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Basline3Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline3Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline4BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline4BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline4Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline4Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline4Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline4FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline4FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline4Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline4Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline5BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline5BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline5Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline5Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline5Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline5FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline5FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline5Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline5Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline6BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline6BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline6Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline6Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline6Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline6FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline6FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline6Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline6Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline7BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline7BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline7Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline7Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline7Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline7FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline7FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline7Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline7Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline8BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline8BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline8Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline8Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline8Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline8FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline8FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline8Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline8Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         Baseline9BudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         Baseline9BudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         Baseline9Cost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         Baseline9Duration,
+        /**
+         * The finish date for the baseline task.
+         */
         Baseline9Finish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         Baseline9FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         Baseline9FixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         Baseline9Start,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         Baseline9Work,
+        /**
+         * The budget cost for the baseline task.
+         */
         BaselineBudgetCost,
+        /**
+         * The budget work for the baseline task, in hours.
+         */
         BaselineBudgetWork,
+        /**
+         * The cost for the baseline task.
+         */
         BaselineCost,
+        /**
+         * The duration for the baseline task, in minutes.
+         */
         BaselineDuration,
+        /**
+         * The finish date for the baseline task.
+         */
         BaselineFinish,
+        /**
+         * The fixed cost of any non-resource expense for the baseline task.
+         */
         BaselineFixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         BaselineFixedCostAccrual,
+        /**
+         * The start date for the baseline task.
+         */
         BaselineStart,
+        /**
+         * The total person-hours scheduled for the baseline task, in minutes.
+         */
         BaselineWork,
+        /**
+         * The budget cost for the task.
+         */
         BudgetCost,
         BudgetFixedCost,
-        BudgetFixedWork,
+        BudgetFixedWork, 
+        /**
+        * The budget work for the task, in hours.
+        */
         BudgetWork,
+        /**
+         * The GUID of the task calendar.
+         */
         TaskCalendarGUID,
+        /**
+         * A constraint date for the task.
+         */
         ConstraintDate,
+        /**
+         * A constraint type for the task: As Soon As Possible = 0, As Late As Possible = 1, Must Start On = 2, Must Finish On = 3, Start No Earlier Than = 4, Start No Later Than = 5, Finish No Earlier Than = 6, Finish No Later Than = 7.
+         */
         ConstraintType,
+        /**
+         * A cost field of the task.
+         */
         Cost1,
+        /**
+         * A cost field of the task.
+         */
         Cost10,
+        /**
+         * A cost field of the task.
+         */
         Cost2,
+        /**
+         * A cost field of the task.
+         */
         Cost3,
+        /**
+         * A cost field of the task.
+         */
         Cost4,
+        /**
+         * A cost field of the task.
+         */
         Cost5,
+        /**
+         * A cost field of the task.
+         */
         Cost6,
+        /**
+         * A cost field of the task.
+         */
         Cost7,
+        /**
+         * A cost field of the task.
+         */
         Cost8,
+        /**
+         * A cost field of the task.
+         */
         Cost9,
+        /**
+         * A date field of the task.
+         */
         Date1,
+        /**
+         * A date field of the task.
+         */
         Date10,
+        /**
+         * A date field of the task.
+         */
         Date2,
+        /**
+         * A date field of the task.
+         */
         Date3,
+        /**
+         * A date field of the task.
+         */
         Date4,
+        /**
+         * A date field of the task.
+         */
         Date5,
+        /**
+         * A date field of the task.
+         */
         Date6,
+        /**
+         * A date field of the task.
+         */
         Date7,
+        /**
+         * A date field of the task.
+         */
         Date8,
+        /**
+         * A date field of the task.
+         */
         Date9,
+        /**
+         * The deadline for a task.
+         */
         Deadline,
+        /**
+         * A duration field of the task.
+         */
         Duration1,
+        /**
+         * A duration field of the task.
+         */
         Duration10,
+        /**
+         * A duration field of the task.
+         */
         Duration2,
+        /**
+         * A duration field of the task.
+         */
         Duration3,
+        /**
+         * A duration field of the task.
+         */
         Duration4,
+        /**
+         * A duration field of the task.
+         */
         Duration5,
+        /**
+         * A duration field of the task.
+         */
         Duration6,
+        /**
+         * A duration field of the task.
+         */
         Duration7,
+        /**
+         * A duration field of the task.
+         */
         Duration8,
+        /**
+         * A duration field of the task.
+         */
         Duration9,
+        /**
+         * A duration field of the task.
+         */
         Duration,
+        /**
+         * The method for calculating earned value for the task.
+         */
         EarnedValueMethod,
+        /**
+         * The duration between the Early Finish and Late Finish dates for the task, in minutes.
+         */
         FinishSlack,
+        /**
+         * The fixed cost for the task.
+         */
         FixedCost,
+        /**
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         */
         FixedCostAccrual,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag10,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag1,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag11,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag12,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag13,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag14,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag15,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag16,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag17,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag18,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag19,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag2,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag20,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag3,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag4,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag5,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag6,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag7,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag8,
+        /**
+         * A Boolean flag field for the task.
+         */
         Flag9,
+        /**
+         * The amount of time that the task can be delayed without delaying its successor tasks.
+         */
         FreeSlack,
+        /**
+         * Indicates whether the task has rollup subtasks.
+         */
         HasRollupSubTasks,
+        /**
+         * The index of the selected task. After the project summary task, the index of the first task in a project is 1.
+         */
         ID,
+        /**
+         * The name of the task.
+         */
         Name,
+        /**
+         * The text value of the notes regarding the task.
+         */
         Notes,
+        /**
+         * A number field for the task.
+         */
         Number1,
+        /**
+         * A number field for the task.
+         */
         Number10,
+        /**
+         * A number field for the task.
+         */
         Number11,
+        /**
+         * A number field for the task.
+         */
         Number12,
+        /**
+         * A number field for the task.
+         */
         Number13,
+        /**
+         * A number field for the task.
+         */
         Number14,
+        /**
+         * A number field for the task.
+         */
         Number15,
+        /**
+         * A number field for the task.
+         */
         Number16,
+        /**
+         * A number field for the task.
+         */
         Number17,
+        /**
+         * A number field for the task.
+         */
         Number18,
+        /**
+         * A number field for the task.
+         */
         Number19,
+        /**
+         * A number field for the task.
+         */
         Number2,
+        /**
+         * A number field for the task.
+         */
         Number20,
+        /**
+         * A number field for the task.
+         */
         Number3,
+        /**
+         * A number field for the task.
+         */
         Number4,
+        /**
+         * A number field for the task.
+         */
         Number5,
+        /**
+         * A number field for the task.
+         */
         Number6,
+        /**
+         * A number field for the task.
+         */
         Number7,
+        /**
+         * A number field for the task.
+         */
         Number8,
+        /**
+         * A number field for the task.
+         */
         Number9,
+        /**
+         * The scheduled (as opposed to actual) duration of the task.
+         */
         ScheduledDuration,
+        /**
+         * The scheduled (as opposed to actual) finish date of the task.
+         */
         ScheduledFinish,
+        /**
+         * The scheduled (as opposed to actual) start date of the task.
+         */
         ScheduledStart,
+        /**
+         * The level of the task in the outline hierarchy.
+         */
         OutlineLevel,
+        /**
+         * The overtime cost for the task.
+         */
         OvertimeCost,
+        /**
+         * The overtime work for the task.
+         */
         OvertimeWork,
+        /**
+         * The percent complete status of the task.
+         */
         PercentComplete,
+        /**
+         * The percentage of work completed for the task.
+         */
         PercentWorkComplete,
+        /**
+         * The IDs of the task's predecessors.
+         */
         Predecessors,
+        /**
+         * The finish date of a task before leveling occurred.
+         */
         PreleveledFinish,
+        /**
+         * The start date of a task before leveling occurred.
+         */
         PreleveledStart,
+        /**
+         * The priority of the task, with values from 0 (low) to 1000 (high). The default priority value is 500.
+         */
         Priority,
+        /**
+         * Indicates whether the task is active.
+         */
         Active,
+        /**
+         * Indicates whether the task is on the critical path.
+         */
         Critical,
+        /**
+         * Indicates whether the task is a milestone.
+         */
         Milestone,
+        /**
+         * Indicates whether any assignments for a task are overallocated.
+         */
         Overallocated,
+        /**
+         * Indicates whether subtask information is rolled up to the summary task bar.
+         */
         IsRollup,
+        /**
+         * Indicates whether the task is a summary task.
+         */
         Summary,
+        /**
+         * The amount of regular work for the task.
+         */
         RegularWork,
+        /**
+         * The remaining cost for the task.
+         */
         RemainingCost,
+        /**
+         * The remaining duration for the task, in minutes.
+         */
         RemainingDuration,
+        /**
+         * The remaining overtime cost for the task.
+         */
         RemainingOvertimeCost,
+        /**
+         * The remaining work for the task, in minutes.
+         */
         RemainingWork,
+        /**
+         * The names of the resources assigned to a task.
+         */
         ResourceNames,
+        /**
+         * The total cost of the task.
+         */
         Cost,
+        /**
+         * The finish date of the task.
+         */
         Finish,
+        /**
+         * The start date of the task.
+         */
         Start,
+        /**
+         * The total person-hours scheduled for the task, in minutes.
+         */
         Work,
+        /**
+         * The duration between the Early Start and Late Start dates for the task.
+         */
         StartSlack,
+        /**
+         * The status of the task: Complete = 0, on schedule = 1, late = 2, future task = 3, status not available = 4.
+         */
         Status,
+        /**
+         * The IDs of the task's successors.
+         */
         Successors,
+        /**
+         * The enterprise resource responsible for accepting or rejecting assignment progress updates for the task.
+         */
         StatusManager,
+        /**
+         * The total slack time for the task, in minutes.
+         */
         TotalSlack,
+        /**
+         * The GUID of the task.
+         */
         TaskGUID,
+        /**
+         * The way the task is calculated: Fixed units = 0, fixed duration = 1, fixed work = 2.
+         */
         Type,
+        /**
+         * The work breakdown structure code of the task.
+         */
         WBS,
+        /**
+         * The work breakdown structure codes of the task predecessors, separated by the list separator.
+         */
         WBSPREDECESSORS,
+        /**
+         * The work breakdown structure codes of the task successors, separated by the list separator.
+         */
         WBSSUCCESSORS,
+        /**
+         * The ID of the task in a SharePoint list, for a project that is synchronized with a SharePoint tasks list.
+         */
         WSSID
     }
+    /**
+     * Specifies the types of views that the getSelectedViewAsync method can recognize.
+     * 
+     * @remarks
+     * The getSelectedViewAsync method returns the ProjectViewTypes constant value and name that corresponds to the active view.
+     * 
+     * Hosts: Project
+     */
     export enum ProjectViewTypes {
+        /**
+         * The Gantt chart view.
+         */
         Gantt,
+        /**
+         * The Network Diagram view.
+         */
         NetworkDiagram,
+        /**
+         * The Task Diagram view.
+         */
         TaskDiagram,
+        /**
+         * The Task form view.
+         */
         TaskForm,
+        /**
+         * The Task Sheet view.
+         */
         TaskSheet,
+        /**
+         * The Resource Form view.
+         */
         ResourceForm,
+        /**
+         * The Resource Sheet view.
+         */
         ResourceSheet,
+        /**
+         * The Resource Graph view.
+         */
         ResourceGraph,
+        /**
+         * The Team Planner view.
+         */
         TeamPlanner,
+        /**
+         * The Task Details view.
+         */
         TaskDetails,
+        /**
+         * The Task Name Form view.
+         */
         TaskNameForm,
+        /**
+         * The Resource Names view.
+         */
         ResourceNames,
+        /**
+         * The Calendar view.
+         */
         Calendar,
+        /**
+         * The Task Usage view.
+         */
         TaskUsage,
+        /**
+         * The Resource Usage view.
+         */
         ResourceUsage,
+        /**
+         * The Timeline view.
+         */
         Timeline
     }
     // Objects
@@ -2036,8 +4667,19 @@ declare namespace Office {
         phoneNumbers: Array<PhoneNumber>;
         urls: Array<string>;
     }
+    /**
+    * Represents the runtime environment of the add-in and provides access to key objects of the API.
+    * 
+    *@remarks
+    * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+    *
+    * Last changed in: 1.1
+    */
     export interface Context {
         mailbox: Mailbox;
+        /**
+        * Gets an object that represents the saved custom settings of the add-in.
+        */
         roamingSettings: RoamingSettings;
     }
     export interface CustomProperties {
@@ -3270,6 +5912,7 @@ declare namespace Excel {
          *
          * Gets the Binding object that represents the binding that raised the SelectionChanged event.
          * 
+         *@remarks
          * **Hosts:** Access, Excel, Word
          *
          * [Api set: ExcelApi 1.2]
@@ -44629,4 +47272,4 @@ declare namespace Visio {
 
 ////////////////////////////////////////////////////////////////
 //////////////////////// End Visio APIs ////////////////////////
-////////////////////////////////////////////////////////////////
\ No newline at end of file
+////////////////////////////////////////////////////////////////Contains the host in which the add-in (web application) is running in. Possible values are: Word, Excel, PowerPoint
\ No newline at end of file

From bf05c947a54306f299b7954bc0733325bbb78878 Mon Sep 17 00:00:00 2001
From: Karim Alibhai <karim@foko.co>
Date: Sun, 20 May 2018 16:18:05 -0400
Subject: [PATCH 269/575] Fix: test issues

---
 types/loopback/index.d.ts        | 27 ++++++++++++++++++---------
 types/loopback/loopback-tests.ts |  2 +-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/types/loopback/index.d.ts b/types/loopback/index.d.ts
index 05a3730d79..aa9bfb2b8b 100644
--- a/types/loopback/index.d.ts
+++ b/types/loopback/index.d.ts
@@ -21,9 +21,9 @@ declare namespace l {
       /**
        * General type for a callback to an async function.
        */
-      type CallbackWithoutResult = (err: Error | null) => any
-      type CallbackWithResult<T = any> = (err: Error | null, result: T) => any
-      type CallbackWithMultipleResults<T, G> = (err: Error | null, arg0: T, arg1: G) => any
+      type CallbackWithoutResult = (err: Error | null) => any;
+      type CallbackWithResult<T> = (err: Error | null, result: T) => any;
+      type CallbackWithMultipleResults<T, G> = (err: Error | null, arg0: T, arg1: G) => any;
 
       /**
        * The `App` object represents a Loopback application
@@ -1210,7 +1210,7 @@ declare namespace l {
              * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
              * @param {Array} changes An Array of [Change](#change) objects
              */
-            static changes(since: number, filter: any, callback: CallbackWithResult): void;
+            static changes(since: number, filter: any, callback: CallbackWithResult<any>): void;
 
             /**
              * Get the changes to a model since the specified checkpoint. Provide a filter object
@@ -1283,14 +1283,23 @@ declare namespace l {
              * @param {any} options Only changes to models matching this where filter will be included in the ChangeStream.
              * @param {() => void} callback
              */
-            static createChangeStream(options: {where: any}, callback: CallbackWithResult<any>): void;
+            static createChangeStream(
+                  options: {
+                        where: any;
+                  },
+                  callback: CallbackWithResult<any>
+            ): void;
 
             /**
              * Create a change stream. See here for more info http://loopback.io/doc/en/lb2/Realtime-server-sent-events.html
              * @param {any} options Only changes to models matching this where filter will be included in the ChangeStream.
              * @returns {any} changes
              */
-            static createChangeStream(options: {where: any}): Promise<any>;
+            static createChangeStream(
+                  options: {
+                        where: any;
+                  }
+            ): Promise<any>;
 
             /**
              * Create an update list (for `Model.bulkUpdate()`) from a delta list
@@ -1314,7 +1323,7 @@ declare namespace l {
              * @param {number} currentCheckpointId Current checkpoint ID
              */
             static currentCheckpoint(callback: CallbackWithResult<number>): void;
-            
+
             /**
              * Get the current checkpoint ID
              * @returns {Promise<number>} resolves to currentCheckpointId
@@ -1449,7 +1458,7 @@ declare namespace l {
                   },
                   callback: CallbackWithResult<T[]>
             ): void;
-            
+
             /**
              * Find all model instances that match `filter` specification.
              * See [Querying models](docs.strongloop.com/display/LB/Querying+models)
@@ -1514,7 +1523,7 @@ declare namespace l {
                   },
                   callback: CallbackWithResult<T>
             ): void;
-            
+
             /**
              * Find object by ID with an optional filter for include/fields
              * @param {*} id Primary key value
diff --git a/types/loopback/loopback-tests.ts b/types/loopback/loopback-tests.ts
index 359e6977b6..cb015fc0bd 100644
--- a/types/loopback/loopback-tests.ts
+++ b/types/loopback/loopback-tests.ts
@@ -36,7 +36,7 @@ class Server {
                 console.dir(data.name);
             }
 
-            model.findOne<TestModel>({}, (err: Error, instance: TestModel) => {
+            model.findOne<TestModel>({}, (err: Error | null, instance: TestModel) => {
                 if (err) {
                     console.dir(err);
                 }

From 56cf16cff3a35fd3473ef98c449f10302fda1dad Mon Sep 17 00:00:00 2001
From: Karim Alibhai <karim@foko.co>
Date: Sun, 20 May 2018 16:19:36 -0400
Subject: [PATCH 270/575] Add: self to definitions by

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

diff --git a/types/loopback/index.d.ts b/types/loopback/index.d.ts
index aa9bfb2b8b..c743db10ce 100644
--- a/types/loopback/index.d.ts
+++ b/types/loopback/index.d.ts
@@ -4,6 +4,7 @@
 //                 Tim Schumacher <https://github.com/enko>
 //                 Sequoia McDowell <https://github.com/sequoia>
 //                 Mike Crowe <https://github.com/drmikecrowe>
+//                 Karim Alibhai <https://github.com/karimsa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From 0275ec9ca05da1fbe34e4d1356ab0517271226a2 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Sun, 20 May 2018 13:24:50 -0700
Subject: [PATCH 271/575] typo and fixing DialogOptions info

---
 types/office-js/index.d.ts | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 58c574e126..6ec8e726e1 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -328,14 +328,7 @@ declare namespace Office {
         * Do not use a dialog box to interact with a document. Use a task pane instead.
         *
         * @param startAddress - Accepts the initial HTTPS URL that opens in the dialog.
-        * @param options - Optional. An object that has any of the following properties:
-        * 
-        *         displayInIframe: Determines whether the dialog box should be displayed within an IFrame. This setting is only applicable in Office Online clients, and is ignored by other platforms. If false (default), the dialog will be displayed as a new browser window (pop-up). Recommended for authentication pages that cannot be displayed in an IFrame. If true, the dialog will be displayed as a floating overlay with an IFrame. This is best for user experience and performance.
-        * 
-        *         height: Defines the height of the dialog box as a percentage of the current display. The default value is 80%. The minimum resolution is 150 pixels.
-        * 
-        *         width: Defines the width of the dialog box as a percentage of the current display. The default value is 80%. The minimum resolution is 250 pixels.
-        * 
+        * @param options - Optional. Accepts a DialogOptions object to define dialog display.
         * @param callback - Optional. Accepts a callback method to handle the dialog creation attempt. If successful, the AsyncResult.value is a DialogHandler object.
         */
         displayDialogAsync(startAddress: string, options?: DialogOptions, callback?: (result: AsyncResult) => void): void;
@@ -362,15 +355,15 @@ declare namespace Office {
     }
     export interface DialogOptions {
         /**
-         * Optional. Defines the width of the dialog as a percentage of the current display. Defaults to 99%. 250px minimum.
+         * Defines the width of the dialog as a percentage of the current display. Defaults to 80%. 250px minimum.
          */
         height?: number,
         /**
-         * Optional. Defines the height of the dialog as a percentage of the current display. Defaults to 99%. 150px minimum.
+         * Defines the height of the dialog as a percentage of the current display. Defaults to 80%. 150px minimum.
          */
         width?: number,
         /**
-         * Optional. Determines whether the dialog box should be displayed within an IFrame. This setting is only applicable in Office Online clients, and is ignored on other platforms.
+         * Determines whether the dialog box should be displayed within an IFrame. This setting is only applicable in Office Online clients, and is ignored by other platforms. If false (default), the dialog will be displayed as a new browser window (pop-up). Recommended for authentication pages that cannot be displayed in an IFrame. If true, the dialog will be displayed as a floating overlay with an IFrame. This is best for user experience and performance.
          */
         displayInIframe?: boolean
     }
@@ -5913,7 +5906,7 @@ declare namespace Excel {
          * Gets the Binding object that represents the binding that raised the SelectionChanged event.
          * 
          *@remarks
-         * **Hosts:** Access, Excel, Word
+         * Hosts: Access, Excel, Word
          *
          * [Api set: ExcelApi 1.2]
          */

From 9e60c2922736a66b3b1eb0c683a0117fc9ef473e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Johansen=20Amundrud?= <oyvindjam@gmail.com>
Date: Sun, 20 May 2018 23:18:50 +0200
Subject: [PATCH 272/575] Update types

---
 types/facebook-instant-games/index.d.ts | 105 ++++++++++++------------
 1 file changed, 54 insertions(+), 51 deletions(-)

diff --git a/types/facebook-instant-games/index.d.ts b/types/facebook-instant-games/index.d.ts
index 1e8a8d76fd..5e5589a150 100644
--- a/types/facebook-instant-games/index.d.ts
+++ b/types/facebook-instant-games/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for facebook-instant-games 6.1
 // Project: https://developers.facebook.com/docs/games/instant-games
-// Definitions by: Menushka Weeratunga <https://github.com/menushka>
+// Definitions by: Menushka Weeratunga <https://github.com/menushka>, Øyvind Johansen Amundrud <https://github.com/oyvindjam>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace FBInstant {
@@ -8,23 +8,23 @@ declare namespace FBInstant {
     let context: Context;
     let payments: Payments;
 
-    function getLocale(): string;
-    function getPlatform(): string;
+    function getLocale(): string | null;
+    function getPlatform(): Platform;
     function getSDKVersion(): string;
-    function initializeAsync(): Promise<any>;
-    function setLoadingProgress(progress: number): void;
+    function initializeAsync(): Promise<void>;
+    function setLoadingProgress(percentage: number): void;
     function getSupportedAPIs(): string[];
     function getEntryPointData(): any;
     function getEntryPointAsync(): Promise<string>;
     function setSessionData(sessionData: any): void;
-    function startGameAsync(): Promise<any>;
+    function startGameAsync(): Promise<void>;
     function shareAsync(payload: SharePayload): Promise<void>;
-    function updateAsync(payload: UpdatePayload | LeaderboardUpdatePayload): Promise<void>;
-    function switchGameAsync(appID: string, data?: string): Promise<void>;
+    function updateAsync(payload: CustomUpdatePayload | LeaderboardUpdatePayload): Promise<void>;
+    function switchGameAsync(appID: string, data?: any): Promise<void>;
     function canCreateShortcutAsync(): Promise<boolean>;
     function createShortcutAsync(): Promise<void>;
     function quit(): void;
-    function logEvent(eventName: string, valueToSum?: number, parameter?: any): APIError;
+    function logEvent(eventName: string, valueToSum?: number, parameter?: { [key: string]: string; }): APIError | null;
     function onPause(func: () => void): void;
     function getInterstitialAdAsync(placementID: string): Promise<AdInstance>;
     function getRewardedVideoAsync(placementID: string): Promise<AdInstance>;
@@ -33,13 +33,13 @@ declare namespace FBInstant {
     function getLeaderboardAsync(name: string): Promise<Leaderboard>;
 
     interface Player {
-        getID(): string;
-        getSignedPlayerInfoAsync(requestPayload: string): Promise<SignedPlayerInfo>;
+        getID(): string | null;
+        getSignedPlayerInfoAsync(requestPayload?: string): Promise<SignedPlayerInfo>;
         canSubscribeBotAsync(): Promise<boolean>;
         subscribeBotAsync(): Promise<void>;
-        getName(): string;
-        getPhoto(): string;
-        getDataAsync(keys?: string[]): Promise<DataObject>;
+        getName(): string | null;
+        getPhoto(): string | null;
+        getDataAsync(keys: string[]): Promise<DataObject>;
         setDataAsync(data: DataObject): Promise<void>;
         flushDataAsync(): Promise<void>;
         getStatsAsync(keys?: string[]): Promise<StatsObject>;
@@ -49,9 +49,9 @@ declare namespace FBInstant {
     }
 
     interface Context {
-        getID(): string;
+        getID(): string | null;
         getType(): Type;
-        isSizeBetween(minSize: number, maxSize: number): ContextSizeResponse;
+        isSizeBetween(minSize?: number, maxSize?: number): ContextSizeResponse | null;
         switchAsync(id: string): Promise<void>;
         chooseAsync(options: ContextOptions): Promise<void>;
         createAsync(playerID: string): Promise<void>;
@@ -60,10 +60,10 @@ declare namespace FBInstant {
 
     interface Leaderboard {
         getName(): string;
-        getContextID(): string;
+        getContextID(): string | null;
         getEntryCountAsync(): Promise<number>;
         setScoreAsync(score: number, extraData: string): Promise<LeaderboardEntry>;
-        getPlayerEntryAsync(): Promise<LeaderboardEntry>;
+        getPlayerEntryAsync(): Promise<LeaderboardEntry | null>;
         getEntriesAsync(count: number, offset: number): Promise<LeaderboardEntry[]>;
     }
 
@@ -72,20 +72,20 @@ declare namespace FBInstant {
         getFormattedScore(): string;
         getTimestamp(): number;
         getRank(): number;
-        getExtraData(): string;
+        getExtraData(): string | null;
         getPlayer(): LeaderboardPlayer;
     }
 
     interface LeaderboardPlayer {
         getName(): string;
-        getPhoto(): string;
-        getID(): string;
+        getPhoto(): string | null;
+        getID(): string | null;
     }
 
     interface ConnectedPlayer {
         getID(): string;
-        getName(): string;
-        getPhoto(): string;
+        getName(): string | null;
+        getPhoto(): string | null;
     }
 
     interface SignedPlayerInfo {
@@ -95,8 +95,8 @@ declare namespace FBInstant {
 
     interface ContextPlayer {
         getID(): string;
-        getName(): string;
-        getPhoto(): string;
+        getName(): string | null;
+        getPhoto(): string | null;
     }
 
     interface AdInstance {
@@ -106,6 +106,7 @@ declare namespace FBInstant {
     }
 
     interface Payments {
+        getCatalogAsync(): Promise<Product[]>;
         purchaseAsync(purchaseConfig: PurchaseConfig): Promise<Purchase>;
         getPurchasesAsync(): Promise<Purchase[]>;
         consumePurchaseAsync(purchaseToken: string): Promise<void>;
@@ -143,9 +144,9 @@ declare namespace FBInstant {
     }
 
     interface SharePayload {
-        intent?: Intent;
-        image?: string;
-        text?: string;
+        intent: Intent;
+        image: string;
+        text: string;
         data?: any;
     }
 
@@ -159,12 +160,12 @@ declare namespace FBInstant {
         developerPayload?: string;
     }
 
-    interface UpdatePayload {
-        action?: UpdateAction;
-        template?: string;
+    interface CustomUpdatePayload {
+        action: UpdateAction;
+        template: string;
         cta?: (string | LocalizableContent);
-        image?: string;
-        text?: (string | LocalizableContent);
+        image: string;
+        text: (string | LocalizableContent);
         data?: any;
         strategy?: string;
         notification?: string;
@@ -181,13 +182,15 @@ declare namespace FBInstant {
         localizations: LocalizationsDict;
     }
 
-    interface DataObject { [ key: string ]: string | number; }
+    interface DataObject { [ key: string ]: any; }
 
     interface StatsObject { [ key: string ]: number; }
 
     interface IncrementObject { [ key: string ]: number; }
 
-    type LocalizationsDict = any;
+    interface LocalizationsDict {
+        [x: string]: string;
+    }
 
     type SignedPurchaseRequest = string;
 
@@ -202,20 +205,20 @@ declare namespace FBInstant {
     type Intent = "INVITE" | "REQUEST" | "CHALLENGE" | "SHARE";
 
     type ErrorCodeType = "ADS_FREQUENT_LOAD" |
-                                 "ADS_NO_FILL" |
-                                 "ADS_NOT_LOADED" |
-                                 "ADS_TOO_MANY_INSTANCES" |
-                                 "ANALYTICS_POST_EXCEPTION" |
-                                 "CLIENT_REQUIRES_UPDATE" |
-                                 "CLIENT_UNSUPPORTED_OPERATION" |
-                                 "INVALID_OPERATION" |
-                                 "INVALID_PARAM" |
-                                 "LEADERBOARD_NOT_FOUND" |
-                                 "LEADERBOARD_WRONG_CONTEXT" |
-                                 "NETWORK_FAILURE" |
-                                 "PENDING_REQUEST" |
-                                 "RATE_LIMITED" |
-                                 "SAME_CONTEXT" |
-                                 "UNKNOWN" |
-                                 "USER_INPUT";
+        "ADS_NO_FILL" |
+        "ADS_NOT_LOADED" |
+        "ADS_TOO_MANY_INSTANCES" |
+        "ANALYTICS_POST_EXCEPTION" |
+        "CLIENT_REQUIRES_UPDATE" |
+        "CLIENT_UNSUPPORTED_OPERATION" |
+        "INVALID_OPERATION" |
+        "INVALID_PARAM" |
+        "LEADERBOARD_NOT_FOUND" |
+        "LEADERBOARD_WRONG_CONTEXT" |
+        "NETWORK_FAILURE" |
+        "PENDING_REQUEST" |
+        "RATE_LIMITED" |
+        "SAME_CONTEXT" |
+        "UNKNOWN" |
+        "USER_INPUT";
 }

From 230927f9c22b65c11966e5807810b03c563fc127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Johansen=20Amundrud?= <oyvindjam@gmail.com>
Date: Sun, 20 May 2018 23:22:33 +0200
Subject: [PATCH 273/575] Update API to 6.2

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

diff --git a/types/facebook-instant-games/index.d.ts b/types/facebook-instant-games/index.d.ts
index 5e5589a150..f213fa9c12 100644
--- a/types/facebook-instant-games/index.d.ts
+++ b/types/facebook-instant-games/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for facebook-instant-games 6.1
+// Type definitions for facebook-instant-games 6.2
 // Project: https://developers.facebook.com/docs/games/instant-games
 // Definitions by: Menushka Weeratunga <https://github.com/menushka>, Øyvind Johansen Amundrud <https://github.com/oyvindjam>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -65,6 +65,7 @@ declare namespace FBInstant {
         setScoreAsync(score: number, extraData: string): Promise<LeaderboardEntry>;
         getPlayerEntryAsync(): Promise<LeaderboardEntry | null>;
         getEntriesAsync(count: number, offset: number): Promise<LeaderboardEntry[]>;
+        getConnectedPlayerEntriesAsync(count: number, offset: number): Promise<LeaderboardEntry[]>;
     }
 
     interface LeaderboardEntry {

From 92eb9e143f3c26ff47142aecf8108958732cccda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Johansen=20Amundrud?= <oyvindjam@gmail.com>
Date: Sun, 20 May 2018 23:30:23 +0200
Subject: [PATCH 274/575] Add documentation

---
 types/facebook-instant-games/index.d.ts | 873 ++++++++++++++++++++++++
 1 file changed, 873 insertions(+)

diff --git a/types/facebook-instant-games/index.d.ts b/types/facebook-instant-games/index.d.ts
index f213fa9c12..74c93c6c96 100644
--- a/types/facebook-instant-games/index.d.ts
+++ b/types/facebook-instant-games/index.d.ts
@@ -3,183 +3,1037 @@
 // Definitions by: Menushka Weeratunga <https://github.com/menushka>, Øyvind Johansen Amundrud <https://github.com/oyvindjam>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/**
+ * Top level namespace for the Instant Games SDK.
+ */
 declare namespace FBInstant {
+    /**
+     * Contains functions and properties related to the current player.
+     */
     let player: Player;
+
+    /**
+     * Contains functions and properties related to the current game context.
+     */
     let context: Context;
+
+    /**
+     * Contains functions and properties related to payments and purchases of game products.
+     */
     let payments: Payments;
 
+    /**
+     * The current locale. Use this to determine what language the current game should be localized with.
+     * The value will not be accurate until FBInstant.startGameAsync() resolves.
+     *
+     * @returns The current locale.
+     */
     function getLocale(): string | null;
+
+    /**
+     * The platform on which the game is currently running. The value will always be null until FBInstant.initializeAsync() resolves.
+     */
     function getPlatform(): Platform;
+
+    /**
+     * The string representation of this SDK version.
+     *
+     * @returns The SDK version.
+     */
     function getSDKVersion(): string;
+
+    /**
+     * Initializes the SDK library. This should be called before any other SDK functions.
+     *
+     * @returns A promise that resolves when the SDK is ready to use.
+     * @throws INVALID_OPERATION
+     */
     function initializeAsync(): Promise<void>;
+
+    /**
+     * Report the game's initial loading progress.
+     *
+     * @param percentage A number between 0 and 100.
+     */
     function setLoadingProgress(percentage: number): void;
+
+    /**
+     * Provides a list of API functions that are supported by the client.
+     *
+     * @returns List of API functions that the client explicitly supports.
+     */
     function getSupportedAPIs(): string[];
+
+    /**
+     * Returns any data object associated with the entry point that the game was launched from.
+     *
+     * The contents of the object are developer-defined, and can occur from entry points on different platforms.
+     * This will return null for older mobile clients, as well as when there is no data associated with the particular entry point.
+     *
+     * @returns Data associated with the current entry point.
+     */
     function getEntryPointData(): any;
+
+    /**
+     * Returns the entry point that the game was launched from.
+     * This function should be called after FBInstant.startGameAsync() resolves.
+     *
+     * @returns The name of the entry point from which the user started the game.
+     */
     function getEntryPointAsync(): Promise<string>;
+
+    /**
+     * Sets the data associated with the individual gameplay session for the current context.
+     *
+     * This function should be called whenever the game would like to update the current session data.
+     * This session data may be used to populate a variety of payloads, such as game play webhooks.
+     *
+     * @param sessionData An arbitrary data object, which must be less than or equal to 1000 characters when stringified.
+     */
     function setSessionData(sessionData: any): void;
+
+    /**
+     * This indicates that the game has finished initial loading and is ready to start.
+     * Context information will be up-to-date when the returned promise resolves.
+     *
+     * @returns A promise that resolves when the game should start.
+     * @throws INVALID_PARAM
+     * @throws CLIENT_UNSUPPORTED_OPERATION
+     */
     function startGameAsync(): Promise<void>;
+
+    /**
+     * This invokes a dialog to let the user share specified content, either as a message in Messenger or as a post on the user's timeline.
+     * A blob of data can be attached to the share which every game session launched from the share will be able to access from FBInstant.getEntryPointData().
+     * This data must be less than or equal to 1000 characters when stringified. The user may choose to cancel the share action and close the dialog, and the
+     * returned promise will resolve when the dialog is closed regardless if the user actually shared the content or not.
+     *
+     * @param payload Specify what to share. See example for details.
+     * @returns A promise that resolves when the share is completed or cancelled.
+     * @throws INVALID_PARAM
+     * @throws NETWORK_FAILURE
+     * @throws PENDING_REQUEST
+     * @throws CLIENT_UNSUPPORTED_OPERATION
+     * @throws INVALID_OPERATION
+     */
     function shareAsync(payload: SharePayload): Promise<void>;
+
+    /**
+     * Informs Facebook of an update that occurred in the game. This will temporarily yield control to Facebook and Facebook will decide what to do based on what the update is.
+     * The returned promise will resolve/reject when Facebook returns control to the game.
+     *
+     * @param payload A payload that describes the update.
+     * @returns A promise that resolves when Facebook gives control back to the game.
+     * @throws INVALID_PARAM
+     * @throws PENDING_REQUEST
+     * @throws INVALID_OPERATION
+     */
     function updateAsync(payload: CustomUpdatePayload | LeaderboardUpdatePayload): Promise<void>;
+
+    /**
+     * Request that the client switch to a different Instant Game. The API will reject if the switch fails - else, the client will load the new game.
+     *
+     * @param appID The Application ID of the Instant Game to switch to. The application must be an Instant Game, and must belong to the same business as the current game.
+     * To associate different games with the same business, you can use Business Manager: https://developers.facebook.com/docs/apps/business-manager#update-business.
+     * @param data An optional data payload. This will be set as the entrypoint data for the game being switched to. Must be less than or equal to 1000 characters when stringified.
+     * @throws USER_INPUT
+     * @throws INVALID_PARAM
+     * @throws PENDING_REQUEST
+     * @throws CLIENT_REQUIRES_UPDATE
+     */
     function switchGameAsync(appID: string, data?: any): Promise<void>;
+
+    /**
+     * Returns whether or not the user is eligible to have shortcut creation requested.
+     *
+     * Will return false if createShortcutAsync was already called this session or the user is ineligible for shortcut creation.
+     *
+     * @returns Promise that resolves with true if the game can request the player create a shortcut to the game, and false otherwise
+     * @throws PENDING_REQUEST
+     * @throws CLIENT_REQUIRES_UPDATE
+     * @throws INVALID_OPERATION
+     */
     function canCreateShortcutAsync(): Promise<boolean>;
+
+    /**
+     * Prompts the user to create a shortcut to the game if they are eligible to Can only be called once per session. (see canCreateShortcutAsync)
+     * @throws USER_INPUT
+     * @throws PENDING_REQUEST
+     * @throws CLIENT_REQUIRES_UPDATE
+     * @throws INVALID_OPERATION
+     */
     function createShortcutAsync(): Promise<void>;
+
+    /**
+     * Quits the game.
+     */
     function quit(): void;
+
+    /**
+     * Log an app event with FB Analytics. See https://developers.facebook.com/docs/javascript/reference/v2.8#app_events for more details about FB Analytics.
+     *
+     * @param eventName Name of the event. Must be 2 to 40 characters, and can only contain '_', '-', ' ', and alphanumeric characters.
+     * @param valueToSum An optional numeric value that FB Analytics can calculate a sum with.
+     * @param parameter An optional object that can contain up to 25 key-value pairs to be logged with the event. Keys must be 2 to 40 characters,
+     * and can only contain '_', '-', ' ', and alphanumeric characters. Values must be less than 100 characters in length.
+     * @returns The error if the event failed to log; otherwise returns null.
+     */
     function logEvent(eventName: string, valueToSum?: number, parameter?: { [key: string]: string; }): APIError | null;
+
+    /**
+     * Set a callback to be fired when a pause event is triggered.
+     * @param func A function to call when a pause event occurs.
+     */
     function onPause(func: () => void): void;
+
+    /**
+     * Attempt to create an instance of interstitial ad. This instance can then be preloaded and presented.
+     * @param placementID The placement ID that's been setup in your Audience Network settings.
+     * @returns A promise that resolves with a AdInstance, or rejects with a APIError if it couldn't be created.
+     * @throws ADS_TOO_MANY_INSTANCES
+     * @throws CLIENT_UNSUPPORTED_OPERATION
+     */
     function getInterstitialAdAsync(placementID: string): Promise<AdInstance>;
+
+    /**
+     * Attempt to create an instance of rewarded video. This instance can then be preloaded and presented.
+     * @param placementID The placement ID that's been setup in your Audience Network settings.
+     * @returns A promise that resolves with a AdInstance, or rejects with a APIError if it couldn't be created.
+     * @throws ADS_TOO_MANY_INSTANCES
+     * @throws CLIENT_UNSUPPORTED_OPERATION
+     */
     function getRewardedVideoAsync(placementID: string): Promise<AdInstance>;
+
+    /**
+     * Attempts to match the current player with other users looking for people to play with. If successful, a new Messenger group
+     * thread will be created containing the matched players and the player will be context switched to that thread.
+     * The default minimum and maximum number of players in one matched thread are 2 and 20 respectively, depending on how many players
+     * are trying to get matched around the same time. The values can be changed in fbapp-config.json. See the
+     * [Bundle Config documentation]https://developers.facebook.com/docs/games/instant-games/bundle-config for documentation about fbapp-config.json.
+     *
+     * @param matchTag Optional extra information about the player used to group them with similar players. Players will only be grouped with other players with exactly the same tag.
+     * The tag must only include letters, numbers, and underscores and be 100 characters or less in length.
+     * @param switchContextWhenMatched Optional extra parameter that specifies whether the player should be immediately switched to the new context when a match is found.
+     * By default this will be false which will mean the player needs explicitly press play after being matched to switch to the new context.
+     * @returns A promise that resolves when the player has been added to a group thread and switched into the thread's context.
+     * @throws INVALID_PARAM
+     * @throws NETWORK_FAILURE
+     * @throws USER_INPUT
+     * @throws PENDING_REQUEST
+     * @throws CLIENT_UNSUPPORTED_OPERATION
+     * @throws INVALID_OPERATION
+     */
     function matchPlayerAsync(matchTag?: string, switchContextWhenMatched?: boolean): Promise<void>;
+
+    /**
+     * Checks if the current player is eligible for the matchPlayerAsync API.
+     * @returns  A promise that resolves with true if the player is eligible to match with other players and false otherwise.
+     * @throws NETWORK_FAILURE
+     * @throws CLIENT_UNSUPPORTED_OPERATION
+     */
     function checkCanPlayerMatchAsync(): Promise<boolean>;
+
+    /**
+     * Fetch a specific leaderboard belonging to this Instant Game.
+     *
+     * @param name The name of the leaderboard. Each leaderboard for an Instant Game must have its own distinct name.
+     * @returns A promise that resolves with the matching leaderboard, rejecting if one is not found.
+     * @throws LEADERBOARD_NOT_FOUND
+     * @throws NETWORK_FAILURE
+     * @throws CLIENT_UNSUPPORTED_OPERATION
+     * @throws INVALID_OPERATION
+     * @throws INVALID_PARAM
+     */
     function getLeaderboardAsync(name: string): Promise<Leaderboard>;
 
     interface Player {
+        /**
+         * A unique identifier for the player. A Facebook user's player ID will remain constant,
+         * and is scoped to a specific game. This means that different games will have different
+         * player IDs for the same user. This function should not be called until FBInstant.initializeAsync()
+         * has resolved.
+         *
+         * @returns A unique identifier for the player.
+         */
         getID(): string | null;
+
+        /**
+         * Fetch the player's unique identifier along with a signature that verifies that the identifier indeed
+         * comes from Facebook without being tampered with. This function should not be called until
+         * FBInstant.initializeAsync() has resolved.
+         *
+         * @param requestPayload  A developer-specified payload to include in the signed response.
+         * @returns A promise that resolves with a SignedPlayerInfo object.
+         * @throws INVALID_PARAM
+         * @throws NETWORK_FAILURE
+         * @throws CLIENT_UNSUPPORTED_OPERATION
+         */
         getSignedPlayerInfoAsync(requestPayload?: string): Promise<SignedPlayerInfo>;
+
+        /**
+         * Returns a promise that resolves with whether the player can subscribe to the game bot or not.
+         * Developer can only call subscribeBotAsync() after checking canSubscribeBotAsync(), and the player will
+         * only be able to see this bot subscription dialog once for a specific game.
+         *
+         * @returns Whether a player can subscribe to the game bot or not.
+         */
         canSubscribeBotAsync(): Promise<boolean>;
+
+        /**
+         * Request that the player subscribe the bot associated to the game. The API will reject if the subscription
+         * fails - else, the player will subscribe the game bot.
+         *
+         * @returns A promise that resolves if player successfully subscribed to the game bot, or rejects if request failed or player chose to not subscribe.
+         * @throws INVALID_PARAM
+         * @throws PENDING_REQUEST
+         * @throws CLIENT_REQUIRES_UPDATE
+         */
         subscribeBotAsync(): Promise<void>;
+
+        /**
+         * The player's localized display name. This function should not be called until FBInstant.startGameAsync() has resolved.
+         *
+         * @returns The player's localized display name.
+         */
         getName(): string | null;
+
+        /**
+         * A url to the player's public profile photo. The photo will always be a square, and with dimensions of at least 200x200.
+         * When rendering it in the game, the exact dimensions should never be assumed to be constant. It's recommended to always
+         * scale the image to a desired size before rendering. The value will always be null until FBInstant.startGameAsync() resolves.
+         *
+         * WARNING: Due to CORS, using these photos in the game canvas can cause it to be tainted, which will prevent the canvas data from being extracted.
+         * To prevent this, set the cross-origin attribute of the images you use to 'anonymous'.
+         *
+         * @returns Url to the player's public profile photo.
+         */
         getPhoto(): string | null;
+
+        /**
+         * Retrieve data from the designated cloud storage of the current player.
+         *
+         * @param keys An array of unique keys to retrieve data for.
+         * @returns A promise that resolves with an object which contains the current key-value pairs for each key specified in the input array, if they exist.
+         * @throws INVALID_PARAM
+         * @throws NETWORK_FAILURE
+         * @throws CLIENT_UNSUPPORTED_OPERATION
+         */
         getDataAsync(keys: string[]): Promise<DataObject>;
+
+        /**
+         * Set data to be saved to the designated cloud storage of the current player. The game can store up to 1MB of data for each unique player.
+         *
+         * @param data An object containing a set of key-value pairs that should be persisted to cloud storage. The object must contain only serializable
+         * values - any non-serializable values will cause the entire modification to be rejected.
+         * @returns A promise that resolves when the input values are set. NOTE: The promise resolving does not necessarily mean that the input has already been persisted.
+         * Rather, it means that the data was valid and has been scheduled to be saved. It also guarantees that all values that were set are now available in player.getDataAsync.
+         * @throws INVALID_PARAM
+         * @throws NETWORK_FAILURE
+         * @throws PENDING_REQUEST
+         * @throws CLIENT_UNSUPPORTED_OPERATION
+         */
         setDataAsync(data: DataObject): Promise<void>;
+
+        /**
+         * Immediately flushes any changes to the player data to the designated cloud storage. This function is expensive, and should primarily be
+         * used for critical changes where persistence needs to be immediate and known by the game. Non-critical changes should rely on the platform
+         * to persist them in the background. NOTE: Calls to player.setDataAsync will be rejected while this function's result is pending.
+         *
+         * @returns  A promise that resolves when changes have been persisted successfully, and rejects if the save fails.
+         * @throws INVALID_PARAM
+         * @throws NETWORK_FAILURE
+         * @throws PENDING_REQUEST
+         * @throws CLIENT_UNSUPPORTED_OPERATION
+         */
         flushDataAsync(): Promise<void>;
+
+        /**
+         * Retrieve stats from the designated cloud storage of the current player.
+         *
+         * @param keys An optional array of unique keys to retrieve stats for. If the function is called without it, it will fetch all stats.
+         * @returns A promise that resolves with an object which contains the current key-value pairs for each key specified in the input array, if they exist.
+         * @throws INVALID_PARAM
+         * @throws NETWORK_FAILURE
+         * @throws CLIENT_UNSUPPORTED_OPERATION
+         */
         getStatsAsync(keys?: string[]): Promise<StatsObject>;
+
+        /**
+         * Set stats to be saved to the designated cloud storage of the current player.
+         *
+         * @param stats An object containing a set of key-value pairs that should be persisted to cloud storage as stats, which can be surfaced or used in a
+         * variety of ways to benefit player engagement.The object must contain only numerical values - any non-numerical values will cause the entire modification to be rejected.
+         * @returns A promise that resolves when the input values are set. NOTE: The promise resolving does not necessarily mean that the input has already been persisted.
+         * Rather, it means that the data was validated and has been scheduled to be saved. It also guarantees that all values that were set are now available in player.getStatsAsync.
+         * @throws INVALID_PARAM
+         * @throws NETWORK_FAILURE
+         * @throws PENDING_REQUEST
+         * @throws CLIENT_UNSUPPORTED_OPERATION
+         */
         setStatsAsync(stats: StatsObject): Promise<void>;
+
+        /**
+         * Increment stats saved in the designated cloud storage of the current player.
+         *
+         * @param increments An object containing a set of key-value pairs indicating how much to increment each stat in cloud storage.
+         * The object must contain only numerical values - any non-numerical values will cause the entire modification to be rejected.
+         * @returns A promise that resolves with an object which contains the updated key-value pairs for each key specified in the input dictionary.
+         * NOTE: The promise resolving does not necessarily mean that the changes have already been persisted. Rather, it means that the increments were
+         * valid and have been scheduled to be performed. It also guarantees that all values that were incremented are now available in player.getStatsAsync.
+         * @throws INVALID_PARAM
+         * @throws NETWORK_FAILURE
+         * @throws PENDING_REQUEST
+         * @throws CLIENT_UNSUPPORTED_OPERATION
+         */
         incrementStatsAsync(increments: IncrementObject): Promise<StatsObject>;
+
+        /**
+         * Fetches an array of ConnectedPlayer objects containing information about players that are connected to the current player.
+         * @returns A promise that resolves with a list of connected player objects. NOTE: This promise will not resolve until FBInstant.startGameAsync() has resolved.
+         * @throws NETWORK_FAILURE
+         * @throws CLIENT_UNSUPPORTED_OPERATION
+         */
         getConnectedPlayersAsync(): Promise<ConnectedPlayer[]>;
     }
 
     interface Context {
+        /**
+         * A unique identifier for the current game context. This represents a specific context that the game is being played in
+         * (for example, a particular messenger conversation or facebook post). The identifier will be null if game is being played in
+         * a solo context. This function should not be called until FBInstant.startGameAsync has resolved.
+         *
+         * @returns A unique identifier for the current game context.
+         */
         getID(): string | null;
+
+        /**
+         * The type of the current game context. POST - A facebook post. THREAD - A messenger thread.
+         * GROUP - A facebook group. SOLO - Default context, where the player is the only participant.
+         * This function should not be called until FBInstant.startGameAsync has resolved.
+         *
+         * @returns Type of the current game context
+         */
         getType(): Type;
+
+        /**
+         * This function determines whether the number of participants in the current game context is between a given minimum and maximum, inclusive.
+         * If one of the bounds is null only the other bound will be checked against. It will always return the original result for the first call made in
+         * a context in a given game play session. Subsequent calls, regardless of arguments, will return the answer to the original query until a context
+         * change occurs and the query result is reset. This function should not be called until FBInstant.startGameAsync has resolved.
+         * This will be null if one or both of the supplied arguments are not valid, if we do not have a size available for the current context,
+         * or if the API is called before startGameAsync() resolves.
+         *
+         * @param minSize The minimum bound of the context size query.
+         * @param maxSize The maximum bound of the context size query.
+         * @returns ContextSizeResponse
+         */
         isSizeBetween(minSize?: number, maxSize?: number): ContextSizeResponse | null;
+
+        /**
+         * Request a switch into a specific context. If the player does not have permission to enter that context,
+         * or if the player does not provide permission for the game to enter that context,
+         * this will reject. Otherwise, the promise will resolve when the game has switched into the specified context.
+         *
+         * @param id ID of the desired context.
+         * @returns A promise that resolves when the game has switched into the specified context, or rejects otherwise.
+         * @throws INVALID_PARAM
+         * @throws SAME_CONTEXT
+         * @throws NETWORK_FAILURE
+         * @throws USER_INPUT
+         * @throws PENDING_REQUEST
+         * @throws CLIENT_UNSUPPORTED_OPERATION
+         */
         switchAsync(id: string): Promise<void>;
+
+        /**
+         * Opens a context selection dialog for the player. If the player selects an available context, the client will attempt to switch into that context,
+         * and resolve if successful. Otherwise, if the player exits the menu or the client fails to switch into the new context, this function will reject.
+         *
+         * @param options An object specifying conditions on the contexts that should be offered.
+         * @returns A promise that resolves when the game has switched into the context chosen by the user. Otherwise, the promise will reject (if the user cancels out of the dialog, for example).
+         * @throws INVALID_PARAM
+         * @throws SAME_CONTEXT
+         * @throws NETWORK_FAILURE
+         * @throws USER_INPUT
+         * @throws PENDING_REQUEST
+         * @throws CLIENT_UNSUPPORTED_OPERATION
+         */
         chooseAsync(options: ContextOptions): Promise<void>;
+
+        /**
+         * Attempts to create or switch into a context between a specified player and the current player. The returned promise will reject if the player listed is not a Connected Player of the current
+         * player or if the player does not provide permission to enter the new context. Otherwise, the promise will resolve when the game has switched into the new context.
+         *
+         * @param playerID ID of the player
+         * @returns A promise that resolves when the game has switched into the new context, or rejects otherwise.
+         * @throws INVALID_PARAM
+         * @throws SAME_CONTEXT
+         * @throws NETWORK_FAILURE
+         * @throws USER_INPUT
+         * @throws PENDING_REQUEST
+         * @throws CLIENT_UNSUPPORTED_OPERATION
+         */
         createAsync(playerID: string): Promise<void>;
+
+        /**
+         * Gets an array of ContextPlayer objects containing information about active players — people who actively played the game in the current context in the last 90 days.
+         * This may include the current player.
+         * @throws NETWORK_FAILURE
+         * @throws CLIENT_UNSUPPORTED_OPERATION
+         * @throws INVALID_OPERATION
+         */
         getPlayersAsync(): Promise<ContextPlayer[]>;
     }
 
+    /**
+     * An Instant Game leaderboard
+     */
     interface Leaderboard {
+        /**
+         * The name of the leaderboard.
+         */
         getName(): string;
+
+        /**
+         * The ID of the context that the leaderboard is associated with, or null if the leaderboard is not tied to a particular context.
+         */
         getContextID(): string | null;
+
+        /**
+         * Fetches the total number of player entries in the leaderboard.
+         *
+         * @returns  A unique identifier for the player.
+         * @throws NETWORK_FAILURE
+         * @throws RATE_LIMITED
+         */
         getEntryCountAsync(): Promise<number>;
+
+        /**
+         * Updates the player's score. If the player has an existing score, the old score will only be replaced if the new score is better than it.
+         * NOTE: If the leaderboard is associated with a specific context, the game must be in that context to set a score for the player.
+         *
+         * @param score The new score for the player. Must be a 64-bit integer number.
+         * @param extraData Metadata to associate with the stored score. Must be less than 2KB in size.
+         * @returns Resolves with the current leaderboard entry for the player after the update.
+         * @throws LEADERBOARD_WRONG_CONTEXT
+         * @throws NETWORK_FAILURE
+         * @throws INVALID_PARAM
+         * @throws INVALID_OPERATION
+         * @throws RATE_LIMITED
+         */
         setScoreAsync(score: number, extraData: string): Promise<LeaderboardEntry>;
+
+        /**
+         * Retrieves the leaderboard's entry for the current player, or null if the player has not set one yet.
+         *
+         * @returns Resolves with the current leaderboard entry for the player.
+         * @throws NETWORK_FAILURE
+         * @throws INVALID_OPERATION
+         * @throws RATE_LIMITED
+         */
         getPlayerEntryAsync(): Promise<LeaderboardEntry | null>;
+
+        /**
+         * Retrieves a set of leaderboard entries, ordered by score ranking in the leaderboard.
+         *
+         * @param count The number of entries to attempt to fetch from the leaderboard. Defaults to 10 if not specified. Up to a maximum of 100 entries may be fetched per query.
+         * @param offset The offset from the top of the leaderboard that entries will be fetched from.
+         * @returns Resolves with the leaderboard entries that match the query.
+         * @throws NETWORK_FAILURE
+         * @throws RATE_LIMITED
+         */
         getEntriesAsync(count: number, offset: number): Promise<LeaderboardEntry[]>;
+
+        /**
+         * Retrieves the leaderboard score entries of the current player's connected players (including the current player), ordered by local rank within the set of connected players.
+         * @param count  The number of entries to attempt to fetch from the leaderboard. Defaults to 10 if not specified. Currently, up to a maximum of 100 entries may be fetched per query.
+         * @param offset The offset from the set of ordered connected player score entries to fetch from.
+         * @returns Resolves with the leaderboard entries that match the query.
+         */
         getConnectedPlayerEntriesAsync(count: number, offset: number): Promise<LeaderboardEntry[]>;
     }
 
+    /**
+     * A score entry for an Instant Game leaderboard
+     */
     interface LeaderboardEntry {
+        /**
+         * Gets the score associated with the entry.
+         * @returns Returns an integer score value.
+         */
         getScore(): number;
+
+        /**
+         * Gets the score associated with the entry, formatted with the score format associated with the leaderboard.
+         * @returns Returns a formatted score.
+         */
         getFormattedScore(): string;
+
+        /**
+         * Gets the timestamp of when the leaderboard entry was last updated.
+         * @returns Returns a Unix timestamp.
+         */
         getTimestamp(): number;
+
+        /**
+         * Gets the rank of the player's score in the leaderboard
+         * @returns Returns the entry's leaderboard ranking.
+         */
         getRank(): number;
+
+        /**
+         * Gets the developer-specified payload associated with the score, or null if one was not set.
+         * @returns An optional developer-specified payload associated with the score.
+         */
         getExtraData(): string | null;
+
+        /**
+         * Gets information about the player associated with the entry.
+         */
         getPlayer(): LeaderboardPlayer;
     }
 
+    /**
+     * Details about the player associated with a score entry.
+     */
     interface LeaderboardPlayer {
+        /**
+         * Gets the player's localized display name.
+         *
+         * @returns The player's localized display name.
+         */
         getName(): string;
+
+        /**
+         * Returns a url to the player's public profile photo.
+         *
+         * @returns Url to the player's public profile photo.
+         */
         getPhoto(): string | null;
+
+        /**
+         * Gets the game's unique identifier for the player.
+         *
+         * @returns The game-scoped identifier for the player.
+         */
         getID(): string | null;
     }
 
+    /**
+     * Represents information about a player who is connected to the current player.
+     */
     interface ConnectedPlayer {
+        /**
+         * Get the id of the connected player.
+         *
+         * @returns The ID of the connected player
+         */
         getID(): string;
+
+        /**
+         * Get the player's full name.
+         *
+         * @returns The player's full name
+         */
         getName(): string | null;
+
+        /**
+         * Get the player's public profile photo.
+         *
+         * @returns A url to the player's public profile photo
+         */
         getPhoto(): string | null;
     }
 
+    /**
+     * Represents information about the player along with a signature to verify that it indeed comes from Facebook.
+     */
     interface SignedPlayerInfo {
+        /**
+         * Get the id of the player.
+         * @returns The ID of the player
+         */
         getPlayerID(): string;
+
+        /**
+         * A signature to verify this object indeed comes from Facebook. The string is base64url encoded and signed with an HMAC version of your App Secret,
+         * based on the OAuth 2.0 spec.
+         *
+         * You can validate it with the following 4 steps:
+         *
+         * Split the signature into two parts delimited by the '.' character.
+         *
+         * Decode the first part (the encoded signature) with base64url encoding.
+         *
+         * Decode the second part (the response payload) with base64url encoding, which should be a string representation of a JSON object that has the following fields:
+         * ** algorithm - always equals to HMAC-SHA256
+         * ** issued_at - a unix timestamp of when this response was issued.
+         * ** player_id - unique identifier of the player.
+         * ** request_payload - the requestPayload string you specified when calling FBInstant.player.getSignedPlayerInfoAsync.
+         *
+         * Hash the whole response payload string using HMAC SHA-256 and your app secret and confirm that it is equal to the encoded signature.
+         *
+         * You may also wish to validate the issued_at timestamp in the response payload to ensure the request was made recently.
+         *
+         * Signature validation should only happen on your server. Never do it on the client side as it will compromise your app secret key.
+         *
+         * @returns The signature string.
+         */
         getSignature(): string;
     }
 
+    /**
+     * Represents information about a player who is in the context that the current player is playing in.
+     */
     interface ContextPlayer {
+        /**
+         * Get the id of the context player.
+         *
+         * @returns The ID of the context player
+         */
         getID(): string;
+
+        /**
+         * Get the player's localized display name.
+         *
+         * @returns The player's localized display name.
+         */
         getName(): string | null;
+
+        /**
+         * Get the player's public profile photo.
+         *
+         * @returns A url to the player's public profile photo
+         */
         getPhoto(): string | null;
     }
 
+    /**
+     * Represents an instance of an ad.
+     */
     interface AdInstance {
+        /**
+         * Return the Audience Network placement ID of this ad instance.
+         */
         getPlacementID(): string;
+
+        /**
+         * Preload the ad. The returned promise resolves when the preload completes, and rejects if it failed.
+         * @throws ADS_FREQUENT_LOAD
+         * @throws ADS_NO_FILL
+         * @throws INVALID_PARAM
+         * @throws NETWORK_FAILURE
+         */
         loadAsync(): Promise<void>;
+
+        /**
+         * Present the ad. The returned promise resolves when user finished watching the ad, and rejects if it failed to present or was closed during the ad.
+         * @throws ADS_NOT_LOADED
+         * @throws INVALID_PARAM
+         * @throws NETWORK_FAILURE
+         * @throws INVALID_OPERATION
+         */
         showAsync(): Promise<void>;
     }
 
     interface Payments {
+        /**
+         * Fetches the game's product catalog.
+         *
+         * @returns The set of products that are registered to the game.
+         * @throws CLIENT_UNSUPPORTED_OPERATION
+         * @throws PAYMENTS_NOT_INITIALIZED
+         * @throws NETWORK_FAILURE
+         */
         getCatalogAsync(): Promise<Product[]>;
+
+        /**
+         * Begins the purchase flow for a specific product. Will immediately reject if called before FBInstant.startGameAsync() has resolved.
+         *
+         * @param purchaseConfig The purchase's configuration details.
+         * @returns A Promise that resolves when the product is successfully purchased by the player. Otherwise, it rejects.
+         * @throws CLIENT_UNSUPPORTED_OPERATION
+         * @throws PAYMENTS_NOT_INITIALIZED
+         * @throws INVALID_PARAM
+         * @throws NETWORK_FAILURE
+         * @throws INVALID_OPERATION
+         */
         purchaseAsync(purchaseConfig: PurchaseConfig): Promise<Purchase>;
+
+        /**
+         * Fetches all of the player's unconsumed purchases. As a best practice, the game should fetch the current player's purchases
+         * as soon as the client indicates that it is ready to perform payments-related operations. The game can then process and consume
+         * any purchases that are waiting to be consumed.
+         *
+         * @returns The set of purchases that the player has made for the game.
+         * @throws CLIENT_UNSUPPORTED_OPERATION
+         * @throws PAYMENTS_NOT_INITIALIZED
+         * @throws NETWORK_FAILURE
+         */
         getPurchasesAsync(): Promise<Purchase[]>;
+
+        /**
+         * Consumes a specific purchase belonging to the current player. Before provisioning a product's effects to the player,
+         * the game should request the consumption of the purchased product. Once the purchase is successfully consumed, the game
+         * should immediately provide the player with the effects of their purchase.
+         *
+         * @param purchaseToken The purchase token of the purchase that should be consumed.
+         * @throws CLIENT_UNSUPPORTED_OPERATION
+         * @throws PAYMENTS_NOT_INITIALIZED
+         * @throws INVALID_PARAM
+         * @throws NETWORK_FAILURE
+         */
         consumePurchaseAsync(purchaseToken: string): Promise<void>;
+
+        /**
+         * Sets a callback to be triggered when Payments operations are available.
+         * @param callback The callback function to be executed when Payments are available.
+         */
         onReady(callback: () => void): void;
     }
 
+    /**
+     * Represents a game's product information.
+     */
     interface Product {
+        /**
+         * The title of the product
+         */
         title: string;
+
+        /**
+         * he product's game-specified identifier
+         */
         productID: string;
+
+        /**
+         * The product description
+         */
         description?: string;
+
+        /**
+         * A link to the product's associated image
+         */
         imageURI?: string;
+
+        /**
+         * The price of the product
+         */
         price: string;
+
+        /**
+         * The currency code for the product
+         */
         priceCurrencyCode: string;
     }
 
+    /**
+     * The answer field is true if the current context size is between the minSize and maxSize values that are specified in the object, and false otherwise.
+     */
     interface ContextSizeResponse {
         answer: boolean;
         minSize?: number;
         maxSize?: number;
     }
 
+    /**
+     * Represents an individual purchase of a game product.
+     */
     interface Purchase {
+        /**
+         * A developer-specified string, provided during the purchase of the product
+         */
         developerPayload?: string;
+
+        /**
+         * The identifier for the purchase transaction
+         */
         paymentID: string;
+
+        /**
+         *  The product's game-specified identifier
+         */
         productID: string;
+
+        /**
+         * Unix timestamp of when the purchase occurred
+         */
         purchaseTime: string;
+
+        /**
+         *  A token representing the purchase that may be used to consume the purchase
+         */
         purchaseToken: string;
+
+        /**
+         *  Server-signed encoding of the purchase request
+         */
         signedRequest: SignedPurchaseRequest;
     }
 
     interface ContextOptions {
+        /**
+         * The set of filters to apply to the context suggestions.
+         */
         filters?: ContextFilter[];
+
+        /**
+         * The maximum number of participants that a suggested context should ideally have.
+         */
         maxSize?: number;
+
+        /**
+         * The minimum number of participants that a suggested context should ideally have.
+         */
         minSize?: number;
     }
 
+    /**
+     * Represents content to be shared by the user.
+     */
     interface SharePayload {
+        /**
+         * Indicates the intent of the share.
+         */
         intent: Intent;
+
+        /**
+         * A base64 encoded image to be shared.
+         */
         image: string;
+
+        /**
+         * A text message to be shared.
+         */
         text: string;
+
+        /**
+         * A blob of data to attach to the share. All game sessions launched from the share will be able to access this blob through FBInstant.getEntryPointData().
+         */
         data?: any;
     }
 
+    /**
+     * An API Error returned by the Instant Games SDK
+     */
     interface APIError {
+        /**
+         * The relevant error code
+         */
         code: ErrorCodeType;
+        /**
+         * A message describing the error
+         */
         message: string;
     }
 
+    /**
+     * The configuration of a purchase request for a product registered to the game.
+     */
     interface PurchaseConfig {
+        /**
+         * The identifier of the product to purchase
+         */
         productID: string;
+
+        /**
+         * An optional developer-specified payload, to be included in the returned purchase's signed request.
+         */
         developerPayload?: string;
     }
 
+    /**
+     * Represents a custom update for FBInstant.updateAsync.
+     */
     interface CustomUpdatePayload {
+        /**
+         * For custom updates, this should be 'CUSTOM'.
+         */
         action: UpdateAction;
+
+        /**
+         * ID of the template this custom update is using. Templates should be predefined in fbapp-config.json.
+         * See the [Bundle Config documentation]https://developers.facebook.com/docs/games/instant-games/bundle-config
+         * or documentation about fbapp-config.json.
+         */
         template: string;
+
+        /**
+         * Optional call-to-action button text. By default we will use a localized 'Play' as the button text. To provide localized
+         * versions of your own call to action, pass an object with the default cta as the value of 'default' and another object mapping
+         * locale keys to translations as the value of 'localizations'.
+         */
         cta?: (string | LocalizableContent);
+
+        /**
+         * Data URL of a base64 encoded image.
+         */
         image: string;
+
+        /**
+         * A text message, or an object with the default text as the value of 'default' and another object mapping locale keys to
+         * translations as the value of 'localizations'.
+         */
         text: (string | LocalizableContent);
+
+        /**
+         * A blob of data to attach to the update. All game sessions launched from the update will be able to access this blob
+         * through FBInstant.getEntryPointData(). Must be less than or equal to 1000 characters when stringified.
+         */
         data?: any;
+
+        /**
+         * Specifies how the update should be delivered. This can be one of the following:
+         *
+         * 'IMMEDIATE' - The update should be posted immediately.
+         *
+         * 'LAST' - The update should be posted when the game session ends. The most recent update sent using the 'LAST' strategy will be the one sent.
+         *
+         * 'IMMEDIATE_CLEAR' - The update is posted immediately, and clears any other pending updates (such as those sent with the 'LAST' strategy).
+         *
+         * If no strategy is specified, we default to 'IMMEDIATE'.
+         */
         strategy?: string;
+
+        /**
+         * Specifies notification setting for the custom update. This can be 'NO_PUSH' or 'PUSH', and defaults to 'NO_PUSH'.
+         * Use push notification only for updates that are high-signal and immediately actionable for the recipients.
+         * Also note that push notification is not always guaranteed, depending on user setting and platform policies.
+         */
         notification?: string;
     }
 
+    /**
+     * Represents a leaderboard update for FBInstant.updateAsync.
+     */
     interface LeaderboardUpdatePayload {
+        /**
+         * For a leaderboard update, this should be 'LEADERBOARD'. text. By default we will use a localized 'Play Now' as the button text.
+         */
         action: UpdateAction;
+
+        /**
+         * The name of the leaderboard to feature in the update.
+         */
         name: string;
+
+        /**
+         * Optional text message. If not specified, a localized fallback message will be provided instead.
+         */
         text?: string;
     }
 
+    /**
+     * Represents a string with localizations and a default value to fall back on.
+     */
     interface LocalizableContent {
+        /**
+         * The default value of the string to use if the viewer's locale is not a key in the localizations object.
+         */
         default: string;
+        /**
+         *  Specifies what string to use for viewers in each locale. See https://origincache.facebook.com/developers/resources/?id=FacebookLocales.xml for a complete list of supported locale values.
+         */
         localizations: LocalizationsDict;
     }
 
@@ -189,16 +1043,35 @@ declare namespace FBInstant {
 
     interface IncrementObject { [ key: string ]: number; }
 
+    /**
+     * Represents a mapping from locales to translations of a given string. Each property is an optional five-character Facebook locale code of the form xx_XX.
+     * See https://origincache.facebook.com/developers/resources/?id=FacebookLocales.xml for a complete list of supported locale codes.
+     */
     interface LocalizationsDict {
         [x: string]: string;
     }
 
     type SignedPurchaseRequest = string;
 
+    /**
+     * A filter that may be applied to a Context Choose operation
+     * 'NEW_CONTEXT_ONLY' - Prefer to only surface contexts the game has not been played in before.
+     * 'INCLUDE_EXISTING_CHALLENGES' - Include the "Existing Challenges" section, which surfaces actively played-in contexts that the player is a part of.
+     * 'NEW_PLAYERS_ONLY' - In sections containing individuals, prefer people who have not played the game.
+     */
     type ContextFilter = "NEW_CONTEXT_ONLY" | "INCLUDE_EXISTING_CHALLENGES" | "NEW_PLAYERS_ONLY";
 
+    /**
+     * Represents the type of the update action to perform.
+     *
+     * "CUSTOM": A custom update, with all content specified by the game.
+     * "LEADERBOARD": An update associated with an Instant Game leaderboard.
+     */
     type UpdateAction = "CUSTOM" | "LEADERBOARD";
 
+    /**
+     * Represents the current platform that the user is playing on.
+     */
     type Platform = "IOS" | "ANDROID" | "WEB" | "MOBILE_WEB";
 
     type Type = "POST" | "THREAD" | "GROUP" | "SOLO";

From 854a093d693e533240820f64977cac054a63edca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Johansen=20Amundrud?= <oyvindjam@gmail.com>
Date: Sun, 20 May 2018 23:34:36 +0200
Subject: [PATCH 275/575] Exercise each function in test

---
 .../facebook-instant-games-tests.ts           | 180 +++++++++++++-----
 1 file changed, 128 insertions(+), 52 deletions(-)

diff --git a/types/facebook-instant-games/facebook-instant-games-tests.ts b/types/facebook-instant-games/facebook-instant-games-tests.ts
index 8d33e2c970..949782c41a 100644
--- a/types/facebook-instant-games/facebook-instant-games-tests.ts
+++ b/types/facebook-instant-games/facebook-instant-games-tests.ts
@@ -1,58 +1,134 @@
-class FBInstantTest {
-    winStreak: number;
+const locale: string = FBInstant.getLocale()!;
+const platform: string = FBInstant.getPlatform();
+const sdkVersion: string = FBInstant.getSDKVersion();
+FBInstant.initializeAsync().then(() => {});
+FBInstant.setLoadingProgress(10);
+const supportedAPIs = FBInstant.getSupportedAPIs();
+const entryPointData = FBInstant.getEntryPointData();
+FBInstant.getEntryPointAsync().then(entryPointName => {});
+FBInstant.setSessionData({sessionData: "sessionData"});
+FBInstant.startGameAsync().then(() => {});
 
-    init() {
-        FBInstant.initializeAsync().then(() => {
-            FBInstant.setLoadingProgress(100);
-            FBInstant.startGameAsync().then(() => {
-                this.startGame();
-            });
-        });
-    }
+const sharePayload = {
+    intent: "INVITE" as "INVITE",
+    image: "",
+    text: "text",
+    data: {score: 10},
+};
+FBInstant.shareAsync(sharePayload);
 
-    startGame() {
-        const contextId = FBInstant.context.getID();
-        const contextType = FBInstant.context.getType();
+const customUpdatePayload = {
+    action: "CUSTOM" as "CUSTOM",
+    template: "template",
+    cta: "cta",
+    image: "image",
+    text: {
+        default: 'Edgar played their move',
+        localizations: {
+            en_US: 'Edgar played their move',
+            es_LA: '\u00A1Edgar jug\u00F3 su jugada!'
+        }
+    },
+};
+FBInstant.updateAsync(customUpdatePayload).then(() => {});
 
-        const playerName = FBInstant.player.getName();
-        const playerPic = FBInstant.player.getPhoto();
-        const playerId = FBInstant.player.getID();
-    }
+const leaderboardUpdatePayload: FBInstant.LeaderboardUpdatePayload = {
+    action: "LEADERBOARD",
+    name: "name",
+    text: "text"
+};
+FBInstant.updateAsync(leaderboardUpdatePayload).then(() => {});
+FBInstant.switchGameAsync("appID").then(() => {});
 
-    saveState() {
-        FBInstant.player.setDataAsync({
-            score: this.winStreak
-        });
-    }
+FBInstant.canCreateShortcutAsync().then((canCreateShortcut: boolean) => {});
+FBInstant.createShortcutAsync().then(() => {});
+FBInstant.quit();
+const apiError = FBInstant.logEvent("eventName", 10, {key1: "value1", key2: "value2"});
+FBInstant.onPause(() => { });
 
-    getState() {
-        FBInstant.player.getDataAsync(['score'])
-            .then((data) => {
-                if (typeof data['score'] !== 'undefined') {
-                    this.winStreak = +data['score'];
-                }
-            });
-    }
+FBInstant.getInterstitialAdAsync("placementID").then(adInstance => {});
+FBInstant.getRewardedVideoAsync("placementID").then(adInstance => {
+    const placementID: string = adInstance.getPlacementID();
+    adInstance.loadAsync().then(() => {});
+    adInstance.showAsync().then(() => {});
+});
 
-    update() {
-        FBInstant.updateAsync({
-            action: 'CUSTOM',
-            cta: 'Play',
-            image: '',
-            text: {
-                default: 'Edgar played their move',
-                localizations: {
-                    en_US: 'Edgar played their move',
-                    es_LA: '\u00A1Edgar jug\u00F3 su jugada!'
-                }
-            },
-            template: 'play_turn',
-            data: { myReplayData: '...' },
-            strategy: 'IMMEDIATE',
-            notification: 'NO_PUSH'
-        }).then(() => {
-            // closes the game after the update is posted.
-            FBInstant.quit();
-        });
-    }
-}
+FBInstant.matchPlayerAsync("matchTag", false).then(() => {});
+FBInstant.checkCanPlayerMatchAsync().then((canPlayerMatchAsync: boolean) => {});
+FBInstant.getLeaderboardAsync("name").then((leaderboard: FBInstant.Leaderboard) => {
+    leaderboard.getConnectedPlayerEntriesAsync(10, 0).then(leaderboardEntries => {
+        const leaderboardEntry = leaderboardEntries[0];
+        const extraData: string = leaderboardEntry.getExtraData()!;
+        const formattedScore: string = leaderboardEntry.getFormattedScore();
+
+        const leaderboardPlayer = leaderboardEntry.getPlayer();
+        const leaderboardPlayerID: string = leaderboardPlayer.getID()!;
+        const leaderboardPlayerName: string = leaderboardPlayer.getName();
+        const leaderboardPlayerPhoto: string = leaderboardPlayer.getPhoto()!;
+
+        const rank: number = leaderboardEntry.getRank();
+        const score: number = leaderboardEntry.getScore();
+        const timestamp: number = leaderboardEntry.getTimestamp();
+    });
+});
+
+FBInstant.player.canSubscribeBotAsync().then((canSubscribeBot: boolean) => {});
+FBInstant.player.flushDataAsync().then(() => {});
+FBInstant.player.getConnectedPlayersAsync().then((connectedPlayers: FBInstant.ConnectedPlayer[]) => {
+    const connectedPlayer: FBInstant.ConnectedPlayer = connectedPlayers[0];
+    const id: string = connectedPlayer.getID();
+    const name: string = connectedPlayer.getName()!;
+    const photo: string = connectedPlayer.getPhoto()!;
+});
+FBInstant.player.getDataAsync(["score"]).then(data => {
+    const score: number = data["score"] as number;
+});
+const playerID: string = FBInstant.player.getID()!;
+const playerName: string = FBInstant.player.getName()!;
+const playerPhoto: string = FBInstant.player.getPhoto()!;
+FBInstant.player.getSignedPlayerInfoAsync('metadata').then(signedPlayerInfo => {
+    const playerID: string = signedPlayerInfo.getPlayerID();
+    const signature: string = signedPlayerInfo.getSignature();
+});
+FBInstant.player.getStatsAsync(["score"]).then(result => {
+    const score: number = result["score"];
+});
+FBInstant.player.incrementStatsAsync({score: 1}).then(result => {
+    const incrementedScore: number = result["score"];
+});
+FBInstant.player.setDataAsync({score: 10}).then(() => {});
+FBInstant.player.setStatsAsync({score: 10}).then(() => {});
+FBInstant.player.subscribeBotAsync().then(() => {});
+
+const contextOptions: FBInstant.ContextOptions = {
+    filters: ["NEW_CONTEXT_ONLY"],
+    maxSize: 10,
+    minSize: 1
+};
+FBInstant.context.chooseAsync(contextOptions);
+FBInstant.context.createAsync("playerID").then(() => {});
+const contextID: string = FBInstant.context.getID()!;
+FBInstant.context.getPlayersAsync().then((contextPlayers: FBInstant.ContextPlayer[]) => {
+    const contextPlayer: FBInstant.ContextPlayer = contextPlayers[0];
+    const id: string = contextPlayer.getID();
+    const name: string = contextPlayer.getName()!;
+    const photo: string = contextPlayer.getPhoto()!;
+});
+const type = FBInstant.context.getType();
+const contextSizeResponse = FBInstant.context.isSizeBetween(1, 10)!;
+const sizeIsBetween: boolean = contextSizeResponse.answer;
+const maxSize: number = contextSizeResponse.maxSize!;
+const minSize: number = contextSizeResponse.minSize!;
+
+FBInstant.context.switchAsync("id").then(() => {});
+
+FBInstant.payments.consumePurchaseAsync("purchaseToken").then(() => {});
+FBInstant.payments.getCatalogAsync().then((products: FBInstant.Product[]) => {
+    const product = products[0];
+    const description: string = product.description!;
+    const imageURI: string = product.imageURI!;
+    const price: string = product.price;
+    const priceCurrencyCode: string = product.priceCurrencyCode;
+    const productID: string = product.productID;
+    const title: string = product.title;
+});

From 2a4b24f0d0d435acc61a3b2f7b3e4c6dbad5a1e9 Mon Sep 17 00:00:00 2001
From: GlenCFL <glencfl@gmail.com>
Date: Sun, 20 May 2018 13:59:20 -0400
Subject: [PATCH 276/575] [atom] support Project.onDidReplace, add history
 interfaces

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

diff --git a/types/atom/atom-tests.ts b/types/atom/atom-tests.ts
index d6de0ef802..39cbb9ead0 100644
--- a/types/atom/atom-tests.ts
+++ b/types/atom/atom-tests.ts
@@ -1740,6 +1740,10 @@ function testProject() {
     subscription = project.onDidAddBuffer(buffer => buffer.id);
     subscription = project.observeBuffers(buffer => buffer.getUri());
 
+    subscription = project.onDidReplace(projectSpec => {
+        if (projectSpec != null) str = projectSpec.originPath;
+    });
+
     // Accessing the git repository
     repositories = project.getRepositories();
 
diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index 77b79fbed2..8546e0e458 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -4485,6 +4485,10 @@ export interface Project {
     /** Invoke a callback when a filesystem change occurs within any open project path. */
     onDidChangeFiles(callback: (events: FilesystemChangeEvent) => void): Disposable;
 
+    /** Invoke a callback whenever the project's configuration has been replaced. */
+    onDidReplace(callback: (projectSpec: ProjectSpecification | null | undefined) => void):
+        Disposable;
+
     // Accessing the Git Repository
     /**
      * Get an Array of GitRepositorys associated with the project's directories.
@@ -5219,17 +5223,17 @@ export class TextBuffer {
      *  Undo the last operation. If a transaction is in progress, aborts it.
      *  @return A boolean of whether or not a change was made.
      */
-    undo(options?: { selectionsMarkerLayer?: MarkerLayer }): boolean;
+    undo(options?: HistoryTraversalOptions): boolean;
 
     /**
      *  Redo the last operation.
      *  @return A boolean of whether or not a change was made.
      */
-    redo(options?: { selectionsMarkerLayer?: MarkerLayer }): boolean;
+    redo(options?: HistoryTraversalOptions): boolean;
 
     /** Batch multiple operations as a single undo/redo step. */
-    transact<T>(optionsOrInterval: number | { groupingInterval?: number,
-        selectionsMarkerLayer?: MarkerLayer }, fn: () => T): T;
+    transact<T>(optionsOrInterval: number | { groupingInterval?: number } &
+        HistoryTransactionOptions, fn: () => T): T;
     /** Batch multiple operations as a single undo/redo step. */
     transact<T>(fn: () => T): T;
 
@@ -5248,13 +5252,13 @@ export class TextBuffer {
      *  `::revertToCheckpoint` and `::groupChangesSinceCheckpoint`.
      *  @return A checkpoint ID value.
      */
-    createCheckpoint(options?: { selectionsMarkerLayer?: MarkerLayer }): number;
+    createCheckpoint(options?: HistoryTransactionOptions): number;
 
     /**
      *  Revert the buffer to the state it was in when the given checkpoint was created.
      *  @return A boolean indicating whether the operation succeeded.
      */
-    revertToCheckpoint(checkpoint: number, options?: { selectionsMarkerLayer: MarkerLayer }):
+    revertToCheckpoint(checkpoint: number, options?: HistoryTraversalOptions):
         boolean;
 
     /**
@@ -5262,8 +5266,7 @@ export class TextBuffer {
      *  purposes of undo/redo.
      *  @return A boolean indicating whether the operation succeeded.
      */
-    groupChangesSinceCheckpoint(checkpoint: number, options?:
-        { selectionsMarkerLayer: MarkerLayer }): boolean;
+    groupChangesSinceCheckpoint(checkpoint: number, options?: HistoryTransactionOptions): boolean;
 
     /**
      *  Group the last two text changes for purposes of undo/redo.
@@ -6369,6 +6372,16 @@ export interface FindMarkerOptions {
     intersectsRow?: number;
 }
 
+export interface HistoryTransactionOptions {
+    /** When provided, skip taking snapshot for other selections markerLayers except given one. */
+    selectionsMarkerLayer?: MarkerLayer;
+}
+
+export interface HistoryTraversalOptions {
+    /** Restore snapshot of selections marker layer to given selectionsMarkerLayer. */
+    selectionsMarkerLayer?: MarkerLayer;
+}
+
 export interface MenuOptions {
     /** The menu itme's label. */
     label: string;
@@ -6840,6 +6853,12 @@ export interface ProjectHistory {
     lastOpened: Date;
 }
 
+export interface ProjectSpecification {
+    paths: string[];
+    originPath: string;
+    config?: ConfigValues;
+}
+
 export interface ScandalResult {
     filePath: string;
     matches: Array<{

From 95427c2bb49d3d8b9c63ccbc8d17b18fa13ac6a8 Mon Sep 17 00:00:00 2001
From: Mohsen Azimi <me@azimi.me>
Date: Sun, 20 May 2018 16:03:46 -0700
Subject: [PATCH 277/575] Add typings for favicons

---
 types/favicons/favicons-tests.ts | 28 ++++++++++
 types/favicons/index.d.ts        | 93 ++++++++++++++++++++++++++++++++
 types/favicons/tsconfig.json     | 16 ++++++
 types/favicons/tslint.json       |  3 ++
 4 files changed, 140 insertions(+)
 create mode 100644 types/favicons/favicons-tests.ts
 create mode 100644 types/favicons/index.d.ts
 create mode 100644 types/favicons/tsconfig.json
 create mode 100644 types/favicons/tslint.json

diff --git a/types/favicons/favicons-tests.ts b/types/favicons/favicons-tests.ts
new file mode 100644
index 0000000000..485ea1d505
--- /dev/null
+++ b/types/favicons/favicons-tests.ts
@@ -0,0 +1,28 @@
+import favicons, { Configuration } from "favicons";
+
+let config: Partial<Configuration> = {
+    path: "/foo/bar"
+};
+
+config = {
+    icons: {
+        android: true
+    }
+};
+
+let html = "";
+favicons("path/to/file.png", config, (err, res) => {
+    html = res.html.join("");
+
+    for (const { name, contents } of [...res.files, ...res.images]) {
+        html = name + contents.toString();
+    }
+});
+
+favicons("file.png", (err, res) => {
+    html = res.html.join("");
+
+    for (const { name, contents } of [...res.files, ...res.images]) {
+        html = name + contents.toString();
+    }
+});
diff --git a/types/favicons/index.d.ts b/types/favicons/index.d.ts
new file mode 100644
index 0000000000..47a9a9d24a
--- /dev/null
+++ b/types/favicons/index.d.ts
@@ -0,0 +1,93 @@
+// Type definitions for favicons 5.1
+// Project: https://github.com/evilebottnawi/favicons/blob/master/package.json
+// Definitions by: Mohsen Azimi <https://github.com/mohsen1>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+export interface Configuration {
+    /** Path for overriding default icons path @default "/" */
+    path: string;
+    /** Your application's name @default null */
+    appName: string | null;
+    /** Your application's description @default null */
+    appDescription: string | null;
+    /** Your (or your developer's) name @default null */
+    developerName: string | null;
+    /** Your (or your developer's) URL @default null */
+    developerURL: string | null;
+    /** Primary text direction for name, short_name, and description @default "auto" */
+    dir: string;
+    /** Primary language for name and short_name @default "en-US */
+    lang: string;
+    /** Background colour for flattened icons @default "#fff" */
+    background: string;
+    /** Theme color user for example in Android's task switcher @default "#fff" */
+    theme_color: string;
+    /** Preferred display mode: "fullscreen", "standalone", "minimal-ui" or "browser" @default "standalone" */
+    display: "fullscreen" | "standalone" | "minimal-ui" | "browser";
+    /** Default orientation: "any", "natural", "portrait" or "landscape" @default "any" */
+    orientation: "any" | "natural" | "portrait" | "landscape";
+    /** Start URL when launching the application from a device @default "/?homescreen=1" */
+    start_url: string;
+    /** Your application's version string @default "1.0" */
+    version: string;
+    /** Print logs to console? @default false */
+    logging: boolean;
+    /**
+     * Platform Options:
+     * - offset - offset in percentage
+     * - background:
+     *   * false - use default
+     *   * true - force use default, e.g. set background for Android icons
+     *   * color - set background for the specified icons
+     */
+    icons: Partial<{
+        /* Create Android homescreen icon.  */
+        android: boolean | { offset: string; background: string };
+        /* Create Apple touch icons.  */
+        appleIcon: boolean | { offset: string; background: string };
+        /* Create Apple startup images.  */
+        appleStartup: boolean | { offset: string; background: string };
+        /* Create Opera Coast icon.  */
+        coast: boolean | { offset: string; background: string };
+        /* Create regular favicons.  */
+        favicons: boolean;
+        /* Create Firefox OS icons.  */
+        firefox: boolean | { offset: string; background: string };
+        /* Create Windows 8 tile icons.   */
+        windows: boolean | { background: string };
+        /* Create Yandex browser icon. */
+        yandex: boolean | { background: string };
+    }>;
+}
+
+export interface FavIconResponse {
+    images: Array<{ name: string; contents: Buffer }>;
+    files: Array<{ name: string; contents: Buffer }>;
+    html: string[];
+}
+
+export type Callback = (error: Error | null, response: FavIconResponse) => void;
+
+/** You can programmatically access Favicons configuration (icon filenames, HTML, manifest files, etc) with this export */
+export const config: Configuration;
+
+/**
+ * Generate favicons
+ * @param source Source image(s)
+ * @param configuration
+ * @param callback
+ */
+declare function favicons(
+    source: string | Buffer | string[],
+    callback?: Callback
+): void;
+declare function favicons(
+    source: string | Buffer | string[],
+    configuration?: Partial<Configuration>,
+    callback?: Callback
+): void;
+
+export default favicons;
diff --git a/types/favicons/tsconfig.json b/types/favicons/tsconfig.json
new file mode 100644
index 0000000000..03d0b43577
--- /dev/null
+++ b/types/favicons/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "favicons-tests.ts"]
+}
diff --git a/types/favicons/tslint.json b/types/favicons/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/favicons/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 4001ee72d35c225d9950afd447612ba6dcbabf96 Mon Sep 17 00:00:00 2001
From: John Ferreira <tatsujinichi@gmail.com>
Date: Mon, 21 May 2018 12:14:30 +0900
Subject: [PATCH 278/575] add renderLine options

---
 .../engine/framework/application.d.ts         | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/types/playcanvas/engine/framework/application.d.ts b/types/playcanvas/engine/framework/application.d.ts
index 6ef4d996d1..fccb92e2ca 100644
--- a/types/playcanvas/engine/framework/application.d.ts
+++ b/types/playcanvas/engine/framework/application.d.ts
@@ -436,6 +436,27 @@ declare namespace pc {
          */
         renderLine(start: pc.Vec3, end: pc.Vec3, startColor: pc.Color, endColor: pc.Color, lineType: number): void;
 
+        /**
+         * @function
+         * @name pc.Application#renderLine^5
+         * @description Draw a line which blends between two colors with specified line type
+         * @param {pc.Vec3} start The start of the line
+         * @param {pc.Vec3} end The end of the line
+         * @param {pc.Color} color The start color of the line
+         * @param {Object} options
+         * @param {Number} [options.layer] lineType The type of rendering to use: pc.LINEBATCH_WORLD, pc.LINEBATCH_OVERLAY, pc.LINEBATCH_GIZMO. Default is pc.LAYERID_IMMEDIATE
+         * @example
+         * var start = new pc.Vec3(0,0,0);
+         * var end = new pc.Vec3(1,0,0);
+         * var startColor = new pc.Color(1,1,1);
+         * const options = {
+         *    layer: pc.LINEBATCH_OVERLAY,
+         * };
+         *
+         * app.renderLine(start, end, color, options);
+         */
+        renderLine(start: pc.Vec3, end: pc.Vec3, color: pc.Color, options: object): void;
+
         /**
          * @function
          * @name pc.Application#renderLines

From 641748a28a0df7e0717caecebb32d6c1c6c1302d Mon Sep 17 00:00:00 2001
From: Liveangela <cs198500@126.com>
Date: Mon, 21 May 2018 14:59:33 +0800
Subject: [PATCH 279/575] [echarts]: add new feature of echarts4.0 and
 echarts-gl

---
 types/echarts/index.d.ts    | 103 +++++++++++++++++++++++-------------
 types/echarts/tsconfig.json |   4 +-
 2 files changed, 69 insertions(+), 38 deletions(-)

diff --git a/types/echarts/index.d.ts b/types/echarts/index.d.ts
index b217be12eb..15892864e5 100644
--- a/types/echarts/index.d.ts
+++ b/types/echarts/index.d.ts
@@ -1,13 +1,17 @@
 // Type definitions for echarts
 // Project: http://echarts.baidu.com/
-// Definitions by: Xie Jingyang <https://github.com/xieisabug>, AntiMoron <https://github.com/AntiMoron>
+// Definitions by: Xie Jingyang <https://github.com/xieisabug>
+//                 AntiMoron <https://github.com/AntiMoron>
+//                 Liveangela <https://github.com/liveangela>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 declare namespace echarts {
-    function init(dom: HTMLDivElement | HTMLCanvasElement, theme?: Object | string, opts?: {
+    function init(dom: HTMLDivElement | HTMLCanvasElement, theme?: object | string, opts?: {
         devicePixelRatio?: number
         renderer?: string
+        width?: number | string
+        height?: number | string
     }): ECharts;
 
     const graphic: Graphic;
@@ -15,10 +19,10 @@ declare namespace echarts {
     interface Graphic {
         clipPointsByRect(points: number[][], rect: ERectangle): number[][];
         clipRectByRect(targetRect: ERectangle, rect: ERectangle): ERectangle;
-        LinearGradient: { new(x: number, y: number, x2: number, y2: number, colorStops: Array<Object>, globalCoord?: boolean): LinearGradient }
+        LinearGradient: { new(x: number, y: number, x2: number, y2: number, colorStops: object[], globalCoord?: boolean): LinearGradient }
     }
 
-    function connect(group: string | Array<string>): void;
+    function connect(group: string | string[]): void;
 
     function disConnect(group: string): void;
 
@@ -26,9 +30,9 @@ declare namespace echarts {
 
     function getInstanceByDom(target: HTMLDivElement | HTMLCanvasElement): ECharts;
 
-    function registerMap(mapName: string, geoJson: Object, specialAreas?: Object): void;
+    function registerMap(mapName: string, geoJson: object, specialAreas?: object): void;
 
-    function registerTheme(themeName: string, theme: Object): void;
+    function registerTheme(themeName: string, theme: object): void;
 
     interface MapObj {
         /** geoJson data for map */
@@ -40,7 +44,7 @@ declare namespace echarts {
     function getMap(mapName: string): MapObj;
 
     interface LinearGradient {
-        colorStops: Array<Object>;
+        colorStops: object[];
         global: boolean;
         type: string;
         x: number
@@ -60,17 +64,17 @@ declare namespace echarts {
 
         getDom(): HTMLCanvasElement | HTMLDivElement
 
-        getOption(): Object
+        getOption(): object
 
         resize(): void
 
-        dispatchAction(payload: Object): void
+        dispatchAction(payload: object): void
 
-        on(eventName: string, handler: Function, context?: Object): void
+        on(eventName: string, handler: Function, context?: object): void
 
         off(eventName: string, handler?: Function): void
 
-        showLoading(type?: string, opts?: Object): void
+        showLoading(type?: string, opts?: object): void
 
         hideLoading(): void
 
@@ -99,13 +103,17 @@ declare namespace echarts {
         dispose(): void
 
         /** 转换逻辑点到像素 */
-        convertToPixel(finder: ConvertFinder | string, value: string | Array<any>): string | Array<any>
+        convertToPixel(finder: ConvertFinder | string, value: string | any[]): string | any[]
 
-        convertFromPixel(finder: ConvertFinder | string, value: Array<any> | string): Array<any> | string
+        convertFromPixel(finder: ConvertFinder | string, value: any[] | string): any[] | string
 
         containPixel(finder: ConvertFinder | string,
             /** 要被判断的点，为像素坐标值，以 echarts 实例的 dom 节点的左上角为坐标 [0, 0] 点。*/
             value: any[]): boolean
+
+        getModel(): {
+            getComponent(finder: string): any;
+        }
     }
 
     interface ConvertFinder {
@@ -135,31 +143,54 @@ declare namespace echarts {
 
     interface EChartOption {
         title?: EChartTitleOption
-        legend?: Object,
-        grid?: Object,
-        xAxis?: Object,
-        yAxis?: Object,
-        polar?: Object,
-        radiusAxis?: Object,
-        angleAxis?: Object,
-        radar?: Object,
-        dataZoom?: Array<Object>,
-        visualMap?: Array<Object>,
-        tooltip?: Object,
-        toolbox?: Object,
-        geo?: Object,
-        parallel?: Object,
-        parallelAxis?: Object,
-        timeline?: Object,
-        series?: Array<Object>,
-        color?: Array<Object>,
+        legend?: object,
+        grid?: object,
+        xAxis?: object,
+        yAxis?: object,
+        polar?: object,
+        radiusAxis?: object,
+        angleAxis?: object,
+        radar?: object,
+        dataZoom?: object[],
+        visualMap?: object[],
+        tooltip?: object,
+        axisPointer?: object,
+        toolbox?: object,
+        brush?: object,
+        geo?: object,
+        parallel?: object,
+        parallelAxis?: object,
+        singleAxis?: object,
+        timeline?: object,
+        graphic?: object | object[],
+        calendar?: object,
+        dataset?: object,
+        aria?: object,
+        series?: object[],
+        color?: string[],
         backgroundColor?: string,
-        textStyle?: Object,
+        textStyle?: object,
         animation?: boolean,
+        animationThreshold?: number,
         animationDuration?: number,
         animationEasing?: string,
-        animationDurationUpdate?: number,
-        animationEasingUpdate?: string
+        animationDelay?: number | Function,
+        animationDurationUpdate?: number | Function,
+        animationEasingUpdate?: string,
+        animationDelayUpdate?: number | Function,
+        progressive?: number,
+        progressiveThreshold?: number,
+        blendMode?: string,
+        hoverLayerThreshold?: number,
+        useUTC?: boolean,
+        /** echarts-gl options */
+        globe?: object,
+        geo3D?: object,
+        mapbox3D?: object,
+        grid3D?: object,
+        xAxis3D?: object,
+        yAxis3D?: object,
+        zAxis3D?: object
     }
 
     interface EChartTitleOption {
@@ -167,11 +198,11 @@ declare namespace echarts {
         text?: string;
         link?: string,
         target?: string,
-        textStyle?: Object,
+        textStyle?: object,
         subtext?: string,
         sublink?: string,
         subtarget?: string,
-        subtextStyle?: Object,
+        subtextStyle?: object,
         padding?: number,
         itemGap?: number,
         zlevel?: number,
diff --git a/types/echarts/tsconfig.json b/types/echarts/tsconfig.json
index 82e6284376..71e6b79545 100644
--- a/types/echarts/tsconfig.json
+++ b/types/echarts/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -20,4 +20,4 @@
     "files": [
         "index.d.ts"
     ]
-}
\ No newline at end of file
+}

From 215d7f0324b3616dee3f2332ee958dcfbfd14311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Veyret?= <stephane.veyret@neptura.org>
Date: Mon, 21 May 2018 10:25:13 +0200
Subject: [PATCH 280/575] express-session: add strictNullCheck

---
 .../express-session/express-session-tests.ts  | 20 +++++-----
 types/express-session/index.d.ts              | 38 +++++++++----------
 types/express-session/tsconfig.json           |  2 +-
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/types/express-session/express-session-tests.ts b/types/express-session/express-session-tests.ts
index 6a619f162c..dc57e88f0d 100644
--- a/types/express-session/express-session-tests.ts
+++ b/types/express-session/express-session-tests.ts
@@ -11,7 +11,7 @@ app.use(session({
   secret: 'keyboard cat',
   name: 'connect.sid',
   store: new session.MemoryStore(),
-  cookie: { path: '/', httpOnly: true, secure: false, maxAge: null },
+  cookie: { path: '/', httpOnly: true, secure: false },
   genid: (req: express.Request): string => '',
   rolling: false,
   resave: true,
@@ -30,7 +30,7 @@ app.use((req, res, next) => {
     sess.views++;
     res.setHeader('Content-Type', 'text/html');
     res.write(`<p>views: ${sess.views}</p>`);
-    res.write(`<p>expires in: ${(sess.cookie.maxAge / 1000)}s</p>`);
+    res.write(`<p>expires in: ${((sess.cookie.maxAge || 0) / 1000)}s</p>`);
     res.end();
   } else {
     sess.views = 1;
@@ -41,26 +41,28 @@ app.use((req, res, next) => {
 // Custom Session Store
 
 class MyStore extends session.Store {
-  private sessions: { [sid: string]: string };
+  private sessions: { [sid: string]: string | undefined };
 
   constructor() {
     super();
     this.sessions = {};
   }
 
-  get = (sid: string, callback: (err: any, session: Express.SessionData) => void): void => {
-    callback(null, JSON.parse(this.sessions[sid]));
+  get = (sid: string, callback: (err: any, session?: Express.SessionData | null) => void): void => {
+    const sessionString: string | undefined = this.sessions[sid];
+    const sessionData: Express.SessionData | null = sessionString ? JSON.parse(sessionString) : null;
+    callback(null, sessionData);
   }
 
-  set = (sid: string, session: Express.Session, callback: (err: any) => void): void => {
+  set = (sid: string, session: Express.Session, callback?: (err?: any) => void): void => {
     this.sessions[sid] = JSON.stringify(session);
-    callback(null);
+    if (callback) callback();
   }
 
-  destroy = (sid: string, callback: (err: any) => void): void => {
+  destroy = (sid: string, callback?: (err?: any) => void): void => {
     this.sessions[sid] = undefined;
     this.sessions = JSON.parse(JSON.stringify(this.sessions));
-    callback(null);
+    if (callback) callback();
   }
 }
 
diff --git a/types/express-session/index.d.ts b/types/express-session/index.d.ts
index d051f84df0..185753b0b6 100644
--- a/types/express-session/index.d.ts
+++ b/types/express-session/index.d.ts
@@ -67,35 +67,35 @@ declare namespace session {
   }
 
   interface BaseMemoryStore {
-    get: (sid: string, callback: (err: any, session: Express.SessionData) => void) => void;
-    set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
-    destroy: (sid: string, callback: (err: any) => void) => void;
-    length?: (callback: (err: any, length: number) => void) => void;
-    clear?: (callback: (err: any) => void) => void;
+    get: (sid: string, callback: (err: any, session?: Express.SessionData | null) => void) => void;
+    set: (sid: string, session: Express.Session, callback?: (err?: any) => void) => void;
+    destroy: (sid: string, callback?: (err?: any) => void) => void;
+    length?: (callback: (err: any, length?: number | null) => void) => void;
+    clear?: (callback?: (err?: any) => void) => void;
   }
 
   abstract class Store extends node.EventEmitter {
     constructor(config?: any);
 
-    regenerate: (req: express.Request, fn: (err: any) => any) => void;
-    load: (sid: string, fn: (err: any, session: Express.Session) => any) => void;
+    regenerate: (req: express.Request, fn: (err?: any) => any) => void;
+    load: (sid: string, fn: (err: any, session?: Express.Session | null) => any) => void;
     createSession: (req: express.Request, sess: Express.SessionData) => void;
 
-    get: (sid: string, callback: (err: any, session: Express.SessionData) => void) => void;
-    set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
-    destroy: (sid: string, callback: (err: any) => void) => void;
-    all: (callback: (err: any, obj: { [sid: string]: Express.SessionData; }) => void) => void;
-    length: (callback: (err: any, length: number) => void) => void;
-    clear: (callback: (err: any) => void) => void;
+    get: (sid: string, callback: (err: any, session?: Express.SessionData | null) => void) => void;
+    set: (sid: string, session: Express.Session, callback?: (err?: any) => void) => void;
+    destroy: (sid: string, callback?: (err?: any) => void) => void;
+    all: (callback: (err: any, obj?: { [sid: string]: Express.SessionData; } | null) => void) => void;
+    length: (callback: (err: any, length?: number | null) => void) => void;
+    clear: (callback?: (err?: any) => void) => void;
   }
 
   class MemoryStore implements BaseMemoryStore {
-    get: (sid: string, callback: (err: any, session: Express.SessionData) => void) => void;
-    set: (sid: string, session: Express.Session, callback: (err: any) => void) => void;
-    destroy: (sid: string, callback: (err: any) => void) => void;
-    all: (callback: (err: any, obj: { [sid: string]: Express.Session; }) => void) => void;
-    length: (callback: (err: any, length: number) => void) => void;
-    clear: (callback: (err: any) => void) => void;
+    get: (sid: string, callback: (err: any, session?: Express.SessionData | null) => void) => void;
+    set: (sid: string, session: Express.Session, callback?: (err?: any) => void) => void;
+    destroy: (sid: string, callback?: (err?: any) => void) => void;
+    all: (callback: (err: any, obj?: { [sid: string]: Express.Session; } | null) => void) => void;
+    length: (callback: (err: any, length?: number | null) => void) => void;
+    clear: (callback?: (err?: any) => void) => void;
   }
 }
 
diff --git a/types/express-session/tsconfig.json b/types/express-session/tsconfig.json
index 14c2e75bd5..dad933c3ea 100644
--- a/types/express-session/tsconfig.json
+++ b/types/express-session/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [

From b0ac435e1cbd13911dcfdba3ddfe83261a71f457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Veyret?= <stephane.veyret@neptura.org>
Date: Mon, 21 May 2018 10:30:03 +0200
Subject: [PATCH 281/575] express-session: add touch method definition

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

diff --git a/types/express-session/index.d.ts b/types/express-session/index.d.ts
index 185753b0b6..29d2b4fbbc 100644
--- a/types/express-session/index.d.ts
+++ b/types/express-session/index.d.ts
@@ -87,6 +87,7 @@ declare namespace session {
     all: (callback: (err: any, obj?: { [sid: string]: Express.SessionData; } | null) => void) => void;
     length: (callback: (err: any, length?: number | null) => void) => void;
     clear: (callback?: (err?: any) => void) => void;
+    touch: (sid: string, session: Express.Session, callback?: (err?: any) => void) => void;
   }
 
   class MemoryStore implements BaseMemoryStore {
@@ -96,6 +97,7 @@ declare namespace session {
     all: (callback: (err: any, obj?: { [sid: string]: Express.Session; } | null) => void) => void;
     length: (callback: (err: any, length?: number | null) => void) => void;
     clear: (callback?: (err?: any) => void) => void;
+    touch: (sid: string, session: Express.Session, callback?: (err?: any) => void) => void;
   }
 }
 

From f316905e97948233051cbc4d4a76b9cffe0cceee Mon Sep 17 00:00:00 2001
From: KevinRamharak <kevinramharak_95@hotmail.com>
Date: Mon, 21 May 2018 10:52:33 +0200
Subject: [PATCH 282/575] added type definitions for NPM package module-alias

---
 types/module-alias/index.d.ts            | 44 ++++++++++++++++++++++++
 types/module-alias/module-alias-tests.ts |  3 ++
 types/module-alias/tsconfig.json         | 23 +++++++++++++
 types/module-alias/tslint.json           |  1 +
 4 files changed, 71 insertions(+)
 create mode 100644 types/module-alias/index.d.ts
 create mode 100644 types/module-alias/module-alias-tests.ts
 create mode 100644 types/module-alias/tsconfig.json
 create mode 100644 types/module-alias/tslint.json

diff --git a/types/module-alias/index.d.ts b/types/module-alias/index.d.ts
new file mode 100644
index 0000000000..159b78111b
--- /dev/null
+++ b/types/module-alias/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for module-alias 2.0
+// Project: https://github.com/ilearnio/module-alias/
+// Definitions by: Kevin Ramharak <https://github.com/KevinRamharak>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
+
+export = init;
+
+/**
+ * Import aliases from package.json
+ */
+declare function init(options?: string | init.Options): void;
+
+declare namespace init {
+    function isPathMatchesAlias(path: string, alias: string): boolean;
+
+    /**
+     * Register a custom modules directory
+     */
+    function addPath(path: string): void;
+
+    /**
+     * Register a single alias
+     */
+    function addAlias(alias: string, path: string): void;
+
+    /**
+     * Register mutliple aliases
+     */
+    function addAliases(aliases: { [alias: string]: string }): void;
+
+    /**
+     * Reset any changes maded (resets all registered aliases
+     * and custom module directories)
+     * The function is undocumented and for testing purposes only
+     */
+    function reset(): void;
+
+    /**
+     * module intialis options type
+     */
+    interface Options {
+        base: string;
+    }
+}
diff --git a/types/module-alias/module-alias-tests.ts b/types/module-alias/module-alias-tests.ts
new file mode 100644
index 0000000000..06f56f3ac2
--- /dev/null
+++ b/types/module-alias/module-alias-tests.ts
@@ -0,0 +1,3 @@
+import * as moduleAlias from 'module-alias';
+
+moduleAlias.isPathMatchesAlias('./path', '@alias'); // $ExpectType boolean
diff --git a/types/module-alias/tsconfig.json b/types/module-alias/tsconfig.json
new file mode 100644
index 0000000000..b9063a644a
--- /dev/null
+++ b/types/module-alias/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",
+        "module-alias-tests.ts"
+    ]
+}
diff --git a/types/module-alias/tslint.json b/types/module-alias/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/module-alias/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 617a2a8ad8135f39b3e917822a9cd07498976599 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 21 May 2018 11:31:56 +0200
Subject: [PATCH 283/575] d3-color : added piecewise method #25582

---
 types/d3-interpolate/d3-interpolate-tests.ts | 13 +++++++++++++
 types/d3-interpolate/index.d.ts              |  8 +++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/types/d3-interpolate/d3-interpolate-tests.ts b/types/d3-interpolate/d3-interpolate-tests.ts
index 6baaf06092..50ade8008c 100644
--- a/types/d3-interpolate/d3-interpolate-tests.ts
+++ b/types/d3-interpolate/d3-interpolate-tests.ts
@@ -229,3 +229,16 @@ iString = d3Interpolate.interpolateCubehelixLong.gamma(2.2)('purple', 'orange');
 iNum = d3Interpolate.interpolateBasis([1, 50, 30, 10]);
 
 iNum = d3Interpolate.interpolateBasisClosed([1, 50, 30, 10]);
+
+iString = d3Interpolate.piecewise(d3Interpolate.interpolateRgb.gamma(2.2), ['red', 'green', 'blue']);
+iString = d3Interpolate.piecewise(d3Interpolate.interpolateCubehelix, ['red', 'green', 'blue']);
+iZoom = d3Interpolate.piecewise(d3Interpolate.interpolateZoom, [[50, 50, 300], [100, 100, 500]] as d3Interpolate.ZoomView[]);
+iNum = d3Interpolate.piecewise(d3Interpolate.interpolateNumber, [1, 2, 3]);
+iNum = d3Interpolate.piecewise(d3Interpolate.interpolateRound, [1.1, 2.2, 3.3]);
+iString = d3Interpolate.piecewise(d3Interpolate.interpolateString, ['a', 'b', 'c']);
+iDate = d3Interpolate.piecewise(d3Interpolate.interpolateDate, [new Date(2018, 5, 1), new Date(2018, 5, 2), new Date(2018, 5, 3)]);
+iArrayNum = d3Interpolate.piecewise<number[]>(d3Interpolate.interpolateArray, [1, 2, 4, 8]);
+iArrayStr = d3Interpolate.piecewise<string[]>(d3Interpolate.interpolateArray, ['a', 'b', 'c', 'd']);
+iArrayMixed = d3Interpolate.piecewise<[Date, string]>(d3Interpolate.interpolateArray, [new Date(2016, 6, 1), 'b: 1']);
+iString = d3Interpolate.piecewise(d3Interpolate.interpolateTransformCss, ['rotate(0deg)', 'rotate(60deg)']);
+iString = d3Interpolate.piecewise(d3Interpolate.interpolateTransformSvg, ['rotate(0)', 'rotate(60)']);
diff --git a/types/d3-interpolate/index.d.ts b/types/d3-interpolate/index.d.ts
index e3fcfa21d8..4d6d67f5d5 100644
--- a/types/d3-interpolate/index.d.ts
+++ b/types/d3-interpolate/index.d.ts
@@ -55,7 +55,9 @@ export function interpolateString(a: string | { toString(): string }, b: string
 
 export function interpolateDate(a: Date, b: Date): ((t: number) => Date);
 
-export function interpolateArray<A extends any[]>(a: any[], b: A): ((t: number) => A);
+type ArrayInterpolator<A  = any[]> = ((t: number) => A);
+
+export function interpolateArray<A extends any[]>(a: any[], b: A): ArrayInterpolator<A>;
 
 export function interpolateObject<U extends any>(a: any, b: U): ((t: number) => U);  // TODO: extends 'any' should become 'object' with TS 2.2+ definitions
 export function interpolateObject(a: { [key: string]: any }, b: { [key: string]: any }): ((t: number) => { [key: string]: any });
@@ -89,3 +91,7 @@ export const interpolateCubehelixLong: ColorGammaInterpolationFactory;
 
 export function interpolateBasis(splineNodes: number[]): ((t: number) => number);
 export function interpolateBasisClosed(splineNodes: number[]): ((t: number) => number);
+
+export function piecewise(interpolate: (a: ZoomView, b: ZoomView) => ZoomInterpolator, values: ZoomView[]): ZoomInterpolator;
+export function piecewise<A extends any[]>(interpolate: (a: any[], b: A) => ArrayInterpolator<A>, values: A): ArrayInterpolator<A>;
+export function piecewise<TData, Interpolator>(interpolate: (a: TData, b: TData) => Interpolator, values: TData[]): (t: number) => any;

From 12bfa245679d7d299c6ad2a98a892109cc6358e5 Mon Sep 17 00:00:00 2001
From: GlenCFL <glencfl@gmail.com>
Date: Mon, 21 May 2018 05:29:19 -0400
Subject: [PATCH 284/575] [atom] mark MarkerLayer.getRole's return as
 potentially undefined

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

diff --git a/types/atom/atom-tests.ts b/types/atom/atom-tests.ts
index 39cbb9ead0..9d01e194a9 100644
--- a/types/atom/atom-tests.ts
+++ b/types/atom/atom-tests.ts
@@ -1327,7 +1327,8 @@ function testMarkerLayer() {
     markers = markerLayer.findMarkers({ containsRange: [[0, 0], pos] });
     markers = markerLayer.findMarkers({ containsRange: [[0, 0], [0, 0]] });
 
-    str = markerLayer.getRole();
+    const role = markerLayer.getRole();
+    if (role) str = role;
 
     // Marker creation
     marker = markerLayer.markRange(range);
diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index 8546e0e458..232c20a034 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -1005,7 +1005,7 @@ export interface MarkerLayer {
     findMarkers(params: FindMarkerOptions): Marker[];
 
     /** Get the role of the marker layer e.g. "atom.selection". */
-    getRole(): string;
+    getRole(): string | undefined;
 
     // Marker Creation
     /** Create a marker with the given range. */

From bc24e50bc1d814d64f05880583cf515b03ca7086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Magrin?= <jeremy.magrin@gmail.com>
Date: Mon, 21 May 2018 11:53:22 +0200
Subject: [PATCH 285/575] Change type definition for v2

---
 types/react-navigation/index.d.ts             |  477 +++-----
 types/react-navigation/v2/index.d.ts          | 1086 +++++++++++++++++
 .../v2/react-navigation-tests.tsx             |  453 +++++++
 types/react-navigation/v2/tsconfig.json       |   30 +
 types/react-navigation/v2/tslint.json         |    1 +
 5 files changed, 1744 insertions(+), 303 deletions(-)
 create mode 100644 types/react-navigation/v2/index.d.ts
 create mode 100644 types/react-navigation/v2/react-navigation-tests.tsx
 create mode 100644 types/react-navigation/v2/tsconfig.json
 create mode 100644 types/react-navigation/v2/tslint.json

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 641dd8463f..1233ca39e3 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-navigation 2.0.1
+// Type definitions for react-navigation 1.5
 // Project: https://github.com/react-navigation/react-navigation
 // Definitions by: Huhuanming <https://github.com/huhuanming>
 //                 mhcgrq <https://github.com/mhcgrq>
@@ -16,12 +16,11 @@
 //                 Armando Assuncao <https://github.com/ArmandoAssuncao>
 //                 Ciaran Liedeman <https://github.com/cliedeman>
 //                 Edward Sammut Alessi <https://github.com/Slessi>
-//                 Jeremy Magrin <https://github.com/magrinj>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
 /**
- * Reference: https://github.com/react-navigation/react-navigation/tree/a37473c5e4833f48796ee6c7c9cb4a8ac49d9c06
+ * Reference: https://github.com/react-navigation/react-navigation/tree/3f3ef6485c8932f49fddc3dd2c508629110bf2b6
  *
  * NOTE: Please update the commit/link above when updating to a new Flow
  * react-navigation/flow/react-navigation.js reference, so we can conveniently just look at diffs on
@@ -44,21 +43,15 @@ export type AnimatedValue = any;
 
 export type HeaderMode = 'float' | 'screen' | 'none';
 
-export interface HeaderForceInset {
-  horizontal?: string;
-  vertical?: string,
-  left?: string,
-  right?: string,
-  top?: string,
-  bottom?: string,
-}
-
 export interface HeaderProps extends NavigationSceneRendererProps {
   mode: HeaderMode;
-  router: NavigationRouter<NavigationState, NavigationStackScreenOptions>;
-  getScreenDetails: (
-    navigationScene: NavigationScene
-  ) => NavigationScreenDetails<NavigationStackScreenOptions>;
+  router: NavigationRouter<
+    NavigationState,
+    NavigationStackScreenOptions
+  >;
+  getScreenDetails: (navigationScene: NavigationScene) => NavigationScreenDetails<
+    NavigationStackScreenOptions
+  >;
   style: StyleProp<ViewStyle>;
 }
 
@@ -83,9 +76,7 @@ export interface NavigationState {
   routes: any[];
 }
 
-export type NavigationRoute<Params = NavigationParams> =
-  | NavigationLeafRoute<Params>
-  | NavigationStateRoute<Params>;
+export type NavigationRoute<Params = NavigationParams> = NavigationLeafRoute<Params> | NavigationStateRoute<Params>;
 
 export interface NavigationLeafRoute<Params> {
   /**
@@ -109,9 +100,7 @@ export interface NavigationLeafRoute<Params> {
   params?: Params;
 }
 
-export type NavigationStateRoute<
-  NavigationLeafRouteParams
-  > = NavigationLeafRoute<NavigationLeafRouteParams> & NavigationState;
+export type NavigationStateRoute<NavigationLeafRouteParams> = NavigationLeafRoute<NavigationLeafRouteParams> & NavigationState;
 
 export type NavigationScreenOptionsGetter<Options> = (
   navigation: NavigationScreenProp<NavigationRoute<any>>,
@@ -124,10 +113,7 @@ export interface NavigationRouter<State = NavigationState, Options = {}> {
    * an optional previous state. When the action is considered handled but the
    * state is unchanged, the output state is null.
    */
-  getStateForAction: (
-    action: NavigationAction,
-    lastState?: State
-  ) => State | null;
+  getStateForAction: (action: NavigationAction, lastState?: State) => (State | null);
 
   /**
    * Maps a URI-like string to an action. This can be mapped to a state
@@ -136,14 +122,14 @@ export interface NavigationRouter<State = NavigationState, Options = {}> {
   getActionForPathAndParams: (
     path: string,
     params?: NavigationParams
-  ) => NavigationAction | null;
+  ) => (NavigationAction | null);
 
   getPathAndParamsForState: (
     state: State
   ) => {
-      path: string;
-      params?: NavigationParams;
-    };
+    path: string,
+    params?: NavigationParams,
+  };
 
   getComponentForRouteName: (routeName: string) => NavigationComponent;
 
@@ -161,8 +147,11 @@ export interface NavigationRouter<State = NavigationState, Options = {}> {
 }
 
 export type NavigationScreenOption<T> =
-  | T
-  | ((navigation: NavigationScreenProp<NavigationRoute>, config: T) => T);
+  T
+  | ((
+    navigation: NavigationScreenProp<NavigationRoute>,
+    config: T
+  ) => T);
 
 export interface NavigationScreenDetails<T> {
   options: T;
@@ -170,9 +159,7 @@ export interface NavigationScreenDetails<T> {
   navigation: NavigationScreenProp<NavigationRoute>;
 }
 
-export type NavigationScreenOptions = NavigationStackScreenOptions &
-  NavigationTabScreenOptions &
-  NavigationDrawerScreenOptions;
+export type NavigationScreenOptions = NavigationStackScreenOptions & NavigationTabScreenOptions & NavigationDrawerScreenOptions;
 
 export interface NavigationScreenConfigProps {
   navigation: NavigationScreenProp<NavigationRoute>;
@@ -180,34 +167,30 @@ export interface NavigationScreenConfigProps {
 }
 
 export type NavigationScreenConfig<Options> =
-  | Options
-  | ((
-    navigationOptionsContainer: NavigationScreenConfigProps & {
-      navigationOptions: NavigationScreenProp<NavigationRoute>;
-    }
-  ) => Options);
+  Options
+  | ((navigationOptionsContainer: NavigationScreenConfigProps & {
+      navigationOptions: NavigationScreenProp<NavigationRoute>,
+    }) => Options);
 
 export type NavigationComponent =
-  | NavigationScreenComponent<any, any, any>
-  | NavigationNavigator<any, any, any>
-  | any;
+  NavigationScreenComponent<any, any, any>
+  | NavigationNavigator<any, any, any>;
 
 export type NavigationScreenComponent<
-  Params = NavigationParams,
-  Options = {},
-  Props = {}
-  > = React.ComponentType<NavigationScreenProps<Params, Options> & Props> & {
-    navigationOptions?: NavigationScreenConfig<Options>;
-  };
+    Params = NavigationParams,
+    Options = {},
+    Props = {}
+> = React.ComponentType<NavigationScreenProps<Params, Options> & Props> &
+{ navigationOptions?: NavigationScreenConfig<Options> };
 
 export type NavigationNavigator<
-  State = NavigationState,
-  Options = {},
-  Props = {}
-  > = React.ComponentType<NavigationNavigatorProps<Options, State> & Props> & {
-    router: NavigationRouter<State, Options>;
-    navigationOptions?: NavigationScreenConfig<Options>;
-  };
+    State = NavigationState,
+    Options = {},
+    Props = {}
+> = React.ComponentType<NavigationNavigatorProps<Options, State> & Props> & {
+    router: NavigationRouter<State, Options>,
+    navigationOptions?: NavigationScreenConfig<Options>,
+};
 
 export interface NavigationParams {
   [key: string]: any;
@@ -223,8 +206,7 @@ export interface NavigationNavigateActionPayload {
   key?: string;
 }
 
-export interface NavigationNavigateAction
-  extends NavigationNavigateActionPayload {
+export interface NavigationNavigateAction extends NavigationNavigateActionPayload {
   type: 'Navigation/NAVIGATE';
 }
 
@@ -244,8 +226,7 @@ export interface NavigationSetParamsActionPayload {
   params?: NavigationParams;
 }
 
-export interface NavigationSetParamsAction
-  extends NavigationSetParamsActionPayload {
+export interface NavigationSetParamsAction extends NavigationSetParamsActionPayload {
   type: 'Navigation/SET_PARAMS';
 }
 
@@ -290,69 +271,40 @@ export interface NavigationPopToTopActionPayload {
   immediate?: boolean;
 }
 
-export interface NavigationPopToTopAction
-  extends NavigationPopToTopActionPayload {
+export interface NavigationPopToTopAction extends NavigationPopToTopActionPayload {
   type: 'Navigation/POP_TO_TOP';
 }
 
 export interface NavigationStackViewConfig {
   mode?: 'card' | 'modal';
   headerMode?: HeaderMode;
-  headerTransitionPreset?: 'fade-in-place' | 'uikit';
   cardStyle?: StyleProp<ViewStyle>;
   transitionConfig?: (
     transitionProps: NavigationTransitionProps,
     prevTransitionProps: NavigationTransitionProps,
-    isModal: boolean
+    isModal: boolean,
   ) => TransitionConfig;
-  onTransitionStart?: (
-    transitionProps: NavigationTransitionProps,
-    prevTransitionProps?: NavigationTransitionProps
-  ) => Promise<void> | void;
-  onTransitionEnd?: (
-    transitionProps: NavigationTransitionProps,
-    prevTransitionProps?: NavigationTransitionProps
-  ) => void;
-}
-
-/**
- * Switch Navigator
- */
-
-export interface NavigationSwitchRouterConfig {
-  initialRouteName?: string;
-  initialRouteParams?: NavigationParams;
-  paths?: NavigationPathsConfig;
-  navigationOptions?: NavigationScreenConfig<NavigationScreenOptions>;
-  order?: string[];
-  backBehavior?: 'none' | 'initialRoute'; // defaults to `'none'`
-  resetOnBlur?: boolean; // defaults to `true`
+  onTransitionStart?: (transitionProps: NavigationTransitionProps, prevTransitionProps?: NavigationTransitionProps) => Promise<void> | void;
+  onTransitionEnd?: (transitionProps: NavigationTransitionProps, prevTransitionProps?: NavigationTransitionProps) => void;
 }
 
 export interface NavigationStackScreenOptions {
   title?: string;
-  header?:
-  | (
-    | React.ReactElement<any>
-    | ((headerProps: HeaderProps) => React.ReactElement<any>))
-  | null;
+  header?: (React.ReactElement<any> | ((headerProps: HeaderProps) => React.ReactElement<any>)) | null;
   headerTransparent?: boolean;
   headerTitle?: string | React.ReactElement<any>;
   headerTitleStyle?: StyleProp<TextStyle>;
   headerTintColor?: string;
   headerLeft?: React.ReactElement<any>;
   headerBackTitle?: string | null;
-  headerBackImage?: React.ReactElement<any>;
   headerTruncatedBackTitle?: string;
   headerBackTitleStyle?: StyleProp<TextStyle>;
   headerPressColorAndroid?: string;
   headerRight?: React.ReactElement<any>;
   headerStyle?: StyleProp<ViewStyle>;
-  headerForceInset?: HeaderForceInset;
   headerBackground?: React.ReactNode | React.ReactType;
   gesturesEnabled?: boolean;
   gestureResponseDistance?: { vertical?: number; horizontal?: number };
-  gestureDirection?: 'default' | 'inverted';
 }
 
 export interface NavigationStackRouterConfig {
@@ -365,7 +317,7 @@ export interface NavigationStackRouterConfig {
 }
 
 export type NavigationStackAction =
-  | NavigationInitAction
+  NavigationInitAction
   | NavigationNavigateAction
   | NavigationBackAction
   | NavigationSetParamsAction
@@ -374,30 +326,25 @@ export type NavigationStackAction =
   | NavigationPopToTopAction;
 
 export type NavigationTabAction =
-  | NavigationInitAction
+  NavigationInitAction
   | NavigationNavigateAction
   | NavigationBackAction;
 
 export type NavigationAction =
-  | NavigationInitAction
+  NavigationInitAction
   | NavigationStackAction
   | NavigationTabAction;
 
-export type NavigationRouteConfig =
-  | NavigationComponent
-  | ({
-    navigationOptions?: NavigationScreenConfig<any>;
-    path?: string;
-  } & NavigationScreenRouteConfig);
+export type NavigationRouteConfig = NavigationComponent | ({
+  navigationOptions?: NavigationScreenConfig<any>,
+  path?: string,
+} & NavigationScreenRouteConfig);
 
-export type NavigationScreenRouteConfig =
-  | NavigationComponent
-  | {
-    screen: NavigationComponent;
-  }
-  | {
-    getScreen: () => NavigationComponent;
-  };
+export type NavigationScreenRouteConfig = NavigationComponent | {
+    screen: NavigationComponent,
+} | {
+    getScreen: () => NavigationComponent,
+};
 
 export interface NavigationPathsConfig {
   [routeName: string]: string;
@@ -413,48 +360,45 @@ export interface NavigationTabRouterConfig {
   backBehavior?: 'none' | 'initialRoute'; // defaults `initialRoute`
 }
 export interface TabScene {
-  route: NavigationRoute;
-  focused: boolean;
-  index: number;
-  tintColor?: string;
+    route: NavigationRoute;
+    focused: boolean;
+    index: number;
+    tintColor?: string;
 }
 export interface NavigationTabScreenOptions {
   title?: string;
   tabBarIcon?:
-  | React.ReactElement<any>
-  | ((
-    options: { tintColor: string | null; focused: boolean }
-  ) => React.ReactElement<any> | null);
+    React.ReactElement<any>
+    | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
+      any
+    > | null));
   tabBarLabel?:
-  | string
-  | React.ReactElement<any>
-  | ((
-    options: { tintColor: string | null; focused: boolean }
-  ) => React.ReactElement<any> | string | null);
+    string
+    | React.ReactElement<any>
+    | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
+      any
+    > | string | null));
   tabBarVisible?: boolean;
-  tabBarTestIDProps?: { testID?: string; accessibilityLabel?: string };
-  tabBarOnPress?: (
-    options: {
-      scene: TabScene;
-      jumpToIndex: (index: number) => void;
-    }
-  ) => void;
+  tabBarTestIDProps?: { testID?: string, accessibilityLabel?: string };
+  tabBarOnPress?: (options: {
+    scene: TabScene,
+    jumpToIndex: (index: number) => void
+  }) => void;
 }
 
 export interface NavigationDrawerScreenOptions {
   title?: string;
   drawerIcon?:
-  | React.ReactElement<any>
-  | ((
-    options: { tintColor: string | null; focused: boolean }
-  ) => React.ReactElement<any> | null);
+    React.ReactElement<any>
+    | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
+      any
+    > | null));
   drawerLabel?:
-  | string
-  | React.ReactElement<any>
-  | ((
-    options: { tintColor: string | null; focused: boolean }
-  ) => React.ReactElement<any> | null);
-  drawerLockMode?: 'unlocked' | 'locked-closed' | 'locked-open';
+    string
+    | React.ReactElement<any>
+    | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
+      any
+    > | null));
 }
 
 export interface NavigationRouteConfigMap {
@@ -469,20 +413,22 @@ export interface NavigationProp<S> {
 }
 
 export type EventType =
-  | 'willFocus'
-  | 'didFocus'
-  | 'willBlur'
-  | 'didBlur'
-  | 'action';
+| 'willFocus'
+| 'didFocus'
+| 'willBlur'
+| 'didBlur'
+| 'action';
 
 export interface NavigationEventPayload {
   type: EventType;
   action: NavigationAction;
   state: NavigationState;
-  lastState: NavigationState | null | undefined;
+  lastState: NavigationState;
 }
 
-export type NavigationEventCallback = (payload: NavigationEventPayload) => void;
+export type NavigationEventCallback = (
+  payload: NavigationEventPayload
+) => void;
 
 export interface NavigationEventSubscription {
   remove: () => void;
@@ -492,14 +438,8 @@ export interface NavigationScreenProp<S, P = NavigationParams> {
   state: S;
   dispatch: NavigationDispatch;
   goBack: (routeKey?: string | null) => boolean;
-  dismiss: () => boolean;
   navigate(options: {
-    routeName: string | {
-      routeName: string;
-      params?: NavigationParams;
-      action?: NavigationNavigateAction;
-      key?: string;
-    };
+    routeName: string;
     params?: NavigationParams;
     action?: NavigationAction;
     key?: string;
@@ -507,7 +447,7 @@ export interface NavigationScreenProp<S, P = NavigationParams> {
   navigate(
     routeNameOrOptions: string,
     params?: NavigationParams,
-    action?: NavigationAction
+    action?: NavigationAction,
   ): boolean;
   getParam: <T extends keyof P>(param: T, fallback?: P[T]) => P[T];
   setParams: (newParams: P) => boolean;
@@ -527,7 +467,6 @@ export interface NavigationScreenProp<S, P = NavigationParams> {
   ) => boolean;
   pop: (n?: number, params?: { immediate?: boolean }) => boolean;
   popToTop: (params?: { immediate?: boolean }) => boolean;
-  isFocused: () => boolean;
 }
 
 export interface NavigationNavigatorProps<O = {}, S = {}> {
@@ -619,7 +558,7 @@ export type NavigationAnimationSetter = (
   lastState: NavigationState
 ) => void;
 
-export type NavigationSceneRenderer = () => React.ReactElement<any> | null;
+export type NavigationSceneRenderer = () => (React.ReactElement<any> | null);
 
 export type NavigationStyleInterpolator = (
   props: NavigationSceneRendererProps
@@ -628,49 +567,50 @@ export type NavigationStyleInterpolator = (
 export interface LayoutEvent {
   nativeEvent: {
     layout: {
-      x: number;
-      y: number;
-      width: number;
-      height: number;
-    };
+      x: number,
+      y: number,
+      width: number,
+      height: number,
+    },
   };
 }
 
 export type NavigatorType =
-  | 'react-navigation/STACK'
-  | 'react-navigation/TABS'
-  | 'react-navigation/DRAWER';
+| 'react-navigation/STACK'
+| 'react-navigation/TABS'
+| 'react-navigation/DRAWER';
 
-export interface NavigationContainerProps<S = {}, O = {}> {
+export function addNavigationHelpers<S = {}>(
+  navigation: {
+    state: S;
+    dispatch: (action: NavigationAction) => any;
+    addListener?: (
+      eventName: string,
+      callback: NavigationEventCallback
+    ) => NavigationEventSubscription;
+  }
+): NavigationScreenProp<S>;
+
+export interface NavigationContainerProps {
   uriPrefix?: string | RegExp;
   onNavigationStateChange?: (
     prevNavigationState: NavigationState,
     nextNavigationState: NavigationState,
-    action: NavigationAction
-  ) => void | null | undefined;
-  navigation?: NavigationScreenProp<S>;
-  persistenceKey?: string | null | undefined;
-  renderLoadingExperimental?: React.ComponentType<{}>,
-  screenProps?: any;
-  navigationOptions?: O;
+    action: NavigationAction,
+  ) => void;
   style?: StyleProp<ViewStyle>;
 }
 
-export interface NavigationContainerComponent
-  extends React.Component<
+export interface NavigationContainerComponent extends React.Component<
   NavigationContainerProps & NavigationNavigatorProps<any>
   > {
   dispatch: NavigationDispatch;
 }
 
-export interface NavigationContainer
-  extends React.ComponentClass<
+export interface NavigationContainer extends React.ComponentClass<
   NavigationContainerProps & NavigationNavigatorProps<any>
   > {
-  new(
-    props: NavigationContainerProps & NavigationNavigatorProps<any>,
-    context?: any
-  ): NavigationContainerComponent;
+  new(props: NavigationContainerProps & NavigationNavigatorProps<any>, context?: any): NavigationContainerComponent;
 
   router: NavigationRouter<any, any>;
   screenProps: { [key: string]: any };
@@ -678,43 +618,29 @@ export interface NavigationContainer
   state: { nav: NavigationState | null };
 }
 
-export interface StackNavigatorConfig
-  extends NavigationStackViewConfig,
-  NavigationStackRouterConfig {
+export interface StackNavigatorConfig extends NavigationStackViewConfig, NavigationStackRouterConfig {
   containerOptions?: any;
 }
 
 // Return createNavigationContainer
 export function StackNavigator(
   routeConfigMap: NavigationRouteConfigMap,
-  stackConfig?: StackNavigatorConfig
-): NavigationContainer;
-
-export function createStackNavigator(
-  routeConfigMap: NavigationRouteConfigMap,
-  stackConfig?: StackNavigatorConfig
+  stackConfig?: StackNavigatorConfig,
 ): NavigationContainer;
 
 export interface SwitchNavigatorConfig {
   initialRouteName: string;
   resetOnBlur?: boolean;
   paths?: NavigationPathsConfig;
-  backBehavior?: 'none' | 'intialRoute';
+  backBehavior?: 'none' | 'initialRoute';
 }
 
 // Return createNavigationContainer
-export type _SwitchNavigatorConfig = NavigationSwitchRouterConfig;
-
 export function SwitchNavigator(
   routeConfigMap: NavigationRouteConfigMap,
   switchConfig?: SwitchNavigatorConfig
 ): NavigationContainer;
 
-export function createSwitchNavigator(
-  routeConfigMap: NavigationRouteConfigMap,
-  switchConfig?: SwitchNavigatorConfig
-): NavigationContainer;
-
 // DrawerItems
 export const DrawerItems: React.ReactType;
 
@@ -729,28 +655,21 @@ export interface DrawerViewConfig {
   contentOptions?: any;
   style?: StyleProp<ViewStyle>;
 }
-export interface DrawerNavigatorConfig
-  extends NavigationTabRouterConfig,
-  DrawerViewConfig {
+export interface DrawerNavigatorConfig extends NavigationTabRouterConfig, DrawerViewConfig {
   containerConfig?: any;
   contentOptions?: {
-    activeTintColor?: string;
-    activeBackgroundColor?: string;
-    inactiveTintColor?: string;
-    inactiveBackgroundColor?: string;
-    style?: StyleProp<ViewStyle>;
-    labelStyle?: StyleProp<TextStyle>;
+    activeTintColor?: string,
+    activeBackgroundColor?: string,
+    inactiveTintColor?: string,
+    inactiveBackgroundColor?: string,
+    style?: StyleProp<ViewStyle>,
+    labelStyle?: StyleProp<TextStyle>,
   };
 }
 
 export function DrawerNavigator(
   routeConfigMap: NavigationRouteConfigMap,
-  drawerConfig?: DrawerNavigatorConfig
-): NavigationContainer;
-
-export function createDrawerNavigator(
-  routeConfigMap: NavigationRouteConfigMap,
-  drawerConfig?: DrawerNavigatorConfig
+  drawerConfig?: DrawerNavigatorConfig,
 ): NavigationContainer;
 
 /**
@@ -762,23 +681,23 @@ export interface TabViewConfig {
   tabBarComponent?: React.ReactType;
   tabBarPosition?: 'top' | 'bottom';
   tabBarOptions?: {
-    activeTintColor?: string;
-    allowFontScaling?: boolean;
-    activeBackgroundColor?: string;
-    inactiveTintColor?: string;
-    inactiveBackgroundColor?: string;
-    showLabel?: boolean;
-    style?: StyleProp<ViewStyle>;
-    labelStyle?: StyleProp<TextStyle>;
-    iconStyle?: StyleProp<ViewStyle>;
+    activeTintColor?: string,
+    allowFontScaling?: boolean,
+    activeBackgroundColor?: string,
+    inactiveTintColor?: string,
+    inactiveBackgroundColor?: string,
+    showLabel?: boolean,
+    style?: StyleProp<ViewStyle>,
+    labelStyle?: StyleProp<TextStyle>,
+    iconStyle?: StyleProp<ViewStyle>,
     // Top
-    showIcon?: boolean;
-    upperCaseLabel?: boolean;
-    pressColor?: string;
-    pressOpacity?: number;
-    scrollEnabled?: boolean;
-    tabStyle?: StyleProp<ViewStyle>;
-    indicatorStyle?: StyleProp<ViewStyle>;
+    showIcon?: boolean,
+    upperCaseLabel?: boolean,
+    pressColor?: string,
+    pressOpacity?: number,
+    scrollEnabled?: boolean,
+    tabStyle?: StyleProp<ViewStyle>,
+    indicatorStyle?: StyleProp<ViewStyle>,
   };
   swipeEnabled?: boolean;
   animationEnabled?: boolean;
@@ -786,33 +705,16 @@ export interface TabViewConfig {
 }
 
 // From navigators/TabNavigator.js
-export interface TabNavigatorConfig
-  extends NavigationTabRouterConfig,
-  TabViewConfig {
+export interface TabNavigatorConfig extends NavigationTabRouterConfig, TabViewConfig {
   lazy?: boolean;
   removeClippedSubviews?: boolean;
-  initialLayout?: { height: number; width: number };
+  initialLayout?: { height: number, width: number };
 }
 
 // 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,
-  drawConfig?: TabNavigatorConfig
-): NavigationContainer;
-
-export function createMaterialTopNavigator(
-  routeConfigMap: NavigationRouteConfigMap,
-  drawConfig?: TabNavigatorConfig
+  drawConfig?: TabNavigatorConfig,
 ): NavigationContainer;
 
 export interface TabBarTopProps {
@@ -827,17 +729,15 @@ export interface TabBarTopProps {
   tabBarPosition: string;
   navigation: NavigationScreenProp<NavigationState>;
   jumpToIndex: (index: number) => void;
-  getLabel: (scene: TabScene) => React.ReactNode | string;
+  getLabel: (scene: TabScene) => (React.ReactNode | string);
   getOnPress: (
     previousScene: NavigationRoute,
     scene: TabScene
-  ) => (
-      args: {
-        previousScene: NavigationRoute;
-        scene: TabScene;
-        jumpToIndex: (index: number) => void;
-      }
-    ) => void;
+  ) => (args: {
+    previousScene: NavigationRoute,
+    scene: TabScene,
+    jumpToIndex: (index: number) => void,
+  }) => void;
   renderIcon: (scene: TabScene) => React.ReactElement<any>;
   labelStyle?: TextStyle;
   iconStyle?: ViewStyle;
@@ -854,17 +754,15 @@ export interface TabBarBottomProps {
   position: AnimatedValue;
   navigation: NavigationScreenProp<NavigationState>;
   jumpToIndex: (index: number) => void;
-  getLabel: (scene: TabScene) => React.ReactNode | string;
+  getLabel: (scene: TabScene) => (React.ReactNode | string);
   getOnPress: (
     previousScene: NavigationRoute,
     scene: TabScene
-  ) => (
-      args: {
-        previousScene: NavigationRoute;
-        scene: TabScene;
-        jumpToIndex: (index: number) => void;
-      }
-    ) => void;
+  ) => (args: {
+    previousScene: NavigationRoute,
+    scene: TabScene,
+    jumpToIndex: (index: number) => void,
+  }) => void;
   getTestIDProps: (scene: TabScene) => (scene: TabScene) => any;
   renderIcon: (scene: TabScene) => React.ReactNode;
   style?: ViewStyle;
@@ -891,18 +789,12 @@ export namespace NavigationActions {
   const POP_TO_TOP: 'Navigation/POP_TO_TOP';
 
   function init(options?: NavigationInitActionPayload): NavigationInitAction;
-  function navigate(
-    options: NavigationNavigateActionPayload
-  ): NavigationNavigateAction;
+  function navigate(options: NavigationNavigateActionPayload): NavigationNavigateAction;
   function reset(options: NavigationResetActionPayload): NavigationResetAction;
   function back(options?: NavigationBackActionPayload): NavigationBackAction;
-  function setParams(
-    options: NavigationSetParamsActionPayload
-  ): NavigationSetParamsAction;
+  function setParams(options: NavigationSetParamsActionPayload): NavigationSetParamsAction;
   function pop(options: NavigationPopActionPayload): NavigationPopAction;
-  function popToTop(
-    options: NavigationPopToTopActionPayload
-  ): NavigationPopToTopAction;
+  function popToTop(options: NavigationPopToTopActionPayload): NavigationPopToTopAction;
 }
 
 /**
@@ -915,14 +807,8 @@ export interface TransitionerProps {
     prevTransitionProps?: NavigationTransitionProps
   ) => NavigationTransitionSpec;
   navigation: NavigationScreenProp<NavigationState>;
-  onTransitionStart?: (
-    transitionProps: NavigationTransitionProps,
-    prevTransitionProps?: NavigationTransitionProps
-  ) => Promise<void> | void;
-  onTransitionEnd?: (
-    transitionProps: NavigationTransitionProps,
-    prevTransitionProps?: NavigationTransitionProps
-  ) => void;
+  onTransitionStart?: (transitionProps: NavigationTransitionProps, prevTransitionProps?: NavigationTransitionProps) => Promise<void> | void;
+  onTransitionEnd?: (transitionProps: NavigationTransitionProps, prevTransitionProps?: NavigationTransitionProps) => void;
   render: (
     transitionProps: NavigationTransitionProps,
     prevTransitionProps?: NavigationTransitionProps
@@ -940,7 +826,7 @@ export interface TransitionerState {
 export class Transitioner extends React.Component<
   TransitionerProps,
   TransitionerState
-  > { }
+> { }
 
 /**
  * Tab Router
@@ -967,23 +853,12 @@ export function StackRouter(
  *
  * @see https://github.com/react-navigation/react-navigation/blob/master/src/navigators/createNavigator.js
  */
-export interface NavigationDescriptor<Params = NavigationParams> {
-  key: string;
-  state: NavigationLeafRoute<Params> | NavigationStateRoute<Params>;
-  navigation: NavigationScreenProp<any>;
-  getComponent: () => React.ComponentType<{}>;
-}
-
-export type NavigationView<O, S> = React.ComponentType<{
-  descriptors: { [key: string]: NavigationDescriptor };
-} & NavigationInjectedProps>;
-
 export function createNavigator<C, S, Options>(
-  view: NavigationView<Options, S>,
   router: NavigationRouter<S, Options>,
+  routeConfigs?: NavigationRouteConfigMap,
   navigatorConfig?: {} | null,
   navigatorType?: NavigatorType
-): any;
+): (NavigationView: React.ComponentClass<C>) => NavigationNavigator<C, S, Options>;
 
 /**
  * Create an HOC that injects the navigation and manages the navigation state
@@ -1004,10 +879,7 @@ export function createNavigationContainer(
  * BEGIN CUSTOM CONVENIENCE INTERFACES
  */
 
-export interface NavigationScreenProps<
-  Params = NavigationParams,
-  Options = any
-  > {
+export interface NavigationScreenProps<Params = NavigationParams, Options = any> {
   navigation: NavigationScreenProp<NavigationRoute<Params>, Params>;
   screenProps?: { [key: string]: any };
   navigationOptions?: NavigationScreenConfig<Options>;
@@ -1064,7 +936,6 @@ export interface SafeAreaViewProps extends ViewProps {
     horizontal?: SafeAreaViewForceInsetValue;
     vertical?: SafeAreaViewForceInsetValue;
   };
-  children?: React.ReactNode;
 }
 
 export const SafeAreaView: React.ComponentClass<SafeAreaViewProps>;
diff --git a/types/react-navigation/v2/index.d.ts b/types/react-navigation/v2/index.d.ts
new file mode 100644
index 0000000000..36251eba5b
--- /dev/null
+++ b/types/react-navigation/v2/index.d.ts
@@ -0,0 +1,1086 @@
+// Type definitions for react-navigation 2.0
+// Project: https://github.com/react-navigation/react-navigation
+// Definitions by: Huhuanming <https://github.com/huhuanming>
+//                 mhcgrq <https://github.com/mhcgrq>
+//                 fangpenlin <https://github.com/fangpenlin>
+//                 petejkim <https://github.com/petejkim>
+//                 Kyle Roach <https://github.com/iRoachie>
+//                 phanalpha <https://github.com/phanalpha>
+//                 charlesfamu <https://github.com/charlesfamu>
+//                 Tim Wang <https://github.com/timwangdev>
+//                 Qibang Sun <https://github.com/bang88>
+//                 Sergei Butko: <https://github.com/svbutko>
+//                 Veit Lehmann: <https://github.com/levito>
+//                 Roberto Huertas: <https://github.com/robertohuertasm>
+//                 Steven Miller <https://github.com/YourGamesBeOver>
+//                 Armando Assuncao <https://github.com/ArmandoAssuncao>
+//                 Ciaran Liedeman <https://github.com/cliedeman>
+//                 Edward Sammut Alessi <https://github.com/Slessi>
+//                 Jérémy Magrin <https://github.com/magrinj>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/**
+ * Reference: https://github.com/react-navigation/react-navigation/tree/a37473c5e4833f48796ee6c7c9cb4a8ac49d9c06
+ *
+ * NOTE: Please update the commit/link above when updating to a new Flow
+ * react-navigation/flow/react-navigation.js reference, so we can conveniently just look at diffs on
+ * react-navigation/flow/react-navigation.js between this latest reference point and the one you are
+ * using when making new updates.
+ */
+
+import * as React from 'react';
+import {
+  Animated,
+  TextStyle,
+  ViewProps,
+  ViewStyle,
+  StyleProp,
+} from 'react-native';
+
+// @todo when we split types into common, native and web,
+// we can properly change Animated.Value to its real value
+export type AnimatedValue = any;
+
+export type HeaderMode = 'float' | 'screen' | 'none';
+
+export interface HeaderForceInset {
+  horizontal?: string;
+  vertical?: string,
+  left?: string,
+  right?: string,
+  top?: string,
+  bottom?: string,
+}
+
+export interface HeaderProps extends NavigationSceneRendererProps {
+  mode: HeaderMode;
+  router: NavigationRouter<NavigationState, NavigationStackScreenOptions>;
+  getScreenDetails: (
+    navigationScene: NavigationScene
+  ) => NavigationScreenDetails<NavigationStackScreenOptions>;
+  leftInterpolator: (props: NavigationSceneRendererProps) => {};
+  titleInterpolator: (props: NavigationSceneRendererProps) => {};
+  rightInterpolator: (props: NavigationSceneRendererProps) => {};
+  style: StyleProp<ViewStyle>;
+}
+
+/**
+ * NavigationState is a tree of routes for a single navigator, where each child
+ * route may either be a NavigationScreenRoute or a NavigationRouterRoute.
+ * NavigationScreenRoute represents a leaf screen, while the
+ * NavigationRouterRoute represents the state of a child navigator.
+ *
+ * NOTE: NavigationState is a state tree local to a single navigator and
+ * its child navigators (via the routes field).
+ * If we're in navigator nested deep inside the app, the state will only be the
+ * state for that navigator.
+ * The state for the root navigator of our app represents the whole navigation
+ * state for the whole app.
+ */
+export interface NavigationState {
+  /**
+   * Index refers to the active child route in the routes array.
+   */
+  index: number;
+  routes: NavigationRoute[];
+}
+
+export type NavigationRoute<Params = NavigationParams> =
+  | NavigationLeafRoute<Params>
+  | NavigationStateRoute<Params>;
+
+export interface NavigationLeafRoute<Params = NavigationParams> {
+  /**
+   * React's key used by some navigators. No need to specify these manually,
+   * they will be defined by the router.
+   */
+  key: string;
+  /**
+   * For example 'Home'.
+   * This is used as a key in a route config when creating a navigator.
+   */
+  routeName: string;
+  /**
+   * Path is an advanced feature used for deep linking and on the web.
+   */
+  path?: string;
+  /**
+   * Params passed to this route when navigating to it,
+   * e.g. `{ car_id: 123 }` in a route that displays a car.
+   */
+  params?: Params;
+}
+
+export type NavigationStateRoute<
+  NavigationLeafRouteParams
+  > = NavigationLeafRoute<NavigationLeafRouteParams> & NavigationState;
+
+export type NavigationScreenOptionsGetter<Options> = (
+  navigation: NavigationScreenProp<NavigationRoute<any>>,
+  screenProps?: { [key: string]: any }
+) => Options;
+
+export interface NavigationRouter<State = NavigationState, Options = {}> {
+  /**
+   * The reducer that outputs the new navigation state for a given action, with
+   * an optional previous state. When the action is considered handled but the
+   * state is unchanged, the output state is null.
+   */
+  getStateForAction: (
+    action: NavigationAction,
+    lastState?: State
+  ) => State | null;
+
+  /**
+   * Maps a URI-like string to an action. This can be mapped to a state
+   * using `getStateForAction`.
+   */
+  getActionForPathAndParams: (
+    path: string,
+    params?: NavigationParams
+  ) => NavigationAction | null;
+
+  getPathAndParamsForState: (
+    state: State
+  ) => {
+      path: string;
+      params?: NavigationParams;
+    };
+
+  getComponentForRouteName: (routeName: string) => NavigationComponent;
+
+  getComponentForState: (state: State) => NavigationComponent;
+
+  /**
+   * Gets the screen navigation options for a given screen.
+   *
+   * For example, we could get the config for the 'Foo' screen when the
+   * `navigation.state` is:
+   *
+   *  {routeName: 'Foo', key: '123'}
+   */
+  getScreenOptions: NavigationScreenOptionsGetter<Options>;
+}
+
+export type NavigationScreenOption<T> =
+  | T
+  | ((navigation: NavigationScreenProp<NavigationRoute>, config: T) => T);
+
+export interface NavigationScreenDetails<T> {
+  options: T;
+  state: NavigationRoute;
+  navigation: NavigationScreenProp<NavigationRoute>;
+}
+
+export type NavigationScreenOptions = NavigationStackScreenOptions &
+  NavigationTabScreenOptions &
+  NavigationDrawerScreenOptions;
+
+export interface NavigationScreenConfigProps {
+  navigation: NavigationScreenProp<NavigationRoute>;
+  screenProps: { [key: string]: any };
+}
+
+export type NavigationScreenConfig<Options> =
+  | Options
+  | ((
+    navigationOptionsContainer: NavigationScreenConfigProps & {
+      navigationOptions: NavigationScreenProp<NavigationRoute>;
+    }
+  ) => Options);
+
+export type NavigationComponent =
+  | NavigationScreenComponent<NavigationParams, any, any>
+  | NavigationNavigator<any, any, any>
+  | any;
+
+export type NavigationScreenComponent<
+  Params = NavigationParams,
+  Options = {},
+  Props = {}
+  > = React.ComponentType<NavigationScreenProps<Params, Options> & Props> & {
+    navigationOptions?: NavigationScreenConfig<Options>;
+  };
+
+export type NavigationNavigator<
+  State = NavigationState,
+  Options = {},
+  Props = {}
+  > = React.ComponentType<NavigationNavigatorProps<Options, State> & Props> & {
+    router: NavigationRouter<State, Options>;
+    navigationOptions?: NavigationScreenConfig<Options>;
+  };
+
+export interface NavigationParams {
+  [key: string]: any;
+}
+
+export interface NavigationNavigateActionPayload {
+  routeName: string;
+  params?: NavigationParams;
+
+  // The action to run inside the sub-router
+  action?: NavigationNavigateAction;
+
+  key?: string;
+}
+
+export interface NavigationNavigateAction
+  extends NavigationNavigateActionPayload {
+  type: 'Navigation/NAVIGATE';
+}
+
+export interface NavigationBackActionPayload {
+  key?: string | null;
+}
+
+export interface NavigationBackAction extends NavigationBackActionPayload {
+  type: 'Navigation/BACK';
+}
+
+export interface NavigationSetParamsActionPayload {
+  // The key of the route where the params should be set
+  key: string;
+
+  // The new params to merge into the existing route params
+  params?: NavigationParams;
+}
+
+export interface NavigationSetParamsAction
+  extends NavigationSetParamsActionPayload {
+  type: 'Navigation/SET_PARAMS';
+}
+
+export interface NavigationInitActionPayload {
+  params?: NavigationParams;
+}
+
+export interface NavigationInitAction extends NavigationInitActionPayload {
+  type: 'Navigation/INIT';
+}
+
+export interface NavigationResetActionPayload {
+  index: number;
+  key?: string | null;
+  actions: NavigationNavigateAction[];
+}
+
+export interface NavigationResetAction extends NavigationResetActionPayload {
+  type: 'Navigation/RESET';
+}
+
+export interface NavigationUriActionPayload {
+  uri: string;
+}
+
+export interface NavigationUriAction extends NavigationUriActionPayload {
+  type: 'Navigation/URI';
+}
+
+export interface NavigationPopActionPayload {
+  // n: the number of routes to pop of the stack
+  n?: number;
+  immediate?: boolean;
+}
+
+export interface NavigationPopAction extends NavigationPopActionPayload {
+  type: 'Navigation/POP';
+}
+
+export interface NavigationPopToTopActionPayload {
+  key?: string;
+  immediate?: boolean;
+}
+
+export interface NavigationPopToTopAction
+  extends NavigationPopToTopActionPayload {
+  type: 'Navigation/POP_TO_TOP';
+}
+
+export interface NavigationStackViewConfig {
+  mode?: 'card' | 'modal';
+  headerMode?: HeaderMode;
+  headerTransitionPreset?: 'fade-in-place' | 'uikit';
+  cardStyle?: StyleProp<ViewStyle>;
+  transitionConfig?: (
+    transitionProps: NavigationTransitionProps,
+    prevTransitionProps: NavigationTransitionProps,
+    isModal: boolean
+  ) => TransitionConfig;
+  onTransitionStart?: (
+    transitionProps: NavigationTransitionProps,
+    prevTransitionProps?: NavigationTransitionProps
+  ) => Promise<void> | void;
+  onTransitionEnd?: (
+    transitionProps: NavigationTransitionProps,
+    prevTransitionProps?: NavigationTransitionProps
+  ) => void;
+}
+
+/**
+ * Switch Navigator
+ */
+
+export interface NavigationSwitchRouterConfig {
+  initialRouteName?: string;
+  initialRouteParams?: NavigationParams;
+  paths?: NavigationPathsConfig;
+  navigationOptions?: NavigationScreenConfig<NavigationScreenOptions>;
+  order?: string[];
+  backBehavior?: 'none' | 'initialRoute'; // defaults to `'none'`
+  resetOnBlur?: boolean; // defaults to `true`
+}
+
+export interface NavigationStackScreenOptions {
+  title?: string;
+  header?:
+  | (
+    | React.ReactElement<any>
+    | ((headerProps: HeaderProps) => React.ReactElement<any>))
+  | null;
+  headerTransparent?: boolean;
+  headerTitle?: string | React.ReactElement<any>;
+  headerTitleStyle?: StyleProp<TextStyle>;
+  headerTitleAllowFontScaling?: boolean;
+  headerTintColor?: string;
+  headerLeft?: React.ReactElement<any>;
+  headerBackTitle?: string | null;
+  headerBackImage?: React.ReactElement<any>;
+  headerTruncatedBackTitle?: string;
+  headerBackTitleStyle?: StyleProp<TextStyle>;
+  headerPressColorAndroid?: string;
+  headerRight?: React.ReactElement<any>;
+  headerStyle?: StyleProp<ViewStyle>;
+  headerForceInset?: HeaderForceInset;
+  headerBackground?: React.ReactNode | React.ReactType;
+  gesturesEnabled?: boolean;
+  gestureResponseDistance?: { vertical?: number; horizontal?: number };
+  gestureDirection?: 'default' | 'inverted';
+}
+
+export interface NavigationStackRouterConfig {
+  headerTransitionPreset?: 'fade-in-place' | 'uikit';
+  initialRouteName?: string;
+  initialRouteParams?: NavigationParams;
+  paths?: NavigationPathsConfig;
+  navigationOptions?: NavigationScreenConfig<NavigationScreenOptions>;
+  initialRouteKey?: string;
+}
+
+export type NavigationStackAction =
+  | NavigationInitAction
+  | NavigationNavigateAction
+  | NavigationBackAction
+  | NavigationSetParamsAction
+  | NavigationResetAction
+  | NavigationPopAction
+  | NavigationPopToTopAction;
+
+export type NavigationTabAction =
+  | NavigationInitAction
+  | NavigationNavigateAction
+  | NavigationBackAction;
+
+export type NavigationAction =
+  | NavigationInitAction
+  | NavigationStackAction
+  | NavigationTabAction;
+
+export type NavigationRouteConfig =
+  | NavigationComponent
+  | ({
+    navigationOptions?: NavigationScreenConfig<any>;
+    path?: string;
+  } & NavigationScreenRouteConfig);
+
+export type NavigationScreenRouteConfig =
+  | NavigationComponent
+  | {
+    screen: NavigationComponent;
+  }
+  | {
+    getScreen: () => NavigationComponent;
+  };
+
+export interface NavigationPathsConfig {
+  [routeName: string]: string;
+}
+
+export interface NavigationTabRouterConfig {
+  initialRouteName?: string;
+  initialRouteParams?: NavigationParams;
+  paths?: NavigationPathsConfig;
+  navigationOptions?: NavigationScreenConfig<NavigationScreenOptions>;
+  order?: string[]; // todo: type these as the real route names rather than 'string'
+
+  // Does the back button cause the router to switch to the initial tab
+  backBehavior?: 'none' | 'initialRoute'; // defaults `initialRoute`
+}
+export interface TabScene {
+  route: NavigationRoute;
+  focused: boolean;
+  index: number;
+  tintColor?: string;
+}
+export interface NavigationTabScreenOptions {
+  title?: string;
+  tabBarIcon?:
+  | React.ReactElement<any>
+  | ((
+    options: { tintColor: string | null; focused: boolean }
+  ) => React.ReactElement<any> | null);
+  tabBarLabel?:
+  | string
+  | React.ReactElement<any>
+  | ((
+    options: { tintColor: string | null; focused: boolean }
+  ) => React.ReactElement<any> | string | null);
+  tabBarVisible?: boolean;
+  tabBarTestIDProps?: { testID?: string; accessibilityLabel?: string };
+  tabBarOnPress?: (
+    options: {
+      scene: TabScene;
+      jumpToIndex: (index: number) => void;
+    }
+  ) => void;
+}
+
+export interface NavigationDrawerScreenOptions {
+  title?: string;
+  drawerIcon?:
+  | React.ReactElement<any>
+  | ((
+    options: { tintColor: string | null; focused: boolean }
+  ) => React.ReactElement<any> | null);
+  drawerLabel?:
+  | string
+  | React.ReactElement<any>
+  | ((
+    options: { tintColor: string | null; focused: boolean }
+  ) => React.ReactElement<any> | null);
+  drawerLockMode?: 'unlocked' | 'locked-closed' | 'locked-open';
+}
+
+export interface NavigationRouteConfigMap {
+  [routeName: string]: NavigationRouteConfig;
+}
+
+export type NavigationDispatch = (action: NavigationAction) => boolean;
+
+export interface NavigationProp<S> {
+  state: S;
+  dispatch: NavigationDispatch;
+}
+
+export type EventType =
+  | 'willFocus'
+  | 'didFocus'
+  | 'willBlur'
+  | 'didBlur'
+  | 'action';
+
+export interface NavigationEventPayload {
+  type: EventType;
+  action: NavigationAction;
+  state: NavigationState;
+  lastState: NavigationState | null | undefined;
+}
+
+export type NavigationEventCallback = (payload: NavigationEventPayload) => void;
+
+export interface NavigationEventSubscription {
+  remove: () => void;
+}
+
+export interface NavigationScreenProp<S, P = NavigationParams> {
+  state: S;
+  dispatch: NavigationDispatch;
+  goBack: (routeKey?: string | null) => boolean;
+  dismiss: () => boolean;
+  navigate(options: {
+    routeName: string | {
+      routeName: string;
+      params?: NavigationParams;
+      action?: NavigationNavigateAction;
+      key?: string;
+    };
+    params?: NavigationParams;
+    action?: NavigationAction;
+    key?: string;
+  }): boolean;
+  navigate(
+    routeNameOrOptions: string,
+    params?: NavigationParams,
+    action?: NavigationAction
+  ): boolean;
+  openDrawer: () => any;
+  closeDrawer: () => any;
+  toggleDrawer: () => any;
+  getParam: <T extends keyof P>(param: T, fallback?: P[T]) => P[T];
+  setParams: (newParams: P) => boolean;
+  addListener: (
+    eventName: string,
+    callback: NavigationEventCallback
+  ) => NavigationEventSubscription;
+  push: (
+    routeName: string,
+    params?: NavigationParams,
+    action?: NavigationNavigateAction
+  ) => boolean;
+  replace: (
+    routeName: string,
+    params?: NavigationParams,
+    action?: NavigationNavigateAction
+  ) => boolean;
+  pop: (n?: number, params?: { immediate?: boolean }) => boolean;
+  popToTop: (params?: { immediate?: boolean }) => boolean;
+  isFocused: () => boolean;
+}
+
+export interface NavigationNavigatorProps<O = {}, S = {}> {
+  navigation?: NavigationProp<S>;
+  screenProps?: { [key: string]: any };
+  navigationOptions?: O;
+}
+
+/**
+ * Gestures, Animations, and Interpolators
+ */
+
+export type NavigationGestureDirection = 'horizontal' | 'vertical';
+
+export interface NavigationLayout {
+  height: AnimatedValue;
+  initHeight: number;
+  initWidth: number;
+  isMeasured: boolean;
+  width: AnimatedValue;
+}
+
+export interface NavigationScene {
+  index: number;
+  isActive: boolean;
+  isStale: boolean;
+  key: string;
+  route: NavigationRoute;
+}
+
+export interface NavigationTransitionProps {
+  // The layout of the screen container
+  layout: NavigationLayout;
+
+  // The destination navigation state of the transition
+  navigation: NavigationScreenProp<NavigationState>;
+
+  // The progressive index of the transitioner's navigation state.
+  position: AnimatedValue;
+
+  // The value that represents the progress of the transition when navigation
+  // state changes from one to another. Its numberic value will range from 0
+  // to 1.
+  //  progress.__getAnimatedValue() < 1 : transtion is happening.
+  //  progress.__getAnimatedValue() == 1 : transtion completes.
+  progress: AnimatedValue;
+
+  // All the scenes of the transitioner.
+  scenes: NavigationScene[];
+
+  // The active scene, corresponding to the route at
+  // `navigation.state.routes[navigation.state.index]`. When rendering
+  // NavigationSceneRendererPropsIndex, the scene does not refer to the active
+  // scene, but instead the scene that is being rendered. The index always
+  // is the index of the scene
+  scene: NavigationScene;
+  index: number;
+
+  screenProps?: { [key: string]: any };
+}
+
+// The scene renderer props are nearly identical to the props used for rendering
+// a transition. The exception is that the passed scene is not the active scene
+// but is instead the scene that the renderer should render content for.
+export type NavigationSceneRendererProps = NavigationTransitionProps;
+
+export interface NavigationTransitionSpec {
+  duration?: number;
+  // An easing function from `Easing`.
+  easing?: (t: number) => number;
+  // A timing function such as `Animated.timing`.
+  timing?: (value: AnimatedValue, config: any) => any;
+}
+
+/**
+ * Describes a visual transition from one screen to another.
+ */
+export interface TransitionConfig {
+  // The basics properties of the animation, such as duration and easing
+  transitionSpec?: NavigationTransitionSpec;
+  // How to animate position and opacity of the screen
+  // based on the value generated by the transitionSpec
+  screenInterpolator?: (props: NavigationSceneRendererProps) => any;
+  // How to animate position and opacity of the header componetns
+  // based on the value generated by the transitionSpec
+  headerLeftInterpolator?: (props: NavigationSceneRendererProps) => any;
+  headerTitleInterpolator?: (props: NavigationSceneRendererProps) => any;
+  headerRightInterpolator?: (props: NavigationSceneRendererProps) => any;
+  // The style of the container. Useful when a scene doesn't have
+  // 100% opacity and the underlying container is visible.
+  containerStyle?: StyleProp<ViewStyle>;
+}
+
+export type NavigationAnimationSetter = (
+  position: AnimatedValue,
+  newState: NavigationState,
+  lastState: NavigationState
+) => void;
+
+export type NavigationSceneRenderer = () => React.ReactElement<any> | null;
+
+export type NavigationStyleInterpolator = (
+  props: NavigationSceneRendererProps
+) => ViewStyle;
+
+export interface LayoutEvent {
+  nativeEvent: {
+    layout: {
+      x: number;
+      y: number;
+      width: number;
+      height: number;
+    };
+  };
+}
+
+export type NavigatorType =
+  | 'react-navigation/STACK'
+  | 'react-navigation/TABS'
+  | 'react-navigation/DRAWER';
+
+export interface NavigationContainerProps<S = {}, O = {}> {
+  uriPrefix?: string | RegExp;
+  onNavigationStateChange?: (
+    prevNavigationState: NavigationState,
+    nextNavigationState: NavigationState,
+    action: NavigationAction
+  ) => void | null | undefined;
+  navigation?: NavigationScreenProp<S>;
+  persistenceKey?: string | null | undefined;
+  renderLoadingExperimental?: React.ComponentType<{}>,
+  screenProps?: any;
+  navigationOptions?: O;
+  style?: StyleProp<ViewStyle>;
+}
+
+export interface NavigationContainerComponent
+  extends React.Component<
+  NavigationContainerProps & NavigationNavigatorProps<any>
+  > {
+  dispatch: NavigationDispatch;
+}
+
+export interface NavigationContainer
+  extends React.ComponentClass<
+  NavigationContainerProps & NavigationNavigatorProps<any>
+  > {
+  new(
+    props: NavigationContainerProps & NavigationNavigatorProps<any>,
+    context?: any
+  ): NavigationContainerComponent;
+
+  router: NavigationRouter<any, any>;
+  screenProps: { [key: string]: any };
+  navigationOptions: any;
+  state: { nav: NavigationState | null };
+}
+
+export interface StackNavigatorConfig
+  extends NavigationStackViewConfig,
+  NavigationStackRouterConfig {
+  containerOptions?: any;
+}
+
+// Return createNavigationContainer
+export function StackNavigator(
+  routeConfigMap: NavigationRouteConfigMap,
+  stackConfig?: StackNavigatorConfig
+): NavigationContainer;
+
+export function createStackNavigator(
+  routeConfigMap: NavigationRouteConfigMap,
+  stackConfig?: StackNavigatorConfig
+): NavigationContainer;
+
+export interface SwitchNavigatorConfig {
+  initialRouteName: string;
+  resetOnBlur?: boolean;
+  paths?: NavigationPathsConfig;
+  backBehavior?: 'none' | 'initialRoute';
+}
+
+// Return createNavigationContainer
+export type _SwitchNavigatorConfig = NavigationSwitchRouterConfig;
+
+export function SwitchNavigator(
+  routeConfigMap: NavigationRouteConfigMap,
+  switchConfig?: SwitchNavigatorConfig
+): NavigationContainer;
+
+export function createSwitchNavigator(
+  routeConfigMap: NavigationRouteConfigMap,
+  switchConfig?: SwitchNavigatorConfig
+): NavigationContainer;
+
+// DrawerItems
+export const DrawerItems: React.ReactType;
+
+/**
+ * Drawer Navigator
+ */
+export interface DrawerViewConfig {
+  drawerBackgroundColor?: string;
+  drawerWidth?: number;
+  drawerPosition?: 'left' | 'right';
+  contentComponent?: React.ReactType;
+  contentOptions?: any;
+  style?: StyleProp<ViewStyle>;
+}
+export interface DrawerNavigatorConfig
+  extends NavigationTabRouterConfig,
+  DrawerViewConfig {
+  containerConfig?: any;
+  contentOptions?: {
+    activeTintColor?: string;
+    activeBackgroundColor?: string;
+    inactiveTintColor?: string;
+    inactiveBackgroundColor?: string;
+    style?: StyleProp<ViewStyle>;
+    labelStyle?: StyleProp<TextStyle>;
+  };
+}
+
+export function DrawerNavigator(
+  routeConfigMap: NavigationRouteConfigMap,
+  drawerConfig?: DrawerNavigatorConfig
+): NavigationContainer;
+
+export function createDrawerNavigator(
+  routeConfigMap: NavigationRouteConfigMap,
+  drawerConfig?: DrawerNavigatorConfig
+): NavigationContainer;
+
+/**
+ * Tab Navigator
+ */
+
+// From views/TabView/TabView.js
+export interface TabViewConfig {
+  tabBarComponent?: React.ReactType;
+  tabBarPosition?: 'top' | 'bottom';
+  tabBarOptions?: {
+    activeTintColor?: string;
+    allowFontScaling?: boolean;
+    activeBackgroundColor?: string;
+    inactiveTintColor?: string;
+    inactiveBackgroundColor?: string;
+    showLabel?: boolean;
+    style?: StyleProp<ViewStyle>;
+    labelStyle?: StyleProp<TextStyle>;
+    iconStyle?: StyleProp<ViewStyle>;
+    // Top
+    showIcon?: boolean;
+    upperCaseLabel?: boolean;
+    pressColor?: string;
+    pressOpacity?: number;
+    scrollEnabled?: boolean;
+    tabStyle?: StyleProp<ViewStyle>;
+    indicatorStyle?: StyleProp<ViewStyle>;
+  };
+  swipeEnabled?: boolean;
+  animationEnabled?: boolean;
+  lazy?: boolean;
+}
+
+// From navigators/TabNavigator.js
+export interface TabNavigatorConfig
+  extends NavigationTabRouterConfig,
+  TabViewConfig {
+  lazy?: boolean;
+  removeClippedSubviews?: boolean;
+  initialLayout?: { height: number; width: number };
+}
+
+// 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,
+  drawConfig?: TabNavigatorConfig
+): NavigationContainer;
+
+export function createMaterialTopNavigator(
+  routeConfigMap: NavigationRouteConfigMap,
+  drawConfig?: TabNavigatorConfig
+): NavigationContainer;
+
+export interface TabBarTopProps {
+  activeTintColor: string;
+  inactiveTintColor: string;
+  indicatorStyle: StyleProp<ViewStyle>;
+  showIcon: boolean;
+  showLabel: boolean;
+  upperCaseLabel: boolean;
+  allowFontScaling: boolean;
+  position: AnimatedValue;
+  tabBarPosition: string;
+  navigation: NavigationScreenProp<NavigationState>;
+  jumpToIndex: (index: number) => void;
+  getLabel: (scene: TabScene) => React.ReactNode | string;
+  getOnPress: (
+    previousScene: NavigationRoute,
+    scene: TabScene
+  ) => (
+      args: {
+        previousScene: NavigationRoute;
+        scene: TabScene;
+        jumpToIndex: (index: number) => void;
+      }
+    ) => void;
+  renderIcon: (scene: TabScene) => React.ReactElement<any>;
+  labelStyle?: TextStyle;
+  iconStyle?: ViewStyle;
+}
+
+export interface TabBarBottomProps {
+  activeTintColor: string;
+  activeBackgroundColor: string;
+  adaptive?: boolean;
+  inactiveTintColor: string;
+  inactiveBackgroundColor: string;
+  showLabel?: boolean;
+  allowFontScaling: boolean;
+  position: AnimatedValue;
+  navigation: NavigationScreenProp<NavigationState>;
+  jumpToIndex: (index: number) => void;
+  getLabel: (scene: TabScene) => React.ReactNode | string;
+  getOnPress: (
+    previousScene: NavigationRoute,
+    scene: TabScene
+  ) => (
+      args: {
+        previousScene: NavigationRoute;
+        scene: TabScene;
+        jumpToIndex: (index: number) => void;
+      }
+    ) => void;
+  getTestIDProps: (scene: TabScene) => (scene: TabScene) => any;
+  renderIcon: (scene: TabScene) => React.ReactNode;
+  style?: ViewStyle;
+  animateStyle?: ViewStyle;
+  labelStyle?: TextStyle;
+  tabStyle?: ViewStyle;
+  showIcon?: boolean;
+}
+
+export const TabBarTop: React.ComponentType<TabBarTopProps>;
+export const TabBarBottom: React.ComponentType<TabBarBottomProps>;
+
+/**
+ * NavigationActions
+ */
+export namespace NavigationActions {
+  const BACK: 'Navigation/BACK';
+  const INIT: 'Navigation/INIT';
+  const NAVIGATE: 'Navigation/NAVIGATE';
+  const RESET: 'Navigation/RESET';
+  const SET_PARAMS: 'Navigation/SET_PARAMS';
+  const URI: 'Navigation/URI';
+  const POP: 'Navigation/POP';
+  const POP_TO_TOP: 'Navigation/POP_TO_TOP';
+
+  function init(options?: NavigationInitActionPayload): NavigationInitAction;
+  function navigate(
+    options: NavigationNavigateActionPayload
+  ): NavigationNavigateAction;
+  function reset(options: NavigationResetActionPayload): NavigationResetAction;
+  function back(options?: NavigationBackActionPayload): NavigationBackAction;
+  function setParams(
+    options: NavigationSetParamsActionPayload
+  ): NavigationSetParamsAction;
+  function pop(options: NavigationPopActionPayload): NavigationPopAction;
+  function popToTop(
+    options: NavigationPopToTopActionPayload
+  ): NavigationPopToTopAction;
+}
+
+/**
+ * Transitioner
+ * @desc From react-navigation/src/views/Transitioner.js
+ */
+export interface TransitionerProps {
+  configureTransition: (
+    transitionProps: NavigationTransitionProps,
+    prevTransitionProps?: NavigationTransitionProps
+  ) => NavigationTransitionSpec;
+  navigation: NavigationScreenProp<NavigationState>;
+  onTransitionStart?: (
+    transitionProps: NavigationTransitionProps,
+    prevTransitionProps?: NavigationTransitionProps
+  ) => Promise<void> | void;
+  onTransitionEnd?: (
+    transitionProps: NavigationTransitionProps,
+    prevTransitionProps?: NavigationTransitionProps
+  ) => void;
+  render: (
+    transitionProps: NavigationTransitionProps,
+    prevTransitionProps?: NavigationTransitionProps
+  ) => any;
+  style?: StyleProp<ViewStyle>;
+}
+
+export interface TransitionerState {
+  layout: NavigationLayout;
+  position: Animated.Value;
+  progress: Animated.Value;
+  scenes: NavigationScene[];
+}
+
+export class Transitioner extends React.Component<
+  TransitionerProps,
+  TransitionerState
+  > { }
+
+/**
+ * Tab Router
+ *
+ * @desc from react-navigation/src/routers/TabRouter.js
+ */
+export function TabRouter(
+  routeConfigs: NavigationRouteConfigMap,
+  config: NavigationTabRouterConfig
+): NavigationRouter<any, any>;
+
+/**
+ * Stack Router
+ *
+ * @desc from react-navigation/src/routers/StackRouter.js
+ */
+export function StackRouter(
+  routeConfigs: NavigationRouteConfigMap,
+  config: NavigationTabRouterConfig
+): NavigationRouter<any, any>;
+
+/**
+ * Create Navigator
+ *
+ * @see https://github.com/react-navigation/react-navigation/blob/master/src/navigators/createNavigator.js
+ */
+export interface NavigationDescriptor<Params = NavigationParams> {
+  key: string;
+  state: NavigationLeafRoute<Params> | NavigationStateRoute<Params>;
+  navigation: NavigationScreenProp<any>;
+  getComponent: () => React.ComponentType<{}>;
+}
+
+export type NavigationView<O, S> = React.ComponentType<{
+  descriptors: { [key: string]: NavigationDescriptor };
+} & NavigationInjectedProps>;
+
+export function createNavigator<C, S, Options>(
+  view: NavigationView<Options, S>,
+  router: NavigationRouter<S, Options>,
+  navigatorConfig?: {} | null,
+  navigatorType?: NavigatorType
+): any;
+
+/**
+ * Create an HOC that injects the navigation and manages the navigation state
+ * in case it's not passed from above.
+ * This allows to use e.g. the StackNavigator and TabNavigator as root-level
+ * components.
+ *
+ * @see https://github.com/react-navigation/react-navigation/blob/master/src/createNavigationContainer.js
+ */
+export function createNavigationContainer(
+  Component: NavigationNavigator<any, any, any>
+): NavigationContainer;
+/**
+ * END MANUAL DEFINITIONS OUTSIDE OF TYPEDEFINITION.JS
+ */
+
+/**
+ * BEGIN CUSTOM CONVENIENCE INTERFACES
+ */
+
+export interface NavigationScreenProps<
+  Params = NavigationParams,
+  Options = any
+  > {
+  navigation: NavigationScreenProp<NavigationRoute<Params>, Params>;
+  screenProps?: { [key: string]: any };
+  navigationOptions?: NavigationScreenConfig<Options>;
+}
+
+/**
+ * END CUSTOM CONVENIENCE INTERFACES
+ */
+
+/*
+ * Header
+ */
+
+// src/views/HeaderBackButton.js
+
+export interface HeaderBackButtonProps {
+  onPress?: () => void;
+  pressColorAndroid?: string;
+  title?: string;
+  titleStyle?: StyleProp<TextStyle>;
+  tintColor?: string;
+  truncatedTitle?: string;
+  width?: number;
+}
+
+export const HeaderBackButton: React.ComponentClass<HeaderBackButtonProps>;
+/**
+ * Header Component
+ */
+export const Header: React.ComponentClass<HeaderProps>;
+
+export interface NavigationInjectedProps {
+  navigation: NavigationScreenProp<NavigationState>;
+}
+
+export function withNavigation<T = {}>(
+  Component: React.ComponentType<T & NavigationInjectedProps>
+): React.ComponentType<T>;
+
+export function withNavigationFocus<T = {}>(
+  Component: React.ComponentType<T & NavigationInjectedProps>
+): React.ComponentType<T>;
+
+/**
+ * SafeAreaView Component
+ */
+export type SafeAreaViewForceInsetValue = 'always' | 'never';
+export interface SafeAreaViewProps extends ViewProps {
+  forceInset?: {
+    top?: SafeAreaViewForceInsetValue;
+    bottom?: SafeAreaViewForceInsetValue;
+    left?: SafeAreaViewForceInsetValue;
+    right?: SafeAreaViewForceInsetValue;
+    horizontal?: SafeAreaViewForceInsetValue;
+    vertical?: SafeAreaViewForceInsetValue;
+  };
+  children?: React.ReactNode;
+}
+
+export const SafeAreaView: React.ComponentClass<SafeAreaViewProps>;
diff --git a/types/react-navigation/v2/react-navigation-tests.tsx b/types/react-navigation/v2/react-navigation-tests.tsx
new file mode 100644
index 0000000000..b59474bd11
--- /dev/null
+++ b/types/react-navigation/v2/react-navigation-tests.tsx
@@ -0,0 +1,453 @@
+import * as React from 'react';
+import {
+    TouchableOpacity,
+    View,
+    ViewStyle,
+} from 'react-native';
+import {
+    createDrawerNavigator,
+    DrawerNavigatorConfig,
+    NavigationAction,
+    NavigationActions,
+    NavigationBackAction,
+    NavigationInitAction,
+    NavigationNavigateAction,
+    NavigationProp,
+    NavigationResetAction,
+    NavigationRouteConfigMap,
+    NavigationScreenProp,
+    NavigationScreenProps,
+    NavigationSetParamsAction,
+    NavigationStackAction,
+    NavigationStackScreenOptions,
+    NavigationTabScreenOptions,
+    NavigationTransitionProps,
+    createStackNavigator,
+    StackNavigatorConfig,
+    createSwitchNavigator,
+    SwitchNavigatorConfig,
+    TabBarTop,
+    createTabNavigator,
+    TabNavigatorConfig,
+    Transitioner,
+    HeaderBackButton,
+    Header,
+    NavigationContainer,
+    NavigationParams,
+    NavigationPopAction,
+    NavigationPopToTopAction,
+    NavigationScreenComponent,
+    NavigationContainerComponent,
+} from 'react-navigation';
+
+// Constants
+const viewStyle: ViewStyle = {
+    flex: 1,
+    margin: 42,
+    padding: 0,
+    backgroundColor: "white",
+};
+
+const ROUTE_NAME_START_SCREEN = "StartScreen";
+const ROUTE_KEY_START_SCREEN = "StartScreen-key";
+
+interface StartScreenNavigationParams {
+    id: number;
+    s: string;
+}
+
+/**
+ * @desc Simple screen component class with typed component props that should
+ *     receive the navigation prop from the AppNavigator.
+ */
+class StartScreen extends React.Component<NavigationScreenProps<StartScreenNavigationParams>> {
+    render() {
+        // Implicit type checks.
+        const navigationStateParams: StartScreenNavigationParams | undefined = this.props.navigation.state.params;
+        const id = this.props.navigation.state.params && this.props.navigation.state.params.id;
+        const s = this.props.navigation.state.params && this.props.navigation.state.params.s;
+
+        return (
+            <View>
+                <TouchableOpacity onPress={this.navigateToNextScreen} />
+                <TouchableOpacity onPress={this.navigateDifferentlyToNextScreen} />
+            </View>
+        );
+    }
+    private readonly navigateToNextScreen = (): void => {
+        const params = {
+            id: this.props.navigation.state.params && this.props.navigation.state.params.id,
+            name: this.props.navigation.state.params && this.props.navigation.state.params.s,
+        };
+        this.props.navigation.navigate(ROUTE_NAME_NEXT_SCREEN, params);
+    }
+    private readonly navigateDifferentlyToNextScreen = (): void => {
+        const params = {
+            id: this.props.navigation.state.params && this.props.navigation.state.params.id,
+            name: this.props.navigation.state.params && this.props.navigation.state.params.s,
+        };
+        this.props.navigation.navigate({routeName: ROUTE_NAME_NEXT_SCREEN, params});
+    }
+}
+
+const ROUTE_NAME_NEXT_SCREEN = "NextScreen";
+
+interface NextScreenNavigationParams {
+    id: number;
+    name: string;
+}
+
+class NextScreen extends React.Component<NavigationScreenProps<NextScreenNavigationParams>> {
+    render() {
+        // Implicit type checks.
+        const navigationStateParams: NextScreenNavigationParams | undefined = this.props.navigation.state.params;
+        const id = this.props.navigation.state.params && this.props.navigation.state.params.id;
+        const name = this.props.navigation.getParam('name', 'Peter');
+
+        return (
+            <View />
+        );
+    }
+}
+
+const navigationOptions = {
+    headerBackTitle: null,
+};
+const initialRouteParams: StartScreenNavigationParams = {
+    id: 1,
+    s: "Start",
+};
+const routeConfigMap: NavigationRouteConfigMap = {
+    [ROUTE_NAME_START_SCREEN]: {
+        path: "start",
+        screen: StartScreen,
+    },
+    [ROUTE_NAME_NEXT_SCREEN]: {
+        path: "next",
+        screen: NextScreen,
+    },
+};
+export const AppNavigator = createStackNavigator(
+    routeConfigMap,
+    {
+        initialRouteName: ROUTE_NAME_START_SCREEN,
+        initialRouteKey: ROUTE_KEY_START_SCREEN,
+        initialRouteParams,
+        navigationOptions,
+    },
+);
+
+interface StatelessScreenParams {
+    testID: string;
+}
+
+const StatelessScreen: NavigationScreenComponent<StatelessScreenParams> = (props) =>
+    <View testID={props.navigation.getParam('testID', 'fallback')}/>;
+
+StatelessScreen.navigationOptions = { title: 'Stateless' };
+
+const SimpleStackNavigator = createStackNavigator(
+    {
+        simple: {
+            screen: StatelessScreen,
+        },
+    }
+);
+
+/**
+ * Tab navigator.
+ */
+
+const tabNavigatorScreenOptions: NavigationTabScreenOptions = {
+    title: 'title',
+    tabBarVisible: true,
+    tabBarIcon: <View />,
+    tabBarLabel: 'label',
+    tabBarOnPress: ({scene, jumpToIndex}) => {}
+};
+
+const tabNavigatorConfig: TabNavigatorConfig = {
+    lazy: true,
+    tabBarComponent: TabBarTop,
+    tabBarOptions: { activeBackgroundColor: "blue" },
+};
+
+const tabNavigatorConfigWithInitialLayout: TabNavigatorConfig = {
+  ...tabNavigatorConfig,
+  initialLayout: { height: 0, width: 100 },
+};
+
+const tabNavigatorConfigWithNavigationOptions: TabNavigatorConfig = {
+    ...tabNavigatorConfig,
+    navigationOptions: {
+        tabBarOnPress: ({scene, jumpToIndex}) => {
+            jumpToIndex(scene.index);
+        },
+        headerStyle: {
+            backgroundColor: 'red',
+        },
+    },
+};
+
+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.
+ */
+
+const stackNavigatorScreenOptions: NavigationStackScreenOptions = {
+    title: 'title',
+};
+
+const stackNavigatorConfig: StackNavigatorConfig = {
+    mode: "card",
+    headerMode: "screen",
+    navigationOptions: stackNavigatorScreenOptions,
+};
+
+const BasicStackNavigator = createStackNavigator(
+    routeConfigMap,
+    stackNavigatorConfig,
+);
+
+function renderBasicStackNavigator(): JSX.Element {
+    return (
+        <BasicStackNavigator
+            ref={(ref: any) => { }}
+            style={viewStyle}
+        />
+    );
+}
+
+const stackNavigatorConfigWithNavigationOptionsAsFunction: StackNavigatorConfig = {
+    mode: "card",
+    headerMode: "screen",
+    navigationOptions: ({navigationOptions, navigation, screenProps}) => (stackNavigatorScreenOptions),
+};
+
+const AdvancedStackNavigator = createStackNavigator(
+    routeConfigMap,
+    stackNavigatorConfigWithNavigationOptionsAsFunction
+);
+
+function renderAdvancedStackNavigator(): JSX.Element {
+    return (
+        <AdvancedStackNavigator
+            ref={(ref: any) => { }}
+            style={viewStyle}
+        />
+    );
+}
+
+/**
+ * Switch navigator.
+ */
+
+const switchNavigatorConfig: SwitchNavigatorConfig = {
+    initialRouteName: 'screen',
+    resetOnBlur: false,
+    backBehavior: 'none'
+};
+
+const BasicSwitchNavigator = createSwitchNavigator(
+    routeConfigMap,
+    switchNavigatorConfig,
+);
+
+function renderBasicSwitchNavigator(): JSX.Element {
+    return (
+        <BasicSwitchNavigator
+            ref={(ref: any) => { }}
+            style={viewStyle}
+        />
+    );
+}
+
+const switchNavigatorConfigWithInitialRoute: SwitchNavigatorConfig = {
+    initialRouteName: 'screen',
+    resetOnBlur: false,
+    backBehavior: 'initialRoute'
+};
+
+const SwitchNavigatorWithInitialRoute = createSwitchNavigator(
+    routeConfigMap,
+    switchNavigatorConfigWithInitialRoute,
+);
+
+function renderSwitchNavigatorWithInitialRoute(): JSX.Element {
+    return (
+        <SwitchNavigatorWithInitialRoute
+            ref={(ref: any) => { }}
+            style={viewStyle}
+        />
+    );
+}
+
+/**
+ * Drawer navigator.
+ */
+
+const drawerNavigatorScreenOptions: NavigationTabScreenOptions = {
+    title: 'title',
+};
+
+const drawerNavigatorConfig: DrawerNavigatorConfig = {
+    drawerBackgroundColor: '#777777',
+    contentOptions: {
+        activeTintColor: '#7A9B49',
+        inactiveTintColor: '#FFFFFF',
+    },
+};
+
+const BasicDrawerNavigator = createDrawerNavigator(
+    routeConfigMap,
+    stackNavigatorConfig,
+);
+
+function renderBasicDrawerNavigator(): JSX.Element {
+    return (
+        <BasicDrawerNavigator
+            ref={(ref: any) => { }}
+            style={viewStyle}
+        />
+    );
+}
+
+interface CustomTransitionerProps {
+    navigation: NavigationScreenProp<any, any>;
+}
+/**
+ * @desc Custom transitioner component. Follows react-navigation/src/views/CardStackTransitioner.js.
+ */
+class CustomTransitioner extends React.Component<CustomTransitionerProps, null> {
+    render() {
+        return (
+            <Transitioner
+                configureTransition={this._configureTransition}
+                navigation={this.props.navigation}
+                render={this._render}
+                onTransitionStart={(curr, prev) => {
+                    if (prev) {
+                        prev.position.setValue(curr.navigation.state.index);
+                    }
+                }}
+                onTransitionEnd={(curr, prev) => {
+                    if (prev) {
+                        prev.position.setValue(curr.navigation.state.index);
+                    }
+                }}
+            />
+        );
+    }
+    _render = (props: NavigationTransitionProps, prevProps: NavigationTransitionProps): React.ReactElement<any> => {
+        return (
+            <View />
+        );
+    }
+    _configureTransition = (
+        _transitionProps: NavigationTransitionProps,
+        _prevTransitionProps: NavigationTransitionProps
+    ) => {
+        return {};
+    }
+}
+
+/**
+ * Header
+ */
+function renderHeaderBackButton(schema: string): JSX.Element {
+    switch (schema) {
+        case 'compact':
+            return (
+                <HeaderBackButton />
+            );
+
+        default:
+            return (
+                <HeaderBackButton
+                    onPress={() => 'noop'}
+                    pressColorAndroid="#ccc"
+                    title="Press Me"
+                    titleStyle={{ color: '#333' }}
+                    tintColor="#2196f3"
+                    truncatedTitle="Press"
+                    width={85}
+                />
+            );
+    }
+}
+
+const initAction: NavigationInitAction = NavigationActions.init({
+    params: {
+        foo: "bar"
+    }
+});
+
+const navigateAction: NavigationNavigateAction = NavigationActions.navigate({
+    routeName: "FooScreen",
+    params: {
+        foo: "bar"
+    },
+    action: NavigationActions.navigate({ routeName: "BarScreen" })
+});
+
+const resetAction: NavigationResetAction = NavigationActions.reset({
+    index: 0,
+    key: "foo",
+    actions: [
+        NavigationActions.navigate({ routeName: "FooScreen" })
+    ]
+});
+
+const backAction: NavigationBackAction = NavigationActions.back({
+    key: "foo"
+});
+
+const setParamsAction: NavigationSetParamsAction = NavigationActions.setParams({
+    key: "foo",
+    params: {
+        foo: "bar"
+    }
+});
+
+const popAction: NavigationPopAction = NavigationActions.pop({
+    n: 1,
+    immediate: true
+});
+
+const popToTopAction: NavigationPopToTopAction = NavigationActions.popToTop({
+    key: "foo",
+    immediate: true
+});
+
+class Page1 extends React.Component { }
+
+const RootNavigator: NavigationContainer = createSwitchNavigator({
+    default: { getScreen: () => Page1 },
+});
+
+class Page2 extends React.Component {
+    navigatorRef: NavigationContainerComponent | null;
+
+    componentDidMount() {
+        if (this.navigatorRef) {
+            this.navigatorRef.dispatch(NavigationActions.navigate({ routeName: 'default' }));
+        }
+    }
+
+    render() {
+        return <RootNavigator ref={(instance: NavigationContainerComponent | null): void => { this.navigatorRef = instance; }} />;
+    }
+}
diff --git a/types/react-navigation/v2/tsconfig.json b/types/react-navigation/v2/tsconfig.json
new file mode 100644
index 0000000000..1b793c0613
--- /dev/null
+++ b/types/react-navigation/v2/tsconfig.json
@@ -0,0 +1,30 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../../",
+        "jsx": "react",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "react-navigation": [
+                "react-navigation/v2"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-navigation-tests.tsx"
+    ]
+}
diff --git a/types/react-navigation/v2/tslint.json b/types/react-navigation/v2/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-navigation/v2/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 819852455128460171d4023922f24320255e074e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matteus=20Hemstr=C3=B6m?= <matteus.hemstrom@valtech.se>
Date: Mon, 21 May 2018 12:16:03 +0200
Subject: [PATCH 286/575] [core-js] Change lpad/rpad to padStart/padEnd

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

diff --git a/types/core-js/index.d.ts b/types/core-js/index.d.ts
index 171aebc943..86259f05ba 100644
--- a/types/core-js/index.d.ts
+++ b/types/core-js/index.d.ts
@@ -755,8 +755,8 @@ declare namespace core {
         raw(template: TemplateStringsArray, ...substitutions: any[]): string;
         startsWith(text: string, searchString: string, position?: number): boolean;
         at(text: string, index: number): string;
-        lpad(text: string, length: number, fillStr?: string): string;
-        rpad(text: string, length: number, fillStr?: string): string;
+        padStart(text: string, length: number, fillStr?: string): string;
+        padEnd(text: string, length: number, fillStr?: string): string;
         escapeHTML(text: string): string;
         unescapeHTML(text: string): string;
     };
@@ -1454,9 +1454,13 @@ declare module "core-js/fn/string/includes" {
     const includes: typeof core.String.includes;
     export = includes;
 }
-declare module "core-js/fn/string/lpad" {
-    const lpad: typeof core.String.lpad;
-    export = lpad;
+declare module "core-js/fn/string/pad-end" {
+    const padEnd: typeof core.String.padEnd;
+    export = padEnd;
+}
+declare module "core-js/fn/string/pad-start" {
+    const padStart: typeof core.String.padStart;
+    export = padStart;
 }
 declare module "core-js/fn/string/raw" {
     const raw: typeof core.String.raw;
@@ -1466,10 +1470,6 @@ declare module "core-js/fn/string/repeat" {
     const repeat: typeof core.String.repeat;
     export = repeat;
 }
-declare module "core-js/fn/string/rpad" {
-    const rpad: typeof core.String.rpad;
-    export = rpad;
-}
 declare module "core-js/fn/string/starts-with" {
     const startsWith: typeof core.String.startsWith;
     export = startsWith;
@@ -2273,9 +2273,13 @@ declare module "core-js/library/fn/string/includes" {
     const includes: typeof core.String.includes;
     export = includes;
 }
-declare module "core-js/library/fn/string/lpad" {
-    const lpad: typeof core.String.lpad;
-    export = lpad;
+declare module "core-js/library/fn/string/pad-end" {
+    const padEnd: typeof core.String.padEnd;
+    export = padEnd;
+}
+declare module "core-js/library/fn/string/pad-start" {
+    const padStart: typeof core.String.padStart;
+    export = padStart;
 }
 declare module "core-js/library/fn/string/raw" {
     const raw: typeof core.String.raw;
@@ -2285,10 +2289,6 @@ declare module "core-js/library/fn/string/repeat" {
     const repeat: typeof core.String.repeat;
     export = repeat;
 }
-declare module "core-js/library/fn/string/rpad" {
-    const rpad: typeof core.String.rpad;
-    export = rpad;
-}
 declare module "core-js/library/fn/string/starts-with" {
     const startsWith: typeof core.String.startsWith;
     export = startsWith;

From abf06b4f43e53c90e71e2abed2d3f5dcbb69d82c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Magrin?= <jeremy.magrin@gmail.com>
Date: Mon, 21 May 2018 12:32:59 +0200
Subject: [PATCH 287/575] Try to fix dependencies

---
 types/react-navigation/v2/tsconfig.json          |  5 ++++-
 types/react-router-navigation-core/tsconfig.json | 10 +++++++++-
 types/react-router-navigation/tsconfig.json      | 10 +++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/types/react-navigation/v2/tsconfig.json b/types/react-navigation/v2/tsconfig.json
index 1b793c0613..1afd5d30f6 100644
--- a/types/react-navigation/v2/tsconfig.json
+++ b/types/react-navigation/v2/tsconfig.json
@@ -14,12 +14,15 @@
         "typeRoots": [
             "../../"
         ],
+        "types": [],
         "paths": {
             "react-navigation": [
                 "react-navigation/v2"
+            ],
+            "react-navigation/*": [
+                "react-navigation/v2/*"
             ]
         },
-        "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/types/react-router-navigation-core/tsconfig.json b/types/react-router-navigation-core/tsconfig.json
index b356b2d5c5..b773967cc9 100644
--- a/types/react-router-navigation-core/tsconfig.json
+++ b/types/react-router-navigation-core/tsconfig.json
@@ -5,6 +5,14 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "react-navigation": [
+                "react-navigation/v2"
+            ],
+            "react-navigation/*": [
+                "react-navigation/v2/*"
+            ]
+        },
         "module": "commonjs",
         "lib": [
             "es6",
@@ -22,4 +30,4 @@
         "index.d.ts",
         "react-router-navigation-core-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-router-navigation/tsconfig.json b/types/react-router-navigation/tsconfig.json
index e10c25a443..c55f423c19 100644
--- a/types/react-router-navigation/tsconfig.json
+++ b/types/react-router-navigation/tsconfig.json
@@ -5,6 +5,14 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "react-navigation": [
+                "react-navigation/v2"
+            ],
+            "react-navigation/*": [
+                "react-navigation/v2/*"
+            ]
+        },
         "module": "commonjs",
         "lib": [
             "es6",
@@ -22,4 +30,4 @@
         "index.d.ts",
         "react-router-navigation-tests.tsx"
     ]
-}
\ No newline at end of file
+}

From 46ef3af9e6bac2b6cf0fcf48cb2ab4b729868269 Mon Sep 17 00:00:00 2001
From: Drew Diamantoukos <MercifulCode@gmail.com>
Date: Mon, 21 May 2018 08:31:30 -0400
Subject: [PATCH 288/575] Added missing hoverinfo options

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

diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index 48b97bab8b..8e098a366c 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -386,7 +386,7 @@ export interface ScatterData {
 	'marker.colorbar': {}; // TODO
 	mode: 'lines' | 'markers' | 'text' | 'lines+markers' | 'text+markers' | 'text+lines' | 'text+lines+markers' | 'none';
 	hoveron: 'points' | 'fills';
-    hoverinfo: 'all' | 'none' | 'skip' |
+    hoverinfo: 'all' | 'name' | 'none' | 'skip' | 'text' |
                'x' | 'x+text' | 'x+name' |
                'x+y' | 'x+y+text' | 'x+y+name' |
                'x+y+z' | 'x+y+z+text' | 'x+y+z+name' |

From 584fbe6c2453bbdcd4b5203afa10f0edb9167b83 Mon Sep 17 00:00:00 2001
From: Jim Bouquet <jbouquet@clearblade.com>
Date: Mon, 21 May 2018 09:14:16 -0500
Subject: [PATCH 289/575] Added namespacing to server and client files

---
 .../clearbladejs-client-tests.ts              |   6 +-
 types/clearbladejs-client/global.d.ts         |   2 +-
 types/clearbladejs-client/index.d.ts          | 876 +++++++++---------
 .../clearbladejs-server-tests.ts              |   8 +-
 types/clearbladejs-server/global.d.ts         |   2 +-
 types/clearbladejs-server/index.d.ts          | 741 ++++++++-------
 6 files changed, 871 insertions(+), 764 deletions(-)

diff --git a/types/clearbladejs-client/clearbladejs-client-tests.ts b/types/clearbladejs-client/clearbladejs-client-tests.ts
index bce39bee2a..03584b629f 100644
--- a/types/clearbladejs-client/clearbladejs-client-tests.ts
+++ b/types/clearbladejs-client/clearbladejs-client-tests.ts
@@ -3,7 +3,7 @@
 // Definitions by: Jim Bouquet <https://github.com/ClearBlade>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-let genericCallback = (error: boolean, response: Resp) => {};
+let genericCallback = (error: boolean, response: CbClient.Resp) => {};
 
 ///////////////////////////////////////
 // ClearBlade object API invocations
@@ -65,12 +65,12 @@ coll1.count(query1.query, genericCallback);
 ///////////////////////////////////////
 query1.addSortToQuery(
     query1,
-    QuerySortDirections.QUERY_SORT_ASCENDING,
+    CbClient.QuerySortDirections.QUERY_SORT_ASCENDING,
     "column1"
 );
 query1.addFilterToQuery(
     query1,
-    QueryConditions.QUERY_GREATERTHAN,
+    CbClient.QueryConditions.QUERY_GREATERTHAN,
     "key",
     "value"
 );
diff --git a/types/clearbladejs-client/global.d.ts b/types/clearbladejs-client/global.d.ts
index d6e2e88a70..b6f2dbcf59 100644
--- a/types/clearbladejs-client/global.d.ts
+++ b/types/clearbladejs-client/global.d.ts
@@ -1,5 +1,5 @@
 declare global {
-    var ClearBlade: ClearBladeGlobal;
+    var ClearBlade: CbClient.ClearBladeGlobal;
 }
 
 export {};
diff --git a/types/clearbladejs-client/index.d.ts b/types/clearbladejs-client/index.d.ts
index 4cb8c4744b..fa27a5d076 100644
--- a/types/clearbladejs-client/index.d.ts
+++ b/types/clearbladejs-client/index.d.ts
@@ -1,436 +1,456 @@
-// Type definitions for clearbladejs-client 1.0
+// Type definitions for clearbladejs-client 1.1
 // Project: https://github.com/ClearBlade/JavaScript-API
 // Definitions by: Jim Bouquet <https://github.com/ClearBlade>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
 /// <reference types="paho-mqtt" />
+declare namespace CbClient {
+    interface Resp {
+        error(msg: any): never; // todo: figure out if we can have the compiler throw an error if someone adds code after this
+        success(msg: any): never;
+    }
 
-interface Resp {
-    error(msg: any): never; // todo: figure out if we can have the compiler throw an error if someone adds code after this
-    success(msg: any): never;
+    enum MessagingQOS {
+        MESSAGING_QOS_AT_MOST_ONCE = 0,
+        MESSAGING_QOS_AT_LEAST_ONCE = 1,
+        MESSAGING_QOS_EXACTLY_ONCE = 2
+    }
+
+    interface InitOptions {
+        systemKey: string;
+        systemSecret: string;
+        masterSecret?: string;
+        logging?: boolean;
+        callback?: CbCallback;
+        email?: string;
+        password?: string;
+        registerUser?: boolean;
+        useUser?: APIUser;
+        URI?: string;
+        messagingURI?: string;
+        messagingPort?: number;
+        defaultQoS?: MessagingQOS;
+        callTimeout?: number;
+        messagingAuthPort?: number;
+    }
+
+    interface RequestOptions {
+        method?: string;
+        endpoint?: string;
+        body?: string;
+        qs?: string;
+        URI?: string;
+        useUser?: boolean;
+        authToken?: string;
+        timeout?: number;
+        user?: APIUser;
+    }
+
+    interface APIUser {
+        email: string;
+        authToken: string;
+    }
+
+    type CbCallback = (error: boolean, response: Resp) => void;
+
+    interface ClearBladeGlobal extends ClearBladeInt {
+        MESSAGING_QOS_AT_MOST_ONCE: MessagingQOS.MESSAGING_QOS_AT_MOST_ONCE;
+        MESSAGING_QOS_AT_LEAST_ONCE: MessagingQOS.MESSAGING_QOS_AT_LEAST_ONCE;
+        MESSAGING_QOS_EXACTLY_ONCE: MessagingQOS.MESSAGING_QOS_EXACTLY_ONCE;
+
+        request(options: RequestOptions, callback: CbCallback): void;
+    }
+
+    interface ClearBladeInt {
+        systemKey: string;
+        systemSecret: string;
+        masterSecret: string;
+        URI: string;
+        messagingURI: string;
+        messagingPort: number;
+        logging: boolean;
+        defaultQoS: MessagingQOS;
+
+        init(options: InitOptions): void;
+        setUser(email: string, password: string): void;
+        registerUser(
+            email: string,
+            password: string,
+            callback: CbCallback
+        ): void;
+        isCurrentUserAuthenticated(callback: CbCallback): void;
+        logoutUser(callback: CbCallback): void;
+        loginAnon(callback: CbCallback): void;
+        loginUser(email: string, password: string, callback: CbCallback): void;
+        loginUserMqtt(
+            email: string,
+            password: string,
+            callback: CbCallback
+        ): void;
+        registerMasterCallback(callback: CbCallback): void;
+        Collection(
+            options:
+                | string
+                | CollectionOptionsWithName
+                | CollectionOptionsWithID
+        ): Collection;
+        Query(
+            options: string | QueryOptionsWithName | QueryOptionsWithID
+        ): QueryObj;
+        Item(data: object, collectionID: string | ItemOptions): Item;
+        Code(): Code;
+        User(): AppUser;
+        Messaging(options: MessagingOptions, callback: CbCallback): Messaging;
+        MessagingStats(): MessagingStats;
+        sendPush(
+            users: string[],
+            payload: object,
+            appId: string,
+            callback: CbCallback
+        ): void;
+        getEdges(query: Query, callback: CbCallback): void;
+        Edge(): Edge;
+        Metrics(): Metrics;
+        Device(): Device;
+        Analytics(): Analytics;
+        Portal(name: string): Portal;
+        Triggers(): Triggers;
+
+        getAllCollections(callback: CbCallback): void;
+    }
+    interface CollectionOptionsWithName {
+        collectionName: string;
+    }
+
+    interface CollectionOptionsWithID {
+        collectionID: string;
+    }
+
+    interface Collection {
+        name: string;
+        endpoint: string;
+        isUsingCollectionName: boolean;
+        user: APIUser;
+        URI: string;
+        systemKey: string;
+        systemSecret: string;
+
+        fetch(query: Query, callback: CbCallback): void;
+        create(newItem: Item, callback: CbCallback): void;
+        update(query: Query, changes: object, callback: CbCallback): void;
+        remove(query: Query, callback: CbCallback): void;
+        columns(callback: CbCallback): void;
+        count(query: Query, callback: CbCallback): void;
+    }
+
+    enum QuerySortDirections {
+        QUERY_SORT_ASCENDING = "ASC",
+        QUERY_SORT_DESCENDING = "DESC"
+    }
+
+    enum QueryConditions {
+        QUERY_EQUAL = "EQ",
+        QUERY_NOTEQUAL = "NEQ",
+        QUERY_GREATERTHAN = "GT",
+        QUERY_GREATERTHAN_EQUAL = "GTE",
+        QUERY_LESSTHAN = "LT",
+        QUERY_LESSTHAN_EQUAL = "LTE",
+        QUERY_MATCHES = "RE"
+    }
+
+    type QueryValue = string | number | boolean;
+
+    interface QueryOptions {
+        offset?: number;
+        limit?: number;
+    }
+
+    interface QueryOptionsWithName
+        extends CollectionOptionsWithName,
+            QueryOptions {}
+    interface QueryOptionsWithID
+        extends CollectionOptionsWithID,
+            QueryOptions {}
+
+    interface Query {
+        SELECTCOLUMNS?: string[];
+        SORT?: QuerySortDirections;
+        FILTERS?: QueryFilter[];
+        PAGESIZE?: number;
+        PAGENUM?: number;
+    }
+
+    interface QueryFilter {
+        [QueryConditions: string]: QueryFilterValue;
+    }
+
+    interface QueryFilterValue {
+        [name: string]: QueryValue;
+    }
+
+    interface QueryObj {
+        endpoint: string;
+        user: APIUser;
+        URI: string;
+        systemKey: string;
+        systemSecret: string;
+        query: Query;
+        OR: Query[];
+        offset: number;
+        limit: number;
+
+        addSortToQuery(
+            query: QueryObj,
+            direction: QuerySortDirections,
+            column: string
+        ): void;
+        addFilterToQuery(
+            query: QueryObj,
+            condition: QueryConditions,
+            key: string,
+            value: QueryValue
+        ): void;
+        ascending(field: string): void;
+        descending(field: string): void;
+        equalTo(field: string, value: QueryValue): void;
+        greaterThan(field: string, value: QueryValue): void;
+        greaterThanEqualTo(field: string, value: QueryValue): void;
+        lessThan(field: string, value: QueryValue): void;
+        lessThanEqualTo(field: string, value: QueryValue): void;
+        notEqualTo(field: string, value: QueryValue): void;
+        matches(field: string, pattern: RegExp): void;
+        or(query: QueryObj): void;
+        setPage(pageSize: number, pageNum: number): void;
+        fetch(callback: CbCallback): void;
+        update(changes: object, callback: CbCallback): void;
+        columns(columnsArray: string[]): void;
+        remove(callback: CbCallback): void;
+    }
+
+    interface ItemOptions extends CollectionOptionsWithID {}
+
+    interface Item {
+        data: object;
+
+        save(callback: CbCallback): void;
+        refresh(callback: CbCallback): void;
+        destroy(callback: CbCallback): void;
+    }
+
+    interface Code {
+        user: APIUser;
+        URI: string;
+        systemKey: string;
+        systemSecret: string;
+        callTimeout: number;
+
+        create(name: string, body: string, callback: CbCallback): void;
+        update(name: string, body: string, callback: CbCallback): void;
+        delete(name: string, callback: CbCallback): void;
+        execute(name: string, params: object, callback: CbCallback): void;
+        getCompletedServices(callback: CbCallback): void;
+        getFailedServices(callback: CbCallback): void;
+        getAllServices(callback: CbCallback): void;
+    }
+
+    interface AppUser {
+        user: APIUser;
+        URI: string;
+        endpoint: string;
+        systemKey: string;
+        systemSecret: string;
+        callTimeout: number;
+
+        getUser(callback: CbCallback): void;
+        setUser(data: object, callback: CbCallback): void;
+        allUsers(query: Query, callback: CbCallback): void;
+        setPassword(
+            old_password: string,
+            new_password: string,
+            callback: CbCallback
+        ): void;
+        count(query: Query, callback: CbCallback): void;
+    }
+
+    interface Messaging {
+        user: APIUser;
+        URI: string;
+        endpoint: string;
+        systemKey: string;
+        systemSecret: string;
+        callTimeout: number;
+        client: Paho.MQTT.Client;
+
+        getMessageHistoryWithTimeFrame(
+            topic: string,
+            count: number,
+            last: number,
+            start: number,
+            stop: number,
+            callback: CbCallback
+        ): void;
+        getMessageHistory(
+            topic: string,
+            last: number,
+            count: number,
+            callback: CbCallback
+        ): void;
+        getAndDeleteMessageHistory(
+            topic: string,
+            count: number,
+            last: number,
+            start: number,
+            stop: number,
+            callback: CbCallback
+        ): void;
+        currentTopics(callback: CbCallback): void;
+        publish(topic: string, payload: object): void;
+        publishREST(topic: string, payload: object, callback: CbCallback): void;
+        subscribe(
+            topic: string,
+            options: MessagingSubscribeOptions,
+            messageCallback: MessageCallback
+        ): void;
+        unsubscribe(topic: string, options: MessagingSubscribeOptions): void;
+        disconnect(): void;
+    }
+
+    interface CommonMessagingProperties {
+        cleanSession?: boolean;
+        useSSL?: boolean;
+        hosts?: string;
+        ports?: string;
+        onSuccess?: Function;
+        onFailure?: Function;
+    }
+
+    interface MessagingOptions extends CommonMessagingProperties {
+        qos?: MessagingQOS;
+    }
+
+    interface MessagingConfiguration extends CommonMessagingProperties {
+        userName: string;
+        password: string;
+    }
+
+    type MessageCallback = (message: string) => void;
+
+    interface MessagingSubscribeOptions {
+        qos?: MessagingQOS;
+        invocationContext?: object;
+        onSuccess?: Function;
+        onFailure?: Function;
+        timeout?: number;
+    }
+
+    interface MessagingStats {
+        user: APIUser;
+        URI: string;
+        endpoint: string;
+        systemKey: string;
+
+        getAveragePayloadSize(
+            topic: string,
+            start: number,
+            stop: number,
+            callback: CbCallback
+        ): void;
+        getOpenConnections(callback: CbCallback): void;
+        getCurrentSubscribers(topic: string, callback: CbCallback): void;
+    }
+
+    interface Edge {
+        user: APIUser;
+        URI: string;
+        systemKey: string;
+        systemSecret: string;
+
+        updateEdgeByName(
+            name: string,
+            object: object,
+            callback: CbCallback
+        ): void;
+        deleteEdgeByName(name: string, callback: CbCallback): void;
+        create(newEdge: object, name: string, callback: CbCallback): void;
+        columns(callback: CbCallback): void;
+        count(query: Query, callback: CbCallback): void;
+    }
+
+    interface Metrics {
+        user: APIUser;
+        URI: string;
+        systemKey: string;
+
+        setQuery(query: Query): void;
+        getStatistics(callback: CbCallback): void;
+        getStatisticsHistory(callback: CbCallback): void;
+        getDBConnections(callback: CbCallback): void;
+        getLogs(callback: CbCallback): void;
+    }
+
+    interface Device {
+        user: APIUser;
+        URI: string;
+        systemKey: string;
+        systemSecret: string;
+
+        getDeviceByName(name: string, callback: CbCallback): void;
+        updateDeviceByName(
+            name: string,
+            object: object,
+            trigger: boolean,
+            callback: CbCallback
+        ): void;
+        deleteDeviceByName(name: string, callback: CbCallback): void;
+        fetch(query: Query, callback: CbCallback): void;
+        update(
+            query: Query,
+            object: object,
+            trigger: boolean,
+            callback: CbCallback
+        ): void;
+        delete(query: Query, callback: CbCallback): void;
+        create(newDevice: object, callback: CbCallback): void;
+        columns(callback: CbCallback): void;
+        count(query: Query, callback: CbCallback): void;
+    }
+
+    interface Analytics {
+        user: APIUser;
+        URI: string;
+        systemKey: string;
+        systemSecret: string;
+
+        getStorage(filter: QueryFilter, callback: CbCallback): void;
+        getCount(filter: QueryFilter, callback: CbCallback): void;
+        getEventList(filter: QueryFilter, callback: CbCallback): void;
+        getEventTotals(filter: QueryFilter, callback: CbCallback): void;
+        getUserEvents(filter: QueryFilter, callback: CbCallback): void;
+    }
+
+    interface Portal {
+        name: string;
+        user: APIUser;
+        URI: string;
+        systemKey: string;
+        systemSecret: string;
+
+        fetch(callback: CbCallback): void;
+        update(data: object, callback: CbCallback): void;
+    }
+
+    interface Triggers {
+        user: APIUser;
+        URI: string;
+        systemKey: string;
+        systemSecret: string;
+
+        fetchDefinitions(callback: CbCallback): void;
+        create(name: string, data: object, callback: CbCallback): void;
+        update(name: string, data: object, callback: CbCallback): void;
+        delete(name: string, callback: CbCallback): void;
+    }
+
+    let ClearBlade: ClearBladeGlobal;
 }
-
-declare enum MessagingQOS {
-    MESSAGING_QOS_AT_MOST_ONCE = 0,
-    MESSAGING_QOS_AT_LEAST_ONCE = 1,
-    MESSAGING_QOS_EXACTLY_ONCE = 2
-}
-
-interface InitOptions {
-    systemKey: string;
-    systemSecret: string;
-    masterSecret?: string;
-    logging?: boolean;
-    callback?: CbCallback;
-    email?: string;
-    password?: string;
-    registerUser?: boolean;
-    useUser?: APIUser;
-    URI?: string;
-    messagingURI?: string;
-    messagingPort?: number;
-    defaultQoS?: MessagingQOS;
-    callTimeout?: number;
-    messagingAuthPort?: number;
-}
-
-interface RequestOptions {
-    method?: string;
-    endpoint?: string;
-    body?: string;
-    qs?: string;
-    URI?: string;
-    useUser?: boolean;
-    authToken?: string;
-    timeout?: number;
-    user?: APIUser;
-}
-
-interface APIUser {
-    email: string;
-    authToken: string;
-}
-
-type CbCallback = (error: boolean, response: Resp) => void;
-
-interface ClearBladeGlobal extends ClearBladeInt {
-    MESSAGING_QOS_AT_MOST_ONCE: MessagingQOS.MESSAGING_QOS_AT_MOST_ONCE;
-    MESSAGING_QOS_AT_LEAST_ONCE: MessagingQOS.MESSAGING_QOS_AT_LEAST_ONCE;
-    MESSAGING_QOS_EXACTLY_ONCE: MessagingQOS.MESSAGING_QOS_EXACTLY_ONCE;
-
-    request(options: RequestOptions, callback: CbCallback): void;
-}
-
-interface ClearBladeInt {
-    systemKey: string;
-    systemSecret: string;
-    masterSecret: string;
-    URI: string;
-    messagingURI: string;
-    messagingPort: number;
-    logging: boolean;
-    defaultQoS: MessagingQOS;
-
-    init(options: InitOptions): void;
-    setUser(email: string, password: string): void;
-    registerUser(email: string, password: string, callback: CbCallback): void;
-    isCurrentUserAuthenticated(callback: CbCallback): void;
-    logoutUser(callback: CbCallback): void;
-    loginAnon(callback: CbCallback): void;
-    loginUser(email: string, password: string, callback: CbCallback): void;
-    loginUserMqtt(email: string, password: string, callback: CbCallback): void;
-    registerMasterCallback(callback: CbCallback): void;
-    Collection(options: string | CollectionOptionsWithName | CollectionOptionsWithID): Collection;
-    Query(
-        options: string | QueryOptionsWithName | QueryOptionsWithID
-    ): QueryObj;
-    Item(data: object, collectionID: string | ItemOptions): Item;
-    Code(): Code;
-    User(): AppUser;
-    Messaging(options: MessagingOptions, callback: CbCallback): Messaging;
-    MessagingStats(): MessagingStats;
-    sendPush(
-        users: string[],
-        payload: object,
-        appId: string,
-        callback: CbCallback
-    ): void;
-    getEdges(query: Query, callback: CbCallback): void;
-    Edge(): Edge;
-    Metrics(): Metrics;
-    Device(): Device;
-    Analytics(): Analytics;
-    Portal(name: string): Portal;
-    Triggers(): Triggers;
-
-    getAllCollections(callback: CbCallback): void;
-}
-interface CollectionOptionsWithName {
-    collectionName: string;
-}
-
-interface CollectionOptionsWithID {
-    collectionID: string;
-}
-
-interface Collection {
-    name: string;
-    endpoint: string;
-    isUsingCollectionName: boolean;
-    user: APIUser;
-    URI: string;
-    systemKey: string;
-    systemSecret: string;
-
-    fetch(query: Query, callback: CbCallback): void;
-    create(newItem: Item, callback: CbCallback): void;
-    update(query: Query, changes: object, callback: CbCallback): void;
-    remove(query: Query, callback: CbCallback): void;
-    columns(callback: CbCallback): void;
-    count(query: Query, callback: CbCallback): void;
-}
-
-declare enum QuerySortDirections {
-    QUERY_SORT_ASCENDING = "ASC",
-    QUERY_SORT_DESCENDING = "DESC"
-}
-
-declare enum QueryConditions {
-    QUERY_EQUAL = "EQ",
-    QUERY_NOTEQUAL = "NEQ",
-    QUERY_GREATERTHAN = "GT",
-    QUERY_GREATERTHAN_EQUAL = "GTE",
-    QUERY_LESSTHAN = "LT",
-    QUERY_LESSTHAN_EQUAL = "LTE",
-    QUERY_MATCHES = "RE"
-}
-
-type QueryValue = string | number | boolean;
-
-interface QueryOptions {
-    offset?: number;
-    limit?: number;
-}
-
-interface QueryOptionsWithName
-    extends CollectionOptionsWithName,
-        QueryOptions {}
-interface QueryOptionsWithID extends CollectionOptionsWithID, QueryOptions {}
-
-interface Query {
-    SELECTCOLUMNS?: string[];
-    SORT?: QuerySortDirections;
-    FILTERS?: QueryFilter[];
-    PAGESIZE?: number;
-    PAGENUM?: number;
-}
-
-interface QueryFilter {
-    [QueryConditions: string]: QueryFilterValue;
-}
-
-interface QueryFilterValue {
-    [name: string]: QueryValue;
-}
-
-interface QueryObj {
-    endpoint: string;
-    user: APIUser;
-    URI: string;
-    systemKey: string;
-    systemSecret: string;
-    query: Query;
-    OR: Query[];
-    offset: number;
-    limit: number;
-
-    addSortToQuery(
-        query: QueryObj,
-        direction: QuerySortDirections,
-        column: string
-    ): void;
-    addFilterToQuery(
-        query: QueryObj,
-        condition: QueryConditions,
-        key: string,
-        value: QueryValue
-    ): void;
-    ascending(field: string): void;
-    descending(field: string): void;
-    equalTo(field: string, value: QueryValue): void;
-    greaterThan(field: string, value: QueryValue): void;
-    greaterThanEqualTo(field: string, value: QueryValue): void;
-    lessThan(field: string, value: QueryValue): void;
-    lessThanEqualTo(field: string, value: QueryValue): void;
-    notEqualTo(field: string, value: QueryValue): void;
-    matches(field: string, pattern: RegExp): void;
-    or(query: QueryObj): void;
-    setPage(pageSize: number, pageNum: number): void;
-    fetch(callback: CbCallback): void;
-    update(changes: object, callback: CbCallback): void;
-    columns(columnsArray: string[]): void;
-    remove(callback: CbCallback): void;
-}
-
-interface ItemOptions extends CollectionOptionsWithID {}
-
-interface Item {
-    data: object;
-
-    save(callback: CbCallback): void;
-    refresh(callback: CbCallback): void;
-    destroy(callback: CbCallback): void;
-}
-
-interface Code {
-    user: APIUser;
-    URI: string;
-    systemKey: string;
-    systemSecret: string;
-    callTimeout: number;
-
-    create(name: string, body: string, callback: CbCallback): void;
-    update(name: string, body: string, callback: CbCallback): void;
-    delete(name: string, callback: CbCallback): void;
-    execute(name: string, params: object, callback: CbCallback): void;
-    getCompletedServices(callback: CbCallback): void;
-    getFailedServices(callback: CbCallback): void;
-    getAllServices(callback: CbCallback): void;
-}
-
-interface AppUser {
-    user: APIUser;
-    URI: string;
-    endpoint: string;
-    systemKey: string;
-    systemSecret: string;
-    callTimeout: number;
-
-    getUser(callback: CbCallback): void;
-    setUser(data: object, callback: CbCallback): void;
-    allUsers(query: Query, callback: CbCallback): void;
-    setPassword(
-        old_password: string,
-        new_password: string,
-        callback: CbCallback
-    ): void;
-    count(query: Query, callback: CbCallback): void;
-}
-
-interface Messaging {
-    user: APIUser;
-    URI: string;
-    endpoint: string;
-    systemKey: string;
-    systemSecret: string;
-    callTimeout: number;
-    client: Paho.MQTT.Client;
-
-    getMessageHistoryWithTimeFrame(
-        topic: string,
-        count: number,
-        last: number,
-        start: number,
-        stop: number,
-        callback: CbCallback
-    ): void;
-    getMessageHistory(
-        topic: string,
-        last: number,
-        count: number,
-        callback: CbCallback
-    ): void;
-    getAndDeleteMessageHistory(
-        topic: string,
-        count: number,
-        last: number,
-        start: number,
-        stop: number,
-        callback: CbCallback
-    ): void;
-    currentTopics(callback: CbCallback): void;
-    publish(topic: string, payload: object): void;
-    publishREST(topic: string, payload: object, callback: CbCallback): void;
-    subscribe(
-        topic: string,
-        options: MessagingSubscribeOptions,
-        messageCallback: MessageCallback
-    ): void;
-    unsubscribe(topic: string, options: MessagingSubscribeOptions): void;
-    disconnect(): void;
-}
-
-interface CommonMessagingProperties {
-    cleanSession?: boolean;
-    useSSL?: boolean;
-    hosts?: string;
-    ports?: string;
-    onSuccess?: Function;
-    onFailure?: Function;
-}
-
-interface MessagingOptions extends CommonMessagingProperties {
-    qos?: MessagingQOS;
-}
-
-interface MessagingConfiguration extends CommonMessagingProperties {
-    userName: string;
-    password: string;
-}
-
-type MessageCallback = (message: string) => void;
-
-interface MessagingSubscribeOptions {
-    qos?: MessagingQOS;
-    invocationContext?: object;
-    onSuccess?: Function;
-    onFailure?: Function;
-    timeout?: number;
-}
-
-interface MessagingStats {
-    user: APIUser;
-    URI: string;
-    endpoint: string;
-    systemKey: string;
-
-    getAveragePayloadSize(
-        topic: string,
-        start: number,
-        stop: number,
-        callback: CbCallback
-    ): void;
-    getOpenConnections(callback: CbCallback): void;
-    getCurrentSubscribers(topic: string, callback: CbCallback): void;
-}
-
-interface Edge {
-    user: APIUser;
-    URI: string;
-    systemKey: string;
-    systemSecret: string;
-
-    updateEdgeByName(name: string, object: object, callback: CbCallback): void;
-    deleteEdgeByName(name: string, callback: CbCallback): void;
-    create(newEdge: object, name: string, callback: CbCallback): void;
-    columns(callback: CbCallback): void;
-    count(query: Query, callback: CbCallback): void;
-}
-
-interface Metrics {
-    user: APIUser;
-    URI: string;
-    systemKey: string;
-
-    setQuery(query: Query): void;
-    getStatistics(callback: CbCallback): void;
-    getStatisticsHistory(callback: CbCallback): void;
-    getDBConnections(callback: CbCallback): void;
-    getLogs(callback: CbCallback): void;
-}
-
-interface Device {
-    user: APIUser;
-    URI: string;
-    systemKey: string;
-    systemSecret: string;
-
-    getDeviceByName(name: string, callback: CbCallback): void;
-    updateDeviceByName(
-        name: string,
-        object: object,
-        trigger: boolean,
-        callback: CbCallback
-    ): void;
-    deleteDeviceByName(name: string, callback: CbCallback): void;
-    fetch(query: Query, callback: CbCallback): void;
-    update(
-        query: Query,
-        object: object,
-        trigger: boolean,
-        callback: CbCallback
-    ): void;
-    delete(query: Query, callback: CbCallback): void;
-    create(newDevice: object, callback: CbCallback): void;
-    columns(callback: CbCallback): void;
-    count(query: Query, callback: CbCallback): void;
-}
-
-interface Analytics {
-    user: APIUser;
-    URI: string;
-    systemKey: string;
-    systemSecret: string;
-
-    getStorage(filter: QueryFilter, callback: CbCallback): void;
-    getCount(filter: QueryFilter, callback: CbCallback): void;
-    getEventList(filter: QueryFilter, callback: CbCallback): void;
-    getEventTotals(filter: QueryFilter, callback: CbCallback): void;
-    getUserEvents(filter: QueryFilter, callback: CbCallback): void;
-}
-
-interface Portal {
-    name: string;
-    user: APIUser;
-    URI: string;
-    systemKey: string;
-    systemSecret: string;
-
-    fetch(callback: CbCallback): void;
-    update(data: object, callback: CbCallback): void;
-}
-
-interface Triggers {
-    user: APIUser;
-    URI: string;
-    systemKey: string;
-    systemSecret: string;
-
-    fetchDefinitions(callback: CbCallback): void;
-    create(name: string, data: object, callback: CbCallback): void;
-    update(name: string, data: object, callback: CbCallback): void;
-    delete(name: string, callback: CbCallback): void;
-}
-
-declare var ClearBlade: ClearBladeGlobal;
diff --git a/types/clearbladejs-server/clearbladejs-server-tests.ts b/types/clearbladejs-server/clearbladejs-server-tests.ts
index d240f181ea..5fe134b5c4 100644
--- a/types/clearbladejs-server/clearbladejs-server-tests.ts
+++ b/types/clearbladejs-server/clearbladejs-server-tests.ts
@@ -3,7 +3,7 @@
 // Definitions by: Jim Bouquet <https://github.com/ClearBlade>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-const genericCallback = (error: boolean, response: Resp) => {};
+const genericCallback = (error: boolean, response: CbServer.Resp) => {};
 
 ///////////////////////////////////////
 // ClearBlade object API invocations
@@ -66,12 +66,12 @@ const device = ClearBlade.Device();
 ClearBlade.addToQuery(query1, "key", "value");
 ClearBlade.addSortToQuery(
     query1,
-    QuerySortDirections.QUERY_SORT_ASCENDING,
+    CbServer.QuerySortDirections.QUERY_SORT_ASCENDING,
     "column1"
 );
 ClearBlade.addFilterToQuery(
     query1,
-    QueryConditions.QUERY_GREATERTHAN,
+    CbServer.QueryConditions.QUERY_GREATERTHAN,
     "key",
     "value"
 );
@@ -177,7 +177,7 @@ ClearBlade.Trigger.Create(
     {
         system_key: "key",
 	    name: "triggername",
-	    def_module: TriggerModule.DEVICE,
+	    def_module: CbServer.TriggerModule.DEVICE,
 	    def_name: "someName",
 	    key_value_pairs: [],
         service_name: "ServiceName"
diff --git a/types/clearbladejs-server/global.d.ts b/types/clearbladejs-server/global.d.ts
index d6e2e88a70..8276b9da44 100644
--- a/types/clearbladejs-server/global.d.ts
+++ b/types/clearbladejs-server/global.d.ts
@@ -1,5 +1,5 @@
 declare global {
-    var ClearBlade: ClearBladeGlobal;
+    var ClearBlade: CbServer.ClearBladeGlobal;
 }
 
 export {};
diff --git a/types/clearbladejs-server/index.d.ts b/types/clearbladejs-server/index.d.ts
index fb3ef065ce..2f6e8d672b 100644
--- a/types/clearbladejs-server/index.d.ts
+++ b/types/clearbladejs-server/index.d.ts
@@ -1,335 +1,422 @@
-// Type definitions for clearbladejs-server 1.0
+// Type definitions for clearbladejs-server 1.1
 // Project: https://docs.clearblade.com/v/3/4-developer_reference/platformsdk/ClearBlade.js/
 // Definitions by: Jim Bouquet <https://github.com/ClearBlade>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
 /// <reference types="paho-mqtt" />
+declare namespace CbServer {
+    interface BasicReq {
+        readonly isLogging: boolean;
+        readonly params: {
+            [id: string]: any;
+        };
+        readonly systemKey: string;
+        readonly systemSecret: string;
+        readonly userEmail: string;
+        readonly userToken: string;
+        readonly userid: string;
+    }
+    type ReqTypes = BasicReq;
 
-interface BasicReq {
-    readonly isLogging: boolean;
-    readonly params: {
-      [id: string]: any;
-    };
-    readonly systemKey: string;
-    readonly systemSecret: string;
-    readonly userEmail: string;
-    readonly userToken: string;
-    readonly userid: string;
+    let req: ReqTypes;
+    interface Resp {
+        error(msg: any): never;
+        success(msg: any): never;
+    }
+    let resp: Resp;
+
+    enum MessagingQOS {
+        MESSAGING_QOS_AT_MOST_ONCE = 0,
+        MESSAGING_QOS_AT_LEAST_ONCE = 1,
+        MESSAGING_QOS_EXACTLY_ONCE = 2
+    }
+
+    interface InitOptions {
+        systemKey: string;
+        systemSecret: string;
+        logging?: boolean;
+        callback?: CbCallback;
+        authToken?: string;
+        userToken?: string;
+        email?: string;
+        password?: string;
+        registerUser?: boolean;
+        useUser?: APIUser;
+        URI?: string;
+        messagingURI?: string;
+        messagingPort?: number;
+        defaultQoS?: MessagingQOS;
+        callTimeout?: number;
+    }
+
+    interface APIUser {
+        email: string;
+        authToken: string;
+        user_id?: string;
+    }
+
+    interface KeyValuePair {
+        [key: string]: any;
+    }
+
+    type CbCallback = (error: boolean, response: Resp) => void;
+
+    interface ClearBladeGlobal extends ClearBladeInt {
+        user: APIUser;
+    }
+
+    interface ClearBladeInt {
+        Trigger: TriggerClass;
+        Timer: TimerClass;
+
+        about(): string;
+        addToQuery(queryObj: QueryObj, key: string, value: string): void;
+        addFilterToQuery(
+            queryObj: QueryObj,
+            condition: QueryConditions,
+            key: string,
+            value: QueryValue
+        ): void;
+        addSortToQuery(
+            queryObj: QueryObj,
+            direction: QuerySortDirections,
+            column: string
+        ): void;
+        Code(): Code;
+        Collection(
+            options:
+                | string
+                | CollectionOptionsWithName
+                | CollectionOptionsWithID
+                | CollectionOptionsWithCollection
+        ): Collection;
+        Deployment(): Deployment;
+        Device(): Device;
+        edgeId(): string;
+        execute(error: object, response: object, callback: CbCallback): any;
+        getAllCollections(callback: CbCallback): void;
+        http(): object;
+        init(options: InitOptions | { request: BasicReq }): void;
+        isEdge(callback: CbCallback): boolean;
+        isCurrentUserAuthenticated(callback: CbCallback): void;
+        isObjectEmpty(obj: object): boolean;
+        Item(data: object, options: string | ItemOptions): Item;
+        logger(message: string): void;
+        loginAnon(callback: CbCallback): void;
+        loginUser(email: string, password: string, callback: CbCallback): void;
+        logoutUser(callback: CbCallback): void;
+        makeKVPair(key: string, value: string): KeyValuePair;
+        Messaging(options: MessagingOptions, callback: CbCallback): Messaging;
+        newCollection(name: string, callback: CbCallback): void;
+        Query(
+            options:
+                | QueryOptionsWithCollection
+                | QueryOptionsWithName
+                | QueryOptionsWithID
+        ): QueryObj;
+        parseOperationQuery(query: Query): string;
+        parseQuery(query: Query | QueryObj): string;
+        registerUser(
+            email: string,
+            password: string,
+            callback: CbCallback
+        ): void;
+        setUser(email: string, authToken: string, userId: string): void;
+        User(): AppUser;
+
+        createDevice(
+            name: string,
+            data: object,
+            causeTrigger: boolean,
+            callback: CbCallback
+        ): void;
+        deleteDevice(
+            name: string,
+            causeTrigger: boolean,
+            callback: CbCallback
+        ): void;
+        updateDevice(
+            name: string,
+            data: object,
+            causeTrigger: boolean,
+            callback: CbCallback
+        ): void;
+        getDeviceByName(name: string, callback: CbCallback): void;
+        getAllDevicesForSystem(callback: CbCallback): void;
+        validateEmailPassword(email: string, password: string): void;
+    }
+
+    interface CollectionOptionsWithCollection {
+        collection: string;
+    }
+
+    interface CollectionOptionsWithName {
+        collectionName: string;
+    }
+
+    interface CollectionOptionsWithID {
+        collectionID: string;
+    }
+
+    interface Collection {
+        user: APIUser;
+        URI: string;
+        systemKey: string;
+        systemSecret: string;
+
+        addColumn(options: object, callback: CbCallback): void;
+        dropColumn(name: string, callback: CbCallback): void;
+        deleteCollection(callback: CbCallback): void;
+        fetch(query: Query, callback: CbCallback): void;
+        create(newItem: Item, callback: CbCallback): void;
+        update(query: Query, changes: object, callback: CbCallback): void;
+        remove(query: Query, callback: CbCallback): void;
+        columns(callback: CbCallback): void;
+        count(query: Query, callback: CbCallback): void;
+    }
+
+    enum QuerySortDirections {
+        QUERY_SORT_ASCENDING = "ASC",
+        QUERY_SORT_DESCENDING = "DESC"
+    }
+
+    enum QueryConditions {
+        QUERY_EQUAL = "EQ",
+        QUERY_NOTEQUAL = "NEQ",
+        QUERY_GREATERTHAN = "GT",
+        QUERY_GREATERTHAN_EQUAL = "GTE",
+        QUERY_LESSTHAN = "LT",
+        QUERY_LESSTHAN_EQUAL = "LTE",
+        QUERY_MATCHES = "RE"
+    }
+
+    type QueryValue = string | number | boolean;
+
+    interface QueryOptions {
+        offset?: number;
+        limit?: number;
+    }
+
+    interface QueryOptionsWithCollection
+        extends CollectionOptionsWithCollection,
+            QueryOptions {}
+
+    interface QueryOptionsWithName
+        extends CollectionOptionsWithName,
+            QueryOptions {}
+
+    interface QueryOptionsWithID
+        extends CollectionOptionsWithID,
+            QueryOptions {}
+
+    interface Query {
+        SELECTCOLUMNS?: string[];
+        SORT?: QuerySortDirections;
+        FILTERS?: QueryFilter[];
+        PAGESIZE?: number;
+        PAGENUM?: number;
+    }
+
+    interface QueryFilter {
+        [QueryConditions: string]: QueryFilterValue;
+    }
+
+    interface QueryFilterValue {
+        [name: string]: QueryValue;
+    }
+
+    interface QueryObj {
+        id: string;
+        user: APIUser;
+        URI: string;
+        systemKey: string;
+        systemSecret: string;
+        query: Query;
+        OR: Query[];
+        offset: number;
+        limit: number;
+
+        ascending(field: string): void;
+        descending(field: string): void;
+        equalTo(field: string, value: QueryValue): void;
+        greaterThan(field: string, value: QueryValue): void;
+        greaterThanEqualTo(field: string, value: QueryValue): void;
+        lessThan(field: string, value: QueryValue): void;
+        lessThanEqualTo(field: string, value: QueryValue): void;
+        notEqualTo(field: string, value: QueryValue): void;
+        matches(field: string, pattern: QueryValue): void;
+        or(query: QueryObj): void;
+        setPage(pageSize: number, pageNum: number): void;
+        fetch(callback: CbCallback): void;
+        update(changes: object, callback: CbCallback): void;
+        columns(columnsArray: string[]): void;
+        remove(callback: CbCallback): void;
+    }
+
+    interface ItemOptions extends CollectionOptionsWithID {}
+
+    interface Item {
+        data: object;
+
+        save(): void;
+        refresh(): void;
+        destroy(): void;
+    }
+
+    interface Code {
+        user: APIUser;
+        systemKey: string;
+        systemSecret: string;
+
+        execute(
+            name: string,
+            params: object,
+            loggingEnabled: boolean,
+            callback: CbCallback
+        ): void;
+        getAllServices(callback: CbCallback): void;
+    }
+
+    interface DeploymentOptions {}
+
+    interface Deployment {
+        user: APIUser;
+        systemKey: string;
+        systemSecret: string;
+
+        create(
+            name: string,
+            description: string,
+            options: DeploymentOptions,
+            callback: CbCallback
+        ): void;
+        update(
+            name: string,
+            options: DeploymentOptions,
+            callback: CbCallback
+        ): void;
+        delete(name: string, callback: CbCallback): void;
+        read(name: string, callback: CbCallback): void;
+        readAll(query: QueryObj, callback: CbCallback): void;
+    }
+
+    interface AppUser {
+        user: APIUser;
+        URI: string;
+        systemKey: string;
+        systemSecret: string;
+
+        getUser(callback: CbCallback): void;
+        setUser(data: object, callback: CbCallback): void;
+        setUsers(query: QueryObj, data: object, callback: CbCallback): void;
+        allUsers(query: QueryObj, callback: CbCallback): void;
+        count(query: QueryObj, callback: CbCallback): void;
+    }
+
+    interface Messaging {
+        user: APIUser;
+        systemKey: string;
+        systemSecret: string;
+
+        getMessageHistoryWithTimeFrame(
+            topic: string,
+            count: number,
+            last: number,
+            start: number,
+            stop: number,
+            callback: CbCallback
+        ): void;
+        getMessageHistory(
+            topic: string,
+            start: number,
+            count: number,
+            callback: CbCallback
+        ): void;
+        getAndDeleteMessageHistory(
+            topic: string,
+            count: number,
+            last: number,
+            start: number,
+            stop: number,
+            callback: CbCallback
+        ): void;
+        getCurrentTopics(callback: CbCallback): void;
+        publish(topic: string, payload: string | ArrayBuffer): void;
+    }
+
+    interface MessagingOptions {}
+
+    interface Device {
+        URI: string;
+        systemKey: string;
+        systemSecret: string;
+
+        fetch(query: Query, callback: CbCallback): void;
+        update(query: Query, changes: object, callback: CbCallback): void;
+        delete(query: Query, callback: CbCallback): void;
+        create(newDevice: object, callback: CbCallback): void;
+    }
+
+    enum TriggerModule {
+        DEVICE = "Device",
+        Data = "Data",
+        MESSAGING = "Messaging",
+        USER = "User"
+    }
+
+    interface TriggerCreateOptions {
+        system_key: string;
+        name: string;
+        def_module: TriggerModule;
+        def_name: string;
+        key_value_pairs: KeyValuePair[];
+        service_name: string;
+    }
+
+    interface TriggerClass {
+        Create(
+            name: string,
+            options: TriggerCreateOptions,
+            callback: CbCallback
+        ): void;
+        Fetch(name: string, callback: CbCallback): void;
+    }
+
+    interface TimerCreateOptions {
+        description?: string;
+        start_time?: Date;
+        repeats?: number;
+        frequency?: number;
+        service_name?: string;
+        user_id?: string;
+        user_token?: string;
+    }
+
+    interface TimerClass {
+        Create(
+            name: string,
+            options: TimerCreateOptions,
+            callback: CbCallback
+        ): void;
+        Fetch(name: string, callback: CbCallback): void;
+    }
+
+    interface TriggerInstance {
+        name: string;
+        systemKey: string;
+
+        Update(options: object, callback: CbCallback): void;
+        Delete(callback: CbCallback): void;
+    }
+
+    interface TimerInstance {
+        name: string;
+        systemKey: string;
+
+        Update(options: object, callback: CbCallback): void;
+        Delete(callback: CbCallback): void;
+    }
+
+    let ClearBlade: ClearBladeGlobal;
 }
-type ReqTypes = BasicReq;
-declare var req: ReqTypes;
-interface Resp {
-    error(msg: any): never;
-    success(msg: any): never;
-}
-declare var resp: Resp;
-
-declare enum MessagingQOS {
-    MESSAGING_QOS_AT_MOST_ONCE = 0,
-    MESSAGING_QOS_AT_LEAST_ONCE = 1,
-    MESSAGING_QOS_EXACTLY_ONCE = 2
-}
-
-interface InitOptions {
-    systemKey: string;
-    systemSecret: string;
-    logging?: boolean;
-    callback?: CbCallback;
-    authToken?: string;
-    userToken?: string;
-    email?: string;
-    password?: string;
-    registerUser?: boolean;
-    useUser?: APIUser;
-    URI?: string;
-    messagingURI?: string;
-    messagingPort?: number;
-    defaultQoS?: MessagingQOS;
-    callTimeout?: number;
-}
-
-interface APIUser {
-    email: string;
-    authToken: string;
-    user_id?: string;
-}
-
-interface KeyValuePair {
-    [key: string]: any;
-}
-
-type CbCallback = (error: boolean, response: Resp) => void;
-
-interface ClearBladeGlobal extends ClearBladeInt {
-    user: APIUser;
-}
-
-interface ClearBladeInt {
-    Trigger: TriggerClass;
-    Timer: TimerClass;
-
-    about(): string;
-    addToQuery(queryObj: QueryObj, key: string, value: string): void;
-    addFilterToQuery(queryObj: QueryObj, condition: QueryConditions, key: string, value: QueryValue): void;
-    addSortToQuery(queryObj: QueryObj, direction: QuerySortDirections, column: string): void;
-    Code(): Code;
-    Collection(options: string | CollectionOptionsWithName | CollectionOptionsWithID | CollectionOptionsWithCollection): Collection;
-    Deployment(): Deployment;
-    Device(): Device;
-    edgeId(): string;
-    execute(error: object, response: object, callback: CbCallback): any;
-    getAllCollections(callback: CbCallback): void;
-    http(): object;
-    init(options: InitOptions | {request: BasicReq}): void;
-    isEdge(callback: CbCallback): boolean;
-    isCurrentUserAuthenticated(callback: CbCallback): void;
-    isObjectEmpty(obj: object): boolean;
-    Item(data: object, options: string | ItemOptions): Item;
-    logger(message: string): void;
-    loginAnon(callback: CbCallback): void;
-    loginUser(email: string, password: string, callback: CbCallback): void;
-    logoutUser(callback: CbCallback): void;
-    makeKVPair(key: string, value: string): KeyValuePair;
-    Messaging(options: MessagingOptions, callback: CbCallback): Messaging;
-    newCollection(name: string, callback: CbCallback): void;
-    Query(options: QueryOptionsWithCollection | QueryOptionsWithName | QueryOptionsWithID): QueryObj;
-    parseOperationQuery(query: Query): string;
-    parseQuery(query: Query | QueryObj): string;
-    registerUser(email: string, password: string, callback: CbCallback): void;
-    setUser(email: string, authToken: string, userId: string): void;
-    User(): AppUser;
-
-    createDevice(name: string, data: object, causeTrigger: boolean, callback: CbCallback): void;
-    deleteDevice(name: string, causeTrigger: boolean, callback: CbCallback): void;
-    updateDevice(name: string, data: object, causeTrigger: boolean, callback: CbCallback): void;
-    getDeviceByName(name: string, callback: CbCallback): void;
-    getAllDevicesForSystem(callback: CbCallback): void;
-    validateEmailPassword(email: string, password: string): void;
-}
-
-interface CollectionOptionsWithCollection {
-    collection: string;
-}
-
-interface CollectionOptionsWithName {
-    collectionName: string;
-}
-
-interface CollectionOptionsWithID {
-    collectionID: string;
-}
-
-interface Collection {
-    user: APIUser;
-    URI: string;
-    systemKey: string;
-    systemSecret: string;
-
-    addColumn(options: object, callback: CbCallback): void;
-    dropColumn(name: string, callback: CbCallback): void;
-    deleteCollection(callback: CbCallback): void;
-    fetch(query: Query, callback: CbCallback): void;
-    create(newItem: Item, callback: CbCallback): void;
-    update(query: Query, changes: object, callback: CbCallback): void;
-    remove(query: Query, callback: CbCallback): void;
-    columns(callback: CbCallback): void;
-    count(query: Query, callback: CbCallback): void;
-}
-
-declare enum QuerySortDirections {
-    QUERY_SORT_ASCENDING = 'ASC',
-    QUERY_SORT_DESCENDING = 'DESC'
-}
-
-declare enum QueryConditions {
-    QUERY_EQUAL = 'EQ',
-    QUERY_NOTEQUAL = 'NEQ',
-    QUERY_GREATERTHAN = 'GT',
-    QUERY_GREATERTHAN_EQUAL = 'GTE',
-    QUERY_LESSTHAN = 'LT',
-    QUERY_LESSTHAN_EQUAL = 'LTE',
-    QUERY_MATCHES = 'RE'
-}
-
-type QueryValue = string|number|boolean;
-
-interface QueryOptions {
-    offset?: number;
-    limit?: number;
-}
-
-interface QueryOptionsWithCollection extends CollectionOptionsWithCollection, QueryOptions {}
-
-interface QueryOptionsWithName extends CollectionOptionsWithName, QueryOptions {}
-
-interface QueryOptionsWithID extends CollectionOptionsWithID, QueryOptions {}
-
-interface Query {
-    SELECTCOLUMNS?: string[];
-    SORT?: QuerySortDirections;
-    FILTERS?: QueryFilter[];
-    PAGESIZE?: number;
-    PAGENUM?: number;
-}
-
-interface QueryFilter {
-    [QueryConditions: string]: QueryFilterValue;
-}
-
-interface QueryFilterValue {
-    [name: string]: QueryValue;
-}
-
-interface QueryObj {
-    id: string;
-    user: APIUser;
-    URI: string;
-    systemKey: string;
-    systemSecret: string;
-    query: Query;
-    OR: Query[];
-    offset: number;
-    limit: number;
-
-    ascending(field: string): void;
-    descending(field: string): void;
-    equalTo(field: string, value: QueryValue): void;
-    greaterThan(field: string, value: QueryValue): void;
-    greaterThanEqualTo(field: string, value: QueryValue): void;
-    lessThan(field: string, value: QueryValue): void;
-    lessThanEqualTo(field: string, value: QueryValue): void;
-    notEqualTo(field: string, value: QueryValue): void;
-    matches(field: string, pattern: QueryValue): void;
-    or(query: QueryObj): void;
-    setPage(pageSize: number, pageNum: number): void;
-    fetch(callback: CbCallback): void;
-    update(changes: object, callback: CbCallback): void;
-    columns(columnsArray: string[]): void;
-    remove(callback: CbCallback): void;
-}
-
-interface ItemOptions extends CollectionOptionsWithID {}
-
-interface Item {
-    data: object;
-
-    save(): void;
-    refresh(): void;
-    destroy(): void;
-}
-
-interface Code {
-    user: APIUser;
-    systemKey: string;
-    systemSecret: string;
-
-    execute(name: string, params: object, loggingEnabled: boolean, callback: CbCallback): void;
-    getAllServices(callback: CbCallback): void;
-}
-
-interface DeploymentOptions {}
-
-interface Deployment {
-    user: APIUser;
-    systemKey: string;
-    systemSecret: string;
-
-    create(name: string, description: string, options: DeploymentOptions, callback: CbCallback): void;
-    update(name: string, options: DeploymentOptions, callback: CbCallback): void;
-    delete(name: string, callback: CbCallback): void;
-    read(name: string, callback: CbCallback): void;
-    readAll(query: QueryObj, callback: CbCallback): void;
-}
-
-interface AppUser {
-    user: APIUser;
-    URI: string;
-    systemKey: string;
-    systemSecret: string;
-
-    getUser(callback: CbCallback): void;
-    setUser(data: object, callback: CbCallback): void;
-    setUsers(query: QueryObj, data: object, callback: CbCallback): void;
-    allUsers(query: QueryObj, callback: CbCallback): void;
-    count(query: QueryObj, callback: CbCallback): void;
-}
-
-interface Messaging {
-    user: APIUser;
-    systemKey: string;
-    systemSecret: string;
-
-    getMessageHistoryWithTimeFrame(topic: string, count: number, last: number, start: number, stop: number, callback: CbCallback): void;
-    getMessageHistory(topic: string, start: number, count: number, callback: CbCallback): void;
-    getAndDeleteMessageHistory(topic: string, count: number, last: number, start: number, stop: number, callback: CbCallback): void;
-    getCurrentTopics(callback: CbCallback): void;
-    publish(topic: string, payload: string | ArrayBuffer): void;
-}
-
-interface MessagingOptions {}
-
-interface Device {
-    URI: string;
-    systemKey: string;
-    systemSecret: string;
-
-    fetch(query: Query, callback: CbCallback): void;
-    update(query: Query, changes: object, callback: CbCallback): void;
-    delete(query: Query, callback: CbCallback): void;
-    create(newDevice: object, callback: CbCallback): void;
-}
-
-declare enum TriggerModule {
-    DEVICE = "Device",
-    Data = "Data",
-    MESSAGING = "Messaging",
-    USER = "User"
-}
-
-interface TriggerCreateOptions {
-    system_key: string;
-	name: string;
-	def_module: TriggerModule;
-	def_name: string;
-	key_value_pairs: KeyValuePair[];
-	service_name: string;
-}
-
-interface TriggerClass {
-    Create(name: string, options: TriggerCreateOptions, callback: CbCallback): void;
-    Fetch(name: string, callback: CbCallback): void;
-}
-
-interface TimerCreateOptions {
-    description?: string;
-    start_time?: Date;
-    repeats?: number;
-    frequency?: number;
-    service_name?: string;
-    user_id?: string;
-    user_token?: string;
-}
-
-interface TimerClass {
-    Create(name: string, options: TimerCreateOptions, callback: CbCallback): void;
-    Fetch(name: string, callback: CbCallback): void;
-}
-
-interface TriggerInstance {
-    name: string;
-    systemKey: string;
-
-    Update(options: object, callback: CbCallback): void;
-    Delete(callback: CbCallback): void;
-}
-
-interface TimerInstance {
-    name: string;
-    systemKey: string;
-
-    Update(options: object, callback: CbCallback): void;
-    Delete(callback: CbCallback): void;
-}
-
-declare var ClearBlade: ClearBladeGlobal;

From fc0a7f609af8f0926718dd277ba6a8aa1da87a78 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Mon, 21 May 2018 16:19:07 +0200
Subject: [PATCH 290/575] Fixes from autogenerated; default members; default
 value for parameters

---
 types/activex-access/index.d.ts  | 739 +++++++++++--------------------
 types/activex-access/tslint.json |   3 +-
 2 files changed, 261 insertions(+), 481 deletions(-)

diff --git a/types/activex-access/index.d.ts b/types/activex-access/index.d.ts
index 4c531ea3ce..199fa22d36 100644
--- a/types/activex-access/index.d.ts
+++ b/types/activex-access/index.d.ts
@@ -2291,12 +2291,11 @@ declare namespace Access {
         Width: number;
     }
 
-    class _ItemsSelected {
-        private 'Access._ItemsSelected_typekey': _ItemsSelected;
-        private constructor();
+    interface _ItemsSelected {
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): number;
+        (Index: any): number;
     }
 
     class _OptionButtonInOption {
@@ -2746,9 +2745,7 @@ declare namespace Access {
         readonly Type: AcObjectType;
     }
 
-    class AccessObjectProperties {
-        private 'Access.AccessObjectProperties_typekey': AccessObjectProperties;
-        private constructor();
+    interface AccessObjectProperties {
         Add(PropertyName: string, Value: any): void;
         readonly Application: Application;
         readonly Count: number;
@@ -2756,6 +2753,7 @@ declare namespace Access {
         Item(Index: any): AccessObjectProperty;
         readonly Parent: any;
         Remove(Item: any): void;
+        (Index: any): AccessObjectProperty;
     }
 
     class AccessObjectProperty {
@@ -2767,124 +2765,112 @@ declare namespace Access {
         Value: any;
     }
 
-    class AdditionalData {
-        private 'Access.AdditionalData_typekey': AdditionalData;
-        private constructor();
+    interface AdditionalData {
         Add(var_0: string): AdditionalData;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): AdditionalData;
         Name: string;
+        (Index: any): AdditionalData;
     }
 
-    class AllDataAccessPages {
-        private 'Access.AllDataAccessPages_typekey': AllDataAccessPages;
-        private constructor();
+    interface AllDataAccessPages {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(var_0: any): AccessObject;
         readonly Parent: any;
+        (var_0: any): AccessObject;
     }
 
-    class AllDatabaseDiagrams {
-        private 'Access.AllDatabaseDiagrams_typekey': AllDatabaseDiagrams;
-        private constructor();
+    interface AllDatabaseDiagrams {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(var_0: any): AccessObject;
         readonly Parent: any;
+        (var_0: any): AccessObject;
     }
 
-    class AllForms {
-        private 'Access.AllForms_typekey': AllForms;
-        private constructor();
+    interface AllForms {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(var_0: any): AccessObject;
         readonly Parent: any;
+        (var_0: any): AccessObject;
     }
 
-    class AllFunctions {
-        private 'Access.AllFunctions_typekey': AllFunctions;
-        private constructor();
+    interface AllFunctions {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(var_0: any): AccessObject;
         readonly Parent: any;
+        (var_0: any): AccessObject;
     }
 
-    class AllMacros {
-        private 'Access.AllMacros_typekey': AllMacros;
-        private constructor();
+    interface AllMacros {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(var_0: any): AccessObject;
         readonly Parent: any;
+        (var_0: any): AccessObject;
     }
 
-    class AllModules {
-        private 'Access.AllModules_typekey': AllModules;
-        private constructor();
+    interface AllModules {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(var_0: any): AccessObject;
         readonly Parent: any;
+        (var_0: any): AccessObject;
     }
 
-    class AllQueries {
-        private 'Access.AllQueries_typekey': AllQueries;
-        private constructor();
+    interface AllQueries {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(var_0: any): AccessObject;
         readonly Parent: any;
+        (var_0: any): AccessObject;
     }
 
-    class AllReports {
-        private 'Access.AllReports_typekey': AllReports;
-        private constructor();
+    interface AllReports {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(var_0: any): AccessObject;
         readonly Parent: any;
+        (var_0: any): AccessObject;
     }
 
-    class AllStoredProcedures {
-        private 'Access.AllStoredProcedures_typekey': AllStoredProcedures;
-        private constructor();
+    interface AllStoredProcedures {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(var_0: any): AccessObject;
         readonly Parent: any;
+        (var_0: any): AccessObject;
     }
 
-    class AllTables {
-        private 'Access.AllTables_typekey': AllTables;
-        private constructor();
+    interface AllTables {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(var_0: any): AccessObject;
         readonly Parent: any;
+        (var_0: any): AccessObject;
     }
 
-    class AllViews {
-        private 'Access.AllViews_typekey': AllViews;
-        private constructor();
+    interface AllViews {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(var_0: any): AccessObject;
         readonly Parent: any;
+        (var_0: any): AccessObject;
     }
 
     class Application {
@@ -2915,45 +2901,41 @@ declare namespace Access {
         readonly COMAddIns: Office.COMAddIns;
         readonly CommandBars: Office.CommandBars;
 
-        /** @param boolean [LogFile=false] */
+        /** @param LogFile [LogFile=false] */
         CompactRepair(SourceFile: string, DestinationFile: string, LogFile?: boolean): boolean;
         ConvertAccessProject(SourceFilename: string, DestinationFilename: string, DestinationFileFormat: AcFileFormat): void;
         CreateAccessProject(filepath: string, Connect?: any): void;
         CreateAdditionalData(): AdditionalData;
 
-        /** @param Access.AcSection [Section=0] */
+        /** @param Section [Section=0] */
         CreateControl(FormName: string, ControlType: AcControlType, Section?: AcSection, Parent?: any, ColumnName?: any, Left?: any, Top?: any, Width?: any, Height?: any): Control;
-        CreateControlEx(
-            FormName: string, ControlType: AcControlType, Section: AcSection, Parent: string, ControlSource: string, Left: number, Top: number, Width: number, Height: number): Control;
-        CreateControlExOld(
-            FormName: string, ControlType: AcControlType, Section: AcSection, Parent: string, ControlSource: string, Left: number, Top: number, Width: number, Height: number): Control;
+        CreateControlEx(FormName: string, ControlType: AcControlType, Section: AcSection, Parent: string, ControlSource: string, Left: number, Top: number, Width: number, Height: number): Control;
+        CreateControlExOld(FormName: string, ControlType: AcControlType, Section: AcSection, Parent: string, ControlSource: string, Left: number, Top: number, Width: number, Height: number): Control;
 
-        /** @param Access.AcSection [Section=0] */
+        /** @param Section [Section=0] */
         CreateControlOld(FormName: string, ControlType: AcControlType, Section?: AcSection, Parent?: any, ColumnName?: any, Left?: any, Top?: any, Width?: any, Height?: any): Control;
 
-        /** @param boolean [CreateNewFile=true] */
+        /** @param CreateNewFile [CreateNewFile=true] */
         CreateDataAccessPage(FileName: any, CreateNewFile?: boolean): DataAccessPage;
         CreateForm(Database?: any, FormTemplate?: any): Form;
         CreateGroupLevel(ReportName: string, Expression: string, Header: number, Footer: number): number;
 
         /**
-         * @param string [Path=' ']
-         * @param string [Name=' ']
-         * @param string [Company=' ']
-         * @param string [WorkgroupID=' ']
-         * @param boolean [Replace=false]
+         * @param Path [Path=' ']
+         * @param Name [Name=' ']
+         * @param Company [Company=' ']
+         * @param WorkgroupID [WorkgroupID=' ']
+         * @param Replace [Replace=false]
          */
         CreateNewWorkgroupFile(Path?: string, Name?: string, Company?: string, WorkgroupID?: string, Replace?: boolean): void;
         CreateReport(Database?: any, ReportTemplate?: any): Report;
 
-        /** @param Access.AcSection [Section=0] */
+        /** @param Section [Section=0] */
         CreateReportControl(ReportName: string, ControlType: AcControlType, Section?: AcSection, Parent?: any, ColumnName?: any, Left?: any, Top?: any, Width?: any, Height?: any): Control;
-        CreateReportControlEx(
-            ReportName: string, ControlType: AcControlType, Section: AcSection, Parent: string, ControlName: string, Left: number, Top: number, Width: number, Height: number): Control;
-        CreateReportControlExOld(
-            ReportName: string, ControlType: AcControlType, Section: AcSection, Parent: string, ControlName: string, Left: number, Top: number, Width: number, Height: number): Control;
+        CreateReportControlEx(ReportName: string, ControlType: AcControlType, Section: AcSection, Parent: string, ControlName: string, Left: number, Top: number, Width: number, Height: number): Control;
+        CreateReportControlExOld(ReportName: string, ControlType: AcControlType, Section: AcSection, Parent: string, ControlName: string, Left: number, Top: number, Width: number, Height: number): Control;
 
-        /** @param Access.AcSection [Section=0] */
+        /** @param Section [Section=0] */
         CreateReportControlOld(ReportName: string, ControlType: AcControlType, Section?: AcSection, Parent?: any, ColumnName?: any, Left?: any, Top?: any, Width?: any, Height?: any): Control;
         readonly CurrentData: CurrentData;
         CurrentDb(): DAO.Database;
@@ -2991,54 +2973,49 @@ declare namespace Access {
         DVar(Expr: string, Domain: string, Criteria?: any): any;
         DVarP(Expr: string, Domain: string, Criteria?: any): any;
 
-        /** @param string [bstrStatusBarText=''] */
+        /** @param bstrStatusBarText [bstrStatusBarText=''] */
         Echo(EchoOn: number, bstrStatusBarText?: string): void;
         EuroConvert(Number: number, SourceCurrency: string, TargetCurrency: string, FullPrecision?: any, TriangulationPrecision?: any): number;
         Eval(StringExpr: string): any;
 
         /**
-         * @param boolean [SelectedRecords=false]
-         * @param number [FromPage=1]
-         * @param number [ToPage=-1]
+         * @param SelectedRecords [SelectedRecords=false]
+         * @param FromPage [FromPage=1]
+         * @param ToPage [ToPage=-1]
          */
-        ExportCustomFixedFormat(
-            ExternalExporter: any, OutputFileName: string, ObjectName: string, ObjectType: AcOutputObjectType, SelectedRecords?: boolean, FromPage?: number, ToPage?: number): void;
+        ExportCustomFixedFormat(ExternalExporter: any, OutputFileName: string, ObjectName: string, ObjectType: AcOutputObjectType, SelectedRecords?: boolean, FromPage?: number, ToPage?: number): void;
         ExportNavigationPane(Path: string): void;
 
         /**
-         * @param string [DataTarget='']
-         * @param string [SchemaTarget='']
-         * @param string [PresentationTarget='']
-         * @param string [ImageTarget='']
-         * @param Access.AcExportXMLEncoding [Encoding=0]
-         * @param Access.AcExportXMLOtherFlags [OtherFlags=0]
-         * @param string [WhereCondition='']
+         * @param DataTarget [DataTarget='']
+         * @param SchemaTarget [SchemaTarget='']
+         * @param PresentationTarget [PresentationTarget='']
+         * @param ImageTarget [ImageTarget='']
+         * @param Encoding [Encoding=0]
+         * @param OtherFlags [OtherFlags=0]
+         * @param WhereCondition [WhereCondition='']
          */
-        ExportXML(
-            ObjectType: AcExportXMLObjectType, DataSource: string, DataTarget?: string, SchemaTarget?: string, PresentationTarget?: string, ImageTarget?: string,
-            Encoding?: AcExportXMLEncoding, OtherFlags?: AcExportXMLOtherFlags, WhereCondition?: string, AdditionalData?: any): void;
+        ExportXML(ObjectType: AcExportXMLObjectType, DataSource: string, DataTarget?: string, SchemaTarget?: string, PresentationTarget?: string, ImageTarget?: string, Encoding?: AcExportXMLEncoding, OtherFlags?: AcExportXMLOtherFlags, WhereCondition?: string, AdditionalData?: any): void;
 
         /**
-         * @param string [DataTarget='']
-         * @param string [SchemaTarget='']
-         * @param string [PresentationTarget='']
-         * @param string [ImageTarget='']
-         * @param Access.AcExportXMLEncoding [Encoding=0]
-         * @param number [OtherFlags=0]
+         * @param DataTarget [DataTarget='']
+         * @param SchemaTarget [SchemaTarget='']
+         * @param PresentationTarget [PresentationTarget='']
+         * @param ImageTarget [ImageTarget='']
+         * @param Encoding [Encoding=0]
+         * @param OtherFlags [OtherFlags=0]
          */
-        ExportXMLOld(
-            ObjectType: AcExportXMLObjectType, DataSource: string, DataTarget?: string, SchemaTarget?: string, PresentationTarget?: string, ImageTarget?: string,
-            Encoding?: AcExportXMLEncoding, OtherFlags?: number): void;
+        ExportXMLOld(ObjectType: AcExportXMLObjectType, DataSource: string, DataTarget?: string, SchemaTarget?: string, PresentationTarget?: string, ImageTarget?: string, Encoding?: AcExportXMLEncoding, OtherFlags?: number): void;
         FeatureInstall: Office.MsoFeatureInstall;
         FileDialog(dialogType: Office.MsoFileDialogType): Office.FileDialog;
         readonly FileSearch: Office.FileSearch;
 
         /**
-         * @param string [SubAddress='']
-         * @param boolean [NewWindow=false]
-         * @param boolean [AddHistory=true]
-         * @param Office.MsoExtraInfoMethod [Method=0]
-         * @param string [HeaderInfo='']
+         * @param SubAddress [SubAddress='']
+         * @param NewWindow [NewWindow=false]
+         * @param AddHistory [AddHistory=true]
+         * @param Method [Method=0]
+         * @param HeaderInfo [HeaderInfo='']
          */
         FollowHyperlink(Address: string, SubAddress?: string, NewWindow?: boolean, AddHistory?: boolean, ExtraInfo?: any, Method?: Office.MsoExtraInfoMethod, HeaderInfo?: string): void;
         readonly Forms: Forms;
@@ -3048,13 +3025,13 @@ declare namespace Access {
         HtmlEncode(PlainText: any, Length?: any): string;
         hWndAccessApp(): number;
 
-        /** @param Access.AcHyperlinkPart [Part=0] */
+        /** @param Part [Part=0] */
         HyperlinkPart(Hyperlink: any, Part?: AcHyperlinkPart): string;
 
-        /** @param boolean [fAppendOnly=false] */
+        /** @param fAppendOnly [fAppendOnly=false] */
         ImportNavigationPane(Path: string, fAppendOnly?: boolean): void;
 
-        /** @param Access.AcImportXMLOption [ImportOptions=1] */
+        /** @param ImportOptions [ImportOptions=1] */
         ImportXML(DataSource: string, ImportOptions?: AcImportXMLOption): void;
         InsertText(Text: string, ModuleName: string): void;
         InstantiateTemplate(Path: string): void;
@@ -3076,25 +3053,25 @@ declare namespace Access {
         NewAccessProject(filepath: string, Connect?: any): void;
 
         /**
-         * @param Access.AcNewDatabaseFormat [FileFormat=0]
-         * @param string [SiteAddress='']
-         * @param string [ListID='']
+         * @param FileFormat [FileFormat=0]
+         * @param SiteAddress [SiteAddress='']
+         * @param ListID [ListID='']
          */
         NewCurrentDatabase(filepath: string, FileFormat?: AcNewDatabaseFormat, Template?: any, SiteAddress?: string, ListID?: string): void;
         NewCurrentDatabaseOld(filepath: string): void;
         readonly NewFileTaskPane: Office.NewFile;
         Nz(Value: any, ValueIfNull?: any): any;
 
-        /** @param boolean [Exclusive=false] */
+        /** @param Exclusive [Exclusive=false] */
         OpenAccessProject(filepath: string, Exclusive?: boolean): void;
 
         /**
-         * @param boolean [Exclusive=false]
-         * @param string [bstrPassword='']
+         * @param Exclusive [Exclusive=false]
+         * @param bstrPassword [bstrPassword='']
          */
         OpenCurrentDatabase(filepath: string, Exclusive?: boolean, bstrPassword?: string): void;
 
-        /** @param boolean [Exclusive=false] */
+        /** @param Exclusive [Exclusive=false] */
         OpenCurrentDatabaseOld(filepath: string, Exclusive?: boolean): void;
         readonly Parent: any;
         PlainText(RichText: any, Length?: any): string;
@@ -3102,7 +3079,7 @@ declare namespace Access {
         readonly Printers: Printers;
         readonly ProductCode: string;
 
-        /** @param Access.AcQuitOption [Option=1] */
+        /** @param Option [Option=1] */
         Quit(Option?: AcQuitOption): void;
         readonly References: References;
         RefreshDatabaseWindow(): void;
@@ -3111,15 +3088,10 @@ declare namespace Access {
         ReplaceModule(objtyp: number, ModuleName: string, FileName: string, token: number): void;
         readonly Reports: Reports;
         readonly ReturnVars: ReturnVars;
-        Run(
-            Procedure: string, Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any,
-            Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any,
-            Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
+        Run(Procedure: string, Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
         RunCommand(Command: AcCommand): void;
         SaveAsAXL(ObjectType: AcObjectType, ObjectName: string, FileName: string): void;
-        SaveAsTemplate(
-            Path: string, Title: string, IconPath: string, CoreTable: string, Category: string, PreviewPath?: any, Description?: any, InstantiationForm?: any,
-            ApplicationPart?: any, IncludeData?: any, Variation?: any): void;
+        SaveAsTemplate(Path: string, Title: string, IconPath: string, CoreTable: string, Category: string, PreviewPath?: any, Description?: any, InstantiationForm?: any, ApplicationPart?: any, IncludeData?: any, Variation?: any): void;
         SaveAsText(ObjectType: AcObjectType, ObjectName: string, FileName: string): void;
         readonly Screen: Screen;
         SetDefaultWorkgroupFile(Path: string): void;
@@ -3132,8 +3104,8 @@ declare namespace Access {
         readonly TempVars: TempVars;
 
         /**
-         * @param boolean [WellFormedXMLOutput=false]
-         * @param Access.AcTransformXMLScriptOption [ScriptOption=1]
+         * @param WellFormedXMLOutput [WellFormedXMLOutput=false]
+         * @param ScriptOption [ScriptOption=1]
          */
         TransformXML(DataSource: string, TransformSource: string, OutputTarget: string, WellFormedXMLOutput?: boolean, ScriptOption?: AcTransformXMLScriptOption): void;
         UserControl: boolean;
@@ -3589,12 +3561,11 @@ declare namespace Access {
         Width: number;
     }
 
-    class Children {
-        private 'Access.Children_typekey': Children;
-        private constructor();
+    interface Children {
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): any;
+        (Index: any): any;
     }
 
     class Class {
@@ -4082,16 +4053,15 @@ declare namespace Access {
         VerticalAnchor: AcVerticalAnchor;
     }
 
-    class Controls {
-        private 'Access.Controls_typekey': Controls;
-        private constructor();
+    interface Controls {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         // tslint:disable-next-line:no-unnecessary-generics
-        Item<T>(index: number | string): T;
-        Item(Index: number | string): Control;
+        Item<T = Control>(Index: number | string): T;
         readonly Parent: any;
+        // tslint:disable-next-line:no-unnecessary-generics
+        <T = Control>(Index: number | string): T;
     }
 
     class CurrentData {
@@ -4272,14 +4242,13 @@ declare namespace Access {
         readonly WindowWidth: number;
     }
 
-    class DataAccessPages {
-        private 'Access.DataAccessPages_typekey': DataAccessPages;
-        private constructor();
+    interface DataAccessPages {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(var_0: any): DataAccessPage;
         readonly Parent: any;
+        (var_0: any): DataAccessPage;
     }
 
     class DefaultWebOptions {
@@ -4314,14 +4283,13 @@ declare namespace Access {
         readonly UnsupportedObjects: DependencyObjects;
     }
 
-    class DependencyObjects {
-        private 'Access.DependencyObjects_typekey': DependencyObjects;
-        private constructor();
+    interface DependencyObjects {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): AccessObject;
         readonly Parent: any;
+        (Index: any): AccessObject;
     }
 
     class DoCmd {
@@ -4332,41 +4300,41 @@ declare namespace Access {
         ApplyFilterOld0(FilterName?: any, WhereCondition?: any): void;
         Beep(): void;
 
-        /** @param Access.AcFormOpenDataMode [DataMode=1] */
+        /** @param DataMode [DataMode=1] */
         BrowseTo(ObjectType: AcBrowseToObjectType, ObjectName: any, PathtoSubformControl: any, WhereCondition: any, Page: any, DataMode?: AcFormOpenDataMode): void;
         CancelEvent(): void;
         ClearMacroError(): void;
 
         /**
-         * @param Access.AcObjectType [ObjectType=-1]
-         * @param Access.AcCloseSave [Save=0]
+         * @param ObjectType [ObjectType=-1]
+         * @param Save [Save=0]
          */
         Close(ObjectType: AcObjectType, ObjectName: any, Save?: AcCloseSave): void;
         Close(): void;
         CloseDatabase(): void;
         CopyDatabaseFile(DatabaseFileName: any, OverwriteExistingFile?: any, DisconnectAllUsers?: any): void;
 
-        /** @param Access.AcObjectType [SourceObjectType=-1] */
+        /** @param SourceObjectType [SourceObjectType=-1] */
         CopyObject(DestinationDatabase: any, NewName: any, SourceObjectType?: AcObjectType, SourceObjectName?: any): void;
 
-        /** @param Access.AcObjectType [ObjectType=-1] */
+        /** @param ObjectType [ObjectType=-1] */
         DeleteObject(ObjectType?: AcObjectType, ObjectName?: any): void;
         DoMenuItem(MenuBar: any, MenuName: any, Command: any, Subcommand?: any, Version?: any): void;
         Echo(EchoOn: any, StatusBarText?: any): void;
         FindNext(): void;
 
         /**
-         * @param Access.AcFindMatch [Match=1]
-         * @param Access.AcSearchDirection [Search=2]
-         * @param Access.AcFindField [OnlyCurrentField=-1]
+         * @param Match [Match=1]
+         * @param Search [Search=2]
+         * @param OnlyCurrentField [OnlyCurrentField=-1]
          */
         FindRecord(FindWhat: any, Match?: AcFindMatch, MatchCase?: any, Search?: AcSearchDirection, SearchAsFormatted?: any, OnlyCurrentField?: AcFindField, FindFirst?: any): void;
         GoToControl(ControlName: any): void;
         GoToPage(PageNumber: any, Right?: any, Down?: any): void;
 
         /**
-         * @param Access.AcDataObjectType [ObjectType=-1]
-         * @param Access.AcRecord [Record=1]
+         * @param ObjectType [ObjectType=-1]
+         * @param Record [Record=1]
          */
         GoToRecord(ObjectType?: AcDataObjectType, ObjectName?: any, Record?: AcRecord, Offset?: any): void;
         Hourglass(HourglassOn: any): void;
@@ -4376,76 +4344,76 @@ declare namespace Access {
         MoveSize(Right?: any, Down?: any, Width?: any, Height?: any): void;
         NavigateTo(Category?: any, Group?: any): void;
 
-        /** @param Access.AcDataAccessPageView [View=0] */
+        /** @param View [View=0] */
         OpenDataAccessPage(DataAccessPageName: any, View?: AcDataAccessPageView): void;
         OpenDiagram(DiagramName: any): void;
 
         /**
-         * @param Access.AcFormView [View=0]
-         * @param Access.AcFormOpenDataMode [DataMode=-1]
-         * @param Access.AcWindowMode [WindowMode=0]
+         * @param View [View=0]
+         * @param DataMode [DataMode=-1]
+         * @param WindowMode [WindowMode=0]
          */
         OpenForm(FormName: any, View?: AcFormView, FilterName?: string, WhereCondition?: string, DataMode?: AcFormOpenDataMode, WindowMode?: AcWindowMode, OpenArgs?: string): void;
 
         /**
-         * @param Access.AcView [View=0]
-         * @param Access.AcOpenDataMode [DataMode=1]
+         * @param View [View=0]
+         * @param DataMode [DataMode=1]
          */
         OpenFunction(FunctionName: any, View?: AcView, DataMode?: AcOpenDataMode): void;
         OpenModule(ModuleName?: any, ProcedureName?: any): void;
 
         /**
-         * @param Access.AcView [View=0]
-         * @param Access.AcOpenDataMode [DataMode=1]
+         * @param View [View=0]
+         * @param DataMode [DataMode=1]
          */
         OpenQuery(QueryName: any, View?: AcView, DataMode?: AcOpenDataMode): void;
 
         /**
-         * @param Access.AcView [View=0]
-         * @param Access.AcWindowMode [WindowMode=0]
+         * @param View [View=0]
+         * @param WindowMode [WindowMode=0]
          */
         OpenReport(ReportName: any, View?: AcView, FilterName?: string, WhereCondition?: string, WindowMode?: AcWindowMode, OpenArgs?: string): void;
 
-        /** @param Access.AcView [View=0] */
+        /** @param View [View=0] */
         OpenReportOld0(ReportName: any, View?: AcView, FilterName?: any, WhereCondition?: any): void;
 
         /**
-         * @param Access.AcView [View=0]
-         * @param Access.AcOpenDataMode [DataMode=1]
+         * @param View [View=0]
+         * @param DataMode [DataMode=1]
          */
         OpenStoredProcedure(ProcedureName: any, View?: AcView, DataMode?: AcOpenDataMode): void;
 
         /**
-         * @param Access.AcView [View=0]
-         * @param Access.AcOpenDataMode [DataMode=1]
+         * @param View [View=0]
+         * @param DataMode [DataMode=1]
          */
         OpenTable(TableName: any, View?: AcView, DataMode?: AcOpenDataMode): void;
 
         /**
-         * @param Access.AcView [View=0]
-         * @param Access.AcOpenDataMode [DataMode=1]
+         * @param View [View=0]
+         * @param DataMode [DataMode=1]
          */
         OpenView(ViewName: any, View?: AcView, DataMode?: AcOpenDataMode): void;
 
-        /** @param Access.AcExportQuality [OutputQuality=0] */
+        /** @param OutputQuality [OutputQuality=0] */
         OutputTo(ObjectType: AcOutputObjectType, ObjectName: any, OutputFormat: any, OutputFile: any, AutoStart: any, TemplateFile: any, Encoding: any, OutputQuality?: AcExportQuality): void;
         OutputToOld0(ObjectType: AcOutputObjectType, ObjectName?: any, OutputFormat?: any, OutputFile?: any, AutoStart?: any, TemplateFile?: any): void;
         OutputToOld1(ObjectType: AcOutputObjectType, ObjectName?: any, OutputFormat?: any, OutputFile?: any, AutoStart?: any, TemplateFile?: any, Encoding?: any): void;
 
         /**
-         * @param Access.AcPrintRange [PrintRange=0]
-         * @param Access.AcPrintQuality [PrintQuality=0]
+         * @param PrintRange [PrintRange=0]
+         * @param PrintQuality [PrintQuality=0]
          */
         PrintOut(PrintRange?: AcPrintRange, PageFrom?: any, PageTo?: any, PrintQuality?: AcPrintQuality, Copies?: any, CollateCopies?: any): void;
 
-        /** @param Access.AcQuitOption [Options=1] */
+        /** @param Options [Options=1] */
         Quit(Options?: AcQuitOption): void;
         RefreshRecord(): void;
 
-        /** @param Access.AcObjectType [ObjectType=-1] */
+        /** @param ObjectType [ObjectType=-1] */
         Rename(NewName: any, ObjectType?: AcObjectType, OldName?: any): void;
 
-        /** @param Access.AcObjectType [ObjectType=-1] */
+        /** @param ObjectType [ObjectType=-1] */
         RepaintObject(ObjectType?: AcObjectType, ObjectName?: any): void;
         Requery(ControlName?: any): void;
         Restore(): void;
@@ -4455,50 +4423,48 @@ declare namespace Access {
         RunSavedImportExport(SavedImportExportName: any): void;
         RunSQL(SQLStatement: any, UseTransaction?: any): void;
 
-        /** @param Access.AcObjectType [ObjectType=-1] */
+        /** @param ObjectType [ObjectType=-1] */
         Save(ObjectType?: AcObjectType, ObjectName?: any): void;
 
         /**
-         * @param Access.AcDataObjectType [ObjectType=-1]
-         * @param Access.AcRecord [Record=2]
+         * @param ObjectType [ObjectType=-1]
+         * @param Record [Record=2]
          */
         SearchForRecord(ObjectType?: AcDataObjectType, ObjectName?: any, Record?: AcRecord, WhereCondition?: any): void;
         SelectObject(ObjectType: AcObjectType, ObjectName?: any, InDatabaseWindow?: any): void;
 
-        /** @param Access.AcSendObjectType [ObjectType=-1] */
-        SendObject(
-            ObjectType?: AcSendObjectType, ObjectName?: any, OutputFormat?: any, To?: any, Cc?: any, Bcc?: any, Subject?: any, MessageText?: any, EditMessage?: any, TemplateFile?: any): void;
+        /** @param ObjectType [ObjectType=-1] */
+        SendObject(ObjectType?: AcSendObjectType, ObjectName?: any, OutputFormat?: any, To?: any, Cc?: any, Bcc?: any, Subject?: any, MessageText?: any, EditMessage?: any, TemplateFile?: any): void;
         SetDisplayedCategories(Show: any, Category?: any): void;
         SetFilter(FilterName?: any, WhereCondition?: any, ControlName?: any): void;
         SetMenuItem(MenuIndex: any, CommandIndex?: any, SubcommandIndex?: any, Flag?: any): void;
         SetOrderBy(OrderBy: any, ControlName?: any): void;
         SetParameter(Name: any, Expression: any): void;
 
-        /** @param Access.AcProperty [Property=0] */
+        /** @param Property [Property=0] */
         SetProperty(ControlName: any, Property?: AcProperty, Value?: any): void;
         SetWarnings(WarningsOn: any): void;
         ShowAllRecords(): void;
 
-        /** @param Access.AcShowToolbar [Show=0] */
+        /** @param Show [Show=0] */
         ShowToolbar(ToolbarName: any, Show?: AcShowToolbar): void;
         SingleStep(): void;
 
         /**
-         * @param Access.AcDataTransferType [TransferType=0]
-         * @param Access.AcObjectType [ObjectType=0]
+         * @param TransferType [TransferType=0]
+         * @param ObjectType [ObjectType=0]
          */
-        TransferDatabase(
-            TransferType?: AcDataTransferType, DatabaseType?: any, DatabaseName?: any, ObjectType?: AcObjectType, Source?: any, Destination?: any, StructureOnly?: any, StoreLogin?: any): void;
+        TransferDatabase(TransferType?: AcDataTransferType, DatabaseType?: any, DatabaseName?: any, ObjectType?: AcObjectType, Source?: any, Destination?: any, StructureOnly?: any, StoreLogin?: any): void;
         TransferSharePointList(TransferType: AcSharePointListTransferType, SiteAddress: any, ListID: any, ViewID?: any, TableName?: any, GetLookupDisplayValues?: any): void;
 
         /**
-         * @param Access.AcDataTransferType [TransferType=0]
-         * @param Access.AcSpreadSheetType [SpreadsheetType=10]
+         * @param TransferType [TransferType=0]
+         * @param SpreadsheetType [SpreadsheetType=10]
          */
         TransferSpreadsheet(TransferType?: AcDataTransferType, SpreadsheetType?: AcSpreadSheetType, TableName?: any, FileName?: any, HasFieldNames?: any, Range?: any, UseOA?: any): void;
         TransferSQLDatabase(Server: any, Database: any, UseTrustedConnection?: any, Login?: any, Password?: any, TransferCopyData?: any): void;
 
-        /** @param Access.AcTextTransferType [TransferType=0] */
+        /** @param TransferType [TransferType=0] */
         TransferText(TransferType?: AcTextTransferType, SpecificationName?: any, TableName?: any, FileName?: any, HasFieldNames?: any, HTMLTableName?: any, CodePage?: any): void;
     }
 
@@ -4578,13 +4544,12 @@ declare namespace Access {
         Width: number;
     }
 
-    class Entities {
-        private 'Access.Entities_typekey': Entities;
-        private constructor();
+    interface Entities {
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): Entity;
         readonly Parent: any;
+        (Index: any): Entity;
     }
 
     class Entity {
@@ -4733,8 +4698,8 @@ declare namespace Access {
         FrozenColumns: number;
 
         /**
-         * @param number [Right=0]
-         * @param number [Down=0]
+         * @param Right [Right=0]
+         * @param Down [Down=0]
          */
         GoToPage(PageNumber: number, Right?: number, Down?: number): void;
         GridX: number;
@@ -4933,7 +4898,7 @@ declare namespace Access {
         LongestBarLimit: AcFormatBarLimits;
         LongestBarValue: string;
 
-        /** @param Access.AcFormatConditionOperator [Operator=0] */
+        /** @param Operator [Operator=0] */
         Modify(Type: AcFormatConditionType, Operator?: AcFormatConditionOperator, Expression1?: any, Expression2?: any): void;
         readonly Operator: AcFormatConditionOperator;
         ShortestBarLimit: AcFormatBarLimits;
@@ -4942,11 +4907,8 @@ declare namespace Access {
         readonly Type: AcFormatConditionType;
     }
 
-    class FormatConditions {
-        private 'Access.FormatConditions_typekey': FormatConditions;
-        private constructor();
-
-        /** @param Access.AcFormatConditionOperator [Operator=0] */
+    interface FormatConditions {
+        /** @param Operator [Operator=0] */
         Add(Type: AcFormatConditionType, Operator?: AcFormatConditionOperator, Expression1?: any, Expression2?: any): FormatCondition;
         readonly Application: Application;
         readonly Count: number;
@@ -4954,6 +4916,7 @@ declare namespace Access {
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): FormatCondition;
         readonly Parent: any;
+        (Index: any): FormatCondition;
     }
 
     class FormOld {
@@ -5037,8 +5000,8 @@ declare namespace Access {
         FrozenColumns: number;
 
         /**
-         * @param number [Right=0]
-         * @param number [Down=0]
+         * @param Right [Right=0]
+         * @param Down [Down=0]
          */
         GoToPage(PageNumber: number, Right?: number, Down?: number): void;
         GridX: number;
@@ -5264,8 +5227,8 @@ declare namespace Access {
         FrozenColumns: number;
 
         /**
-         * @param number [Right=0]
-         * @param number [Down=0]
+         * @param Right [Right=0]
+         * @param Down [Down=0]
          */
         GoToPage(PageNumber: number, Right?: number, Down?: number): void;
         GridX: number;
@@ -5403,14 +5366,13 @@ declare namespace Access {
         ZoomControl: number;
     }
 
-    class Forms {
-        private 'Access.Forms_typekey': Forms;
-        private constructor();
+    interface Forms {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: number | string): Form;
         readonly Parent: any;
+        (Index: number | string): Form;
     }
 
     class GroupLevel {
@@ -5438,10 +5400,10 @@ declare namespace Access {
         EmailSubject: string;
 
         /**
-         * @param boolean [NewWindow=false]
-         * @param boolean [AddHistory=true]
-         * @param Office.MsoExtraInfoMethod [Method=0]
-         * @param string [HeaderInfo='']
+         * @param NewWindow [NewWindow=false]
+         * @param AddHistory [AddHistory=true]
+         * @param Method [Method=0]
+         * @param HeaderInfo [HeaderInfo='']
          */
         Follow(NewWindow?: boolean, AddHistory?: boolean, ExtraInfo?: any, Method?: Office.MsoExtraInfoMethod, HeaderInfo?: string): void;
         IsMemberSafe(dispid: number): boolean;
@@ -5555,15 +5517,15 @@ declare namespace Access {
         XML: string;
     }
 
-    class ImportExportSpecifications {
-        private 'Access.ImportExportSpecifications_typekey': ImportExportSpecifications;
-        private constructor();
+    // tslint:disable-next-line:interface-name
+    interface ImportExportSpecifications {
         Add(Name: string, SpecificationDefinition: string): ImportExportSpecification;
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): ImportExportSpecification;
         readonly Parent: any;
+        (Index: any): ImportExportSpecification;
     }
 
     class Label {
@@ -5910,15 +5872,14 @@ declare namespace Access {
         Value: any;
     }
 
-    class LocalVars {
-        private 'Access.LocalVars_typekey': LocalVars;
-        private constructor();
+    interface LocalVars {
         Add(Name: string, Value: any): void;
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): LocalVar;
         readonly Parent: any;
+        (Index: any): LocalVar;
     }
 
     class MacroError {
@@ -5945,9 +5906,9 @@ declare namespace Access {
         DeleteLines(StartLine: number, Count: number): void;
 
         /**
-         * @param boolean [WholeWord=false]
-         * @param boolean [MatchCase=false]
-         * @param boolean [PatternSearch=false]
+         * @param WholeWord [WholeWord=false]
+         * @param MatchCase [MatchCase=false]
+         * @param PatternSearch [PatternSearch=false]
          */
         Find(Target: string, StartLine: number, StartColumn: number, EndLine: number, EndColumn: number, WholeWord?: boolean, MatchCase?: boolean, PatternSearch?: boolean): boolean;
         InsertLines(Line: number, String: string): void;
@@ -5964,14 +5925,13 @@ declare namespace Access {
         readonly Type: AcModuleType;
     }
 
-    class Modules {
-        private 'Access.Modules_typekey': Modules;
-        private constructor();
+    interface Modules {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): Module;
         readonly Parent: any;
+        (Index: any): Module;
     }
 
     class NavigationButton {
@@ -6427,7 +6387,7 @@ declare namespace Access {
         private 'Access.Operation_typekey': Operation;
         private constructor();
 
-        /** @param string [bstrParameters=''] */
+        /** @param bstrParameters [bstrParameters=''] */
         Execute(bstrParameters?: string): any;
         IsMemberSafe(dispid: number): boolean;
         readonly Name: string;
@@ -6435,13 +6395,12 @@ declare namespace Access {
         readonly WSParameters: WSParameters;
     }
 
-    class Operations {
-        private 'Access.Operations_typekey': Operations;
-        private constructor();
+    interface Operations {
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): Operation;
         readonly Parent: any;
+        (Index: any): Operation;
     }
 
     class OptionButton {
@@ -6779,14 +6738,13 @@ declare namespace Access {
         Visible: boolean;
     }
 
-    class Pages {
-        private 'Access.Pages_typekey': Pages;
-        private constructor();
+    interface Pages {
         Add(Before?: any): Page;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): Page;
         Remove(Item?: any): void;
+        (Index: any): Page;
     }
 
     class PaletteButton {
@@ -6903,24 +6861,22 @@ declare namespace Access {
         TopMargin: number;
     }
 
-    class Printers {
-        private 'Access.Printers_typekey': Printers;
-        private constructor();
+    interface Printers {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): Printer;
         readonly Parent: any;
+        (Index: any): Printer;
     }
 
-    class Properties {
-        private 'Access.Properties_typekey': Properties;
-        private constructor();
+    interface Properties {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): any;
         readonly Parent: any;
+        (Index: any): any;
     }
 
     class Rectangle {
@@ -6991,9 +6947,7 @@ declare namespace Access {
         readonly Name: string;
     }
 
-    class References {
-        private 'Access.References_typekey': References;
-        private constructor();
+    interface References {
         AddFromFile(FileName: string): Reference;
         AddFromGuid(Guid: string, Major: number, Minor: number): Reference;
         readonly Count: number;
@@ -7001,6 +6955,7 @@ declare namespace Access {
         Item(var_0: any): Reference;
         readonly Parent: any;
         Remove(Reference: Reference): void;
+        (var_0: any): Reference;
     }
 
     class Report {
@@ -7445,14 +7400,13 @@ declare namespace Access {
         ZoomControl: number;
     }
 
-    class Reports {
-        private 'Access.Reports_typekey': Reports;
-        private constructor();
+    interface Reports {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): Report;
         readonly Parent: any;
+        (Index: any): Report;
     }
 
     class ReturnVar {
@@ -7464,14 +7418,13 @@ declare namespace Access {
         readonly Value: any;
     }
 
-    class ReturnVars {
-        private 'Access.ReturnVars_typekey': ReturnVars;
-        private constructor();
+    interface ReturnVars {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): ReturnVar;
         readonly Parent: any;
+        (Index: any): ReturnVar;
     }
 
     class Screen {
@@ -7554,14 +7507,13 @@ declare namespace Access {
         readonly Type: AcResourceType;
     }
 
-    class SharedResources {
-        private 'Access.SharedResources_typekey': SharedResources;
-        private constructor();
+    interface SharedResources {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: number): SharedResource;
         readonly Parent: any;
+        (Index: number): SharedResource;
     }
 
     class SmartTag {
@@ -7588,25 +7540,23 @@ declare namespace Access {
         readonly Parent: any;
     }
 
-    class SmartTagActions {
-        private 'Access.SmartTagActions_typekey': SmartTagActions;
-        private constructor();
+    interface SmartTagActions {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): SmartTagAction;
         readonly Parent: any;
+        (Index: any): SmartTagAction;
     }
 
-    class SmartTagProperties {
-        private 'Access.SmartTagProperties_typekey': SmartTagProperties;
-        private constructor();
+    interface SmartTagProperties {
         Add(Name: string, Value: any): SmartTagProperty;
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): SmartTagProperty;
         readonly Parent: any;
+        (Index: any): SmartTagProperty;
     }
 
     class SmartTagProperty {
@@ -7618,15 +7568,14 @@ declare namespace Access {
         Value: string;
     }
 
-    class SmartTags {
-        private 'Access.SmartTags_typekey': SmartTags;
-        private constructor();
+    interface SmartTags {
         Add(Name: string): SmartTag;
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): SmartTag;
         readonly Parent: any;
+        (Index: any): SmartTag;
     }
 
     class SubForm {
@@ -7887,9 +7836,7 @@ declare namespace Access {
         Value: any;
     }
 
-    class TempVars {
-        private 'Access.TempVars_typekey': TempVars;
-        private constructor();
+    interface TempVars {
         Add(Name: string, Value: any): void;
         readonly Application: Application;
         readonly Count: number;
@@ -7898,6 +7845,7 @@ declare namespace Access {
         readonly Parent: any;
         Remove(var_0: any): void;
         RemoveAll(): void;
+        (Index: any): TempVar;
     }
 
     class TextBox {
@@ -8417,14 +8365,13 @@ declare namespace Access {
         readonly Parent: any;
     }
 
-    class WebServices {
-        private 'Access.WebServices_typekey': WebServices;
-        private constructor();
+    interface WebServices {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): WebService;
         readonly Parent: any;
+        (Index: any): WebService;
     }
 
     class WizHook {
@@ -8460,12 +8407,8 @@ declare namespace Access {
         GetColumns(bstrBase: string): string;
         GetCurrentView(bstrTableName: string): number;
         GetDisabledExtensions(): string;
-        GetFileName(
-            hwndOwner: number, AppName: string, DlgTitle: string, OpenTitle: string, File: string, InitialDir: string, Filter: string, FilterIndex: number, View: number,
-            flags: number, fOpen: boolean): number;
-        GetFileName2(
-            hwndOwner: number, AppName: string, DlgTitle: string, OpenTitle: string, File: string, InitialDir: string, Filter: string, FilterIndex: number, View: number,
-            flags: number, fOpen: boolean, fFileSystem: any): number;
+        GetFileName(hwndOwner: number, AppName: string, DlgTitle: string, OpenTitle: string, File: string, InitialDir: string, Filter: string, FilterIndex: number, View: number, flags: number, fOpen: boolean): number;
+        GetFileName2(hwndOwner: number, AppName: string, DlgTitle: string, OpenTitle: string, File: string, InitialDir: string, Filter: string, FilterIndex: number, View: number, flags: number, fOpen: boolean, fFileSystem: any): number;
         GetFileOdso(bstrExt: string, bstrFilename: string): number;
         GetImexTblName(): string;
         GetInfoForColumns(bstrBase: string): string;
@@ -8515,13 +8458,12 @@ declare namespace Access {
         readonly Type: number;
     }
 
-    class WSParameters {
-        private 'Access.WSParameters_typekey': WSParameters;
-        private constructor();
+    interface WSParameters {
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
         Item(Index: any): WSParameter;
         readonly Parent: any;
+        (Index: any): WSParameter;
     }
 
     namespace EventHelperTypes {
@@ -8543,71 +8485,45 @@ interface ActiveXObject {
     on(obj: Access._CheckBoxInOption, event: 'BeforeUpdate' | 'DblClick' | 'Exit', argNames: ['Cancel'], handler: (this: Access._CheckBoxInOption, parameter: {Cancel: number}) => void): void;
     on(obj: Access._CheckBoxInOption, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access._CheckBoxInOption, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access._CheckBoxInOption, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access._CheckBoxInOption, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access._CheckBoxInOption, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access._CheckBoxInOption, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access._CheckBoxInOption, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access._CheckBoxInOption, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access._OptionButtonInOption, event: 'BeforeUpdate' | 'DblClick' | 'Exit', argNames: ['Cancel'], handler: (this: Access._OptionButtonInOption, parameter: {Cancel: number}) => void): void;
-    on(
-        obj: Access._OptionButtonInOption, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (
-            this: Access._OptionButtonInOption, parameter: {KeyCode: number, Shift: number}) => void): void;
+    on(obj: Access._OptionButtonInOption, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access._OptionButtonInOption, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access._OptionButtonInOption, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access._OptionButtonInOption, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access._OptionButtonInOption, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'],
-        handler: (this: Access._OptionButtonInOption, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access._OptionButtonInOption, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access._OptionButtonInOption, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access._PageHdrFtrInReport, event: 'DblClick', argNames: ['Cancel'], handler: (this: Access._PageHdrFtrInReport, parameter: {Cancel: number}) => void): void;
-    on(
-        obj: Access._PageHdrFtrInReport, event: 'Format', argNames: ['Cancel', 'FormatCount'], handler: (
-            this: Access._PageHdrFtrInReport, parameter: {Cancel: number, FormatCount: number}) => void): void;
-    on(
-        obj: Access._PageHdrFtrInReport, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access._PageHdrFtrInReport, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access._PageHdrFtrInReport, event: 'Format', argNames: ['Cancel', 'FormatCount'], handler: (this: Access._PageHdrFtrInReport, parameter: {Cancel: number, FormatCount: number}) => void): void;
+    on(obj: Access._PageHdrFtrInReport, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access._PageHdrFtrInReport, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access._PageHdrFtrInReport, event: 'Print', argNames: ['Cancel', 'PrintCount'], handler: (this: Access._PageHdrFtrInReport, parameter: {Cancel: number, PrintCount: number}) => void): void;
     on(obj: Access._SectionInReport, event: 'DblClick', argNames: ['Cancel'], handler: (this: Access._SectionInReport, parameter: {Cancel: number}) => void): void;
     on(obj: Access._SectionInReport, event: 'Format', argNames: ['Cancel', 'FormatCount'], handler: (this: Access._SectionInReport, parameter: {Cancel: number, FormatCount: number}) => void): void;
-    on(
-        obj: Access._SectionInReport, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access._SectionInReport, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access._SectionInReport, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access._SectionInReport, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access._SectionInReport, event: 'Print', argNames: ['Cancel', 'PrintCount'], handler: (this: Access._SectionInReport, parameter: {Cancel: number, PrintCount: number}) => void): void;
     on(obj: Access._ToggleButtonInOption, event: 'BeforeUpdate' | 'DblClick' | 'Exit', argNames: ['Cancel'], handler: (this: Access._ToggleButtonInOption, parameter: {Cancel: number}) => void): void;
-    on(
-        obj: Access._ToggleButtonInOption, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (
-            this: Access._ToggleButtonInOption, parameter: {KeyCode: number, Shift: number}) => void): void;
+    on(obj: Access._ToggleButtonInOption, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access._ToggleButtonInOption, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access._ToggleButtonInOption, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access._ToggleButtonInOption, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access._ToggleButtonInOption, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'],
-        handler: (this: Access._ToggleButtonInOption, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access._ToggleButtonInOption, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access._ToggleButtonInOption, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.Attachment, event: 'BeforeUpdate' | 'DblClick' | 'Dirty' | 'Exit', argNames: ['Cancel'], handler: (this: Access.Attachment, parameter: {Cancel: number}) => void): void;
     on(obj: Access.Attachment, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.Attachment, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.Attachment, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.Attachment, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.Attachment, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.Attachment, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.Attachment, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.Attachment, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.BoundObjectFrame, event: 'BeforeUpdate' | 'DblClick' | 'Exit', argNames: ['Cancel'], handler: (this: Access.BoundObjectFrame, parameter: {Cancel: number}) => void): void;
     on(obj: Access.BoundObjectFrame, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.BoundObjectFrame, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.BoundObjectFrame, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.BoundObjectFrame, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.BoundObjectFrame, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.BoundObjectFrame, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.BoundObjectFrame, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.BoundObjectFrame, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.BoundObjectFrame, event: 'Updated', argNames: ['Code'], handler: (this: Access.BoundObjectFrame, parameter: {Code: number}) => void): void;
     on(obj: Access.CheckBox, event: 'BeforeUpdate' | 'DblClick' | 'Exit', argNames: ['Cancel'], handler: (this: Access.CheckBox, parameter: {Cancel: number}) => void): void;
     on(obj: Access.CheckBox, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.CheckBox, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.CheckBox, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.CheckBox, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.CheckBox, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.CheckBox, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.CheckBox, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.CheckBox, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.ComboBox, event: 'BeforeUpdate' | 'DblClick' | 'Dirty' | 'Exit' | 'Undo', argNames: ['Cancel'], handler: (this: Access.ComboBox, parameter: {Cancel: number}) => void): void;
     on(obj: Access.ComboBox, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.ComboBox, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.ComboBox, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.ComboBox, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.ComboBox, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.ComboBox, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.ComboBox, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.ComboBox, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.ComboBox, event: 'NotInList', argNames: ['NewData', 'Response'], handler: (this: Access.ComboBox, parameter: {NewData: string, Response: number}) => void): void;
     on(obj: Access.CommandButton, event: 'DblClick' | 'Exit', argNames: ['Cancel'], handler: (this: Access.CommandButton, parameter: {Cancel: number}) => void): void;
     on(obj: Access.CommandButton, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.CommandButton, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.CommandButton, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.CommandButton, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.CommandButton, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.CommandButton, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.CommandButton, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.CommandButton, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.CustomControl, event: 'Exit', argNames: ['Cancel'], handler: (this: Access.CustomControl, parameter: {Cancel: number}) => void): void;
     on(obj: Access.CustomControl, event: 'Updated', argNames: ['Code'], handler: (this: Access.CustomControl, parameter: {Code: number}) => void): void;
     on(obj: Access.Form, event: 'AfterDelConfirm', argNames: ['Status'], handler: (this: Access.Form, parameter: {Status: number}) => void): void;
@@ -8615,16 +8531,9 @@ interface ActiveXObject {
     on(obj: Access.Form, event: 'AfterRender', argNames: ['drawObject', 'chartObject'], handler: (this: Access.Form, parameter: {readonly drawObject: any, readonly chartObject: any}) => void): void;
     on(obj: Access.Form, event: 'ApplyFilter', argNames: ['Cancel', 'ApplyType'], handler: (this: Access.Form, parameter: {Cancel: number, ApplyType: number}) => void): void;
     on(obj: Access.Form, event: 'BeforeDelConfirm', argNames: ['Cancel', 'Response'], handler: (this: Access.Form, parameter: {Cancel: number, Response: number}) => void): void;
-    on(
-        obj: Access.Form, event: 'BeforeInsert' | 'BeforeUpdate' | 'BeginBatchEdit' | 'DblClick' | 'Delete' | 'Dirty' | 'Open' | 'RecordExit' | 'Undo' | 'UndoBatchEdit' |
-        'Unload',
-        argNames: ['Cancel'], handler: (this: Access.Form, parameter: {Cancel: number}) => void): void;
-    on(
-        obj: Access.Form, event: 'BeforeRender', argNames: ['drawObject', 'chartObject', 'Cancel'], handler: (
-            this: Access.Form, parameter: {readonly drawObject: any, readonly chartObject: any, readonly Cancel: any}) => void): void;
-    on(
-        obj: Access.Form, event: 'BeforeScreenTip', argNames: ['ScreenTipText', 'SourceObject'], handler: (
-            this: Access.Form, parameter: {readonly ScreenTipText: any, readonly SourceObject: any}) => void): void;
+    on(obj: Access.Form, event: 'BeforeInsert' | 'BeforeUpdate' | 'BeginBatchEdit' | 'DblClick' | 'Delete' | 'Dirty' | 'Open' | 'RecordExit' | 'Undo' | 'UndoBatchEdit' | 'Unload', argNames: ['Cancel'], handler: (this: Access.Form, parameter: {Cancel: number}) => void): void;
+    on(obj: Access.Form, event: 'BeforeRender', argNames: ['drawObject', 'chartObject', 'Cancel'], handler: (this: Access.Form, parameter: {readonly drawObject: any, readonly chartObject: any, readonly Cancel: any}) => void): void;
+    on(obj: Access.Form, event: 'BeforeScreenTip', argNames: ['ScreenTipText', 'SourceObject'], handler: (this: Access.Form, parameter: {readonly ScreenTipText: any, readonly SourceObject: any}) => void): void;
     on(obj: Access.Form, event: 'CommandBeforeExecute', argNames: ['Command', 'Cancel'], handler: (this: Access.Form, parameter: {readonly Command: any, readonly Cancel: any}) => void): void;
     on(obj: Access.Form, event: 'CommandChecked', argNames: ['Command', 'Checked'], handler: (this: Access.Form, parameter: {readonly Command: any, readonly Checked: any}) => void): void;
     on(obj: Access.Form, event: 'CommandEnabled', argNames: ['Command', 'Enabled'], handler: (this: Access.Form, parameter: {readonly Command: any, readonly Enabled: any}) => void): void;
@@ -8634,33 +8543,18 @@ interface ActiveXObject {
     on(obj: Access.Form, event: 'Filter', argNames: ['Cancel', 'FilterType'], handler: (this: Access.Form, parameter: {Cancel: number, FilterType: number}) => void): void;
     on(obj: Access.Form, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.Form, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.Form, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.Form, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.Form, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.Form, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.Form, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.Form, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.Form, event: 'MouseWheel', argNames: ['Page', 'Count'], handler: (this: Access.Form, parameter: {readonly Page: boolean, readonly Count: number}) => void): void;
-    on(
-        obj: Access.FormOld, event: 'AfterBeginTransaction' | 'AfterCommitTransaction' | 'RollbackTransaction', argNames: ['Connection'], handler: (
-            this: Access.FormOld, parameter: {readonly Connection: ADODB.Connection}) => void): void;
+    on(obj: Access.FormOld, event: 'AfterBeginTransaction' | 'AfterCommitTransaction' | 'RollbackTransaction', argNames: ['Connection'], handler: (this: Access.FormOld, parameter: {readonly Connection: ADODB.Connection}) => void): void;
     on(obj: Access.FormOld, event: 'AfterDelConfirm', argNames: ['Status'], handler: (this: Access.FormOld, parameter: {Status: number}) => void): void;
     on(obj: Access.FormOld, event: 'AfterFinalRender' | 'AfterLayout', argNames: ['drawObject'], handler: (this: Access.FormOld, parameter: {readonly drawObject: any}) => void): void;
-    on(
-        obj: Access.FormOld, event: 'AfterRender', argNames: ['drawObject', 'chartObject'], handler: (
-            this: Access.FormOld, parameter: {readonly drawObject: any, readonly chartObject: any}) => void): void;
+    on(obj: Access.FormOld, event: 'AfterRender', argNames: ['drawObject', 'chartObject'], handler: (this: Access.FormOld, parameter: {readonly drawObject: any, readonly chartObject: any}) => void): void;
     on(obj: Access.FormOld, event: 'ApplyFilter', argNames: ['Cancel', 'ApplyType'], handler: (this: Access.FormOld, parameter: {Cancel: number, ApplyType: number}) => void): void;
-    on(
-        obj: Access.FormOld, event: 'BeforeBeginTransaction' | 'BeforeCommitTransaction', argNames: ['Cancel', 'Connection'], handler: (
-            this: Access.FormOld, parameter: {Cancel: number, readonly Connection: ADODB.Connection}) => void): void;
+    on(obj: Access.FormOld, event: 'BeforeBeginTransaction' | 'BeforeCommitTransaction', argNames: ['Cancel', 'Connection'], handler: (this: Access.FormOld, parameter: {Cancel: number, readonly Connection: ADODB.Connection}) => void): void;
     on(obj: Access.FormOld, event: 'BeforeDelConfirm', argNames: ['Cancel', 'Response'], handler: (this: Access.FormOld, parameter: {Cancel: number, Response: number}) => void): void;
-    on(
-        obj: Access.FormOld, event: 'BeforeInsert' | 'BeforeUpdate' | 'BeginBatchEdit' | 'DblClick' | 'Delete' | 'Dirty' | 'Open' | 'RecordExit' | 'Undo' |
-        'UndoBatchEdit' | 'Unload',
-        argNames: ['Cancel'], handler: (this: Access.FormOld, parameter: {Cancel: number}) => void): void;
-    on(
-        obj: Access.FormOld, event: 'BeforeRender', argNames: ['drawObject', 'chartObject', 'Cancel'], handler: (
-            this: Access.FormOld, parameter: {readonly drawObject: any, readonly chartObject: any, readonly Cancel: any}) => void): void;
-    on(
-        obj: Access.FormOld, event: 'BeforeScreenTip', argNames: ['ScreenTipText', 'SourceObject'], handler: (
-            this: Access.FormOld, parameter: {readonly ScreenTipText: any, readonly SourceObject: any}) => void): void;
+    on(obj: Access.FormOld, event: 'BeforeInsert' | 'BeforeUpdate' | 'BeginBatchEdit' | 'DblClick' | 'Delete' | 'Dirty' | 'Open' | 'RecordExit' | 'Undo' | 'UndoBatchEdit' | 'Unload', argNames: ['Cancel'], handler: (this: Access.FormOld, parameter: {Cancel: number}) => void): void;
+    on(obj: Access.FormOld, event: 'BeforeRender', argNames: ['drawObject', 'chartObject', 'Cancel'], handler: (this: Access.FormOld, parameter: {readonly drawObject: any, readonly chartObject: any, readonly Cancel: any}) => void): void;
+    on(obj: Access.FormOld, event: 'BeforeScreenTip', argNames: ['ScreenTipText', 'SourceObject'], handler: (this: Access.FormOld, parameter: {readonly ScreenTipText: any, readonly SourceObject: any}) => void): void;
     on(obj: Access.FormOld, event: 'CommandBeforeExecute', argNames: ['Command', 'Cancel'], handler: (this: Access.FormOld, parameter: {readonly Command: any, readonly Cancel: any}) => void): void;
     on(obj: Access.FormOld, event: 'CommandChecked', argNames: ['Command', 'Checked'], handler: (this: Access.FormOld, parameter: {readonly Command: any, readonly Checked: any}) => void): void;
     on(obj: Access.FormOld, event: 'CommandEnabled', argNames: ['Command', 'Enabled'], handler: (this: Access.FormOld, parameter: {readonly Command: any, readonly Enabled: any}) => void): void;
@@ -8670,36 +8564,19 @@ interface ActiveXObject {
     on(obj: Access.FormOld, event: 'Filter', argNames: ['Cancel', 'FilterType'], handler: (this: Access.FormOld, parameter: {Cancel: number, FilterType: number}) => void): void;
     on(obj: Access.FormOld, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.FormOld, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.FormOld, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.FormOld, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.FormOld, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.FormOld, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.FormOld, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.FormOld, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.FormOld, event: 'MouseWheel', argNames: ['Page', 'Count'], handler: (this: Access.FormOld, parameter: {readonly Page: boolean, readonly Count: number}) => void): void;
-    on(
-        obj: Access.FormOldV10, event: 'AfterBeginTransaction' | 'AfterCommitTransaction' | 'RollbackTransaction', argNames: ['Connection'],
-        handler: (this: Access.FormOldV10, parameter: {readonly Connection: ADODB.Connection}) => void): void;
+    on(obj: Access.FormOldV10, event: 'AfterBeginTransaction' | 'AfterCommitTransaction' | 'RollbackTransaction', argNames: ['Connection'], handler: (this: Access.FormOldV10, parameter: {readonly Connection: ADODB.Connection}) => void): void;
     on(obj: Access.FormOldV10, event: 'AfterDelConfirm', argNames: ['Status'], handler: (this: Access.FormOldV10, parameter: {Status: number}) => void): void;
     on(obj: Access.FormOldV10, event: 'AfterFinalRender' | 'AfterLayout', argNames: ['drawObject'], handler: (this: Access.FormOldV10, parameter: {readonly drawObject: any}) => void): void;
-    on(
-        obj: Access.FormOldV10, event: 'AfterRender', argNames: ['drawObject', 'chartObject'], handler: (
-            this: Access.FormOldV10, parameter: {readonly drawObject: any, readonly chartObject: any}) => void): void;
+    on(obj: Access.FormOldV10, event: 'AfterRender', argNames: ['drawObject', 'chartObject'], handler: (this: Access.FormOldV10, parameter: {readonly drawObject: any, readonly chartObject: any}) => void): void;
     on(obj: Access.FormOldV10, event: 'ApplyFilter', argNames: ['Cancel', 'ApplyType'], handler: (this: Access.FormOldV10, parameter: {Cancel: number, ApplyType: number}) => void): void;
-    on(
-        obj: Access.FormOldV10, event: 'BeforeBeginTransaction' | 'BeforeCommitTransaction', argNames: ['Cancel', 'Connection'], handler: (
-            this: Access.FormOldV10, parameter: {Cancel: number, readonly Connection: ADODB.Connection}) => void): void;
+    on(obj: Access.FormOldV10, event: 'BeforeBeginTransaction' | 'BeforeCommitTransaction', argNames: ['Cancel', 'Connection'], handler: (this: Access.FormOldV10, parameter: {Cancel: number, readonly Connection: ADODB.Connection}) => void): void;
     on(obj: Access.FormOldV10, event: 'BeforeDelConfirm', argNames: ['Cancel', 'Response'], handler: (this: Access.FormOldV10, parameter: {Cancel: number, Response: number}) => void): void;
-    on(
-        obj: Access.FormOldV10, event: 'BeforeInsert' | 'BeforeUpdate' | 'BeginBatchEdit' | 'DblClick' | 'Delete' | 'Dirty' | 'Open' | 'RecordExit' | 'Undo' |
-        'UndoBatchEdit' | 'Unload',
-        argNames: ['Cancel'], handler: (this: Access.FormOldV10, parameter: {Cancel: number}) => void): void;
-    on(
-        obj: Access.FormOldV10, event: 'BeforeRender', argNames: ['drawObject', 'chartObject', 'Cancel'], handler: (
-            this: Access.FormOldV10, parameter: {readonly drawObject: any, readonly chartObject: any, readonly Cancel: any}) => void): void;
-    on(
-        obj: Access.FormOldV10, event: 'BeforeScreenTip', argNames: ['ScreenTipText', 'SourceObject'], handler: (
-            this: Access.FormOldV10, parameter: {readonly ScreenTipText: any, readonly SourceObject: any}) => void): void;
-    on(
-        obj: Access.FormOldV10, event: 'CommandBeforeExecute', argNames: ['Command', 'Cancel'], handler: (
-            this: Access.FormOldV10, parameter: {readonly Command: any, readonly Cancel: any}) => void): void;
+    on(obj: Access.FormOldV10, event: 'BeforeInsert' | 'BeforeUpdate' | 'BeginBatchEdit' | 'DblClick' | 'Delete' | 'Dirty' | 'Open' | 'RecordExit' | 'Undo' | 'UndoBatchEdit' | 'Unload', argNames: ['Cancel'], handler: (this: Access.FormOldV10, parameter: {Cancel: number}) => void): void;
+    on(obj: Access.FormOldV10, event: 'BeforeRender', argNames: ['drawObject', 'chartObject', 'Cancel'], handler: (this: Access.FormOldV10, parameter: {readonly drawObject: any, readonly chartObject: any, readonly Cancel: any}) => void): void;
+    on(obj: Access.FormOldV10, event: 'BeforeScreenTip', argNames: ['ScreenTipText', 'SourceObject'], handler: (this: Access.FormOldV10, parameter: {readonly ScreenTipText: any, readonly SourceObject: any}) => void): void;
+    on(obj: Access.FormOldV10, event: 'CommandBeforeExecute', argNames: ['Command', 'Cancel'], handler: (this: Access.FormOldV10, parameter: {readonly Command: any, readonly Cancel: any}) => void): void;
     on(obj: Access.FormOldV10, event: 'CommandChecked', argNames: ['Command', 'Checked'], handler: (this: Access.FormOldV10, parameter: {readonly Command: any, readonly Checked: any}) => void): void;
     on(obj: Access.FormOldV10, event: 'CommandEnabled', argNames: ['Command', 'Enabled'], handler: (this: Access.FormOldV10, parameter: {readonly Command: any, readonly Enabled: any}) => void): void;
     on(obj: Access.FormOldV10, event: 'CommandExecute', argNames: ['Command'], handler: (this: Access.FormOldV10, parameter: {readonly Command: any}) => void): void;
@@ -8708,67 +8585,41 @@ interface ActiveXObject {
     on(obj: Access.FormOldV10, event: 'Filter', argNames: ['Cancel', 'FilterType'], handler: (this: Access.FormOldV10, parameter: {Cancel: number, FilterType: number}) => void): void;
     on(obj: Access.FormOldV10, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.FormOldV10, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.FormOldV10, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.FormOldV10, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.FormOldV10, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.FormOldV10, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.FormOldV10, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.FormOldV10, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.FormOldV10, event: 'MouseWheel', argNames: ['Page', 'Count'], handler: (this: Access.FormOldV10, parameter: {readonly Page: boolean, readonly Count: number}) => void): void;
     on(obj: Access.Image, event: 'DblClick', argNames: ['Cancel'], handler: (this: Access.Image, parameter: {Cancel: number}) => void): void;
-    on(
-        obj: Access.Image, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.Image, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.Image, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.Image, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.Label, event: 'DblClick', argNames: ['Cancel'], handler: (this: Access.Label, parameter: {Cancel: number}) => void): void;
-    on(
-        obj: Access.Label, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.Label, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.Label, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.Label, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.ListBox, event: 'BeforeUpdate' | 'DblClick' | 'Exit', argNames: ['Cancel'], handler: (this: Access.ListBox, parameter: {Cancel: number}) => void): void;
     on(obj: Access.ListBox, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.ListBox, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.ListBox, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.ListBox, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.ListBox, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.ListBox, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.ListBox, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.ListBox, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.NavigationButton, event: 'DblClick' | 'Exit', argNames: ['Cancel'], handler: (this: Access.NavigationButton, parameter: {Cancel: number}) => void): void;
     on(obj: Access.NavigationButton, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.NavigationButton, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.NavigationButton, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.NavigationButton, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.NavigationButton, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.NavigationButton, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
-    on(
-        obj: Access.NavigationControl, event: 'BeforeUpdate' | 'DblClick' | 'Dirty' | 'Exit' | 'Undo', argNames: ['Cancel'], handler: (
-            this: Access.NavigationControl, parameter: {Cancel: number}) => void): void;
+    on(obj: Access.NavigationButton, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.NavigationButton, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.NavigationControl, event: 'BeforeUpdate' | 'DblClick' | 'Dirty' | 'Exit' | 'Undo', argNames: ['Cancel'], handler: (this: Access.NavigationControl, parameter: {Cancel: number}) => void): void;
     on(obj: Access.NavigationControl, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.NavigationControl, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.NavigationControl, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.NavigationControl, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.NavigationControl, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.NavigationControl, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.NavigationControl, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.NavigationControl, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.ObjectFrame, event: 'DblClick' | 'Exit', argNames: ['Cancel'], handler: (this: Access.ObjectFrame, parameter: {Cancel: number}) => void): void;
-    on(
-        obj: Access.ObjectFrame, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.ObjectFrame, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.ObjectFrame, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.ObjectFrame, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.ObjectFrame, event: 'Updated', argNames: ['Code'], handler: (this: Access.ObjectFrame, parameter: {Code: number}) => void): void;
     on(obj: Access.OptionButton, event: 'BeforeUpdate' | 'DblClick' | 'Exit', argNames: ['Cancel'], handler: (this: Access.OptionButton, parameter: {Cancel: number}) => void): void;
     on(obj: Access.OptionButton, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.OptionButton, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.OptionButton, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.OptionButton, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.OptionButton, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.OptionButton, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.OptionButton, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.OptionButton, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.OptionGroup, event: 'BeforeUpdate' | 'DblClick' | 'Exit', argNames: ['Cancel'], handler: (this: Access.OptionGroup, parameter: {Cancel: number}) => void): void;
-    on(
-        obj: Access.OptionGroup, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.OptionGroup, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.OptionGroup, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.OptionGroup, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.Page, event: 'DblClick', argNames: ['Cancel'], handler: (this: Access.Page, parameter: {Cancel: number}) => void): void;
-    on(
-        obj: Access.Page, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.Page, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.Page, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.Page, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.PaletteButton, event: 'BeforeUpdate' | 'DblClick' | 'Exit', argNames: ['Cancel'], handler: (this: Access.PaletteButton, parameter: {Cancel: number}) => void): void;
     on(obj: Access.PaletteButton, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.PaletteButton, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.PaletteButton, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.PaletteButton, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.PaletteButton, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.PaletteButton, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.PaletteButton, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.PaletteButton, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.Rectangle, event: 'DblClick', argNames: ['Cancel'], handler: (this: Access.Rectangle, parameter: {Cancel: number}) => void): void;
-    on(
-        obj: Access.Rectangle, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.Rectangle, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.Rectangle, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.Rectangle, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.References, event: 'ItemAdded' | 'ItemRemoved', argNames: ['Reference'], handler: (this: Access.References, parameter: {readonly Reference: Access.Reference}) => void): void;
     on(obj: Access.Report, event: 'ApplyFilter', argNames: ['Cancel', 'ApplyType'], handler: (this: Access.Report, parameter: {Cancel: number, ApplyType: number}) => void): void;
     on(obj: Access.Report, event: 'DblClick' | 'NoData' | 'Open' | 'Unload', argNames: ['Cancel'], handler: (this: Access.Report, parameter: {Cancel: number}) => void): void;
@@ -8776,58 +8627,36 @@ interface ActiveXObject {
     on(obj: Access.Report, event: 'Filter', argNames: ['Cancel', 'FilterType'], handler: (this: Access.Report, parameter: {Cancel: number, FilterType: number}) => void): void;
     on(obj: Access.Report, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.Report, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.Report, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.Report, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.Report, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.Report, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.Report, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.Report, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.Report, event: 'MouseWheel', argNames: ['Page', 'Count'], handler: (this: Access.Report, parameter: {readonly Page: boolean, readonly Count: number}) => void): void;
     on(obj: Access.ReportOld, event: 'Error', argNames: ['DataErr', 'Response'], handler: (this: Access.ReportOld, parameter: {DataErr: number, Response: number}) => void): void;
     on(obj: Access.ReportOld, event: 'NoData' | 'Open', argNames: ['Cancel'], handler: (this: Access.ReportOld, parameter: {Cancel: number}) => void): void;
     on(obj: Access.ReportOldV10, event: 'Error', argNames: ['DataErr', 'Response'], handler: (this: Access.ReportOldV10, parameter: {DataErr: number, Response: number}) => void): void;
     on(obj: Access.ReportOldV10, event: 'NoData' | 'Open', argNames: ['Cancel'], handler: (this: Access.ReportOldV10, parameter: {Cancel: number}) => void): void;
     on(obj: Access.Section, event: 'DblClick', argNames: ['Cancel'], handler: (this: Access.Section, parameter: {Cancel: number}) => void): void;
-    on(
-        obj: Access.Section, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.Section, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.Section, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.Section, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.SubForm, event: 'Exit', argNames: ['Cancel'], handler: (this: Access.SubForm, parameter: {Cancel: number}) => void): void;
     on(obj: Access.SubReport, event: 'Exit', argNames: ['Cancel'], handler: (this: Access.SubReport, parameter: {Cancel: number}) => void): void;
     on(obj: Access.TabControl, event: 'DblClick', argNames: ['Cancel'], handler: (this: Access.TabControl, parameter: {Cancel: number}) => void): void;
     on(obj: Access.TabControl, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.TabControl, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.TabControl, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.TabControl, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.TabControl, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.TabControl, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.TabControl, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.TabControl, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.TextBox, event: 'BeforeUpdate' | 'DblClick' | 'Dirty' | 'Exit' | 'Undo', argNames: ['Cancel'], handler: (this: Access.TextBox, parameter: {Cancel: number}) => void): void;
     on(obj: Access.TextBox, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.TextBox, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.TextBox, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.TextBox, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.TextBox, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.TextBox, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.TextBox, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.TextBox, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.ToggleButton, event: 'BeforeUpdate' | 'DblClick' | 'Exit', argNames: ['Cancel'], handler: (this: Access.ToggleButton, parameter: {Cancel: number}) => void): void;
     on(obj: Access.ToggleButton, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.ToggleButton, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.ToggleButton, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.ToggleButton, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.ToggleButton, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.ToggleButton, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
-    on(
-        obj: Access.WebBrowserControl, event: 'BeforeNavigate2', argNames: Access.EventHelperTypes.WebBrowserControl_BeforeNavigate2_ArgNames,
-        handler: (this: Access.WebBrowserControl, parameter: Access.EventHelperTypes.WebBrowserControl_BeforeNavigate2_Parameter) => void): void;
-    on(
-        obj: Access.WebBrowserControl, event: 'BeforeUpdate' | 'DblClick' | 'Dirty' | 'Exit', argNames: ['Cancel'], handler: (
-            this: Access.WebBrowserControl, parameter: {Cancel: number}) => void): void;
-    on(
-        obj: Access.WebBrowserControl, event: 'DocumentComplete', argNames: ['pDisp', 'URL'], handler: (
-            this: Access.WebBrowserControl, parameter: {readonly pDisp: any, readonly URL: any}) => void): void;
+    on(obj: Access.ToggleButton, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.ToggleButton, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.WebBrowserControl, event: 'BeforeNavigate2', argNames: Access.EventHelperTypes.WebBrowserControl_BeforeNavigate2_ArgNames, handler: (this: Access.WebBrowserControl, parameter: Access.EventHelperTypes.WebBrowserControl_BeforeNavigate2_Parameter) => void): void;
+    on(obj: Access.WebBrowserControl, event: 'BeforeUpdate' | 'DblClick' | 'Dirty' | 'Exit', argNames: ['Cancel'], handler: (this: Access.WebBrowserControl, parameter: {Cancel: number}) => void): void;
+    on(obj: Access.WebBrowserControl, event: 'DocumentComplete', argNames: ['pDisp', 'URL'], handler: (this: Access.WebBrowserControl, parameter: {readonly pDisp: any, readonly URL: any}) => void): void;
     on(obj: Access.WebBrowserControl, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.WebBrowserControl, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.WebBrowserControl, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.WebBrowserControl, parameter: {KeyAscii: number}) => void): void;
-    on(
-        obj: Access.WebBrowserControl, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (
-            this: Access.WebBrowserControl, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
-    on(
-        obj: Access.WebBrowserControl, event: 'NavigateError', argNames: ['pDisp', 'URL', 'TargetFrameName', 'StatusCode', 'Cancel'],
-        handler: (this: Access.WebBrowserControl, parameter: {readonly pDisp: any, readonly URL: any, readonly TargetFrameName: any, readonly StatusCode: any, Cancel: boolean}) => void): void;
-    on(
-        obj: Access.WebBrowserControl, event: 'ProgressChange', argNames: ['Progress', 'ProgressMax'], handler: (
-            this: Access.WebBrowserControl, parameter: {readonly Progress: number, readonly ProgressMax: number}) => void): void;
+    on(obj: Access.WebBrowserControl, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.WebBrowserControl, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
+    on(obj: Access.WebBrowserControl, event: 'NavigateError', argNames: ['pDisp', 'URL', 'TargetFrameName', 'StatusCode', 'Cancel'], handler: (this: Access.WebBrowserControl, parameter: {readonly pDisp: any, readonly URL: any, readonly TargetFrameName: any, readonly StatusCode: any, Cancel: boolean}) => void): void;
+    on(obj: Access.WebBrowserControl, event: 'ProgressChange', argNames: ['Progress', 'ProgressMax'], handler: (this: Access.WebBrowserControl, parameter: {readonly Progress: number, readonly ProgressMax: number}) => void): void;
     on(obj: Access.WebBrowserControl, event: 'Updated', argNames: ['Code'], handler: (this: Access.WebBrowserControl, parameter: {Code: number}) => void): void;
     on(obj: Access._CheckBoxInOption, event: 'AfterUpdate' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access._CheckBoxInOption, parameter: {}) => void): void;
     on(obj: Access._OptionButtonInOption, event: 'AfterUpdate' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access._OptionButtonInOption, parameter: {}) => void): void;
@@ -8841,18 +8670,9 @@ interface ActiveXObject {
     on(obj: Access.ComboBox, event: 'AfterUpdate' | 'Change' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.ComboBox, parameter: {}) => void): void;
     on(obj: Access.CommandButton, event: 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.CommandButton, parameter: {}) => void): void;
     on(obj: Access.CustomControl, event: 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.CustomControl, parameter: {}) => void): void;
-    on(
-        obj: Access.Form, event: 'Activate' | 'AfterInsert' | 'AfterUpdate' | 'BeforeQuery' | 'Click' | 'Close' | 'Current' | 'DataSetChange' | 'Deactivate' | 'GotFocus' |
-        'Load' | 'LostFocus' | 'OnConnect' | 'OnDisconnect' | 'Query' | 'Resize' | 'SelectionChange' | 'Timer',
-        handler: (this: Access.Form, parameter: {}) => void): void;
-    on(
-        obj: Access.FormOld, event: 'Activate' | 'AfterInsert' | 'AfterUpdate' | 'BeforeQuery' | 'Click' | 'Close' | 'Current' | 'DataSetChange' | 'Deactivate' |
-        'GotFocus' | 'Load' | 'LostFocus' | 'OnConnect' | 'OnDisconnect' | 'Query' | 'Resize' | 'SelectionChange' | 'Timer',
-        handler: (this: Access.FormOld, parameter: {}) => void): void;
-    on(
-        obj: Access.FormOldV10, event: 'Activate' | 'AfterInsert' | 'AfterUpdate' | 'BeforeQuery' | 'Click' | 'Close' | 'Current' | 'DataSetChange' | 'Deactivate' |
-        'GotFocus' | 'Load' | 'LostFocus' | 'OnConnect' | 'OnDisconnect' | 'Query' | 'Resize' | 'SelectionChange' | 'Timer',
-        handler: (this: Access.FormOldV10, parameter: {}) => void): void;
+    on(obj: Access.Form, event: 'Activate' | 'AfterInsert' | 'AfterUpdate' | 'BeforeQuery' | 'Click' | 'Close' | 'Current' | 'DataSetChange' | 'Deactivate' | 'GotFocus' | 'Load' | 'LostFocus' | 'OnConnect' | 'OnDisconnect' | 'Query' | 'Resize' | 'SelectionChange' | 'Timer', handler: (this: Access.Form, parameter: {}) => void): void;
+    on(obj: Access.FormOld, event: 'Activate' | 'AfterInsert' | 'AfterUpdate' | 'BeforeQuery' | 'Click' | 'Close' | 'Current' | 'DataSetChange' | 'Deactivate' | 'GotFocus' | 'Load' | 'LostFocus' | 'OnConnect' | 'OnDisconnect' | 'Query' | 'Resize' | 'SelectionChange' | 'Timer', handler: (this: Access.FormOld, parameter: {}) => void): void;
+    on(obj: Access.FormOldV10, event: 'Activate' | 'AfterInsert' | 'AfterUpdate' | 'BeforeQuery' | 'Click' | 'Close' | 'Current' | 'DataSetChange' | 'Deactivate' | 'GotFocus' | 'Load' | 'LostFocus' | 'OnConnect' | 'OnDisconnect' | 'Query' | 'Resize' | 'SelectionChange' | 'Timer', handler: (this: Access.FormOldV10, parameter: {}) => void): void;
     on(obj: Access.Image, event: 'Click', handler: (this: Access.Image, parameter: {}) => void): void;
     on(obj: Access.Label, event: 'Click', handler: (this: Access.Label, parameter: {}) => void): void;
     on(obj: Access.ListBox, event: 'AfterUpdate' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.ListBox, parameter: {}) => void): void;
@@ -8864,9 +8684,7 @@ interface ActiveXObject {
     on(obj: Access.Page, event: 'Click', handler: (this: Access.Page, parameter: {}) => void): void;
     on(obj: Access.PaletteButton, event: 'AfterUpdate' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.PaletteButton, parameter: {}) => void): void;
     on(obj: Access.Rectangle, event: 'Click', handler: (this: Access.Rectangle, parameter: {}) => void): void;
-    on(
-        obj: Access.Report, event: 'Activate' | 'Click' | 'Close' | 'Current' | 'Deactivate' | 'GotFocus' | 'Load' | 'LostFocus' | 'Page' | 'Resize' | 'Timer',
-        handler: (this: Access.Report, parameter: {}) => void): void;
+    on(obj: Access.Report, event: 'Activate' | 'Click' | 'Close' | 'Current' | 'Deactivate' | 'GotFocus' | 'Load' | 'LostFocus' | 'Page' | 'Resize' | 'Timer', handler: (this: Access.Report, parameter: {}) => void): void;
     on(obj: Access.ReportOld, event: 'Activate' | 'Close' | 'Deactivate' | 'Page', handler: (this: Access.ReportOld, parameter: {}) => void): void;
     on(obj: Access.ReportOldV10, event: 'Activate' | 'Close' | 'Deactivate' | 'Page', handler: (this: Access.ReportOldV10, parameter: {}) => void): void;
     on(obj: Access.Section, event: 'Click' | 'Paint', handler: (this: Access.Section, parameter: {}) => void): void;
@@ -8876,50 +8694,11 @@ interface ActiveXObject {
     on(obj: Access.TextBox, event: 'AfterUpdate' | 'Change' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.TextBox, parameter: {}) => void): void;
     on(obj: Access.ToggleButton, event: 'AfterUpdate' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.ToggleButton, parameter: {}) => void): void;
     on(obj: Access.WebBrowserControl, event: 'AfterUpdate' | 'Change' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.WebBrowserControl, parameter: {}) => void): void;
-    set(
-        obj: Access._CheckBoxInOption | Access._ChildLabel | Access._CustomControlInReport | Access._OptionButtonInOption | Access._ToggleButtonInOption |
-        Access.Attachment | Access.BoundObjectFrame | Access.CheckBox | Access.ComboBox | Access.CommandButton | Access.CustomControl | Access.EmptyCell | Access.Form |
-        Access.FormOld | Access.FormOldV10 | Access.Label | Access.ListBox | Access.NavigationButton | Access.NavigationControl | Access.ObjectFrame |
-        Access.OptionButton | Access.OptionGroup | Access.Page | Access.SubForm | Access.TabControl | Access.TextBox | Access.ToggleButton | Access.WebBrowserControl,
-        propertyName: 'accName' | 'accValue', parameterTypes: [any], newValue: string): void;
+    set(obj: Access._CheckBoxInOption | Access._ChildLabel | Access._CustomControlInReport | Access._OptionButtonInOption | Access._ToggleButtonInOption | Access.Attachment | Access.BoundObjectFrame | Access.CheckBox | Access.ComboBox | Access.CommandButton | Access.CustomControl | Access.EmptyCell | Access.Form | Access.FormOld | Access.FormOldV10 | Access.Label | Access.ListBox | Access.NavigationButton | Access.NavigationControl | Access.ObjectFrame | Access.OptionButton | Access.OptionGroup | Access.Page | Access.SubForm | Access.TabControl | Access.TextBox | Access.ToggleButton | Access.WebBrowserControl, propertyName: 'accName' | 'accValue', parameterTypes: [any], newValue: string): void;
     set(obj: Access._ControlInReportEvents | Access.ComboBox | Access.Control | Access.ListBox, propertyName: 'Selected', parameterTypes: [number], newValue: number): void;
+    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }
 
 interface ActiveXObjectNameMap {
     'Access.Application': Access.Application;
 }
-
-interface EnumeratorConstructor {
-    new(col: Access._ItemsSelected): Enumerator<number>;
-    new(col: Access.AccessObjectProperties): Enumerator<Access.AccessObjectProperty>;
-    new(col: Access.AdditionalData): Enumerator<Access.AdditionalData>;
-    new(
-        col: Access.AllDataAccessPages | Access.AllDatabaseDiagrams | Access.AllForms | Access.AllFunctions | Access.AllMacros | Access.AllModules | Access.AllQueries |
-        Access.AllReports | Access.AllStoredProcedures | Access.AllTables | Access.AllViews | Access.DependencyObjects): Enumerator<Access.AccessObject>;
-    new(col: Access.Controls): Enumerator<Access.Control>;
-    new(col: Access.Children | Access.Properties): Enumerator<any>; // tslint:disable-line:use-default-type-parameter
-    new(col: Access.DataAccessPages): Enumerator<Access.DataAccessPage>;
-    new(col: Access.Entities): Enumerator<Access.Entity>;
-    new(col: Access.FormatConditions): Enumerator<Access.FormatCondition>;
-    new(col: Access.Forms): Enumerator<Access.Form>;
-    new(col: Access.ImportExportSpecifications): Enumerator<Access.ImportExportSpecification>;
-    new(col: Access.LocalVars): Enumerator<Access.LocalVar>;
-    new(col: Access.Modules): Enumerator<Access.Module>;
-    new(col: Access.Operations): Enumerator<Access.Operation>;
-    new(col: Access.Pages): Enumerator<Access.Page>;
-    new(col: Access.Printers): Enumerator<Access.Printer>;
-    new(col: Access.References): Enumerator<Access.Reference>;
-    new(col: Access.Reports): Enumerator<Access.Report>;
-    new(col: Access.ReturnVars): Enumerator<Access.ReturnVar>;
-    new(col: Access.SharedResources): Enumerator<Access.SharedResource>;
-    new(col: Access.SmartTagActions): Enumerator<Access.SmartTagAction>;
-    new(col: Access.SmartTagProperties): Enumerator<Access.SmartTagProperty>;
-    new(col: Access.SmartTags): Enumerator<Access.SmartTag>;
-    new(col: Access.TempVars): Enumerator<Access.TempVar>;
-    new(col: Access.WebServices): Enumerator<Access.WebService>;
-    new(col: Access.WSParameters): Enumerator<Access.WSParameter>;
-}
-
-interface SafeArray<T = any> {
-    _brand: SafeArray<T>;
-}
diff --git a/types/activex-access/tslint.json b/types/activex-access/tslint.json
index 3224b40b8b..7b89accc6d 100644
--- a/types/activex-access/tslint.json
+++ b/types/activex-access/tslint.json
@@ -1,6 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-const-enum": false
+        "no-const-enum": false,
+        "max-line-length": false
     }
 }

From b50cae0a825520c825ce9f3d37b2419ccf04da56 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Mon, 21 May 2018 16:31:08 +0200
Subject: [PATCH 291/575] Reduce any 1

---
 types/activex-access/index.d.ts | 540 ++++++++++++++++----------------
 1 file changed, 269 insertions(+), 271 deletions(-)

diff --git a/types/activex-access/index.d.ts b/types/activex-access/index.d.ts
index 199fa22d36..e553b82fad 100644
--- a/types/activex-access/index.d.ts
+++ b/types/activex-access/index.d.ts
@@ -988,6 +988,13 @@ declare namespace Access {
         acLayoutTabular = 1,
     }
 
+    const enum AcSetMenuItemState {
+        acMenuCheck = 3,
+        acMenuGray = 1,
+        acMenuUncheck = 2,
+        acMenuUngray = 0,
+    }
+
     const enum AcModuleType {
         acClassModule = 1,
         acStandardModule = 0,
@@ -1028,6 +1035,21 @@ declare namespace Access {
         acReadOnly = 2,
     }
 
+    const enum AcOutputFormat {
+        acFormatASP = 'Microsoft Active Server Pages (*.asp)',
+        acFormatDAP = 'Microsoft Access Data Access Page (*.htm; *.html)',
+        acFormatHTML = 'HTML (*.html)',
+        acFormatIIS = 'Microsoft IIS (*.htx; *.idc)',
+        acFormatPDF = 'PDF Format (*.pdf)',
+        acFormatRTF = 'Rich Text Format (*.rtf)',
+        acFormatSNP = 'Snapshot Format (*.snp)',
+        acFormatTXT = 'MS-DOS Text (*.txt)',
+        acFormatXLS = 'Microsoft Excel (*.xls)',
+        acFormatXLSB = 'Microsoft Excel Binary Workbook (*.xlsb)',
+        acFormatXLSX = 'Microsoft Excel Workbook (*.xlsx)',
+        acFormatXPS = 'XPS Format (*.xps)'
+    }
+
     const enum AcOutputObjectType {
         acOutputDataAccessPage = 6,
         acOutputForm = 2,
@@ -1865,6 +1887,10 @@ declare namespace Access {
         TypeLib = 0,
     }
 
+    type ByteArray = SafeArray<number>;
+
+    type DatabaseType = 'Microsoft Access (default)' | 'Jet 2.x' | 'Jet 3.x' | 'dBase III' | 'dBase IV' | 'dBase 5.0' | 'Paradox 3.x' | 'Paradox 4.x' | 'Paradox 5.x' | 'Paradox 7.x' | 'ODBC Database' | 'WSS';
+
     class _AccessProperty {
         private 'Access._AccessProperty_typekey': _AccessProperty;
         private constructor();
@@ -1958,7 +1984,7 @@ declare namespace Access {
         Left: number;
         LeftPadding: number;
         Locked: boolean;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         OldBorderStyle: number;
         readonly OldValue: any;
@@ -2095,7 +2121,7 @@ declare namespace Access {
         LeftMargin: number;
         LeftPadding: number;
         LineSpacing: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         NumeralShapes: number;
         OldBorderStyle: number;
@@ -2162,7 +2188,7 @@ declare namespace Access {
         readonly Layout: AcLayoutType;
         readonly LayoutID: number;
         LeftPadding: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         readonly Object: any;
         ObjectVerbs(Index: number): string;
@@ -2250,7 +2276,7 @@ declare namespace Access {
         LeftPadding: number;
         Locked: boolean;
         LpOleObject: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         readonly Object: any;
         ObjectPalette: any;
@@ -2377,7 +2403,7 @@ declare namespace Access {
         Left: number;
         LeftPadding: number;
         Locked: boolean;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         OldBorderStyle: number;
         readonly OldValue: any;
@@ -2645,7 +2671,7 @@ declare namespace Access {
         Left: number;
         LeftPadding: number;
         Locked: boolean;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         ObjectPalette: any;
         readonly OldValue: any;
@@ -2750,10 +2776,10 @@ declare namespace Access {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): AccessObjectProperty;
+        Item(Index: number | string): AccessObjectProperty;
         readonly Parent: any;
-        Remove(Item: any): void;
-        (Index: any): AccessObjectProperty;
+        Remove(Item: number | string): void;
+        (Index: number | string): AccessObjectProperty;
     }
 
     class AccessObjectProperty {
@@ -2765,118 +2791,28 @@ declare namespace Access {
         Value: any;
     }
 
+    interface AccessObjects {
+        readonly Application: Application;
+        readonly Count: number;
+        IsMemberSafe(dispid: number): boolean;
+        Item(var_0: number | string): AccessObject;
+        readonly Parent: any;
+        (var_0: number | string): AccessObject;
+    }
+
     interface AdditionalData {
         Add(var_0: string): AdditionalData;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): AdditionalData;
+        Item(Index: number | string): AdditionalData;
         Name: string;
-        (Index: any): AdditionalData;
-    }
-
-    interface AllDataAccessPages {
-        readonly Application: Application;
-        readonly Count: number;
-        IsMemberSafe(dispid: number): boolean;
-        Item(var_0: any): AccessObject;
-        readonly Parent: any;
-        (var_0: any): AccessObject;
-    }
-
-    interface AllDatabaseDiagrams {
-        readonly Application: Application;
-        readonly Count: number;
-        IsMemberSafe(dispid: number): boolean;
-        Item(var_0: any): AccessObject;
-        readonly Parent: any;
-        (var_0: any): AccessObject;
-    }
-
-    interface AllForms {
-        readonly Application: Application;
-        readonly Count: number;
-        IsMemberSafe(dispid: number): boolean;
-        Item(var_0: any): AccessObject;
-        readonly Parent: any;
-        (var_0: any): AccessObject;
-    }
-
-    interface AllFunctions {
-        readonly Application: Application;
-        readonly Count: number;
-        IsMemberSafe(dispid: number): boolean;
-        Item(var_0: any): AccessObject;
-        readonly Parent: any;
-        (var_0: any): AccessObject;
-    }
-
-    interface AllMacros {
-        readonly Application: Application;
-        readonly Count: number;
-        IsMemberSafe(dispid: number): boolean;
-        Item(var_0: any): AccessObject;
-        readonly Parent: any;
-        (var_0: any): AccessObject;
-    }
-
-    interface AllModules {
-        readonly Application: Application;
-        readonly Count: number;
-        IsMemberSafe(dispid: number): boolean;
-        Item(var_0: any): AccessObject;
-        readonly Parent: any;
-        (var_0: any): AccessObject;
-    }
-
-    interface AllQueries {
-        readonly Application: Application;
-        readonly Count: number;
-        IsMemberSafe(dispid: number): boolean;
-        Item(var_0: any): AccessObject;
-        readonly Parent: any;
-        (var_0: any): AccessObject;
-    }
-
-    interface AllReports {
-        readonly Application: Application;
-        readonly Count: number;
-        IsMemberSafe(dispid: number): boolean;
-        Item(var_0: any): AccessObject;
-        readonly Parent: any;
-        (var_0: any): AccessObject;
-    }
-
-    interface AllStoredProcedures {
-        readonly Application: Application;
-        readonly Count: number;
-        IsMemberSafe(dispid: number): boolean;
-        Item(var_0: any): AccessObject;
-        readonly Parent: any;
-        (var_0: any): AccessObject;
-    }
-
-    interface AllTables {
-        readonly Application: Application;
-        readonly Count: number;
-        IsMemberSafe(dispid: number): boolean;
-        Item(var_0: any): AccessObject;
-        readonly Parent: any;
-        (var_0: any): AccessObject;
-    }
-
-    interface AllViews {
-        readonly Application: Application;
-        readonly Count: number;
-        IsMemberSafe(dispid: number): boolean;
-        Item(var_0: any): AccessObject;
-        readonly Parent: any;
-        (var_0: any): AccessObject;
+        (Index: number | string): AdditionalData;
     }
 
     class Application {
         private 'Access.Application_typekey': Application;
         private constructor();
-        AccessError(ErrorNumber: any): any;
+        AccessError(ErrorNumber: number): string;
         AddAutoCorrect(ChangeFrom: string, ChangeTo: string): void;
         AddToFavorites(): void;
         readonly ADOConnectString: string;
@@ -2904,20 +2840,20 @@ declare namespace Access {
         /** @param LogFile [LogFile=false] */
         CompactRepair(SourceFile: string, DestinationFile: string, LogFile?: boolean): boolean;
         ConvertAccessProject(SourceFilename: string, DestinationFilename: string, DestinationFileFormat: AcFileFormat): void;
-        CreateAccessProject(filepath: string, Connect?: any): void;
+        CreateAccessProject(filepath: string, Connect?: string): void;
         CreateAdditionalData(): AdditionalData;
 
         /** @param Section [Section=0] */
-        CreateControl(FormName: string, ControlType: AcControlType, Section?: AcSection, Parent?: any, ColumnName?: any, Left?: any, Top?: any, Width?: any, Height?: any): Control;
+        CreateControl(FormName: string, ControlType: AcControlType, Section?: AcSection, Parent?: string, ColumnName?: string, Left?: number, Top?: number, Width?: number, Height?: number): Control;
         CreateControlEx(FormName: string, ControlType: AcControlType, Section: AcSection, Parent: string, ControlSource: string, Left: number, Top: number, Width: number, Height: number): Control;
         CreateControlExOld(FormName: string, ControlType: AcControlType, Section: AcSection, Parent: string, ControlSource: string, Left: number, Top: number, Width: number, Height: number): Control;
 
         /** @param Section [Section=0] */
-        CreateControlOld(FormName: string, ControlType: AcControlType, Section?: AcSection, Parent?: any, ColumnName?: any, Left?: any, Top?: any, Width?: any, Height?: any): Control;
+        CreateControlOld(FormName: string, ControlType: AcControlType, Section?: AcSection, Parent?: string, ColumnName?: string, Left?: number, Top?: number, Width?: number, Height?: number): Control;
 
         /** @param CreateNewFile [CreateNewFile=true] */
-        CreateDataAccessPage(FileName: any, CreateNewFile?: boolean): DataAccessPage;
-        CreateForm(Database?: any, FormTemplate?: any): Form;
+        CreateDataAccessPage(FileName: string, CreateNewFile?: boolean): DataAccessPage;
+        CreateForm(Database?: string, FormTemplate?: string): Form;
         CreateGroupLevel(ReportName: string, Expression: string, Header: number, Footer: number): number;
 
         /**
@@ -2928,15 +2864,15 @@ declare namespace Access {
          * @param Replace [Replace=false]
          */
         CreateNewWorkgroupFile(Path?: string, Name?: string, Company?: string, WorkgroupID?: string, Replace?: boolean): void;
-        CreateReport(Database?: any, ReportTemplate?: any): Report;
+        CreateReport(Database?: string, ReportTemplate?: string): Report;
 
         /** @param Section [Section=0] */
-        CreateReportControl(ReportName: string, ControlType: AcControlType, Section?: AcSection, Parent?: any, ColumnName?: any, Left?: any, Top?: any, Width?: any, Height?: any): Control;
+        CreateReportControl(ReportName: string, ControlType: AcControlType, Section?: AcSection, Parent?: string, ColumnName?: string, Left?: number, Top?: number, Width?: number, Height?: number): Control;
         CreateReportControlEx(ReportName: string, ControlType: AcControlType, Section: AcSection, Parent: string, ControlName: string, Left: number, Top: number, Width: number, Height: number): Control;
         CreateReportControlExOld(ReportName: string, ControlType: AcControlType, Section: AcSection, Parent: string, ControlName: string, Left: number, Top: number, Width: number, Height: number): Control;
 
         /** @param Section [Section=0] */
-        CreateReportControlOld(ReportName: string, ControlType: AcControlType, Section?: AcSection, Parent?: any, ColumnName?: any, Left?: any, Top?: any, Width?: any, Height?: any): Control;
+        CreateReportControlOld(ReportName: string, ControlType: AcControlType, Section?: AcSection, Parent?: string, ColumnName?: string, Left?: number, Top?: number, Width?: number, Height?: number): Control;
         readonly CurrentData: CurrentData;
         CurrentDb(): DAO.Database;
         readonly CurrentObjectName: string;
@@ -2946,36 +2882,36 @@ declare namespace Access {
         CurrentWebUser(DisplayOption: AcWebUserDisplay): any;
         CurrentWebUserGroups(DisplayOption: AcWebUserGroupsDisplay): any;
         readonly DataAccessPages: DataAccessPages;
-        DAvg(Expr: string, Domain: string, Criteria?: any): any;
+        DAvg(Expr: string, Domain: string, Criteria?: string): number | null;
         readonly DBEngine: DAO.DBEngine;
-        DCount(Expr: string, Domain: string, Criteria?: any): any;
-        DDEExecute(ChanNum: any, Command: string): void;
-        DDEInitiate(Application: string, Topic: string): any;
-        DDEPoke(ChanNum: any, Item: string, Data: string): void;
-        DDERequest(ChanNum: any, Item: string): string;
-        DDETerminate(ChanNum: any): void;
+        DCount(Expr: string, Domain: string, Criteria?: string): number | null;
+        DDEExecute(ChanNum: number, Command: string): void;
+        DDEInitiate(Application: string, Topic: string): number;
+        DDEPoke(ChanNum: number, Item: string, Data: string): void;
+        DDERequest(ChanNum: number, Item: string): string;
+        DDETerminate(ChanNum: number): void;
         DDETerminateAll(): void;
         readonly DefaultWebOptions: DefaultWebOptions;
         DefaultWorkspaceClone(): DAO.Workspace;
         DelAutoCorrect(ChangeFrom: string): void;
         DeleteControl(FormName: string, ControlName: string): void;
         DeleteReportControl(ReportName: string, ControlName: string): void;
-        DFirst(Expr: string, Domain: string, Criteria?: any): any;
+        DFirst(Expr: string, Domain: string, Criteria?: string): any;
         DirtyObject(ObjectType: AcObjectType, ObjectName: string): void;
-        DLast(Expr: string, Domain: string, Criteria?: any): any;
-        DLookup(Expr: string, Domain: string, Criteria?: any): any;
-        DMax(Expr: string, Domain: string, Criteria?: any): any;
-        DMin(Expr: string, Domain: string, Criteria?: any): any;
+        DLast(Expr: string, Domain: string, Criteria?: string): any;
+        DLookup(Expr: string, Domain: string, Criteria?: string): any;
+        DMax(Expr: string, Domain: string, Criteria?: string): any;
+        DMin(Expr: string, Domain: string, Criteria?: string): any;
         readonly DoCmd: DoCmd;
-        DStDev(Expr: string, Domain: string, Criteria?: any): any;
-        DStDevP(Expr: string, Domain: string, Criteria?: any): any;
-        DSum(Expr: string, Domain: string, Criteria?: any): any;
-        DVar(Expr: string, Domain: string, Criteria?: any): any;
-        DVarP(Expr: string, Domain: string, Criteria?: any): any;
+        DStDev(Expr: string, Domain: string, Criteria?: string): number | null;
+        DStDevP(Expr: string, Domain: string, Criteria?: string): number | null;
+        DSum(Expr: string, Domain: string, Criteria?: string): number | null;
+        DVar(Expr: string, Domain: string, Criteria?: string): number | null;
+        DVarP(Expr: string, Domain: string, Criteria?: string): number | null;
 
         /** @param bstrStatusBarText [bstrStatusBarText=''] */
         Echo(EchoOn: number, bstrStatusBarText?: string): void;
-        EuroConvert(Number: number, SourceCurrency: string, TargetCurrency: string, FullPrecision?: any, TriangulationPrecision?: any): number;
+        EuroConvert(Number: number, SourceCurrency: string, TargetCurrency: string, FullPrecision?: boolean, TriangulationPrecision?: number): number;
         Eval(StringExpr: string): any;
 
         /**
@@ -2995,7 +2931,7 @@ declare namespace Access {
          * @param OtherFlags [OtherFlags=0]
          * @param WhereCondition [WhereCondition='']
          */
-        ExportXML(ObjectType: AcExportXMLObjectType, DataSource: string, DataTarget?: string, SchemaTarget?: string, PresentationTarget?: string, ImageTarget?: string, Encoding?: AcExportXMLEncoding, OtherFlags?: AcExportXMLOtherFlags, WhereCondition?: string, AdditionalData?: any): void;
+        ExportXML(ObjectType: AcExportXMLObjectType, DataSource: string, DataTarget?: string, SchemaTarget?: string, PresentationTarget?: string, ImageTarget?: string, Encoding?: AcExportXMLEncoding, OtherFlags?: AcExportXMLOtherFlags, WhereCondition?: string, AdditionalData?: AdditionalData): void;
 
         /**
          * @param DataTarget [DataTarget='']
@@ -3017,12 +2953,19 @@ declare namespace Access {
          * @param Method [Method=0]
          * @param HeaderInfo [HeaderInfo='']
          */
-        FollowHyperlink(Address: string, SubAddress?: string, NewWindow?: boolean, AddHistory?: boolean, ExtraInfo?: any, Method?: Office.MsoExtraInfoMethod, HeaderInfo?: string): void;
+        FollowHyperlink(Address: string, SubAddress?: string, NewWindow?: boolean, AddHistory?: boolean, ExtraInfo?: string | ByteArray, Method?: Office.MsoExtraInfoMethod, HeaderInfo?: string): void;
         readonly Forms: Forms;
         GetHiddenAttribute(ObjectType: AcObjectType, ObjectName: string): boolean;
-        GetOption(OptionName: string): any;
-        GUIDFromString(String: any): any;
-        HtmlEncode(PlainText: any, Length?: any): string;
+
+        /**
+         * Returns different types of values based on how the options are set:
+         * * If by selecting / clearing a checkbox, returns `boolean`
+         * * If by typing a string or numeric value, returns `string` or `number`
+         * * If by choosing from a list, will return the 0-based index of the selected item
+         */
+        GetOption(OptionName: string): boolean | string | number;
+        GUIDFromString(String: string): ByteArray;
+        HtmlEncode(PlainText: string, Length?: number): string;
         hWndAccessApp(): number;
 
         /** @param Part [Part=0] */
@@ -3050,14 +2993,14 @@ declare namespace Access {
         readonly Modules: Modules;
         readonly MsoDebugOptions: Office.MsoDebugOptions;
         readonly Name: string;
-        NewAccessProject(filepath: string, Connect?: any): void;
+        NewAccessProject(filepath: string, Connect?: string): void;
 
         /**
          * @param FileFormat [FileFormat=0]
          * @param SiteAddress [SiteAddress='']
          * @param ListID [ListID='']
          */
-        NewCurrentDatabase(filepath: string, FileFormat?: AcNewDatabaseFormat, Template?: any, SiteAddress?: string, ListID?: string): void;
+        NewCurrentDatabase(filepath: string, FileFormat?: AcNewDatabaseFormat, Template?: string, SiteAddress?: string, ListID?: string): void;
         NewCurrentDatabaseOld(filepath: string): void;
         readonly NewFileTaskPane: Office.NewFile;
         Nz(Value: any, ValueIfNull?: any): any;
@@ -3074,7 +3017,7 @@ declare namespace Access {
         /** @param Exclusive [Exclusive=false] */
         OpenCurrentDatabaseOld(filepath: string, Exclusive?: boolean): void;
         readonly Parent: any;
-        PlainText(RichText: any, Length?: any): string;
+        PlainText(RichText: string, Length?: number): string;
         Printer: Printer;
         readonly Printers: Printers;
         readonly ProductCode: string;
@@ -3091,16 +3034,27 @@ declare namespace Access {
         Run(Procedure: string, Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
         RunCommand(Command: AcCommand): void;
         SaveAsAXL(ObjectType: AcObjectType, ObjectName: string, FileName: string): void;
-        SaveAsTemplate(Path: string, Title: string, IconPath: string, CoreTable: string, Category: string, PreviewPath?: any, Description?: any, InstantiationForm?: any, ApplicationPart?: any, IncludeData?: any, Variation?: any): void;
+        SaveAsTemplate(Path: string, Title: string, IconPath: string, CoreTable: string, Category: string, PreviewPath?: any, Description?: string, InstantiationForm?: string, ApplicationPart?: boolean, IncludeData?: boolean, Variation?: any): void;
         SaveAsText(ObjectType: AcObjectType, ObjectName: string, FileName: string): void;
         readonly Screen: Screen;
         SetDefaultWorkgroupFile(Path: string): void;
         SetHiddenAttribute(ObjectType: AcObjectType, ObjectName: string, fHidden: boolean): void;
-        SetOption(OptionName: string, Setting: any): void;
+
+        /**
+         * Pass different types of values based on how the option is set in the UI
+         * * If by selecting / clearing a checkbox, pass a `boolean`
+         * * If by typing a string or numeric value, pass a `string` or `number`
+         * * If by choosing from a list, pass the 0-based index of the tiem to select
+         */
+        SetOption(OptionName: string, Setting: boolean | string | number): void;
         SetUndoRecording(yesno: number): void;
         ShortcutMenuBar: string;
-        StringFromGUID(Guid: any): any;
-        SysCmd(Action: AcSysCmdAction, Argument2?: any, Argument3?: any): any;
+        StringFromGUID(Guid: ByteArray): string;
+        SysCmd(Action: AcSysCmdAction.acSysCmdInitMeter, StatusText: string, MaxValue: number): null;
+        SysCmd(Action: AcSysCmdAction.acSysCmdUpdateMeter, CurrentValue: number): null;
+        SysCmd(Action: AcSysCmdAction.acSysCmdSetStatus, StatusText: string): null;
+        SysCmd(Action: AcSysCmdAction.acSysCmdGetObjectState, Argument2: AcObjectType, Argument3: string): Constants.acObjStateDirty | Constants.acObjStateNew | Constants.acObjStateOpen;
+        SysCmd(Acton: AcSysCmdAction.acSysCmdAccessDir | AcSysCmdAction.acSysCmdAccessVer | AcSysCmdAction.acSysCmdClearHelpTopic | AcSysCmdAction.acSysCmdClearStatus | AcSysCmdAction.acSysCmdGetWorkgroupFile | AcSysCmdAction.acSysCmdIniFile | AcSysCmdAction.acSysCmdProfile | AcSysCmdAction.acSysCmdRemoveMeter | AcSysCmdAction.acSysCmdRuntime): null;
         readonly TempVars: TempVars;
 
         /**
@@ -3179,9 +3133,9 @@ declare namespace Access {
         Enabled: boolean;
         EventProcPrefix: string;
         FileData(var_0?: any): any;
-        FileName(var_0?: any): string;
-        FileType(var_0?: any): string;
-        FileURL(var_0?: any): string;
+        FileName(var_0?: number | string): string;
+        FileType(var_0?: number | string): string;
+        FileURL(var_0?: number | string): string;
         Forward(): void;
         Goto(): void;
         GridlineColor: number;
@@ -3211,7 +3165,7 @@ declare namespace Access {
         Left: number;
         LeftPadding: number;
         Locked: boolean;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: null): void;
         Name: string;
         OldBorderStyle: number;
         readonly OldValue: any;
@@ -3363,7 +3317,7 @@ declare namespace Access {
         LeftPadding: number;
         Locked: boolean;
         LpOleObject: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         readonly Object: any;
         ObjectPalette: any;
@@ -3506,7 +3460,7 @@ declare namespace Access {
         Left: number;
         LeftPadding: number;
         Locked: boolean;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         OldBorderStyle: number;
         readonly OldValue: any;
@@ -3564,8 +3518,10 @@ declare namespace Access {
     interface Children {
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): any;
-        (Index: any): any;
+        // tslint:disable-next-line:no-unnecessary-generics
+        Item<T = Control>(Index: number | string): T;
+        // tslint:disable-next-line:no-unnecessary-generics
+        <T = Control>(Index: number | string): T;
     }
 
     class Class {
@@ -3576,12 +3532,12 @@ declare namespace Access {
     class CodeData {
         private 'Access.CodeData_typekey': CodeData;
         private constructor();
-        readonly AllDatabaseDiagrams: AllDatabaseDiagrams;
-        readonly AllFunctions: AllFunctions;
-        readonly AllQueries: AllQueries;
-        readonly AllStoredProcedures: AllStoredProcedures;
-        readonly AllTables: AllTables;
-        readonly AllViews: AllViews;
+        readonly AllDatabaseDiagrams: AccessObjects;
+        readonly AllFunctions: AccessObjects;
+        readonly AllQueries: AccessObjects;
+        readonly AllStoredProcedures: AccessObjects;
+        readonly AllTables: AccessObjects;
+        readonly AllViews: AccessObjects;
         IsMemberSafe(dispid: number): boolean;
     }
 
@@ -3590,11 +3546,11 @@ declare namespace Access {
         private constructor();
         readonly AccessConnection: ADODB.Connection;
         AddSharedImage(SharedImageName: string, FileName: string): void;
-        readonly AllDataAccessPages: AllDataAccessPages;
-        readonly AllForms: AllForms;
-        readonly AllMacros: AllMacros;
-        readonly AllModules: AllModules;
-        readonly AllReports: AllReports;
+        readonly AllDataAccessPages: AccessObjects;
+        readonly AllForms: AccessObjects;
+        readonly AllMacros: AccessObjects;
+        readonly AllModules: AccessObjects;
+        readonly AllReports: AccessObjects;
         readonly Application: Application;
         readonly BaseConnectionString: string;
         CloseConnection(): void;
@@ -3607,7 +3563,7 @@ declare namespace Access {
         readonly IsTrusted: boolean;
         readonly IsWeb: boolean;
         readonly Name: string;
-        OpenConnection(BaseConnectionString?: any, UserID?: any, Password?: any): void;
+        OpenConnection(BaseConnectionString?: string, UserID?: string, Password?: string): void;
         readonly Parent: any;
         readonly Path: string;
         readonly ProjectType: AcProjectType;
@@ -3643,7 +3599,7 @@ declare namespace Access {
         accState(varChild?: any): any;
         accValue(varChild?: any): string;
         AddColon: boolean;
-        AddItem(Item: string, Index?: any): void;
+        AddItem(Item: string, Index?: number): void;
         AfterUpdate: string;
         AfterUpdateMacro: string;
         AllowAutoCorrect: boolean;
@@ -3672,7 +3628,7 @@ declare namespace Access {
         CanGrow: boolean;
         CanShrink: boolean;
         Coltyp: number;
-        Column(Index: number, Row?: any): any;
+        Column(Index: number, Row?: number): any;
         ColumnCount: number;
         ColumnHeads: boolean;
         ColumnHidden: boolean;
@@ -3749,7 +3705,7 @@ declare namespace Access {
         ListRows: number;
         ListWidth: string;
         Locked: boolean;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         NumeralShapes: number;
         OldBorderStyle: number;
@@ -3787,8 +3743,8 @@ declare namespace Access {
         readonly Parent: any;
         readonly Properties: Properties;
         ReadingOrder: number;
-        Recordset: any;
-        RemoveItem(Index: any): void;
+        Recordset: DAO.Recordset | ADODB.Recordset;
+        RemoveItem(Index: number | string): void;
         Requery(): void;
         RightMargin: number;
         RightPadding: number;
@@ -3933,7 +3889,7 @@ declare namespace Access {
         readonly LayoutID: number;
         Left: number;
         LeftPadding: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         ObjectPalette: any;
         readonly OldValue: any;
@@ -4011,7 +3967,7 @@ declare namespace Access {
         _Name: string;
         readonly Application: Application;
         BottomPadding: number;
-        Column(Index: number, Row?: any): any;
+        Column(Index: number, Row?: number): any;
         readonly Controls: Children;
         Dropdown(): void;
         readonly Form: Form;
@@ -4033,7 +3989,7 @@ declare namespace Access {
         readonly Layout: AcLayoutType;
         readonly LayoutID: number;
         LeftPadding: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         readonly Object: any;
         ObjectVerbs(Index: number): string;
@@ -4067,12 +4023,12 @@ declare namespace Access {
     class CurrentData {
         private 'Access.CurrentData_typekey': CurrentData;
         private constructor();
-        readonly AllDatabaseDiagrams: AllDatabaseDiagrams;
-        readonly AllFunctions: AllFunctions;
-        readonly AllQueries: AllQueries;
-        readonly AllStoredProcedures: AllStoredProcedures;
-        readonly AllTables: AllTables;
-        readonly AllViews: AllViews;
+        readonly AllDatabaseDiagrams: AccessObjects;
+        readonly AllFunctions: AccessObjects;
+        readonly AllQueries: AccessObjects;
+        readonly AllStoredProcedures: AccessObjects;
+        readonly AllTables: AccessObjects;
+        readonly AllViews: AccessObjects;
         IsMemberSafe(dispid: number): boolean;
     }
 
@@ -4081,11 +4037,11 @@ declare namespace Access {
         private constructor();
         readonly AccessConnection: ADODB.Connection;
         AddSharedImage(SharedImageName: string, FileName: string): void;
-        readonly AllDataAccessPages: AllDataAccessPages;
-        readonly AllForms: AllForms;
-        readonly AllMacros: AllMacros;
-        readonly AllModules: AllModules;
-        readonly AllReports: AllReports;
+        readonly AllDataAccessPages: AccessObjects;
+        readonly AllForms: AccessObjects;
+        readonly AllMacros: AccessObjects;
+        readonly AllModules: AccessObjects;
+        readonly AllReports: AccessObjects;
         readonly Application: Application;
         readonly BaseConnectionString: string;
         CloseConnection(): void;
@@ -4098,7 +4054,7 @@ declare namespace Access {
         readonly IsTrusted: boolean;
         readonly IsWeb: boolean;
         readonly Name: string;
-        OpenConnection(BaseConnectionString?: any, UserID?: any, Password?: any): void;
+        OpenConnection(BaseConnectionString?: string, UserID?: string, Password?: string): void;
         readonly Parent: any;
         readonly Path: string;
         readonly ProjectType: AcProjectType;
@@ -4177,7 +4133,7 @@ declare namespace Access {
         LeftPadding: number;
         Locked: boolean;
         LpOleObject: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         readonly Object: any;
         ObjectPalette: any;
@@ -4287,21 +4243,21 @@ declare namespace Access {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): AccessObject;
+        Item(Index: number | string): AccessObject;
         readonly Parent: any;
-        (Index: any): AccessObject;
+        (Index: number | string): AccessObject;
     }
 
     class DoCmd {
         private 'Access.DoCmd_typekey': DoCmd;
         private constructor();
-        AddMenu(MenuName: any, MenuMacroName: any, StatusBarText?: any): void;
-        ApplyFilter(FilterName?: any, WhereCondition?: any, ControlName?: any): void;
-        ApplyFilterOld0(FilterName?: any, WhereCondition?: any): void;
+        AddMenu(MenuName: string, MenuMacroName: string, StatusBarText?: string): void;
+        ApplyFilter(FilterName?: string, WhereCondition?: string, ControlName?: any): void;
+        ApplyFilterOld0(FilterName?: string, WhereCondition?: string): void;
         Beep(): void;
 
         /** @param DataMode [DataMode=1] */
-        BrowseTo(ObjectType: AcBrowseToObjectType, ObjectName: any, PathtoSubformControl: any, WhereCondition: any, Page: any, DataMode?: AcFormOpenDataMode): void;
+        BrowseTo(ObjectType: AcBrowseToObjectType, ObjectName: string, PathtoSubformControl?: string, WhereCondition?: string, Page?: string, DataMode?: AcFormOpenDataMode): void;
         CancelEvent(): void;
         ClearMacroError(): void;
 
@@ -4309,70 +4265,80 @@ declare namespace Access {
          * @param ObjectType [ObjectType=-1]
          * @param Save [Save=0]
          */
-        Close(ObjectType: AcObjectType, ObjectName: any, Save?: AcCloseSave): void;
+        Close(ObjectType: AcObjectType, ObjectName: string, Save?: AcCloseSave): void;
         Close(): void;
         CloseDatabase(): void;
-        CopyDatabaseFile(DatabaseFileName: any, OverwriteExistingFile?: any, DisconnectAllUsers?: any): void;
+        CopyDatabaseFile(DatabaseFileName: string, OverwriteExistingFile?: boolean, DisconnectAllUsers?: boolean): void;
 
         /** @param SourceObjectType [SourceObjectType=-1] */
-        CopyObject(DestinationDatabase: any, NewName: any, SourceObjectType?: AcObjectType, SourceObjectName?: any): void;
+        CopyObject(DestinationDatabase: string, NewName: string, SourceObjectType?: AcObjectType, SourceObjectName?: string): void;
 
         /** @param ObjectType [ObjectType=-1] */
-        DeleteObject(ObjectType?: AcObjectType, ObjectName?: any): void;
-        DoMenuItem(MenuBar: any, MenuName: any, Command: any, Subcommand?: any, Version?: any): void;
-        Echo(EchoOn: any, StatusBarText?: any): void;
+        DeleteObject(ObjectType?: AcObjectType, ObjectName?: string): void;
+
+        /** @deprecated Use the **RunCommand** method */
+        DoMenuItem(MenuBar: Constants.acFormBar | number, MenuName: Constants.acFile | Constants.acEditMenu | Constants.acRecordsMenu | number, Command: Constants.acNew | Constants.acSaveForm | Constants.acSaveFormAs | Constants.acSaveRecord | Constants.acUndo | Constants.acCut | Constants.acCopy | Constants.acPaste | Constants.acDelete | Constants.acSelectRecord | Constants.acSelectAllRecords | Constants.acRefresh | number, Subcommand?: Constants.acObjectVerb | Constants.acObjectUpdate | number, Version?: Constants.acMenuVer70 | Constants.acMenuVer20 | Constants.acMenuVer1X): void;
+        Echo(EchoOn: boolean, StatusBarText?: string): void;
         FindNext(): void;
 
         /**
          * @param Match [Match=1]
+         * @param MatchCase [MatchCase=false]
          * @param Search [Search=2]
+         * @param SearchAsFormatted [SearchAsFormatted=false]
          * @param OnlyCurrentField [OnlyCurrentField=-1]
          */
-        FindRecord(FindWhat: any, Match?: AcFindMatch, MatchCase?: any, Search?: AcSearchDirection, SearchAsFormatted?: any, OnlyCurrentField?: AcFindField, FindFirst?: any): void;
-        GoToControl(ControlName: any): void;
-        GoToPage(PageNumber: any, Right?: any, Down?: any): void;
+        FindRecord(FindWhat: string | number | VarDate, Match?: AcFindMatch, MatchCase?: boolean, Search?: AcSearchDirection, SearchAsFormatted?: boolean, OnlyCurrentField?: AcFindField, FindFirst?: boolean): void;
+        GoToControl(ControlName: string): void;
+        GoToPage(PageNumber: number, Right?: number, Down?: number): void;
 
         /**
          * @param ObjectType [ObjectType=-1]
          * @param Record [Record=1]
          */
-        GoToRecord(ObjectType?: AcDataObjectType, ObjectName?: any, Record?: AcRecord, Offset?: any): void;
-        Hourglass(HourglassOn: any): void;
-        LockNavigationPane(Lock: any): void;
+        GoToRecord(ObjectType?: AcDataObjectType, ObjectName?: string, Record?: AcRecord.acFirst | AcRecord.acLast | AcRecord.acNewRec): void;
+
+        /**
+         * @param ObjectType [ObjectType=-1]
+         * @param Record [Record=1]
+         */
+        GoToRecord(ObjectType?: AcDataObjectType, ObjectName?: string, Record?: AcRecord, Offset?: AcRecord.acNext | AcRecord.acPrevious | AcRecord.acGoTo): void;
+        Hourglass(HourglassOn: boolean): void;
+        LockNavigationPane(Lock: boolean): void;
         Maximize(): void;
         Minimize(): void;
-        MoveSize(Right?: any, Down?: any, Width?: any, Height?: any): void;
+        MoveSize(Right?: number, Down?: number, Width?: number, Height?: number): void;
         NavigateTo(Category?: any, Group?: any): void;
 
         /** @param View [View=0] */
-        OpenDataAccessPage(DataAccessPageName: any, View?: AcDataAccessPageView): void;
-        OpenDiagram(DiagramName: any): void;
+        OpenDataAccessPage(DataAccessPageName: string, View?: AcDataAccessPageView): void;
+        OpenDiagram(DiagramName: string): void;
 
         /**
          * @param View [View=0]
          * @param DataMode [DataMode=-1]
          * @param WindowMode [WindowMode=0]
          */
-        OpenForm(FormName: any, View?: AcFormView, FilterName?: string, WhereCondition?: string, DataMode?: AcFormOpenDataMode, WindowMode?: AcWindowMode, OpenArgs?: string): void;
+        OpenForm(FormName: string, View?: AcFormView, FilterName?: string, WhereCondition?: string, DataMode?: AcFormOpenDataMode, WindowMode?: AcWindowMode, OpenArgs?: string): void;
 
         /**
          * @param View [View=0]
          * @param DataMode [DataMode=1]
          */
-        OpenFunction(FunctionName: any, View?: AcView, DataMode?: AcOpenDataMode): void;
-        OpenModule(ModuleName?: any, ProcedureName?: any): void;
+        OpenFunction(FunctionName: string, View?: AcView, DataMode?: AcOpenDataMode): void;
+        OpenModule(ModuleName?: string, ProcedureName?: string): void;
 
         /**
          * @param View [View=0]
          * @param DataMode [DataMode=1]
          */
-        OpenQuery(QueryName: any, View?: AcView, DataMode?: AcOpenDataMode): void;
+        OpenQuery(QueryName: string, View?: AcView, DataMode?: AcOpenDataMode): void;
 
         /**
          * @param View [View=0]
          * @param WindowMode [WindowMode=0]
          */
-        OpenReport(ReportName: any, View?: AcView, FilterName?: string, WhereCondition?: string, WindowMode?: AcWindowMode, OpenArgs?: string): void;
+        OpenReport(ReportName: string, View?: AcView, FilterName?: string, WhereCondition?: string, WindowMode?: AcWindowMode, OpenArgs?: string): void;
 
         /** @param View [View=0] */
         OpenReportOld0(ReportName: any, View?: AcView, FilterName?: any, WhereCondition?: any): void;
@@ -4381,91 +4347,123 @@ declare namespace Access {
          * @param View [View=0]
          * @param DataMode [DataMode=1]
          */
-        OpenStoredProcedure(ProcedureName: any, View?: AcView, DataMode?: AcOpenDataMode): void;
+        OpenStoredProcedure(ProcedureName: string, View?: AcView, DataMode?: AcOpenDataMode): void;
 
         /**
          * @param View [View=0]
          * @param DataMode [DataMode=1]
          */
-        OpenTable(TableName: any, View?: AcView, DataMode?: AcOpenDataMode): void;
+        OpenTable(TableName: string, View?: AcView, DataMode?: AcOpenDataMode): void;
 
         /**
          * @param View [View=0]
          * @param DataMode [DataMode=1]
          */
-        OpenView(ViewName: any, View?: AcView, DataMode?: AcOpenDataMode): void;
+        OpenView(ViewName: string, View?: AcView, DataMode?: AcOpenDataMode): void;
 
         /** @param OutputQuality [OutputQuality=0] */
-        OutputTo(ObjectType: AcOutputObjectType, ObjectName: any, OutputFormat: any, OutputFile: any, AutoStart: any, TemplateFile: any, Encoding: any, OutputQuality?: AcExportQuality): void;
+        OutputTo(ObjectType: AcOutputObjectType.acOutputModule, ObjectName: string, OutputFormat: AcOutputFormat.acFormatTXT, OutputFile: string, AutoStart: boolean, TemplateFile: string, Encoding: any, OutputQuality?: AcExportQuality): void;
+
+        /** @param OutputQuality [OutputQuality=0] */
+        OutputTo(ObjectType: AcOutputObjectType, ObjectName?: string, OutputFormat?: AcOutputFormat, OutputFile?: string, AutoStart?: boolean, TemplateFile?: string, Encoding?: any, OutputQuality?: AcExportQuality): void;
         OutputToOld0(ObjectType: AcOutputObjectType, ObjectName?: any, OutputFormat?: any, OutputFile?: any, AutoStart?: any, TemplateFile?: any): void;
         OutputToOld1(ObjectType: AcOutputObjectType, ObjectName?: any, OutputFormat?: any, OutputFile?: any, AutoStart?: any, TemplateFile?: any, Encoding?: any): void;
 
         /**
          * @param PrintRange [PrintRange=0]
          * @param PrintQuality [PrintQuality=0]
+         * @param Copies [Copies=1]
+         * @param CollateCopies [CollateCopies=true]
          */
-        PrintOut(PrintRange?: AcPrintRange, PageFrom?: any, PageTo?: any, PrintQuality?: AcPrintQuality, Copies?: any, CollateCopies?: any): void;
+        PrintOut(PrintRange: AcPrintRange.acPages, PageFrom?: number, PageTo?: number, PrintQuality?: AcPrintQuality, Copies?: number, CollateCopies?: boolean): void;
+
+        /**
+         * @param PrintRange [PrintRange=0]
+         * @param PrintQuality [PrintQuality=0]
+         * @param Copies [Copies=1]
+         * @param CollateCopies [CollateCopies=true]
+         */
+        PrintOut(PrintRange?: AcPrintRange, PageFrom?: undefined, PageTo?: undefined, PrintQuality?: AcPrintQuality, Copies?: number, CollateCopies?: boolean): void;
 
         /** @param Options [Options=1] */
         Quit(Options?: AcQuitOption): void;
         RefreshRecord(): void;
 
         /** @param ObjectType [ObjectType=-1] */
-        Rename(NewName: any, ObjectType?: AcObjectType, OldName?: any): void;
+        Rename(NewName: string, ObjectType: AcObjectType, OldName: string): void;
+        Rename(NewName: string): void;
 
         /** @param ObjectType [ObjectType=-1] */
-        RepaintObject(ObjectType?: AcObjectType, ObjectName?: any): void;
-        Requery(ControlName?: any): void;
+        RepaintObject(ObjectType: AcObjectType, ObjectName: string): void;
+        RepaintObject(): void;
+
+        Requery(ControlName?: string): void;
         Restore(): void;
         RunCommand(Command: AcCommand): void;
-        RunDataMacro(MacroName: any): void;
-        RunMacro(MacroName: any, RepeatCount?: any, RepeatExpression?: any): void;
-        RunSavedImportExport(SavedImportExportName: any): void;
-        RunSQL(SQLStatement: any, UseTransaction?: any): void;
+        RunDataMacro(MacroName: string): void;
+        RunMacro(MacroName: string, RepeatCount?: number, RepeatExpression?: string): void;
+        RunSavedImportExport(SavedImportExportName: string): void;
+        RunSQL(SQLStatement: string, UseTransaction?: boolean): void;
 
         /** @param ObjectType [ObjectType=-1] */
-        Save(ObjectType?: AcObjectType, ObjectName?: any): void;
+        Save(ObjectType: AcObjectType | undefined, ObjectName: string): void;
+        Save(): void;
 
         /**
          * @param ObjectType [ObjectType=-1]
          * @param Record [Record=2]
          */
-        SearchForRecord(ObjectType?: AcDataObjectType, ObjectName?: any, Record?: AcRecord, WhereCondition?: any): void;
-        SelectObject(ObjectType: AcObjectType, ObjectName?: any, InDatabaseWindow?: any): void;
+        SearchForRecord(ObjectType?: AcDataObjectType, ObjectName?: string, Record?: AcRecord, WhereCondition?: string): void;
+        SelectObject(ObjectType: AcObjectType, ObjectName: string | undefined, InDatabaseWindow: true): void;
+        SelectObject(ObjectType: AcObjectType, ObjectName: string): void;
 
         /** @param ObjectType [ObjectType=-1] */
-        SendObject(ObjectType?: AcSendObjectType, ObjectName?: any, OutputFormat?: any, To?: any, Cc?: any, Bcc?: any, Subject?: any, MessageText?: any, EditMessage?: any, TemplateFile?: any): void;
-        SetDisplayedCategories(Show: any, Category?: any): void;
-        SetFilter(FilterName?: any, WhereCondition?: any, ControlName?: any): void;
-        SetMenuItem(MenuIndex: any, CommandIndex?: any, SubcommandIndex?: any, Flag?: any): void;
-        SetOrderBy(OrderBy: any, ControlName?: any): void;
-        SetParameter(Name: any, Expression: any): void;
+        SendObject(ObjectType?: AcSendObjectType, ObjectName?: string, OutputFormat?: AcOutputFormat, To?: string, Cc?: string, Bcc?: string, Subject?: string, MessageText?: string, EditMessage?: boolean, TemplateFile?: string): void;
+        SetDisplayedCategories(Show: boolean, Category?: string): void;
+        SetFilter(FilterName?: string, WhereCondition?: string, ControlName?: string): void;
+        SetMenuItem(MenuIndex: number, CommandIndex?: number, SubcommandIndex?: number, Flag?: AcSetMenuItemState): void;
+        SetOrderBy(OrderBy: string, ControlName?: string): void;
+        SetParameter(Name: string, Expression: any): void;
 
         /** @param Property [Property=0] */
-        SetProperty(ControlName: any, Property?: AcProperty, Value?: any): void;
-        SetWarnings(WarningsOn: any): void;
+        SetProperty(ControlName: string, Property?: AcProperty, Value?: any): void;
+        SetWarnings(WarningsOn: boolean): void;
         ShowAllRecords(): void;
 
         /** @param Show [Show=0] */
-        ShowToolbar(ToolbarName: any, Show?: AcShowToolbar): void;
+        ShowToolbar(ToolbarName: string, Show?: AcShowToolbar): void;
         SingleStep(): void;
 
         /**
          * @param TransferType [TransferType=0]
          * @param ObjectType [ObjectType=0]
+         * @param StructureOnly [StructureOnly=false\]
+         * @param StoreLogin [StoreLogin=false]
          */
-        TransferDatabase(TransferType?: AcDataTransferType, DatabaseType?: any, DatabaseName?: any, ObjectType?: AcObjectType, Source?: any, Destination?: any, StructureOnly?: any, StoreLogin?: any): void;
-        TransferSharePointList(TransferType: AcSharePointListTransferType, SiteAddress: any, ListID: any, ViewID?: any, TableName?: any, GetLookupDisplayValues?: any): void;
+        TransferDatabase(TransferType?: AcDataTransferType, DatabaseType?: DatabaseType, DatabaseName?: string, ObjectType?: AcObjectType, Source?: string, Destination?: string, StructureOnly?: boolean, StoreLogin?: boolean): void;
+        TransferSharePointList(TransferType: AcSharePointListTransferType, SiteAddress: string, ListID: string, ViewID?: string, TableName?: string, GetLookupDisplayValues?: boolean): void;
 
         /**
          * @param TransferType [TransferType=0]
          * @param SpreadsheetType [SpreadsheetType=10]
+         * @param HasFieldNames [HasFieldNames=false]
          */
-        TransferSpreadsheet(TransferType?: AcDataTransferType, SpreadsheetType?: AcSpreadSheetType, TableName?: any, FileName?: any, HasFieldNames?: any, Range?: any, UseOA?: any): void;
-        TransferSQLDatabase(Server: any, Database: any, UseTrustedConnection?: any, Login?: any, Password?: any, TransferCopyData?: any): void;
+        TransferSpreadsheet(TransferType: AcDataTransferType.acImport, SpreadsheetType?: AcSpreadSheetType, TableName?: string, FileName?: string, HasFieldNames?: boolean, Range?: any): void;
 
-        /** @param TransferType [TransferType=0] */
-        TransferText(TransferType?: AcTextTransferType, SpecificationName?: any, TableName?: any, FileName?: any, HasFieldNames?: any, HTMLTableName?: any, CodePage?: any): void;
+        /**
+         * @param TransferType [TransferType=0]
+         * @param SpreadsheetType [SpreadsheetType=10]
+         * @param HasFieldNames [HasFieldNames=false]
+         */
+        TransferSpreadsheet(TransferType?: AcDataTransferType, SpreadsheetType?: AcSpreadSheetType, TableName?: string, FileName?: string, HasFieldNames?: boolean): void;
+        TransferSQLDatabase(Server: string, Database: string, UseTrustedConnection?: boolean, Login?: string, Password?: string, TransferCopyData?: boolean): void;
+
+        /**
+         * @param TransferType [TransferType=0]
+         * @param Encoding For valid values see https://msdn.microsoft.com/en-us/library/windows/desktop/dd317756(v=vs.85).aspx
+         */
+        TransferText(TransferType?: AcTextTransferType.acExportHTML | AcTextTransferType.acImportHTML, SpecificationName?: string, TableName?: string, FileName?: string, HasFieldNames?: boolean, HTMLTableName?: string, CodePage?: number): void;
+        TransferText(TransferType?: AcTextTransferType, SpecificationName?: string, TableName?: string, FileName?: string, HasFieldNames?: boolean, HTMLTableName?: undefined, CodePage?: number): void;
     }
 
     class EmptyCell {
@@ -4526,7 +4524,7 @@ declare namespace Access {
         readonly LayoutID: number;
         Left: number;
         LeftPadding: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         readonly Parent: any;
         readonly Properties: Properties;
@@ -4637,7 +4635,7 @@ declare namespace Access {
         BeforeUpdateMacro: string;
         BeginBatchEdit: string;
         BeginBatchEditMacro: string;
-        Bookmark: any;
+        Bookmark: ADODB.Bookmark | DAO.Bookmark;
         BorderStyle: number;
         Caption: string;
         readonly ChartSpace: any;
@@ -4726,7 +4724,7 @@ declare namespace Access {
         readonly Module: Module;
         MouseWheel: string;
         MouseWheelMacro: string;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Moveable: boolean;
         Name: string;
         NavigationButtons: boolean;
@@ -4790,7 +4788,7 @@ declare namespace Access {
         OnUndoMacro: string;
         OnUnload: string;
         OnUnloadMacro: string;
-        OpenArgs: any;
+        OpenArgs: string;
         OrderBy: string;
         OrderByOn: boolean;
         OrderByOnLoad: boolean;
@@ -5254,7 +5252,7 @@ declare namespace Access {
         Modal: boolean;
         readonly Module: Module;
         MouseWheel: string;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Moveable: boolean;
         Name: string;
         NavigationButtons: boolean;
@@ -5465,7 +5463,7 @@ declare namespace Access {
         readonly LayoutID: number;
         Left: number;
         LeftPadding: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         ObjectPalette: any;
         OldBorderStyle: number;
@@ -5610,7 +5608,7 @@ declare namespace Access {
         LeftMargin: number;
         LeftPadding: number;
         LineSpacing: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         NumeralShapes: number;
         OldBorderStyle: number;
@@ -5672,7 +5670,7 @@ declare namespace Access {
         IsVisible: boolean;
         Left: number;
         LineSlant: boolean;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         OldBorderStyle: number;
         readonly Parent: any;
@@ -5797,7 +5795,7 @@ declare namespace Access {
         ListIndex: number;
         ListItemsEditForm: string;
         Locked: boolean;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         MultiSelect: number;
         Name: string;
         NumeralShapes: number;
@@ -6036,7 +6034,7 @@ declare namespace Access {
         readonly LayoutID: number;
         readonly Left: number;
         LeftPadding: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         NavigationTargetName: string;
         NavigationWhereClause: string;
@@ -6184,7 +6182,7 @@ declare namespace Access {
         Left: number;
         LeftPadding: number;
         LineSpacing: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         NumeralShapes: number;
         OldBorderStyle: number;
@@ -6321,7 +6319,7 @@ declare namespace Access {
         LinkMasterFields: string;
         Locked: boolean;
         LpOleObject: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         readonly Object: any;
         ObjectPalette: any;
@@ -6482,7 +6480,7 @@ declare namespace Access {
         Left: number;
         LeftPadding: number;
         Locked: boolean;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         OldBorderStyle: number;
         readonly OldValue: any;
@@ -6604,7 +6602,7 @@ declare namespace Access {
         LabelY: number;
         Left: number;
         Locked: boolean;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         OldBorderStyle: number;
         readonly OldValue: any;
@@ -6683,7 +6681,7 @@ declare namespace Access {
         IsMemberSafe(dispid: number): boolean;
         IsVisible: boolean;
         Left: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         OnClick: string;
         OnClickMacro: string;
@@ -6727,7 +6725,7 @@ declare namespace Access {
         IsMemberSafe(dispid: number): boolean;
         IsVisible: boolean;
         Left: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         readonly Parent: any;
         readonly Properties: Properties;
@@ -6785,7 +6783,7 @@ declare namespace Access {
         LabelY: number;
         Left: number;
         Locked: boolean;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         readonly OldValue: any;
         OnClick: string;
@@ -6907,7 +6905,7 @@ declare namespace Access {
         IsMemberSafe(dispid: number): boolean;
         IsVisible: boolean;
         Left: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         OldBorderStyle: number;
         OnClick: string;
@@ -7031,7 +7029,7 @@ declare namespace Access {
         readonly Module: Module;
         MouseWheel: string;
         MouseWheelMacro: string;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Moveable: boolean;
         MoveLayout: boolean;
         Name: string;
@@ -7327,7 +7325,7 @@ declare namespace Access {
         MinMaxButtons: number;
         Modal: boolean;
         readonly Module: Module;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Moveable: boolean;
         MoveLayout: boolean;
         Name: string;
@@ -7651,7 +7649,7 @@ declare namespace Access {
         LinkChildFields: string;
         LinkMasterFields: string;
         Locked: boolean;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         OldBorderStyle: number;
         OnEnter: string;
@@ -7771,7 +7769,7 @@ declare namespace Access {
         readonly LayoutID: number;
         Left: number;
         LeftPadding: number;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         MultiRow: boolean;
         Name: string;
         readonly OldValue: any;
@@ -7968,7 +7966,7 @@ declare namespace Access {
         LeftPadding: number;
         LineSpacing: number;
         Locked: boolean;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         NumeralShapes: number;
         OldBorderStyle: number;
@@ -8149,7 +8147,7 @@ declare namespace Access {
         Left: number;
         LeftPadding: number;
         Locked: boolean;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         ObjectPalette: any;
         readonly OldValue: any;
@@ -8285,7 +8283,7 @@ declare namespace Access {
         Left: number;
         LeftPadding: number;
         readonly LocationURL: string;
-        Move(Left: any, Top?: any, Width?: any, Height?: any): void;
+        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
         Name: string;
         readonly Object: any;
         readonly OldValue: any;

From 8eb8a46af9eafbf6f5df807ec0d87fc91297c8c7 Mon Sep 17 00:00:00 2001
From: jonbretman <jon.bretman@gmail.com>
Date: Mon, 21 May 2018 08:58:01 +0100
Subject: [PATCH 292/575] fix(stripe): listSource should be listSources

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

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 418525d38f..991d4a618a 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -4460,7 +4460,7 @@ declare namespace Stripe {
             billing?: SubscriptionBilling;
 
             /**
-             * Number of days a customer has to pay invoices generated by this subscription. 
+             * Number of days a customer has to pay invoices generated by this subscription.
              * Only valid for subscriptions where billing=send_invoice.
              */
             days_until_due?: number;
@@ -5753,8 +5753,8 @@ declare namespace Stripe {
              * @param customerId The ID of the customer whose cards will be retrieved
              * @param data Filtering options
              */
-            listSource(customerId: string, data: customers.ICardSourceListOptions, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
-            listSource(customerId: string, data: customers.ICardSourceListOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            listSources(customerId: string, data: customers.ICardSourceListOptions, options: HeaderOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
+            listSources(customerId: string, data: customers.ICardSourceListOptions, response?: IResponseFn<IList<cards.ICard>>): Promise<IList<cards.ICard>>;
             /**
              * You can see a list of the bank accounts belonging to a customer or recipient. Note that the 10 most recent
              * bank accounts are always available by default on the customer or recipient object. If you need more than
@@ -5768,8 +5768,8 @@ declare namespace Stripe {
              * @param customerId The ID of the customer whose cards will be retrieved
              * @param data Filtering options
              */
-            listSource(customerId: string, data: customers.IBankAccountSourceListOptions, options: HeaderOptions, response?: IResponseFn<IList<bankAccounts.IBankAccount>>): Promise<IList<bankAccounts.IBankAccount>>;
-            listSource(customerId: string, data: customers.IBankAccountSourceListOptions, response?: IResponseFn<IList<bankAccounts.IBankAccount>>): Promise<IList<bankAccounts.IBankAccount>>;
+            listSources(customerId: string, data: customers.IBankAccountSourceListOptions, options: HeaderOptions, response?: IResponseFn<IList<bankAccounts.IBankAccount>>): Promise<IList<bankAccounts.IBankAccount>>;
+            listSources(customerId: string, data: customers.IBankAccountSourceListOptions, response?: IResponseFn<IList<bankAccounts.IBankAccount>>): Promise<IList<bankAccounts.IBankAccount>>;
 
             /**
              * By default, you can see the 10 most recent cards/bank accounts stored on a customer or recipient directly on the customer or recipient object, but
@@ -7104,10 +7104,10 @@ declare namespace Stripe {
          * Many objects contain the ID of a related object in their response properties. For example, a Charge may have an associated Customer ID.
          * Those objects can be expanded inline with the expand request parameter. Objects that can be expanded are noted in this documentation.
          * This parameter is available on all API requests, and applies to the response of that request only.
-         * 
+         *
          * You can nest expand requests with the dot property. For example, requesting invoice.customer on a charge will expand the invoice property
          * into a full Invoice object, and will then expand the customer property on that invoice into a full Customer object.
-         * 
+         *
          * You can expand multiple objects at once by identifying multiple items in the expand array.
          */
         expand?: string[];
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index e56a454108..91cfa0f50c 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -495,6 +495,25 @@ stripe.customers.listCards('cu_15fvyVEe31JkLCeQvr155iqc').then(function (cards)
     // asynchronously called
 });
 
+stripe.customers.listSources('cu_15fvyVEe31JkLCeQvr155iqc', null, function (err, cards) {
+    // asynchronously called
+});
+stripe.customers.listSources('cu_15fvyVEe31JkLCeQvr155iqc', null).then(function (cards) {
+    // asynchronously called
+});
+stripe.customers.listSources('cu_15fvyVEe31JkLCeQvr155iqc', {
+    object: "card",
+    limit: 100
+}).then(function (cards) {
+    // asynchronously called
+});
+stripe.customers.listSources('cu_15fvyVEe31JkLCeQvr155iqc', {
+    object: "bank_account",
+    limit: 100
+}).then(function (cards) {
+    // asynchronously called
+});
+
 stripe.customers.retrieveSubscription(
     "cus_5rfJKDJkuxzh5Q",
     "sub_5rfJxnBLGSwsYp",

From fce821fb6e5cfb5e69ad561e1121be030a1ee25d Mon Sep 17 00:00:00 2001
From: David Rouyer <rouyer.david@gmail.com>
Date: Mon, 21 May 2018 18:28:45 +0200
Subject: [PATCH 293/575] [Dropzone] Add chunks options

---
 types/dropzone/dropzone-tests.ts | 17 +++++++++++++++++
 types/dropzone/index.d.ts        |  7 +++++++
 2 files changed, 24 insertions(+)

diff --git a/types/dropzone/dropzone-tests.ts b/types/dropzone/dropzone-tests.ts
index 4abc3a6223..1caed5f4e2 100644
--- a/types/dropzone/dropzone-tests.ts
+++ b/types/dropzone/dropzone-tests.ts
@@ -14,6 +14,12 @@ const dropzoneWithOptions = new Dropzone(".test", {
 	withCredentials: false,
 	parallelUploads: 2,
 	uploadMultiple: true,
+	chunking: true,
+	forceChunking: true,
+	chunkSize: 4000000,
+	parallelChunkUploads: true,
+	retryChunks: true,
+	retryChunksLimit: 6,
 	maxFilesize: 1024,
 	paramName: "file",
 	createImageThumbnails: true,
@@ -69,6 +75,17 @@ const dropzoneWithOptions = new Dropzone(".test", {
 			done(new Error(file.status));
 		}
 	},
+	chunksUploaded: (file: Dropzone.DropzoneFile, done: (error?: string | Error) => void) => {
+		if (file.accepted) {
+			file.previewElement.classList.add("accepted");
+			file.previewTemplate.classList.add("accepted");
+			file.previewsContainer.classList.add("accepted");
+			done();
+		}
+		else {
+			done(new Error(file.status));
+		}
+	},
 	init: () => console.log("Initialized"),
 	forceFallback: false,
 	fallback: () => console.log("Fallback"),
diff --git a/types/dropzone/index.d.ts b/types/dropzone/index.d.ts
index 0295afbed2..93f95d2a65 100644
--- a/types/dropzone/index.d.ts
+++ b/types/dropzone/index.d.ts
@@ -42,6 +42,12 @@ declare namespace Dropzone {
 		timeout?: number;
 		parallelUploads?: number;
 		uploadMultiple?: boolean;
+		chunking?: boolean;
+		forceChunking?: boolean;
+		chunkSize?: number;
+		parallelChunkUploads?: boolean;
+		retryChunks?: boolean;
+		retryChunksLimit?: number;
 		maxFilesize?: number;
 		paramName?: string;
 		createImageThumbnails?: boolean;
@@ -83,6 +89,7 @@ declare namespace Dropzone {
 		dictFileSizeUnits?: DropzoneDictFileSizeUnits;
 
 		accept?(file: DropzoneFile, done: (error?: string | Error) => void): void;
+		chunksUploaded?(file: DropzoneFile, done: (error?: string | Error) => void): void; 
 		init?(): void;
 		forceFallback?: boolean;
 		fallback?(): void;

From 13bc1daa61b85c4674364259392e715aa1dd3a19 Mon Sep 17 00:00:00 2001
From: kaaboaye <kaaboaye@gmail.com>
Date: Mon, 21 May 2018 18:32:54 +0200
Subject: [PATCH 294/575] layout can be also a filename, so boolean is not
 enough. It should be boolean | string

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

diff --git a/types/vision/index.d.ts b/types/vision/index.d.ts
index 1c4e2ddc33..6c6c2a23bd 100644
--- a/types/vision/index.d.ts
+++ b/types/vision/index.d.ts
@@ -72,7 +72,7 @@ declare namespace vision {
          * Disable layout when using Jade as it will handle including any layout files independently.
          * Defaults to false.
          */
-        layout?: boolean;
+        layout?: boolean | string;
         /** the root file path, or array of file paths, where layout templates are located (using the relativeTo prefix if present). Defaults to path. */
         layoutPath?: string | string[];
         /** the key used by the template engine to denote where primary template content should go. Defaults to 'content'. */

From 7cdd1daa0dbc33389249ba2376003601b36cf6cd Mon Sep 17 00:00:00 2001
From: Alex Jerabek <38896772+AlexJerabek@users.noreply.github.com>
Date: Mon, 21 May 2018 10:46:26 -0700
Subject: [PATCH 295/575] Spacing cleanup and removing 'last modified in'
 comments (#4)

---
 types/office-js/index.d.ts | 58 ++++++++------------------------------
 1 file changed, 12 insertions(+), 46 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index cf1c5dbb51..d29491618e 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -145,38 +145,30 @@ declare namespace Office {
     }
     // Objects
         /**
-		* An object which encapsulates the result of an asynchronous request, including status and error information if the request failed.
-		* 
+        * An object which encapsulates the result of an asynchronous request, including status and error information if the request failed.
+        * 
         * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
         *
-        * **Last changed in**: 1.1
-        * 
         * @remarks
         * When the function you pass to the `callback` parameter of an "Async" method executes, it receives an AsyncResult object that you can access from the `callback` function's only parameter.
-		*/
+        */
         export interface AsyncResult {
         /**
         * Gets the user-defined item passed to the optional `asyncContext` parameter of the invoked method in the same state as it was passed in. This the user-defined item (which can be of any JavaScript type: String, Number, Boolean, Object, Array, Null, or Undefined) passed to the optional `asyncContext` parameter of the invoked method. Returns Undefined, if you didn't pass anything to the asyncContext parameter.
         * 
         * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
-        * 
-        * **Last changed in**: 1.1
         */
         asyncContext: any;
         /**
         * Gets the [AsyncResultStatus](office.asyncresultstatus.md) of the asynchronous operation.
         * 
         * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
-        * 
-        * **Last changed in**: 1.1
         */
         status: AsyncResultStatus;
         /**
         * Gets an [Error](office.error.md) object that provides a description of the error, if any error occurred.
         * 
         * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
-        * 
-        * **Last changed in**: 1.1
         */
         error: Error;
         /**
@@ -186,8 +178,6 @@ declare namespace Office {
         * 
         * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
         * 
-        * **Last changed in**: 1.1
-        * 
         * @remarks
         * You access the AsyncResult object in the function passed as the argument to the callback parameter of an "Async" method, such as the `getSelectedDataAsync` and `setSelectedDataAsync` methods of the Document object.
         */
@@ -482,8 +472,6 @@ declare namespace Office {
          * 
          * Hosts: Access, Excel, Word
          * 
-         * Last changed in: 1.1
-         * 
          * @remarks
          * To add an event handler for the BindingDataChanged event of a binding, use the addHandlerAsync method of the Binding object. The event handler receives an argument of type BindingDataChangedEventArgs.
          */
@@ -495,8 +483,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: BindingEvents
          * 
-         * Last changed in: 1.1
-         * 
          * @remarks
          * To add an event handler for the BindingSelectionChanged event of a binding, use the addHandlerAsync method of the Binding object. The event handler receives an argument of type BindingSelectionChangedEventArgs.
          */
@@ -656,8 +642,6 @@ declare namespace Office {
     * 
     * **Available in Requirement sets**: MatrixBinding, TableBinding, TextBinding
     * 
-    * **Last changed in**: 1.1
-    * 
     * @remarks
     * The Binding object exposes the functionality possessed by all bindings regardless of type.
     * 
@@ -668,25 +652,19 @@ declare namespace Office {
         * Get the Document object associated with the binding.
         * 
         * **Hosts**: Access, Excel, Word
-        * 
-        * **Last changed in**: 1.1
         */
         document: Document;
         /**
          * A string that uniquely identifies this binding among the bindings in the same Document object.
          * 
          * Hosts: Access, Excel, Word
-         * 
-         * Last changed in: 1.1
          */
         id: string;
         /**
-		* Gets the type of the binding.
-		* 
+        * Gets the type of the binding.
+        * 
         * **Hosts**: Access, Excel, Word
-        
-		* **Last changed in**: 1.1
-		*/
+        */
         type: BindingType;
         /**
          * Adds an event handler to the object for the specified event type.
@@ -707,8 +685,6 @@ declare namespace Office {
          * 
          * Available in Requirement sets: MatrixBindings, TableBindings, TextBindings
          * 
-         * Last changed in: 1.1
-         * 
          * @remarks
          * When called from a MatrixBinding or TableBinding, the getDataAsync method will return a subset of the bound values if the optional startRow, startColumn, rowCount, and columnCount parameters are specified (and they specify a contiguous and valid range).
          * 
@@ -742,8 +718,6 @@ declare namespace Office {
          * 
          * **Available in Requirement set**: BindingEvents
          * 
-         * **Last changed in**: 1.1
-         * 
          * @param eventType The event type. For binding can be 'bindingDataChanged' and 'bindingSelectionChanged'
          * @param options An object with any of the following:
          * 
@@ -761,8 +735,6 @@ declare namespace Office {
          * 
          * **Available in Requirement sets**: MatrixBindings, TableBindings, TextBindings
          * 
-         * **Last changed in**: 1.1
-         * 
          * @param data The data to be set in the current selection. Possible data types by host:
          * 
          *        string: Excel, Excel Online, Word, and Word Online only
@@ -1174,31 +1146,25 @@ declare namespace Office {
     * 
     * **Available in Requirement set**: MatrixBindings
     * 
-    * **Last changed in**: 1.1
-    * 
     * @remarks
     * The MatrixBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object.
     */
     export interface MatrixBinding extends Binding {
         /**
-		* Gets the number of columns in the matrix data structure, as an integer value.
-		* 
+        * Gets the number of columns in the matrix data structure, as an integer value.
+        * 
         * **Hosts**: Access, Excel, PowerPoint, Project, Word
         * 
         * Available in Requirement set: MatrixBindings
-        *
-		* **Last changed in**: 1.1
-		*/
+        */
         columnCount: number;
         /**
-		* Gets the number of rows in the matrix data structure, as an integer value.
-		* 
+        * Gets the number of rows in the matrix data structure, as an integer value.
+        * 
         * **Hosts**: Access, Excel, PowerPoint, Project, Word
         * 
         * Available in Requirement set: MatrixBindings
-        *
-		* **Last changed in**: 1.1
-		*/
+        */
         rowCount: number;
     }
     /**

From 4e3aa7a59c1eade452dd1bf2f1f5923374ba6487 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Mon, 21 May 2018 11:14:06 -0700
Subject: [PATCH 296/575] Fix spacing and 'last modified in' prose

---
 types/office-js/index.d.ts | 219 +++++--------------------------------
 1 file changed, 28 insertions(+), 191 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 6ec8e726e1..8c687606c0 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -151,23 +151,19 @@ declare namespace Office {
     }
     // Objects
         /**
-		* An object which encapsulates the result of an asynchronous request, including status and error information if the request failed.
-		*         
+        * An object which encapsulates the result of an asynchronous request, including status and error information if the request failed.
+        *         
         * @remarks
         * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
-        *
-        * Last changed in: 1.1
         * 
         * When the function you pass to the `callback` parameter of an "Async" method executes, it receives an AsyncResult object that you can access from the `callback` function's only parameter.
-		*/
+        */
         export interface AsyncResult {
         /**
         * Gets the user-defined item passed to the optional `asyncContext` parameter of the invoked method in the same state as it was passed in. This the user-defined item (which can be of any JavaScript type: String, Number, Boolean, Object, Array, Null, or Undefined) passed to the optional `asyncContext` parameter of the invoked method. Returns Undefined, if you didn't pass anything to the asyncContext parameter.
         *         
         * @remarks
         * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
-        * 
-        * Last changed in: 1.1
         */
         asyncContext: any;
         /**
@@ -175,8 +171,6 @@ declare namespace Office {
         * 
         * @remarks
         * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
-        * 
-        * Last changed in: 1.1
         */
         status: AsyncResultStatus;
         /**
@@ -184,8 +178,6 @@ declare namespace Office {
         * 
         * @remarks
         * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
-        * 
-        * Last changed in: 1.1
         */
         error: Error;
         /**
@@ -197,8 +189,6 @@ declare namespace Office {
         * Note: What the value property returns for a particular "Async" method varies depending on the purpose and context of that method. To determine what is returned by the value property for an "Async" method, refer to the "Callback value" section of the method's topic. For a complete listing of the "Async" methods, see the Remarks section of the AsyncResult object topic.
         * 
         * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
-        * 
-        * Last changed in: 1.1
         */
         value: any;
     }
@@ -207,8 +197,6 @@ declare namespace Office {
     * 
     * @remarks
     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
-    *
-    * Last changed in: 1.1
     */
     export interface Context {
         /**
@@ -295,14 +283,12 @@ declare namespace Office {
     export interface UI {
         /**
         * Displays a dialog to show or collect information from the user or to facilitate Web navigation. 
-		*         
+        *         
         * @remarks
         * Hosts: Word, Excel, Outlook, PowerPoint
         * 
         * Requirement sets: DialogApi, Mailbox 1.4
         * 
-        * Last changed in: DialogApi 1.1, Mailbox 1.4
-        * 
         * The initial page must be on the same domain as the parent page (the startAddress parameter). After the initial page loads, you can go to other domains.
         * 
         * Any page calling office.context.ui.messageParent must also be on the same domain as the parent page.
@@ -374,9 +360,7 @@ declare namespace Office {
         * @remarks
         * Hosts: Excel, OneNote, Outlook, PowerPoint, Word
         * 
-        * Requirement sets: IdentityAPI
-        * 
-        * Last changed in: 1.1
+        * Requirement sets: IdentityApi
         * 
         * 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.
         * 
@@ -554,8 +538,6 @@ declare namespace Office {
          * @remarks
          * Hosts: Access, Excel, Word
          * 
-         * Last changed in: 1.1
-         * 
          * To add an event handler for the BindingDataChanged event of a binding, use the addHandlerAsync method of the Binding object. The event handler receives an argument of type BindingDataChangedEventArgs.
          */
         BindingDataChanged,
@@ -567,8 +549,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: BindingEvents
          * 
-         * Last changed in: 1.1
-         * 
          * To add an event handler for the BindingSelectionChanged event of a binding, use the addHandlerAsync method of the Binding object. The event handler receives an argument of type BindingSelectionChangedEventArgs.
          */
         BindingSelectionChanged,
@@ -728,8 +708,6 @@ declare namespace Office {
     * 
     * Available in Requirement sets: MatrixBinding, TableBinding, TextBinding
     * 
-    * Last changed in: 1.1
-    * 
     * The Binding object exposes the functionality possessed by all bindings regardless of type.
     * 
     * The Binding object is never called directly. It is the abstract parent class of the objects that represent each type of binding: MatrixBinding, TableBinding, or TextBinding. All three of these objects inherit the getDataAsync and setDataAsync methods from the Binding object that enable to you interact with the data in the binding. They also inherit the id and type properties for querying those property values. Additionally, the MatrixBinding and TableBinding objects expose additional methods for matrix- and table-specific features, such as counting the number of rows and columns.
@@ -740,8 +718,6 @@ declare namespace Office {
         * 
         *@remarks
         * Hosts: Access, Excel, Word
-        * 
-        * Last changed in: 1.1
         */
         document: Document;
         /**
@@ -749,18 +725,14 @@ declare namespace Office {
          * 
          *@remarks
          * Hosts: Access, Excel, Word
-         * 
-         * Last changed in: 1.1
          */
         id: string;
         /**
-		* Gets the type of the binding.
-		* 
+        * Gets the type of the binding.
+        * 
         *@remarks
         * Hosts: Access, Excel, Word
-        *
-		* Last changed in: 1.1
-		*/
+        */
         type: BindingType;
         /**
          * Adds an event handler to the object for the specified event type.
@@ -782,8 +754,6 @@ declare namespace Office {
          * 
          * Available in Requirement sets: MatrixBindings, TableBindings, TextBindings
          * 
-         * Last changed in: 1.1
-         * 
          * When called from a MatrixBinding or TableBinding, the getDataAsync method will return a subset of the bound values if the optional startRow, startColumn, rowCount, and columnCount parameters are specified (and they specify a contiguous and valid range).
          * 
          * @param options An object with any of the following (example: {coercionType: 'matrix, 'valueFormat: 'formatted', filterType:'all'}):
@@ -817,8 +787,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: BindingEvents
          * 
-         * Last changed in: 1.1
-         * 
          * @param eventType The event type. For binding can be 'bindingDataChanged' and 'bindingSelectionChanged'
          * @param options An object with any of the following:
          * 
@@ -837,8 +805,6 @@ declare namespace Office {
          * 
          * Available in Requirement sets: MatrixBindings, TableBindings, TextBindings
          * 
-         * Last changed in: 1.1
-         * 
          * @param data The data to be set in the current selection. Possible data types by host:
          * 
          *        string: Excel, Excel Online, Word, and Word Online only
@@ -878,22 +844,18 @@ declare namespace Office {
     * 
     *@remarks
     * Hosts: 
-    * 
-    * Last changed in: 1.1
     */
     export interface Bindings {
         /**
-		* Gets a Document object that represents the document associated with this set of bindings.
-		* 
+        * Gets a Document object that represents the document associated with this set of bindings.
+        * 
         *remarks
         * Hosts: Access, Excel, Word
-        *
-		* Last changed in: 1.1
-		*/
+        */
         document: Document;
         /**
          * Creates a binding against a named object in the document.
-		 * 
+         * 
          *@remarks
          * Hosts: Access, Excel, Word
          * 
@@ -932,8 +894,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: Not in a set
          * 
-         * Last changed in: 1.1
-         * 
          * Adds a binding object of the specified type to the Bindings collection, which will be identified with the supplied id. The method fails if the specified selection cannot be bound.
          * 
          * @param bindingType Specifies the type of the binding object to create. Required. Returns null if the selected object cannot be coerced into the specified type.
@@ -958,8 +918,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
          * 
-         * Last changed in: 1.1
-         * 
          * Adds the specified type of binding object to the Bindings collection, which will be identified with the supplied id.
          * 
          * Note In Excel, if you call the addFromSelectionAsync method passing in the Binding.id of an existing binding, the Binding.type of that binding is used, and its type cannot be changed by specifying a different value for the bindingType parameter.If you need to use an existing id and change the bindingType, call the Bindings.releaseByIdAsync method first to release the binding, and then call the addFromSelectionAsync method to reestablish the binding with a new type.
@@ -986,8 +944,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
          * 
-         * Last changed in: 1.1
-         * 
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
@@ -1000,8 +956,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: CustomXmlParts, MatrixBindings, TableBindings, TextBindings
          * 
-         * Last changed in: 1.1
-         * 
          * Fails if the specified id does not exist.
          * 
          * @param id Specifies the unique name of the binding object. Required.
@@ -1017,8 +971,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
          * 
-         * Last changed in: 1.1
-         * 
          * Fails if the specified id does not exist.
          * 
          * @param id Specifies the unique name to be used to identify the binding object. Required.
@@ -1032,8 +984,6 @@ declare namespace Office {
     * 
     *@remarks
     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
-    *
-    * Last changed in: 1.1
     */
     export interface Context {
         /**
@@ -1048,8 +998,6 @@ declare namespace Office {
      * Hosts: Word
      * 
      * Available in Requirement set: CustomXmlParts
-     * 
-     * Last changed in: 1.1
      */
     export interface CustomXmlNode {
         /**
@@ -1059,8 +1007,6 @@ declare namespace Office {
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
-         * 
-         * Last changed in: 1.1
          */
         baseName: string;
         /**
@@ -1070,8 +1016,6 @@ declare namespace Office {
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
-         * 
-         * Last changed in: 1.1
          */
         namespaceUri: string;
         /**
@@ -1081,8 +1025,6 @@ declare namespace Office {
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
-         * 
-         * Last changed in: 1.1
          */
         nodeType: string;
         /**
@@ -1093,8 +1035,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: CustomXmlParts
          * 
-         * Last changed in: 1.1
-         * 
          * @param xPath The XPath expression that specifies the nodes to get. Required.
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1108,8 +1048,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: CustomXmlParts
          * 
-         * Last changed in: 1.1
-         * 
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
@@ -1122,8 +1060,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: CustomXmlParts
          * 
-         * Last changed in: 1.2
-         * 
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
@@ -1136,8 +1072,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: CustomXmlParts
          * 
-         * Last changed in: 1.1
-         * 
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
@@ -1150,8 +1084,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: CustomXmlParts
          * 
-         * Last changed in: 1.1
-         * 
          * @param value The value to be set on the node
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1165,8 +1097,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: CustomXmlParts
          * 
-         * Last changed in: 1.2
-         * 
          * @param text Required. The text value of the XML node.
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1180,8 +1110,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: CustomXmlParts
          * 
-         * Last changed in: 1.1
-         * 
          * @param xml The XML to be set on the node
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1195,8 +1123,6 @@ declare namespace Office {
      * Hosts: Word
      * 
      * Available in Requirement set: CustomXmlParts
-     * 
-     * Last changed in: 1.1
      */
     export interface CustomXmlPart {
         /**
@@ -1206,8 +1132,6 @@ declare namespace Office {
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
-         * 
-         * Last changed in: 1.1         * 
          */
         builtIn: boolean;
         /**
@@ -1217,8 +1141,6 @@ declare namespace Office {
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
-         * 
-         * Last changed in: 1.1         * 
          */
         id: string;
         /**
@@ -1228,8 +1150,6 @@ declare namespace Office {
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
-         * 
-         * Last changed in: 1.1         * 
          */
         namespaceManager: CustomXmlPrefixMappings;
         /**
@@ -1237,8 +1157,6 @@ declare namespace Office {
          * 
          *@remarks
          * Hosts: Word
-         *  
-         * Last changed in: 1.1
          * 
          * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
          * 
@@ -1255,8 +1173,6 @@ declare namespace Office {
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
-         *  
-         * Last changed in: 1.1
          * 
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1269,8 +1185,6 @@ declare namespace Office {
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
-         *  
-         * Last changed in: 1.1
          * 
          * @param xPath An XPath expression that specifies the nodes you want returned. Required.
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1284,8 +1198,6 @@ declare namespace Office {
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
-         *  
-         * Last changed in: 1.1
          * 
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1298,8 +1210,6 @@ declare namespace Office {
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
-         *  
-         * Last changed in: 1.1
          * 
          * @param eventType Specifies the type of event to remove. Required.For a CustomXmlPart object event, the eventType parameter can be specified as Office.EventType.DataNodeDeleted, Office.EventType.DataNodeInserted, Office.EventType.DataNodeReplaced, or the corresponding text values of these enumerations.
          * @param handler The event handler function to remove. If not specified, all event handlers for the specified eventType will be removed.
@@ -1315,8 +1225,6 @@ declare namespace Office {
      * Hosts: Word
      * 
      * Available in Requirement set: CustomXmlParts
-     * 
-     * Last changed in: 1.1
      */
     export interface CustomXmlParts {
         /**
@@ -1326,8 +1234,6 @@ declare namespace Office {
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
-         *  
-         * Last changed in: 1.1
          * 
          * @param xml The XML to add to the newly created custom XML part.
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1341,8 +1247,6 @@ declare namespace Office {
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
-         *  
-         * Last changed in: 1.1
          * 
          * @param id The GUID of the custom XML part, including opening and closing braces. 
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1356,8 +1260,6 @@ declare namespace Office {
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
-         *  
-         * Last changed in: 1.1
          * 
          * @param ns  The namespace URI.
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1370,8 +1272,6 @@ declare namespace Office {
      * 
      *@remarks
      * Hosts: Word
-     * 
-     * Last changed in: 1.1
      */
     export interface CustomXmlPrefixMappings {
         /**
@@ -1382,8 +1282,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: CustomXmlParts
          * 
-         * Last changed in: 1.1
-         * 
          * If no namespace is assigned to the requested prefix, the method returns an empty string ("").
          * 
          * @param prefix Specifies the prefix to add to the prefix mapping list. Required.
@@ -1400,8 +1298,6 @@ declare namespace Office {
          *
          * Available in Requirement set: CustomXmlParts
          * 
-         * Last changed in: 1.1
-         * 
          * If the prefix already exists in the namespace manager, this method will overwrite the mapping of that prefix except when the prefix is one added or used by the data store internally, in which case it will return an error.
          * 
          * @param prefix TSpecifies the prefix to get the namespace for. Required.
@@ -1417,8 +1313,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: CustomXmlParts
          * 
-         * Last changed in: 1.1
-         * 
          * If no prefix is assigned to the requested namespace, the method returns an empty string (""). If there are multiple prefixes specified in the namespace manager, the method returns the first prefix that matches the supplied namespace.
          * 
          * @param ns Specifies the namespace to get the prefix for. Required.
@@ -1432,8 +1326,6 @@ declare namespace Office {
      * 
      *@remarks
      * Hosts: Access, Excel, PowerPoint, Project, Word
-     * 
-     * Last changed in: 1.1
      */
     export interface Document {
         /**
@@ -1442,8 +1334,6 @@ declare namespace Office {
          *@remarks
          * Hosts: Access, Excel, Word
          * 
-         * Last changed in: 1.1 
-         * 
          * You don't instantiate the Document object directly in your script. To call members of the Document object to interact with the current document or worksheet, use Office.context.document in your script.
          */
         bindings: Bindings;
@@ -1452,8 +1342,6 @@ declare namespace Office {
          * 
          *@remarks
          * Hosts: Word
-         * 
-         * Last changed in: 1.1
          */
         customXmlParts: CustomXmlParts;
         /**
@@ -1461,8 +1349,6 @@ declare namespace Office {
          * 
          *@remarks
          * Hosts: Word
-         * 
-         * Last changed in: 1.1
          */
         mode: DocumentMode;
         /**
@@ -1470,8 +1356,6 @@ declare namespace Office {
          * 
          *@remarks
          * Hosts: Word
-         * 
-         * Last changed in: 1.1
          */
         settings: Settings;
         /**
@@ -1479,8 +1363,6 @@ declare namespace Office {
          * 
          *@remarks
          * Hosts: Word
-         * 
-         * Last changed in: 1.1
          */
         url: string;
         /**
@@ -1491,8 +1373,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: DocumentEvents
          * 
-         * Last changed in: 1.1
-         * 
          * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
          * 
          * @param eventType For a Document object event, the eventType parameter can be specified as Office.EventType.Document.SelectionChanged or Office.EventType.Document.ActiveViewChanged, or the corresponding text value of this enumeration.
@@ -1509,8 +1389,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: ActiveView
          * 
-         * Last changed in: 1.1
-         * 
          * Can trigger an event when the view changes.
          * 
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1525,8 +1403,6 @@ declare namespace Office {
          *
          * Available in Requirement set: File
          * 
-         * Last changed in: 1.1
-         * 
          * For add-ins running in Office host applications other than Office for iOS, the getFileAsync method supports getting files in slices of up to 4194304 bytes (4 MB). For add-ins running in Office for iOS apps, the getFileAsync method supports getting files in slices of up to 65536 (64 KB).
          * 
          * The fileType parameter can be specified by using the FileType enumeration or text values. But the possible values vary with the host: 
@@ -1557,8 +1433,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: not in a set
          * 
-         * Last changed in: 1.1
-         * 
          * You get the file's URL with the url property ( asyncResult.value.url).
          * 
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1573,8 +1447,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: Selection
          * 
-         * Last changed in: 1.1
-         * 
          * The possible values for the coercionType parameter vary by the host:
          * 
          * Excel, Excel Online, PowerPoint, PowerPoint Online, Word, and Word Online only: Office.CoercionType.Text (string)
@@ -1609,8 +1481,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: not in a set
          * 
-         * Last changed in: 1.1
-         * 
          * PowerPoint doesn't support the goToByIdAsync method in Master Views.
          * 
          * The behavior caused by the selectionMode option varies by host:
@@ -1640,7 +1510,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: DocumentEvents
          * 
-         * Last changed in: 1.1
          * @param eventType The event type. For document can be 'Document.SelectionChanged' or 'Document.ActiveViewChanged'.
          * @param options An object like Syntax example: {asyncContext:context} that has any of the following properties:
          * 
@@ -1659,8 +1528,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: Selection
          * 
-         * Last changed in: 1.1
-         * 
          * The possible CoercionTypes that can be used for the data parameter, or for the coercionType option, vary by host:
          * 
          * Office.CoercionType.Text: Excel, Word, PowerPoint
@@ -1781,32 +1648,26 @@ declare namespace Office {
     * 
     * Available in Requirement set: MatrixBindings
     * 
-    * Last changed in: 1.1
-    * 
     * The MatrixBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object.
     */
     export interface MatrixBinding extends Binding {
         /**
-		* Gets the number of columns in the matrix data structure, as an integer value.
-		* 
+        * Gets the number of columns in the matrix data structure, as an integer value.
+        * 
         *@remarks
         * Hosts: Access, Excel, PowerPoint, Project, Word
         * 
         * Available in Requirement set: MatrixBindings
-        *
-		* Last changed in: 1.1
-		*/
+        */
         columnCount: number;
         /**
-		* Gets the number of rows in the matrix data structure, as an integer value.
-		* 
+        * Gets the number of rows in the matrix data structure, as an integer value.
+        * 
         *@remarks
         * Hosts: Access, Excel, PowerPoint, Project, Word
         * 
         * Available in Requirement set: MatrixBindings
-        *
-		* Last changed in: 1.1
-		*/
+        */
         rowCount: number;
     }
     /**
@@ -1977,45 +1838,37 @@ declare namespace Office {
     * 
     * Available in Requirement set: TableBindings
     * 
-    * Last changed in: 1.1
-    * 
     * The TableBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object.
     * 
     * For Excel, note that after you establish a table binding in Excel, each new row a user adds to the table is automatically included in the binding and rowCount increases.
     */
     export interface TableBinding extends Binding {
         /**
-		* Gets the number of columns in the TableBinding, as an integer value.
-		* 
+        * Gets the number of columns in the TableBinding, as an integer value.
+        * 
         *@remarks
         * Hosts: Access, Excel,Word
         * 
         * Available in Requirement set: TableBindings
-        *
-		* Last changed in: 1.1
-		*/
+        */
         columnCount: number;
         /**
-		* True, if the table has headers; otherwise false.
-		* 
+        * True, if the table has headers; otherwise false.
+        * 
         *@remarks
         * Hosts: Access, Excel, PowerPoint, Project, Word
         * 
         * Available in Requirement set: TableBindings
-        *
-		* Last changed in: 1.1
-		*/
+        */
         hasHeaders: boolean;
          /**
-		* Gets the number of rows in the TableBinding, as an integer value.
-		* 
+        * Gets the number of rows in the TableBinding, as an integer value.
+        * 
         *@remarks
         * Hosts: Access, Excel,Word
         * 
         * Available in Requirement set: TableBindings
         *
-        * Last changed in: 1.1
-        *
         * When you insert an empty table by selecting a single row in Excel 2013 and Excel Online (using Table on the Insert tab), both Office host applications create a single row of headers followed by a single blank row. However, if your add-in's script creates a binding for this newly inserted table (for example, by using the addFromSelectionAsync method), and then checks the value of the rowCount property, the value returned will differ depending whether the spreadsheet is open in Excel 2013 or Excel Online.
 
         * - In Excel on the desktop, rowCount will return 0 (the blank row following the headers is not counted).
@@ -2025,7 +1878,7 @@ declare namespace Office {
         * You can work around this difference in your script by checking if rowCount == 1, and if so, then checking if the row contains all empty strings.
         * 
         * In content add-ins for Access, for performance reasons the rowCount property always returns -1.
-		*/
+        */
         rowCount: number;
         /**
          * Adds the specified data to the table as additional columns.
@@ -2035,8 +1888,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: TableBindings
          * 
-         * Last changed in: 1.0
-         * 
          * To add one or more columns specifying the values of the data and headers, pass a TableData object as the data parameter. To add one or more columns specifying only the data, pass an array of arrays ("matrix") as the data parameter.
          * 
          * The success or failure of an addColumnsAsync operation is atomic. That is, the entire add columns operation must succeed, or it will be completely rolled back (and the AsyncResult.status property returned to the callback will report failure):
@@ -2062,8 +1913,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: TableBindings
          * 
-         * Last changed in: 1.1
-         * 
          * To add one or more columns specifying the values of the data and headers, pass a TableData object as the data parameter. To add one or more columns specifying only the data, pass an array of arrays ("matrix") as the data parameter.
          * 
          * The success or failure of an addRowsAsync operation is atomic. That is, the entire add columns operation must succeed, or it will be completely rolled back (and the AsyncResult.status property returned to the callback will report failure):
@@ -2089,8 +1938,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: TableBindings
          * 
-         * Last changed in: 1.1
-         * 
          * In Excel, if the table has no header row, this method will delete the table itself.
          *  
          * @param options The object like {asyncContext:context}, where context is a user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -2105,8 +1952,6 @@ declare namespace Office {
          * 
          * Available in Requirement set: Not in a set
          * 
-         * Last changed in: 1.1
-         * 
          * See [Format tables in add-ins for Excel](https://docs.microsoft.com/en-us/office/dev/add-ins/excel/excel-add-ins-tables#format-a-table) for more information.
          * 
          * @param options The object like {asyncContext:context}, where context is a user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -2128,8 +1973,6 @@ declare namespace Office {
          * Hosts: Excel
          * 
          * Available in Requirement set: Not in a set
-         * 
-		 * Last changed in: 1.1
          * 
          * @param formatsInfo Array elements are themselves three-element arrays:[target, type, formats]
          * 
@@ -2146,12 +1989,10 @@ declare namespace Office {
         /**
          * Updates table formatting options on the bound table.
          *
-		 *@remarks
+         *@remarks
          * Hosts: Excel
          * 
          * Available in Requirement set: Not in a set
-         * 
-		 * Last changed in: 1.1
          * 
          * @param tableOptions An object literal containing a list of property name-value pairs that define the table options to apply.
          * @param options The object {asyncContext:context}, where context is a user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -2224,8 +2065,6 @@ declare namespace Office {
     * 
     * Available in Requirement set: TextBindings
     * 
-    * Last changed in: 1.1
-    * 
     * The TextBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object. It does not implement any additional properties or methods of its own.
     */
     export interface TextBinding extends Binding { }
@@ -4665,8 +4504,6 @@ declare namespace Office {
     * 
     *@remarks
     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
-    *
-    * Last changed in: 1.1
     */
     export interface Context {
         mailbox: Mailbox;

From 55fabd3ae7b3e2dd548d02d4c9a0818bdea5d593 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 21 May 2018 20:16:19 +0200
Subject: [PATCH 297/575] d3-interpolate : fix linting errors Switch to
 TypeScript 2.3

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

diff --git a/types/d3-interpolate/d3-interpolate-tests.ts b/types/d3-interpolate/d3-interpolate-tests.ts
index 50ade8008c..e77d3d4aef 100644
--- a/types/d3-interpolate/d3-interpolate-tests.ts
+++ b/types/d3-interpolate/d3-interpolate-tests.ts
@@ -232,7 +232,7 @@ iNum = d3Interpolate.interpolateBasisClosed([1, 50, 30, 10]);
 
 iString = d3Interpolate.piecewise(d3Interpolate.interpolateRgb.gamma(2.2), ['red', 'green', 'blue']);
 iString = d3Interpolate.piecewise(d3Interpolate.interpolateCubehelix, ['red', 'green', 'blue']);
-iZoom = d3Interpolate.piecewise(d3Interpolate.interpolateZoom, [[50, 50, 300], [100, 100, 500]] as d3Interpolate.ZoomView[]);
+iZoom = d3Interpolate.piecewise(d3Interpolate.interpolateZoom, [[50, 50, 300], [100, 100, 500]]);
 iNum = d3Interpolate.piecewise(d3Interpolate.interpolateNumber, [1, 2, 3]);
 iNum = d3Interpolate.piecewise(d3Interpolate.interpolateRound, [1.1, 2.2, 3.3]);
 iString = d3Interpolate.piecewise(d3Interpolate.interpolateString, ['a', 'b', 'c']);
diff --git a/types/d3-interpolate/index.d.ts b/types/d3-interpolate/index.d.ts
index 4d6d67f5d5..3853bff326 100644
--- a/types/d3-interpolate/index.d.ts
+++ b/types/d3-interpolate/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for D3JS d3-interpolate module 1.1
+// Type definitions for D3JS d3-interpolate module 1.2
 // Project: https://github.com/d3/d3-interpolate/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-// Last module patch version validated against: 1.1.1
+// Last module patch version validated against: 1.2.0
 
 import { ColorCommonInstance } from 'd3-color';
 

From 0d24e9589b1b9feab135807e3ecede0e7c634783 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Mon, 21 May 2018 11:16:21 -0700
Subject: [PATCH 298/575] Correcting IdentityAPI capitalization

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 8c687606c0..d819833fb7 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -360,7 +360,7 @@ declare namespace Office {
         * @remarks
         * Hosts: Excel, OneNote, Outlook, PowerPoint, Word
         * 
-        * Requirement sets: IdentityApi
+        * Requirement sets: IdentityAPI
         * 
         * 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.
         * 

From c3b80513fd56b0c4bdf075bf0674289ef6a6860d Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 21 May 2018 20:22:41 +0200
Subject: [PATCH 299/575] Typescript version for d3-scale, required for
 d3-interpoalte

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

diff --git a/types/d3-scale/index.d.ts b/types/d3-scale/index.d.ts
index b3ca4114e2..9471096fb9 100644
--- a/types/d3-scale/index.d.ts
+++ b/types/d3-scale/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/d3/d3-scale/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // Last module patch version validated against: 2.0.0
 

From 94e8c22ab383e2a3f4111961637dfbea0d3fc48c Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Mon, 21 May 2018 11:38:34 -0700
Subject: [PATCH 300/575] Adding Requirement Sets and spacing cleanup

---
 types/office-js/index.d.ts | 200 ++++++++++++++++++++++++-------------
 1 file changed, 128 insertions(+), 72 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index d819833fb7..33b0f373f0 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -716,21 +716,21 @@ declare namespace Office {
         /**
         * Get the Document object associated with the binding.
         * 
-        *@remarks
+        * @remarks
         * Hosts: Access, Excel, Word
         */
         document: Document;
         /**
          * A string that uniquely identifies this binding among the bindings in the same Document object.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Access, Excel, Word
          */
         id: string;
         /**
         * Gets the type of the binding.
         * 
-        *@remarks
+        * @remarks
         * Hosts: Access, Excel, Word
         */
         type: BindingType;
@@ -749,7 +749,7 @@ declare namespace Office {
         /**
          * Returns the data contained within the binding.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Access, Excel, Word
          * 
          * Available in Requirement sets: MatrixBindings, TableBindings, TextBindings
@@ -782,7 +782,7 @@ declare namespace Office {
         /**
          * Removes the specified handler from the binding for the specified event type.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Access, Excel, Word
          * 
          * Available in Requirement set: BindingEvents
@@ -800,7 +800,7 @@ declare namespace Office {
         /**
          * Writes data to the bound section of the document represented by the specified binding object.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Access, Excel, Word
          * 
          * Available in Requirement sets: MatrixBindings, TableBindings, TextBindings
@@ -842,7 +842,7 @@ declare namespace Office {
     /**
     * Represents the bindings the add-in has within the document.
     * 
-    *@remarks
+    * @remarks
     * Hosts: 
     */
     export interface Bindings {
@@ -856,7 +856,7 @@ declare namespace Office {
         /**
          * Creates a binding against a named object in the document.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Access, Excel, Word
          * 
          * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
@@ -889,7 +889,7 @@ declare namespace Office {
         /**
          * Create a binding by prompting the user to make a selection on the document.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Access, Excel
          * 
          * Available in Requirement set: Not in a set
@@ -913,7 +913,7 @@ declare namespace Office {
         /**
          * Create a binding based on the user's current selection.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Access, Excel, Word
          * 
          * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
@@ -939,7 +939,7 @@ declare namespace Office {
         /**
          * Gets all bindings that were previously created.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Access, Excel, Word
          * 
          * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
@@ -951,7 +951,7 @@ declare namespace Office {
         /**
          * Retrieves a binding based on its Name
          * 
-         *@remarks
+         * @remarks
          * Hosts: Access, Excel, Word
          * 
          * Available in Requirement set: CustomXmlParts, MatrixBindings, TableBindings, TextBindings
@@ -966,7 +966,7 @@ declare namespace Office {
         /**
          * Removes the binding from the document
          * 
-         *@remarks
+         * @remarks
          * Hosts: Access, Excel, Word
          * 
          * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
@@ -982,7 +982,7 @@ declare namespace Office {
     /**
     * Represents the runtime environment of the add-in and provides access to key objects of the API.
     * 
-    *@remarks
+    * @remarks
     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
     */
     export interface Context {
@@ -994,7 +994,7 @@ declare namespace Office {
     /**
      * Represents an XML node in a tree in a document.
      * 
-     *@remarks
+     * @remarks
      * Hosts: Word
      * 
      * Available in Requirement set: CustomXmlParts
@@ -1003,7 +1003,7 @@ declare namespace Office {
         /**
          * Gets the base name of the node without the namespace prefix, if one exists.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1012,7 +1012,7 @@ declare namespace Office {
         /**
          * Retrieves the string GUID of the CustomXMLPart.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1021,7 +1021,7 @@ declare namespace Office {
         /**
          * Gets the type of the CustomXMLNode.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1030,7 +1030,7 @@ declare namespace Office {
         /**
          * Gets the nodes associated with the XPath expression.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1043,7 +1043,7 @@ declare namespace Office {
         /**
          * Gets the node value.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1055,7 +1055,7 @@ declare namespace Office {
         /**
          * Gets the text of an XML node in a custom XML part.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1067,7 +1067,7 @@ declare namespace Office {
         /**
          * Gets the node's XML.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1079,7 +1079,7 @@ declare namespace Office {
         /**
          * Sets the node value.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1092,7 +1092,7 @@ declare namespace Office {
         /**
          * Asynchronously sets the text of an XML node in a custom XML part.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1105,7 +1105,7 @@ declare namespace Office {
         /**
          * Sets the node XML.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1119,7 +1119,7 @@ declare namespace Office {
     /**
      * Represents a single CustomXMLPart in a CustomXMLParts collection.
      * 
-     *@remarks
+     * @remarks
      * Hosts: Word
      * 
      * Available in Requirement set: CustomXmlParts
@@ -1128,7 +1128,7 @@ declare namespace Office {
         /**
          * True, if the custom XML part is built in; otherwise false.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1137,7 +1137,7 @@ declare namespace Office {
         /**
          * Gets the GUID of the CustomXMLPart.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1146,7 +1146,7 @@ declare namespace Office {
         /**
          * Gets the set of namespace prefix mappings (CustomXMLPrefixMappings) used against the current CustomXMLPart.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1155,7 +1155,7 @@ declare namespace Office {
         /**
          * Adds an event handler to the object using the specified event type.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
@@ -1169,7 +1169,7 @@ declare namespace Office {
         /**
          * Deletes the Custom XML Part.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1181,7 +1181,7 @@ declare namespace Office {
         /**
          * Asynchronously gets any CustomXmlNodes in this custom XML part which match the specified XPath.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1194,7 +1194,7 @@ declare namespace Office {
         /**
          * Asynchronously gets the XML inside this custom XML part.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1206,7 +1206,7 @@ declare namespace Office {
         /**
          * Removes an event handler for the specified event type.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1221,7 +1221,7 @@ declare namespace Office {
     /**
      * Represents a collection of CustomXmlPart objects.
      * 
-     *@remarks
+     * @remarks
      * Hosts: Word
      * 
      * Available in Requirement set: CustomXmlParts
@@ -1230,7 +1230,7 @@ declare namespace Office {
         /**
          * Asynchronously adds a new custom XML part to a file.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1243,7 +1243,7 @@ declare namespace Office {
         /**
          * Asynchronously gets the specified custom XML part by its id.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1256,7 +1256,7 @@ declare namespace Office {
         /**
          * Asynchronously gets the specified custom XML part(s) by its namespace.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1270,14 +1270,14 @@ declare namespace Office {
     /**
      * Represents a collection of CustomXmlPart objects.
      * 
-     *@remarks
+     * @remarks
      * Hosts: Word
      */
     export interface CustomXmlPrefixMappings {
         /**
          * Asynchronously adds a prefix to namespace mapping to use when querying an item.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1293,7 +1293,7 @@ declare namespace Office {
         /**
          * Asynchronously gets the namespace mapped to the specified prefix.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          *
          * Available in Requirement set: CustomXmlParts
@@ -1308,7 +1308,7 @@ declare namespace Office {
         /**
          * Asynchronously gets the prefix for the specified namespace.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          * 
          * Available in Requirement set: CustomXmlParts
@@ -1324,14 +1324,14 @@ declare namespace Office {
     /**
      * An abstract class that represents the document the add-in is interacting with.
      * 
-     *@remarks
+     * @remarks
      * Hosts: Access, Excel, PowerPoint, Project, Word
      */
     export interface Document {
         /**
          * Gets an object that provides access to the bindings defined in the document.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Access, Excel, Word
          * 
          * You don't instantiate the Document object directly in your script. To call members of the Document object to interact with the current document or worksheet, use Office.context.document in your script.
@@ -1340,35 +1340,35 @@ declare namespace Office {
         /**
          * Gets an object that represents the custom XML parts in the document.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          */
         customXmlParts: CustomXmlParts;
         /**
          * Gets the mode the document is in.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          */
         mode: DocumentMode;
         /**
          * Gets an object that represents the saved custom settings of the content or task pane add-in for the current document.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          */
         settings: Settings;
         /**
          * Gets the URL of the document that the host application currently has open. Returns null if the URL is unavailable.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Word
          */
         url: string;
         /**
          * Adds an event handler for a Document object event.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Excel, PowerPoint, Project, Word
          * 
          * Available in Requirement set: DocumentEvents
@@ -1384,7 +1384,7 @@ declare namespace Office {
         /**
          * Returns the state of the current view of the presentation (edit or read).
          *
-         *@remarks
+         * @remarks
          * Hosts: Excel, PowerPoint, Word
          * 
          * Available in Requirement set: ActiveView
@@ -1398,7 +1398,7 @@ declare namespace Office {
         /**
          * Returns the entire document file in slices of up to 4194304 bytes (4 MB). For add-ins for iOS, file slice is supported up to 65536 (64 KB). Note that specifying file slice size of above permitted limit will result in an "Internal Error" failure.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Excel, PowerPoint, Word
          *
          * Available in Requirement set: File
@@ -1428,7 +1428,7 @@ declare namespace Office {
         /**
          * Gets file properties of the current document.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Excel, PowerPoint, Word
          * 
          * Available in Requirement set: not in a set
@@ -1442,7 +1442,7 @@ declare namespace Office {
         /**
          * Reads the data contained in the current selection in the document.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Access, Excel, PowerPoint, Project, Word
          * 
          * Available in Requirement set: Selection
@@ -1476,7 +1476,7 @@ declare namespace Office {
         /**
          * Goes to the specified object or location in the document.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Excel, PowerPoint, Word
          * 
          * Available in Requirement set: not in a set
@@ -1505,7 +1505,7 @@ declare namespace Office {
         /**
          * Removes an event handler for the specified event type.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Excel, PowerPoint, Project, Word
          * 
          * Available in Requirement set: DocumentEvents
@@ -1523,7 +1523,7 @@ declare namespace Office {
         /**
          * Writes the specified data into the current selection.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Access, Excel, PowerPoint, Project, Word, Word Online
          * 
          * Available in Requirement set: Selection
@@ -1588,8 +1588,11 @@ declare namespace Office {
     export interface File {
         /**
          * Gets the document file size in bytes.
+         * 
          * @remarks
          * Hosts: PowerPoint, Word
+         * 
+         * Available in Requirement set: File
          */
         size: number;
         /**
@@ -1605,6 +1608,7 @@ declare namespace Office {
          * 
          * Hosts: PowerPoint, Word
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
+         * 
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
          * In the callback function passed to the closeAsync method, you can use the properties of the AsyncResult object to return the following information.
@@ -1614,6 +1618,8 @@ declare namespace Office {
          * |AsyncResult.status|Determine the success or failure of the operation.|
          * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
          * |AsyncResult.asyncContext|Access your user-defined object or value, if you passed one as the asyncContext parameter.|
+         * 
+         * Available in Requirement set: File
          */
         closeAsync(callback?: (result: AsyncResult) => void): void;
         /**
@@ -1631,6 +1637,8 @@ declare namespace Office {
          * |AsyncResult.status|Determine the success or failure of the operation.|
          * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
          * |AsyncResult.asyncContext|Access your user-defined object or value, if you passed one as the asyncContext parameter.|
+         * 
+         * Available in Requirement set: File
          */
         getSliceAsync(sliceIndex: number, callback?: (result: AsyncResult) => void): void;
     }
@@ -1643,7 +1651,7 @@ declare namespace Office {
     /**
     * Represents a binding in two dimensions of rows and columns.
     * 
-    *@remarks
+    * @remarks
          * Hosts: Excel, Word
     * 
     * Available in Requirement set: MatrixBindings
@@ -1654,7 +1662,7 @@ declare namespace Office {
         /**
         * Gets the number of columns in the matrix data structure, as an integer value.
         * 
-        *@remarks
+        * @remarks
         * Hosts: Access, Excel, PowerPoint, Project, Word
         * 
         * Available in Requirement set: MatrixBindings
@@ -1663,7 +1671,7 @@ declare namespace Office {
         /**
         * Gets the number of rows in the matrix data structure, as an integer value.
         * 
-        *@remarks
+        * @remarks
         * Hosts: Access, Excel, PowerPoint, Project, Word
         * 
         * Available in Requirement set: MatrixBindings
@@ -1681,10 +1689,13 @@ declare namespace Office {
      * The Settings object is automatically loaded as part of the Document object, and is available by calling the settings property of that object when the add-in is activated. The developer is responsible for calling the saveAsync method after adding or deleting settings to save the settings in the document.
      * 
      * Hosts: Access, Excel, PowerPoint, Word
+     * 
+     * Available in Requirement set: Settings
      */
     export interface Settings {
         /**
          * Adds an event handler for the settingsChanged event.
+         * 
          * @remarks
          * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
          * 
@@ -1692,6 +1703,9 @@ declare namespace Office {
          * > Your add-in's code can register a handler for the settingsChanged event when the add-in is running with any Excel client, but the event will fire only when the add-in is loaded with a spreadsheet that is opened in Excel Online, and more than one user is editing the spreadsheet (co-authoring). Therefore, effectively the settingsChanged event is supported only in Excel Online in co-authoring scenarios.
          * 
          * Hosts: Excel
+         * 
+         * Available in Requirement set: Settings
+         * 
          * @param eventType Specifies the type of event to add. Required.
          * @param handler The event handler function to add. Required.
          * @param options Specifies any of the following optional parameters.
@@ -1710,19 +1724,27 @@ declare namespace Office {
         addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Retrieves the specified setting.
+         * 
          * @remarks
          * Hosts: Access, Excel, PowerPoint, Word
+         * 
+         * Available in Requirement set: Settings
+         * 
          * @param settingName The case-sensitive name of the setting to retrieve.
          * @returns An object that has property names mapped to JSON serialized values.
          */
         get(name: string): any;
         /**
          * Reads all settings persisted in the document and refreshes the content or task pane add-in's copy of those settings held in memory.
+         * 
          * @remarks
          * This method is useful in Word and PowerPoint coauthoring scenarios when multiple instances of the same add-in are working against the same document. Because each add-in is working against an in-memory copy of the settings loaded from the document at the time the user opened it, the settings values used by each user can get out of sync. This can happen whenever an instance of the add-in calls the Settings.saveAsync method to persist all of that user's settings to the document. Calling the refreshAsync method from the event handler for the settingsChanged event of the add-in will refresh the settings values for all users.
          * The refreshAsync method can be called from add-ins created for Excel, but since it doesn't support coauthoring there is no reason to do so.
          * 
          * Hosts: Access, Excel, PowerPoint, Word
+         * 
+         * Available in Requirement set: Settings
+         * 
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
@@ -1737,21 +1759,29 @@ declare namespace Office {
         refreshAsync(callback?: (result: AsyncResult) => void): void;
         /**
          * Removes the specified setting.
+         * 
          * @remarks
          * null is a valid value for a setting. Therefore, assigning null to the setting will not remove it from the settings property bag.
          * 
          * > [!IMPORTANT]
          * > Be aware that the Settings.remove method affects only the in-memory copy of the settings property bag. To persist the removal of the specified setting in the document, at some point after calling the Settings.remove method and before the add-in is closed, you must call the Settings.saveAsync method.
          * Hosts: Access, Excel, PowerPoint, Word
+         * 
+         * Available in Requirement set: Settings
+         * 
          * @param settingName The case-sensitive name of the setting to remove.
          */
         remove(name: string): void;
         /**
          * Removes an event handler for the settingsChanged event.
+         * 
          * @remarks
          * If the optional handler parameter is omitted when calling the removeHandlerAsync method, all event handlers for the specified eventType will be removed.
          * 
          * Hosts: Access, Excel, PowerPoint
+         * 
+         * Available in Requirement set: Settings
+         * 
          * @param eventType Specifies the type of event to remove. Required.
          * @param options Specifies any of the following optional parameters.
          * @param handler Specifies the name of the handler to remove.
@@ -1772,6 +1802,9 @@ declare namespace Office {
          * > The refreshAsync method is only useful in coauthoring scenarios (which are only supported in Word) when other instances of the same add-in might change the settings and those changes should be made available to all instances.
          * 
          * Hosts: Access, Excel, PowerPoint, Word
+         * 
+         * Available in Requirement set: Settings
+         * 
          * @param options Syntax example: {overwriteIfStale:false}
          * @param overwriteIfStale Indicates whether the setting will be replaced if stale.
          *        asyncContext: Object keeping state for the callback
@@ -1789,6 +1822,7 @@ declare namespace Office {
         saveAsync(callback?: (result: AsyncResult) => void): void;
         /**
          * Sets or creates the specified setting.
+         * 
          * @remarks
          * The set method creates a new setting of the specified name if it does not already exist, or sets an existing setting of the specified name in the in-memory copy of the settings property bag. After you call the Settings.saveAsync method, the value is stored in the document as the serialized JSON representation of its data type. A maximum of 2MB is available for the settings of each add-in.
          * 
@@ -1796,6 +1830,9 @@ declare namespace Office {
          * > Be aware that the Settings.set method affects only the in-memory copy of the settings property bag. To make sure that additions or changes to settings will be available to your add-in the next time the document is opened, at some point after calling the Settings.set method and before the add-in is closed, you must call the Settings.saveAsync method to persist settings in the document.
          * 
          * Hosts: Access, Excel, PowerPoint, Word
+         * 
+         * Available in Requirement set: Settings
+         * 
          * @param settingName The case-sensitive name of the setting to set or create.
          * @param value Specifies the value to be stored.
          */
@@ -1803,37 +1840,49 @@ declare namespace Office {
     }
     /**
      * Represents a slice of a document file.
+     * 
      * @remarks
      * The Slice object is accessed with the File.getSliceAsync method.
      * 
      * Hosts: PowerPoint, Word
+     * 
+     * Available in Requirement set: File
      */
     export interface Slice {
         /**
          * Gets the raw data of the file slice in Office.FileType.Text ("text") or Office.FileType.Compressed ("compressed") format as specified by the fileType parameter of the call to the Document.getFileAsync method.
+         * 
          * @remarks
          * Files in the "compressed" format will return a byte array that can be transformed to a base64-encoded string if required.
          * 
          * Hosts: PowerPoint, Word
+         * 
+         * Available in Requirement set: File
          */
         data: any;
         /**
          * Gets the zero-based index of the file slice.
+         * 
          * @remarks
          * Hosts: PowerPoint, Word
+         * 
+         * Available in Requirement set: File
          */
         index: number;
         /**
          * Gets the size of the slice in bytes.
+         * 
          * @remarks
          * Hosts: PowerPoint, Word
+         * 
+         * Available in Requirement set: File
          */
         size: number;
     }
     /**
     * Represents a binding in two dimensions of rows and columns, optionally with headers.
     * 
-    *@remarks
+    * @remarks
     * Hosts: Access, Excel, PowerPoint, Project, Word
     * 
     * Available in Requirement set: TableBindings
@@ -1846,7 +1895,7 @@ declare namespace Office {
         /**
         * Gets the number of columns in the TableBinding, as an integer value.
         * 
-        *@remarks
+        * @remarks
         * Hosts: Access, Excel,Word
         * 
         * Available in Requirement set: TableBindings
@@ -1855,7 +1904,7 @@ declare namespace Office {
         /**
         * True, if the table has headers; otherwise false.
         * 
-        *@remarks
+        * @remarks
         * Hosts: Access, Excel, PowerPoint, Project, Word
         * 
         * Available in Requirement set: TableBindings
@@ -1864,7 +1913,7 @@ declare namespace Office {
          /**
         * Gets the number of rows in the TableBinding, as an integer value.
         * 
-        *@remarks
+        * @remarks
         * Hosts: Access, Excel,Word
         * 
         * Available in Requirement set: TableBindings
@@ -1883,7 +1932,7 @@ declare namespace Office {
         /**
          * Adds the specified data to the table as additional columns.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Excel, Word
          * 
          * Available in Requirement set: TableBindings
@@ -1908,7 +1957,7 @@ declare namespace Office {
         /**
          * Adds the specified data to the table as additional rows.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Access, Excel, Word
          * 
          * Available in Requirement set: TableBindings
@@ -1933,7 +1982,7 @@ declare namespace Office {
         /**
          * Deletes all non-header rows and their values in the table, shifting appropriately for the host application.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Access, Excel, Word
          * 
          * Available in Requirement set: TableBindings
@@ -1947,7 +1996,7 @@ declare namespace Office {
         /**
          * Clears formatting on the bound table.
          *
-         *@remarks
+         * @remarks
          * Hosts: Excel
          * 
          * Available in Requirement set: Not in a set
@@ -1969,7 +2018,7 @@ declare namespace Office {
         /**
          * Sets formatting on specified items and data in the table.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Excel
          * 
          * Available in Requirement set: Not in a set
@@ -1989,7 +2038,7 @@ declare namespace Office {
         /**
          * Updates table formatting options on the bound table.
          *
-         *@remarks
+         * @remarks
          * Hosts: Excel
          * 
          * Available in Requirement set: Not in a set
@@ -2002,8 +2051,11 @@ declare namespace Office {
     }
     /**
      * Represents the data in a table or a TableBinding.
+     * 
      * @remarks
      * Hosts: Excel, Word
+     * 
+     * Available in Requirement set: TableBindings
      */
     export class TableData {
         constructor(rows: any[][], headers: any[]);
@@ -2020,6 +2072,8 @@ declare namespace Office {
          * - If you overwrite or update an existing table, the existing headers are not altered.
          * 
          * Hosts: Excel, Word
+         * 
+         * Available in Requirement set: TableBindings
          */
         headers: any[];
         /**
@@ -2034,6 +2088,8 @@ declare namespace Office {
          * - If you overwrite or update an existing table, the existing rows are not altered.
          * 
          * Hosts: Excel, Word
+         * 
+         * Available in Requirement set: TableBindings
          */
         rows: any[][];
     }
@@ -2060,7 +2116,7 @@ declare namespace Office {
     /**
     * Represents a bound text selection in the document.
     * 
-    *@remarks
+    * @remarks
     * Hosts: Access, Excel, PowerPoint, Project, Word
     * 
     * Available in Requirement set: TextBindings
@@ -4502,7 +4558,7 @@ declare namespace Office {
     /**
     * Represents the runtime environment of the add-in and provides access to key objects of the API.
     * 
-    *@remarks
+    * @remarks
     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
     */
     export interface Context {
@@ -5742,7 +5798,7 @@ declare namespace Excel {
          *
          * Gets the Binding object that represents the binding that raised the SelectionChanged event.
          * 
-         *@remarks
+         * @remarks
          * Hosts: Access, Excel, Word
          *
          * [Api set: ExcelApi 1.2]

From 7526c00cc01a1e84dfb30e0e97d7dc4725b25e90 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 21 May 2018 20:44:39 +0200
Subject: [PATCH 301/575] Typescript version for d3-array, required for
 d3-interpoalte

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

diff --git a/types/d3-array/index.d.ts b/types/d3-array/index.d.ts
index 67cd291f22..a42f8e1fe9 100644
--- a/types/d3-array/index.d.ts
+++ b/types/d3-array/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/d3/d3-array
 // Definitions by: Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>, Tom Wanzek <https://github.com/tomwanzek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 // Last module patch version validated against: 1.2.0
 

From d43c45aaa37bc14fbded6e3410b2367c74730f0f Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Mon, 21 May 2018 11:45:52 -0700
Subject: [PATCH 302/575] Adding documention from UI.Dialog to DialogHandler
 class

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 33b0f373f0..b8d34d89ab 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -403,7 +403,11 @@ declare namespace Office {
          */
         close(): void;
         /**
-         * Adds an event handler for DialogMessageReceived or DialogEventReceived
+         * Registers an event handler. The two supported events are: 
+         * 
+         * - DialogMessageReceived. Triggered when the dialog box sends a message to its parent.
+         * 
+         * - DialogEventReceived. Triggered when the dialog box has been closed or otherwise unloaded.
          */
         addEventHandler(eventType: Office.EventType, handler: Function): void;
 

From 09f426148f2bdd052de40d224b4ea207054d1cf5 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 21 May 2018 20:46:23 +0200
Subject: [PATCH 303/575] d3-interpolate : removed TS2.3 constraint

---
 types/d3-array/index.d.ts       | 1 -
 types/d3-interpolate/index.d.ts | 3 +--
 types/d3-scale/index.d.ts       | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/types/d3-array/index.d.ts b/types/d3-array/index.d.ts
index a42f8e1fe9..67cd291f22 100644
--- a/types/d3-array/index.d.ts
+++ b/types/d3-array/index.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/d3/d3-array
 // Definitions by: Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>, Tom Wanzek <https://github.com/tomwanzek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
 
 // Last module patch version validated against: 1.2.0
 
diff --git a/types/d3-interpolate/index.d.ts b/types/d3-interpolate/index.d.ts
index 3853bff326..ceab2db551 100644
--- a/types/d3-interpolate/index.d.ts
+++ b/types/d3-interpolate/index.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/d3/d3-interpolate/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
 
 // Last module patch version validated against: 1.2.0
 
@@ -56,7 +55,7 @@ export function interpolateString(a: string | { toString(): string }, b: string
 
 export function interpolateDate(a: Date, b: Date): ((t: number) => Date);
 
-type ArrayInterpolator<A  = any[]> = ((t: number) => A);
+type ArrayInterpolator<A extends any[]> = ((t: number) => A);
 
 export function interpolateArray<A extends any[]>(a: any[], b: A): ArrayInterpolator<A>;
 
diff --git a/types/d3-scale/index.d.ts b/types/d3-scale/index.d.ts
index 9471096fb9..b3ca4114e2 100644
--- a/types/d3-scale/index.d.ts
+++ b/types/d3-scale/index.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/d3/d3-scale/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
 
 // Last module patch version validated against: 2.0.0
 

From 1e824708e8f2a46cd231d8346bcac9cdd36b1d68 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 21 May 2018 20:57:27 +0200
Subject: [PATCH 304/575] d3-interpolate : exported type Added rule to tslint

---
 types/d3-interpolate/index.d.ts  | 2 +-
 types/d3-interpolate/tslint.json | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/d3-interpolate/index.d.ts b/types/d3-interpolate/index.d.ts
index ceab2db551..7d8ee60252 100644
--- a/types/d3-interpolate/index.d.ts
+++ b/types/d3-interpolate/index.d.ts
@@ -55,7 +55,7 @@ export function interpolateString(a: string | { toString(): string }, b: string
 
 export function interpolateDate(a: Date, b: Date): ((t: number) => Date);
 
-type ArrayInterpolator<A extends any[]> = ((t: number) => A);
+export type ArrayInterpolator<A extends any[]> = ((t: number) => A);
 
 export function interpolateArray<A extends any[]>(a: any[], b: A): ArrayInterpolator<A>;
 
diff --git a/types/d3-interpolate/tslint.json b/types/d3-interpolate/tslint.json
index 604d5950cf..9846c79a4d 100644
--- a/types/d3-interpolate/tslint.json
+++ b/types/d3-interpolate/tslint.json
@@ -2,6 +2,7 @@
     "extends": "dtslint/dt.json",
     "rules": {
         "unified-signatures": false,
-        "callable-types": false
+        "callable-types": false,
+        "no-unnecessary-generics": false
     }
 }

From 4563f43f69fded015ce81ac1fbf790d43240dbc5 Mon Sep 17 00:00:00 2001
From: Sean Kelley <sean.kelley@carbonlighthouse.com>
Date: Mon, 21 May 2018 13:14:29 -0700
Subject: [PATCH 305/575] Reactstrap: StatelessComponent -> Component where
 appropriate.

(See also #24846 for prior work.)

Update Reactstrap to declare components that aren't stateless functional components
as regular components. This allows consumers to use ref-related APIs, namely, the
`ref` prop and `forwardRef`.

Previously, Typescript would outright deny passing `ref`, and any attempts to use
`forwardRef` would cause very confusing type errors claiming that the component class
you were trying to refer to didn't exist (?!).

Note that many components actually are implemented as stateless components, and as such
their typings haven't been changed.

I found the list of components needing this update by checking out current master
of reactstrap (1d20d6d52c258428df39429e09c84b0ddcac76ee), then

```sh
cd src
rg 'extends (React.)?Component' -l | grep -v '__tests__'
```
---
 types/reactstrap/lib/Button.d.ts         |  3 ++-
 types/reactstrap/lib/Carousel.d.ts       |  3 ++-
 types/reactstrap/lib/CarouselItem.d.ts   |  3 ++-
 types/reactstrap/lib/Collapse.d.ts       |  3 ++-
 types/reactstrap/lib/Dropdown.d.ts       |  5 +++--
 types/reactstrap/lib/DropdownItem.d.ts   |  3 ++-
 types/reactstrap/lib/DropdownToggle.d.ts |  3 ++-
 types/reactstrap/lib/Form.d.ts           |  3 ++-
 types/reactstrap/lib/Modal.d.ts          |  3 ++-
 types/reactstrap/lib/NavLink.d.ts        |  3 ++-
 types/reactstrap/lib/Popover.d.ts        |  5 ++---
 types/reactstrap/lib/TabContent.d.ts     |  3 ++-
 types/reactstrap/lib/Tooltip.d.ts        |  5 ++---
 types/reactstrap/lib/Uncontrolled.d.ts   | 10 ++++++----
 types/reactstrap/reactstrap-tests.tsx    | 25 ++++++++++++++++++++----
 15 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/types/reactstrap/lib/Button.d.ts b/types/reactstrap/lib/Button.d.ts
index 50f69b1fb1..de1e92482f 100644
--- a/types/reactstrap/lib/Button.d.ts
+++ b/types/reactstrap/lib/Button.d.ts
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface ButtonProps extends React.HTMLProps<HTMLButtonElement> {
@@ -17,5 +18,5 @@ export interface ButtonProps extends React.HTMLProps<HTMLButtonElement> {
   cssModule?: CSSModule;
 }
 
-declare const Button: React.StatelessComponent<ButtonProps>;
+declare class Button extends React.Component<ButtonProps> {}
 export default Button;
diff --git a/types/reactstrap/lib/Carousel.d.ts b/types/reactstrap/lib/Carousel.d.ts
index 1fc992ada2..1f21364cdf 100644
--- a/types/reactstrap/lib/Carousel.d.ts
+++ b/types/reactstrap/lib/Carousel.d.ts
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface CarouselProps extends React.HTMLProps<HTMLElement> {
@@ -14,5 +15,5 @@ export interface CarouselProps extends React.HTMLProps<HTMLElement> {
     cssModule?: CSSModule
 }
 
-declare const Carousel: React.StatelessComponent<CarouselProps>;
+declare class Carousel extends React.Component<CarouselProps> {}
 export default Carousel;
diff --git a/types/reactstrap/lib/CarouselItem.d.ts b/types/reactstrap/lib/CarouselItem.d.ts
index 6be3c28d5e..88e93dfcf1 100644
--- a/types/reactstrap/lib/CarouselItem.d.ts
+++ b/types/reactstrap/lib/CarouselItem.d.ts
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface Transition {
@@ -16,5 +17,5 @@ export interface CarouselItemProps extends React.HTMLProps<HTMLElement>, Transit
     slide?: boolean;
 }
 
-declare const CarouselItem: React.StatelessComponent<CarouselItemProps>;
+declare class CarouselItem extends React.Component<CarouselItemProps> {}
 export default CarouselItem;
diff --git a/types/reactstrap/lib/Collapse.d.ts b/types/reactstrap/lib/Collapse.d.ts
index 9fa6ebd4ad..d83ff45666 100644
--- a/types/reactstrap/lib/Collapse.d.ts
+++ b/types/reactstrap/lib/Collapse.d.ts
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface CollapseProps extends React.HTMLProps<HTMLElement> {
@@ -19,5 +20,5 @@ export interface CollapseProps extends React.HTMLProps<HTMLElement> {
   onExited?: () => void;
 }
 
-declare const Collapse: React.StatelessComponent<CollapseProps>;
+declare class Collapse extends React.Component<CollapseProps> {}
 export default Collapse;
diff --git a/types/reactstrap/lib/Dropdown.d.ts b/types/reactstrap/lib/Dropdown.d.ts
index 52194dac65..4d892fff5c 100644
--- a/types/reactstrap/lib/Dropdown.d.ts
+++ b/types/reactstrap/lib/Dropdown.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type Direction = 
+export type Direction =
   | "up"
   | "down"
   | "left"
@@ -30,5 +31,5 @@ export interface DropdownProps extends Props {
   /* intentionally blank */
 }
 
-declare const Dropdown: React.StatelessComponent<DropdownProps>;
+declare class Dropdown extends React.Component<DropdownProps> {}
 export default Dropdown;
diff --git a/types/reactstrap/lib/DropdownItem.d.ts b/types/reactstrap/lib/DropdownItem.d.ts
index 598c2fbfc8..723e4707d4 100644
--- a/types/reactstrap/lib/DropdownItem.d.ts
+++ b/types/reactstrap/lib/DropdownItem.d.ts
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface DropdownItemProps extends React.HTMLAttributes<HTMLElement> {
@@ -13,5 +14,5 @@ export interface DropdownItemProps extends React.HTMLAttributes<HTMLElement> {
   active?: boolean;
 }
 
-declare const DropdownItem: React.StatelessComponent<DropdownItemProps>;
+declare class DropdownItem extends React.Component<DropdownItemProps> {}
 export default DropdownItem;
diff --git a/types/reactstrap/lib/DropdownToggle.d.ts b/types/reactstrap/lib/DropdownToggle.d.ts
index 5c27af11ad..d02edd50b2 100644
--- a/types/reactstrap/lib/DropdownToggle.d.ts
+++ b/types/reactstrap/lib/DropdownToggle.d.ts
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface DropdownToggleProps extends React.HTMLAttributes<HTMLElement> {
@@ -16,5 +17,5 @@ export interface DropdownToggleProps extends React.HTMLAttributes<HTMLElement> {
   size?: string;
 }
 
-declare const DropdownToggle: React.StatelessComponent<DropdownToggleProps>;
+declare class DropdownToggle extends React.Component<DropdownToggleProps> {}
 export default DropdownToggle;
diff --git a/types/reactstrap/lib/Form.d.ts b/types/reactstrap/lib/Form.d.ts
index 997f4c4e5c..534a5d3988 100644
--- a/types/reactstrap/lib/Form.d.ts
+++ b/types/reactstrap/lib/Form.d.ts
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface FormProps extends React.HTMLProps<HTMLFormElement> {
@@ -8,5 +9,5 @@ export interface FormProps extends React.HTMLProps<HTMLFormElement> {
   cssModule?: CSSModule;
 }
 
-declare const Form: React.StatelessComponent<FormProps>;
+declare class Form extends React.Component<FormProps> {}
 export default Form;
diff --git a/types/reactstrap/lib/Modal.d.ts b/types/reactstrap/lib/Modal.d.ts
index cead67c943..1049ec7918 100644
--- a/types/reactstrap/lib/Modal.d.ts
+++ b/types/reactstrap/lib/Modal.d.ts
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 import { FadeProps } from './Fade';
 
@@ -28,5 +29,5 @@ export interface ModalProps extends React.HTMLAttributes<HTMLElement> {
   role?: string;
 }
 
-declare const Modal: React.StatelessComponent<ModalProps>;
+declare class Modal extends React.Component<ModalProps> {}
 export default Modal;
diff --git a/types/reactstrap/lib/NavLink.d.ts b/types/reactstrap/lib/NavLink.d.ts
index 53640c65e1..9625f92bc9 100644
--- a/types/reactstrap/lib/NavLink.d.ts
+++ b/types/reactstrap/lib/NavLink.d.ts
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface NavLinkProps extends React.HTMLProps<HTMLAnchorElement> {
@@ -11,5 +12,5 @@ export interface NavLinkProps extends React.HTMLProps<HTMLAnchorElement> {
   href?: string;
 }
 
-declare const NavLink: React.StatelessComponent<NavLinkProps>;
+declare class NavLink extends React.Component<NavLinkProps> {}
 export default NavLink;
diff --git a/types/reactstrap/lib/Popover.d.ts b/types/reactstrap/lib/Popover.d.ts
index 3012b64485..e1ef254ee2 100644
--- a/types/reactstrap/lib/Popover.d.ts
+++ b/types/reactstrap/lib/Popover.d.ts
@@ -1,5 +1,4 @@
-/// <reference types='react' />
-
+import * as React from 'react';
 import { CSSModule } from '../index';
 import { Popper } from './Popper';
 
@@ -19,5 +18,5 @@ export interface PopoverProps extends React.HTMLAttributes<HTMLElement> {
   cssModule?: CSSModule;
 }
 
-declare const Popover: React.StatelessComponent<PopoverProps>;
+declare class Popover extends React.Component<PopoverProps> {}
 export default Popover;
diff --git a/types/reactstrap/lib/TabContent.d.ts b/types/reactstrap/lib/TabContent.d.ts
index 0a180cf3c4..46bf48d079 100644
--- a/types/reactstrap/lib/TabContent.d.ts
+++ b/types/reactstrap/lib/TabContent.d.ts
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface TabContentProps extends React.HTMLAttributes<HTMLElement> {
@@ -7,5 +8,5 @@ export interface TabContentProps extends React.HTMLAttributes<HTMLElement> {
   cssModule?: CSSModule;
 }
 
-declare const TabContent: React.StatelessComponent<TabContentProps>;
+declare class TabContent extends React.Component<TabContentProps> {}
 export default TabContent;
diff --git a/types/reactstrap/lib/Tooltip.d.ts b/types/reactstrap/lib/Tooltip.d.ts
index bf472477c6..9c79c8a6d3 100644
--- a/types/reactstrap/lib/Tooltip.d.ts
+++ b/types/reactstrap/lib/Tooltip.d.ts
@@ -1,5 +1,4 @@
-/// <reference types='react' />
-
+import * as React from 'react';
 import { CSSModule } from '../index';
 import {Popper} from './Popper';
 
@@ -23,5 +22,5 @@ export interface TooltipProps extends UncontrolledTooltipProps {
   isOpen?: boolean;
 }
 
-declare const Tooltip: React.StatelessComponent<TooltipProps>;
+declare class Tooltip extends React.Component<TooltipProps> {}
 export default Tooltip;
diff --git a/types/reactstrap/lib/Uncontrolled.d.ts b/types/reactstrap/lib/Uncontrolled.d.ts
index d241477adb..d7aed3962f 100644
--- a/types/reactstrap/lib/Uncontrolled.d.ts
+++ b/types/reactstrap/lib/Uncontrolled.d.ts
@@ -1,12 +1,14 @@
+import * as React from 'react';
+
 import { UncontrolledAlertProps          } from './Alert';
 import { UncontrolledButtonDropdownProps } from './ButtonDropdown';
 import { UncontrolledDropdownProps       } from './Dropdown';
 import { UncontrolledTooltipProps        } from './Tooltip';
 
-export const UncontrolledAlert: React.StatelessComponent<UncontrolledAlertProps>;
-export const UncontrolledButtonDropdown: React.StatelessComponent<UncontrolledButtonDropdownProps>;
-export const UncontrolledDropdown: React.StatelessComponent<UncontrolledDropdownProps>;
-export const UncontrolledTooltip: React.StatelessComponent<UncontrolledTooltipProps>;
+export class UncontrolledAlert extends React.Component<UncontrolledAlertProps> {}
+export class UncontrolledButtonDropdown extends React.Component<UncontrolledButtonDropdownProps> {}
+export class UncontrolledDropdown extends React.Component<UncontrolledDropdownProps> {}
+export class UncontrolledTooltip extends React.Component<UncontrolledTooltipProps> {}
 
 export { UncontrolledAlertProps          } from './Alert';
 export { UncontrolledButtonDropdownProps } from './ButtonDropdown';
diff --git a/types/reactstrap/reactstrap-tests.tsx b/types/reactstrap/reactstrap-tests.tsx
index 9215bc7ba9..6f922a6dd4 100644
--- a/types/reactstrap/reactstrap-tests.tsx
+++ b/types/reactstrap/reactstrap-tests.tsx
@@ -3691,8 +3691,25 @@ const Example116 = (props: any) => {
   );
 };
 
-class Example117 extends React.Component {
-  render() {
-    return <Input ref={e => { console.log(e); }}/>;
-  }
+function Example117() {
+    const ref = (e: any) => {};
+
+    <Input ref={ref}/>;
+    <Button ref={ref}/>;
+    <Carousel ref={ref} next={null as any} previous={null as any}/>;
+    <CarouselItem ref={ref}/>;
+    <Collapse ref={ref}/>;
+    <Dropdown ref={ref}/>;
+    <DropdownItem ref={ref}/>;
+    <DropdownToggle ref={ref}/>;
+    <Form ref={ref}/>;
+    <Input ref={ref}/>;
+    <Modal ref={ref}/>;
+    <NavLink ref={ref}/>;
+    <TabContent ref={ref}/>;
+    <Tooltip ref={ref} target={null as any}/>;
+    <UncontrolledAlert ref={ref}/>;
+    <UncontrolledButtonDropdown ref={ref}/>;
+    <UncontrolledDropdown ref={ref}/>;
+    <UncontrolledTooltip ref={ref} target={null as any}/>;
 }

From ee05115ac7da202bdaba5dba87092ebce7670568 Mon Sep 17 00:00:00 2001
From: Sean Kelley <sean.kelley@carbonlighthouse.com>
Date: Mon, 21 May 2018 13:45:15 -0700
Subject: [PATCH 306/575] Reactstrap: update types for innerRefs.

Refer to React's Ref<T> class instead. This way the types of the innerRef reflect
whatever the installed typings for React say a ref can be.
---
 types/reactstrap/lib/Button.d.ts      |  2 +-
 types/reactstrap/lib/CardLink.d.ts    |  2 +-
 types/reactstrap/lib/Form.d.ts        |  2 +-
 types/reactstrap/lib/Input.d.ts       |  2 +-
 types/reactstrap/lib/NavLink.d.ts     |  2 +-
 types/reactstrap/reactstrap-tests.tsx | 13 +++++++++++--
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/types/reactstrap/lib/Button.d.ts b/types/reactstrap/lib/Button.d.ts
index de1e92482f..bf75bcec8e 100644
--- a/types/reactstrap/lib/Button.d.ts
+++ b/types/reactstrap/lib/Button.d.ts
@@ -8,7 +8,7 @@ export interface ButtonProps extends React.HTMLProps<HTMLButtonElement> {
   color?: string;
   disabled?: boolean;
   tag?: React.ReactType;
-  innerRef?: string | ((instance: HTMLButtonElement) => any);
+  innerRef?: React.Ref<HTMLButtonElement>;
 
   onClick?: React.MouseEventHandler<any>;
   size?: any;
diff --git a/types/reactstrap/lib/CardLink.d.ts b/types/reactstrap/lib/CardLink.d.ts
index 9425571de5..1a24b55658 100644
--- a/types/reactstrap/lib/CardLink.d.ts
+++ b/types/reactstrap/lib/CardLink.d.ts
@@ -2,7 +2,7 @@ import { CSSModule } from '../index';
 
 export interface CardLinkProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
-  innerRef?: string | ((instance: HTMLButtonElement) => any);
+  innerRef?: React.Ref<HTMLAnchorElement>;
   className?: string;
   cssModule?: CSSModule;
   href?: string;
diff --git a/types/reactstrap/lib/Form.d.ts b/types/reactstrap/lib/Form.d.ts
index 534a5d3988..3b6f846d08 100644
--- a/types/reactstrap/lib/Form.d.ts
+++ b/types/reactstrap/lib/Form.d.ts
@@ -4,7 +4,7 @@ import { CSSModule } from '../index';
 export interface FormProps extends React.HTMLProps<HTMLFormElement> {
   inline?: boolean;
   tag?: React.ReactType;
-  innerRef?: string | ((instance: HTMLButtonElement) => any);
+  innerRef?: React.Ref<HTMLFormElement>;
   className?: string;
   cssModule?: CSSModule;
 }
diff --git a/types/reactstrap/lib/Input.d.ts b/types/reactstrap/lib/Input.d.ts
index eddd8089be..9d160ec2c4 100644
--- a/types/reactstrap/lib/Input.d.ts
+++ b/types/reactstrap/lib/Input.d.ts
@@ -35,7 +35,7 @@ export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement>
   valid?: boolean;
   invalid?: boolean;
   tag?: React.ReactType;
-  innerRef?: string | ((instance: HTMLInputElement) => any);
+  innerRef?: React.Ref<HTMLInputElement>;
   plaintext?: boolean;
   addon?: boolean;
   className?: string;
diff --git a/types/reactstrap/lib/NavLink.d.ts b/types/reactstrap/lib/NavLink.d.ts
index 9625f92bc9..0fdfdec641 100644
--- a/types/reactstrap/lib/NavLink.d.ts
+++ b/types/reactstrap/lib/NavLink.d.ts
@@ -3,7 +3,7 @@ import { CSSModule } from '../index';
 
 export interface NavLinkProps extends React.HTMLProps<HTMLAnchorElement> {
   tag?: React.ReactType;
-  innerRef?: string | ((instance: HTMLButtonElement) => any);
+  innerRef?: React.Ref<HTMLAnchorElement>;
   disabled?: boolean;
   active?: boolean;
   className?: string;
diff --git a/types/reactstrap/reactstrap-tests.tsx b/types/reactstrap/reactstrap-tests.tsx
index 6f922a6dd4..959ac2658b 100644
--- a/types/reactstrap/reactstrap-tests.tsx
+++ b/types/reactstrap/reactstrap-tests.tsx
@@ -3336,7 +3336,7 @@ const CSSModuleExample = (props: any) => {
 };
 
 class Example107 extends React.Component {
-  private input: HTMLInputElement;
+  private input: HTMLInputElement | null;
 
   render() {
     return <Input type="file" innerRef={(input) => { this.input = input; }} />;
@@ -3694,7 +3694,6 @@ const Example116 = (props: any) => {
 function Example117() {
     const ref = (e: any) => {};
 
-    <Input ref={ref}/>;
     <Button ref={ref}/>;
     <Carousel ref={ref} next={null as any} previous={null as any}/>;
     <CarouselItem ref={ref}/>;
@@ -3713,3 +3712,13 @@ function Example117() {
     <UncontrolledDropdown ref={ref}/>;
     <UncontrolledTooltip ref={ref} target={null as any}/>;
 }
+
+function Example118() {
+    const ref: string | ((e: any) => void) | React.RefObject<any> = null as any;
+
+    <Button innerRef={ref}/>;
+    <CardLink innerRef={ref}/>;
+    <Form innerRef={ref}/>;
+    <Input innerRef={ref}/>;
+    <NavLink innerRef={ref}/>;
+}

From 26d40427c112542df60da0b53d906b9e034ad6ea Mon Sep 17 00:00:00 2001
From: Jonathan Jung <jonathan.jung@nfl.com>
Date: Mon, 21 May 2018 14:47:57 -0700
Subject: [PATCH 307/575] [types/aws-lambda] adds a path attribute to the
 APIGatewayEventRequestContext

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

diff --git a/types/aws-lambda/aws-lambda-tests.ts b/types/aws-lambda/aws-lambda-tests.ts
index 8a3909329f..ea51d25770 100644
--- a/types/aws-lambda/aws-lambda-tests.ts
+++ b/types/aws-lambda/aws-lambda-tests.ts
@@ -93,6 +93,7 @@ str = apiGwEvtReqCtx.identity.sourceIp;
 strOrNull = apiGwEvtReqCtx.identity.user;
 strOrNull = apiGwEvtReqCtx.identity.userAgent;
 strOrNull = apiGwEvtReqCtx.identity.userArn;
+str = apiGwEvtReqCtx.path;
 str = apiGwEvtReqCtx.stage;
 str = apiGwEvtReqCtx.requestId;
 str = apiGwEvtReqCtx.resourceId;
diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index e61d2bac72..4b62269902 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -42,6 +42,7 @@ export interface APIGatewayEventRequestContext {
         userAgent: string | null;
         userArn: string | null;
     };
+    path: string;
     stage: string;
     requestId: string;
     requestTimeEpoch: number;

From e7e64d2735c23d397b7bcd6cab68f889e25c4898 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Mon, 21 May 2018 16:14:53 -0700
Subject: [PATCH 308/575] Normailzing callback and async result strings

---
 types/office-js/index.d.ts | 227 +++++++++++++++++++------------------
 1 file changed, 114 insertions(+), 113 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index d29491618e..7ecd02afd1 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -349,7 +349,7 @@ declare namespace Office {
     /**
      * Returns a promise of an object described in the expression. Callback is invoked only if method fails.
      * @param expression The object to be retrieved. Example "bindings#BindingName", retrieves a binding promise for a binding named 'BindingName'
-     * @param callback The optional callback method
+     * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
      */
     export function select(expression: string, callback?: (result: AsyncResult) => void): Binding;
     // Enumerations
@@ -674,8 +674,9 @@ declare namespace Office {
          * 
          * @param eventType The event type. For example, for bindings, it can be **Office.EventType.BindingSelectionChanged**, **Office.EventType.BindingDataChanged**, or the corresponding text values of these enumerations.
          * @param handler The event handler function to add.
-         * @param options  { asyncContext: context } Where context is an object of any type that keeps state for the callback.
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param options Syntax example: {asyncContext:context}
+         *        asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
@@ -704,11 +705,11 @@ declare namespace Office {
          * 
          *       filterType: Specify whether to get only the visible (filtered in) data or all the data (default is all). Useful when filtering data. Use Office.FilterType or text value.
          * 
-         *       asyncContext: Object keeping state for the callback
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * 
          *       rows: Only for table bindings in content add-ins for Access. Specifies the pre-defined string "thisRow" to get data in the currently selected row.
 
-         * @param callback The optional callback method
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getDataAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
@@ -725,7 +726,7 @@ declare namespace Office {
          * 
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * 
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
@@ -765,7 +766,7 @@ declare namespace Office {
          * 
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * 
-         * @param callback The optional callback method
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         setDataAsync(data: TableData | any, options?: any, callback?: (result: AsyncResult) => void): void;
     }
@@ -777,9 +778,9 @@ declare namespace Office {
          * @param bindingType The Office BindingType for the data
          * @param options Syntax example: {id: "BindingID"}
          *       id: Name of the binding, autogenerated if not supplied.
-         *       asyncContext: Object keeping state for the callback
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          *       columns: The string[] of the columns involved in the binding
-         * @param callback The optional callback method
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addFromNamedItemAsync(itemName: string, bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
@@ -787,10 +788,10 @@ declare namespace Office {
          * @param bindingType The Office BindingType for the data
          * @param options addFromPromptAsyncOptions- e.g. {promptText: "Please select data", id: "mySales"}
          *       promptText: Greet your users with a friendly word.
-         *       asyncContext: Object keeping state for the callback
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          *       id: Identifier.
          *       sampleData: A TableData that gives sample table in the Dialog.TableData.Headers is [][] of string.
-         * @param callback The optional callback method
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addFromPromptAsync(bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
@@ -798,33 +799,33 @@ declare namespace Office {
          * @param bindingType The Office BindingType for the data
          * @param options addFromSelectionAsyncOptions- e.g. {id: "BindingID"}
          *       id: Identifier.
-         *       asyncContext: Object keeping state for the callback
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          *       columns: The string[] of the columns involved in the binding
          *       sampleData: A TableData that gives sample table in the Dialog.TableData.Headers is [][] of string.
-         * @param callback The optional callback method
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addFromSelectionAsync(bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets an array with all the binding objects in the document.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getAllAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Retrieves a binding based on its Name
          * @param id The binding id
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes the binding from the document
          * @param id The binding id
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         releaseByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
     }
@@ -839,53 +840,53 @@ declare namespace Office {
          * Gets the nodes associated with the xPath expression.
          * @param xPath The xPath expression
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getNodesAsync(xPath: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the node value.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getNodeValueAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the text of an XML node in a custom XML part.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getTextAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the node's XML.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getXmlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets the node value.
          * @param value The value to be set on the node
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         setNodeValueAsync(value: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously sets the text of an XML node in a custom XML part.
          * @param text Required. The text value of the XML node.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         setTextAsync(text: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets the node XML.
          * @param xml The XML to be set on the node
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         setXmlAsync(xml: string, options?: any, callback?: (result: AsyncResult) => void): void;
     }
@@ -898,30 +899,30 @@ declare namespace Office {
          * @param eventType The event type. For CustomXmlPartNode it can be 'nodeDeleted', 'nodeInserted' or 'nodeReplaced'
          * @param handler The name of the handler
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addHandlerAsync(eventType: EventType, handler?: (result: any) => void, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Deletes the Custom XML Part.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         deleteAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the nodes associated with the xPath expression.
          * @param xPath The xPath expression
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getNodesAsync(xPath: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the XML for the Custom XML Part.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getXmlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
@@ -929,8 +930,8 @@ declare namespace Office {
          * @param eventType The event type. For CustomXmlPartNode it can be 'nodeDeleted', 'nodeInserted' or 'nodeReplaced'
          * @param options Syntax example: {handler:eventHandler}
          *       handler: Indicates a specific handler to be removed, if not specified all handlers are removed
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
     }
@@ -939,24 +940,24 @@ declare namespace Office {
          * Asynchronously adds a new custom XML part to a file.
          * @param xml The XML to add to the newly created custom XML part.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addAsync(xml: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the specified custom XML part by its id.
          * @param id The id of the custom XML part.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the specified custom XML part(s) by its namespace.
          * @param ns  The namespace to search.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getByNamespaceAsync(ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
     }
@@ -966,24 +967,24 @@ declare namespace Office {
          * @param prefix The namespace prefix
          * @param ns The namespace URI
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addNamespaceAsync(prefix: string, ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets a namespace  with the specified prefix
          * @param prefix The namespace prefix
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getNamespaceAsync(prefix: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets a prefix  for  the specified URI
          * @param ns The namespace URI
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getPrefixAsync(ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
     }
@@ -998,15 +999,15 @@ declare namespace Office {
          * @param eventType The event type. For document can be 'DocumentSelectionChanged'
          * @param handler The name of the handler
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Returns the current view of the presentation.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getActiveViewAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
@@ -1014,14 +1015,14 @@ declare namespace Office {
          * @param fileType The format in which the file will be returned
          * @param options Syntax example: {sliceSize:1024}
          *       sliceSize: Specifies the desired slice size (in bytes) up to 4MB. If not specified a default slice size of 4MB will be used.
-         * @param callback The optional callback method
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getFileAsync(fileType: FileType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets file properties of the current document.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getFilePropertiesAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
@@ -1030,27 +1031,27 @@ declare namespace Office {
          * @param options Syntax example: {valueFormat: 'formatted', filterType:'all'}
          *       valueFormat: Get data with or without format. Use Office.ValueFormat or text value.
          *       filterType: Get the visible or all the data. Useful when filtering data. Use Office.FilterType or text value.
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getSelectedDataAsync(coercionType: CoercionType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Goes to the specified object or location in the document.
          * @param id The identifier of the object or location to go to.
          * @param goToType The type of the location to go to.
-         * @param options Syntax example: {asyncContext:context}
+         * @param options Syntax example: {selectionMode:Office.SelectionMode.Selected}
          *       selectionMode: Use Office.SelectionMode or text value.
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         goToByIdAsync(id: string | number, goToType: GoToType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes an event handler for the specified event type.
          * @param eventType The event type. For document can be 'DocumentSelectionChanged'
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          *       handler: The name of the handler. If not specified all handlers are removed
-         * @param callback The optional callback method
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
@@ -1058,8 +1059,8 @@ declare namespace Office {
          * @param data The data to be set. Either a string or value, 2d array or TableData object
          * @param options Syntax example: {coercionType:Office.CoercionType.Matrix} or {coercionType: 'matrix'}
          *       coercionType: Explicitly sets the shape of the data object. Use Office.CoercionType or text value. If not supplied is inferred from the data type.
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         setSelectedDataAsync(data: string | TableData | any[][], options?: any, callback?: (result: AsyncResult) => void): void;
     }
@@ -1103,7 +1104,7 @@ declare namespace Office {
          * No more than two documents are allowed to be in memory; otherwise the Document.getFileAsync operation will fail. Use the File.closeAsync method to close the file when you are finished working with it.
          * 
          * Hosts: PowerPoint, Word
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
          * In the callback function passed to the closeAsync method, you can use the properties of the AsyncResult object to return the following information.
@@ -1112,7 +1113,7 @@ declare namespace Office {
          * |AsyncResult.value|Always returns undefined because there is no object or data to retrieve.|
          * |AsyncResult.status|Determine the success or failure of the operation.|
          * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
-         * |AsyncResult.asyncContext|Access your user-defined object or value, if you passed one as the asyncContext parameter.|
+         * |AsyncResult.asyncContext|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
          */
         closeAsync(callback?: (result: AsyncResult) => void): void;
         /**
@@ -1120,7 +1121,7 @@ declare namespace Office {
          * @remarks
          * Hosts: PowerPoint, Word
          * @param sliceIndex Specifies the zero-based index of the slice to be retrieved. Required.
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
          * In the callback function passed to the getSliceAsync method, you can use the properties of the AsyncResult object to return the following information.
@@ -1129,7 +1130,7 @@ declare namespace Office {
          * |AsyncResult.value|Access the Slice object.|
          * |AsyncResult.status|Determine the success or failure of the operation.|
          * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
-         * |AsyncResult.asyncContext|Access your user-defined object or value, if you passed one as the asyncContext parameter.|
+         * |AsyncResult.asyncContext|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
          */
         getSliceAsync(sliceIndex: number, callback?: (result: AsyncResult) => void): void;
     }
@@ -1193,7 +1194,7 @@ declare namespace Office {
          * @param handler The event handler function to add. Required.
          * @param options Specifies any of the following optional parameters.
          *        asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
          * In the callback function passed to the addHandlerAsync method, you can use the properties of the AsyncResult object to return the following information.
@@ -1202,7 +1203,7 @@ declare namespace Office {
          * |AsyncResult.value|Always returns undefined because there is no data or object to retrieve when adding an event handler.|
          * |AsyncResult.status|Determine the success or failure of the operation.|
          * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
-         * |AsyncResult.asyncContext|Access your user-defined object or value, if you passed one as the asyncContext parameter.|
+         * |AsyncResult.asyncContext|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
          */
         addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
@@ -1220,7 +1221,7 @@ declare namespace Office {
          * The refreshAsync method can be called from add-ins created for Excel, but since it doesn't support coauthoring there is no reason to do so.
          * 
          * Hosts: Access, Excel, PowerPoint, Word
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
          * In the callback function passed to the refreshAsync method, you can use the properties of the AsyncResult object to return the following information.
@@ -1229,7 +1230,7 @@ declare namespace Office {
          * |AsyncResult.value|Access a Settings object with the refreshed values.|
          * |AsyncResult.status|Determine the success or failure of the operation.|
          * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
-         * |AsyncResult.asyncContext|Access your user-defined  object or value, if you passed one as the asyncContext parameter.|
+         * |AsyncResult.asyncContext|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
          */
         refreshAsync(callback?: (result: AsyncResult) => void): void;
         /**
@@ -1253,7 +1254,7 @@ declare namespace Office {
          * @param options Specifies any of the following optional parameters.
          * @param handler Specifies the name of the handler to remove.
          *        asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
          * In the callback function passed to the removeHandlerAsync method, you can use the properties of the AsyncResult object to return the following information.
@@ -1271,8 +1272,8 @@ declare namespace Office {
          * Hosts: Access, Excel, PowerPoint, Word
          * @param options Syntax example: {overwriteIfStale:false}
          * @param overwriteIfStale Indicates whether the setting will be replaced if stale.
-         *        asyncContext: Object keeping state for the callback
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
+         *        asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
          * In the callback function passed to the saveAsync method, you can use the properties of the AsyncResult object to return the following information.
@@ -1281,7 +1282,7 @@ declare namespace Office {
          * |AsyncResult.value|Always returns undefined because there is no object or data to retrieve.|
          * |AsyncResult.status|Determine the success or failure of the operation.|
          * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
-         * |AsyncResult.asyncContext|Access your user-defined object or value, if you passed one as the asyncContext parameter.|
+         * |AsyncResult.asyncContext|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
          */
         saveAsync(callback?: (result: AsyncResult) => void): void;
         /**
@@ -1335,30 +1336,30 @@ declare namespace Office {
          * Adds the specified columns to the table
          * @param tableData A TableData object with the headers and rows
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addColumnsAsync(tableData: TableData | any[][], options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Adds the specified rows to the table
          * @param rows A 2D array with the rows to add
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addRowsAsync(rows: TableData | any[][], options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Clears the table
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         deleteAllDataValuesAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Clears formatting on the bound table.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         clearFormatsAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
@@ -1366,8 +1367,8 @@ declare namespace Office {
          * @param cellReference An object literal containing name-value pairs that specify the range of cells to get formatting from.
          * @param formats An array specifying the format properties to get.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getFormatsAsync(cellReference?: any, formats?: any[], options?: any, callback?: (result: AsyncResult) => void): void;
         /**
@@ -1377,16 +1378,16 @@ declare namespace Office {
          *       type: The kind of item to format. String.
          *       formats: An object literal containing a list of property name-value pairs that define the formatting to apply.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         setFormatsAsync(formatsInfo?: any[], options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Updates table formatting options on the bound table.
          * @param tableOptions An object literal containing a list of property name-value pairs that define the table options to apply.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         setTableOptionsAsync(tableOptions: any, options?: any, callback?: (result: AsyncResult) => void): void;
     }
@@ -3535,8 +3536,8 @@ declare namespace Office {
          * Get Project field (Ex. ProjectWebAccessURL).
          * @param fieldId Project level fields.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getProjectFieldAsync(fieldId: number, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
@@ -3544,37 +3545,37 @@ declare namespace Office {
          * @param resourceId Either a string or value of the Resource Id.
          * @param fieldId Resource Fields.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getResourceFieldAsync(resourceId: string, fieldId: number, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Get the current selected Resource's Id.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getSelectedResourceAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Get the current selected Task's Id.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getSelectedTaskAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Get the current selected View Type (Ex. Gantt) and View Name.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getSelectedViewAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Get the Task Name, WSS Task Id, and ResourceNames for given taskId.
          * @param taskId Either a string or value of the Task Id.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getTaskAsync(taskId: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
@@ -3582,15 +3583,15 @@ declare namespace Office {
          * @param taskId Either a string or value of the Task Id.
          * @param fieldId Task Fields.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getTaskFieldAsync(taskId: string, fieldId: number, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Get the WSS Url and list name for the Tasks List, the MPP is synced too.
          * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: Object keeping state for the callback
-         * @param callback The optional callback method
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getWSSUrlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
     }

From 9d66b391d76932a3c179025361291ce55f5708ba Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Tue, 22 May 2018 02:30:30 +0200
Subject: [PATCH 309/575] Reduce any 2

---
 types/activex-access/activex-access-tests.ts |   4 +-
 types/activex-access/index.d.ts              | 953 +++----------------
 2 files changed, 118 insertions(+), 839 deletions(-)

diff --git a/types/activex-access/activex-access-tests.ts b/types/activex-access/activex-access-tests.ts
index f224b92d70..3992ba34fd 100644
--- a/types/activex-access/activex-access-tests.ts
+++ b/types/activex-access/activex-access-tests.ts
@@ -1,3 +1,5 @@
+/// <reference types="windows-script-host" />
+
 let app = new ActiveXObject('Access.Application');
 app.UserControl = true;
 
@@ -6,7 +8,7 @@ app.DoCmd.OpenForm('MyForm', Access.AcFormView.acNormal, '', 'LastName="Smith"')
 
 // change the contents of a textbox
 // tslint:disable-next-line:no-unnecessary-type-assertion
-let textbox = app.Forms.Item('MyForm').Controls.Item('MyTextBox') as Access.TextBox;
+let textbox = app.Forms('MyForm').Controls('MyTextBox') as Access.TextBox;
 textbox.Text = 'Not Smith';
 
 // save the current record on the active form
diff --git a/types/activex-access/index.d.ts b/types/activex-access/index.d.ts
index e553b82fad..02b985ebc3 100644
--- a/types/activex-access/index.d.ts
+++ b/types/activex-access/index.d.ts
@@ -930,6 +930,14 @@ declare namespace Access {
         acFormReadOnly = 2,
     }
 
+    const enum AcFormSection {
+        acDetail = 0,
+        acFooter = 2,
+        acHeader = 1,
+        acPageFooter = 4,
+        acPageHeader = 3,
+    }
+
     const enum AcFormView {
         acDesign = 1,
         acFormDS = 3,
@@ -1208,18 +1216,7 @@ declare namespace Access {
         acPrevious = 0,
     }
 
-    const enum AcResourceType {
-        acResourceImage = 1,
-        acResourceTheme = 0,
-    }
-
-    const enum AcSearchDirection {
-        acDown = 1,
-        acSearchAll = 2,
-        acUp = 0,
-    }
-
-    const enum AcSection {
+    const enum AcReportSection {
         acDetail = 0,
         acFooter = 2,
         acGroupLevel1Footer = 6,
@@ -1231,6 +1228,17 @@ declare namespace Access {
         acPageHeader = 3,
     }
 
+    const enum AcResourceType {
+        acResourceImage = 1,
+        acResourceTheme = 0,
+    }
+
+    const enum AcSearchDirection {
+        acDown = 1,
+        acSearchAll = 2,
+        acUp = 0,
+    }
+
     const enum AcSendObjectType {
         acSendDataAccessPage = 6,
         acSendForm = 2,
@@ -1891,20 +1899,6 @@ declare namespace Access {
 
     type DatabaseType = 'Microsoft Access (default)' | 'Jet 2.x' | 'Jet 3.x' | 'dBase III' | 'dBase IV' | 'dBase 5.0' | 'Paradox 3.x' | 'Paradox 4.x' | 'Paradox 5.x' | 'Paradox 7.x' | 'ODBC Database' | 'WSS';
 
-    class _AccessProperty {
-        private 'Access._AccessProperty_typekey': _AccessProperty;
-        private constructor();
-        readonly Application: Application;
-        readonly Category: number;
-        readonly Inherited: boolean;
-        IsMemberSafe(dispid: number): boolean;
-        Name: string;
-        readonly Parent: any;
-        readonly Properties: DAO.Properties;
-        Type: number;
-        Value: any;
-    }
-
     class _CheckBoxInOption {
         private 'Access._CheckBoxInOption_typekey': _CheckBoxInOption;
         private constructor();
@@ -2800,6 +2794,20 @@ declare namespace Access {
         (var_0: number | string): AccessObject;
     }
 
+    class AccessProperty {
+        private 'Access._AccessProperty_typekey': AccessProperty;
+        private constructor();
+        readonly Application: Application;
+        readonly Category: number;
+        readonly Inherited: boolean;
+        IsMemberSafe(dispid: number): boolean;
+        Name: string;
+        readonly Parent: any;
+        readonly Properties: DAO.Properties;
+        Type: number;
+        Value: any;
+    }
+
     interface AdditionalData {
         Add(var_0: string): AdditionalData;
         readonly Count: number;
@@ -2844,12 +2852,12 @@ declare namespace Access {
         CreateAdditionalData(): AdditionalData;
 
         /** @param Section [Section=0] */
-        CreateControl(FormName: string, ControlType: AcControlType, Section?: AcSection, Parent?: string, ColumnName?: string, Left?: number, Top?: number, Width?: number, Height?: number): Control;
-        CreateControlEx(FormName: string, ControlType: AcControlType, Section: AcSection, Parent: string, ControlSource: string, Left: number, Top: number, Width: number, Height: number): Control;
-        CreateControlExOld(FormName: string, ControlType: AcControlType, Section: AcSection, Parent: string, ControlSource: string, Left: number, Top: number, Width: number, Height: number): Control;
+        CreateControl(FormName: string, ControlType: AcControlType, Section?: AcFormSection, Parent?: string, ColumnName?: string, Left?: number, Top?: number, Width?: number, Height?: number): Control;
+        CreateControlEx(FormName: string, ControlType: AcControlType, Section: AcFormSection, Parent: string, ControlSource: string, Left: number, Top: number, Width: number, Height: number): Control;
+        CreateControlExOld(FormName: string, ControlType: AcControlType, Section: AcFormSection, Parent: string, ControlSource: string, Left: number, Top: number, Width: number, Height: number): Control;
 
         /** @param Section [Section=0] */
-        CreateControlOld(FormName: string, ControlType: AcControlType, Section?: AcSection, Parent?: string, ColumnName?: string, Left?: number, Top?: number, Width?: number, Height?: number): Control;
+        CreateControlOld(FormName: string, ControlType: AcControlType, Section?: AcFormSection, Parent?: string, ColumnName?: string, Left?: number, Top?: number, Width?: number, Height?: number): Control;
 
         /** @param CreateNewFile [CreateNewFile=true] */
         CreateDataAccessPage(FileName: string, CreateNewFile?: boolean): DataAccessPage;
@@ -2867,12 +2875,12 @@ declare namespace Access {
         CreateReport(Database?: string, ReportTemplate?: string): Report;
 
         /** @param Section [Section=0] */
-        CreateReportControl(ReportName: string, ControlType: AcControlType, Section?: AcSection, Parent?: string, ColumnName?: string, Left?: number, Top?: number, Width?: number, Height?: number): Control;
-        CreateReportControlEx(ReportName: string, ControlType: AcControlType, Section: AcSection, Parent: string, ControlName: string, Left: number, Top: number, Width: number, Height: number): Control;
-        CreateReportControlExOld(ReportName: string, ControlType: AcControlType, Section: AcSection, Parent: string, ControlName: string, Left: number, Top: number, Width: number, Height: number): Control;
+        CreateReportControl(ReportName: string, ControlType: AcControlType, Section?: AcReportSection, Parent?: string, ColumnName?: string, Left?: number, Top?: number, Width?: number, Height?: number): Control;
+        CreateReportControlEx(ReportName: string, ControlType: AcControlType, Section: AcReportSection, Parent: string, ControlName: string, Left: number, Top: number, Width: number, Height: number): Control;
+        CreateReportControlExOld(ReportName: string, ControlType: AcControlType, Section: AcReportSection, Parent: string, ControlName: string, Left: number, Top: number, Width: number, Height: number): Control;
 
         /** @param Section [Section=0] */
-        CreateReportControlOld(ReportName: string, ControlType: AcControlType, Section?: AcSection, Parent?: string, ColumnName?: string, Left?: number, Top?: number, Width?: number, Height?: number): Control;
+        CreateReportControlOld(ReportName: string, ControlType: AcControlType, Section?: AcReportSection, Parent?: string, ColumnName?: string, Left?: number, Top?: number, Width?: number, Height?: number): Control;
         readonly CurrentData: CurrentData;
         CurrentDb(): DAO.Database;
         readonly CurrentObjectName: string;
@@ -4820,8 +4828,8 @@ declare namespace Access {
         Recalc(): void;
         RecordLocks: number;
         RecordSelectors: boolean;
-        Recordset: any;
-        readonly RecordsetClone: any;
+        Recordset: DAO.Recordset | ADODB.Recordset | null;
+        readonly RecordsetClone: DAO.Recordset | ADODB.Recordset;
         RecordsetType: number;
         RecordSource: string;
         RecordSourceQualifier: string;
@@ -4834,7 +4842,7 @@ declare namespace Access {
         RollbackTransactionMacro: string;
         RowHeight: number;
         ScrollBars: number;
-        Section(Index: any): Section;
+        Section(Index: AcFormSection | string): Section;
         SectionOld(Index: any): Section;
         SelectionChange: string;
         SelectionChangeMacro: string;
@@ -4897,7 +4905,14 @@ declare namespace Access {
         LongestBarValue: string;
 
         /** @param Operator [Operator=0] */
-        Modify(Type: AcFormatConditionType, Operator?: AcFormatConditionOperator, Expression1?: any, Expression2?: any): void;
+        Modify(Type: AcFormatConditionType.acExpression, Operator: undefined, Expression1: string | number | boolean): void;
+
+        /** @param Operator [Operator=0] */
+        Modify(Type: AcFormatConditionType, Operator: AcFormatConditionOperator.acBetween | AcFormatConditionOperator.acNotBetween, Expression1: string | number | boolean, Expression2: string | number | boolean): void;
+
+        /** @param Operator [Operator=0] */
+        Modify(Type: AcFormatConditionType, Operator?: AcFormatConditionOperator, Expression1?: string | number | boolean): void;
+
         readonly Operator: AcFormatConditionOperator;
         ShortestBarLimit: AcFormatBarLimits;
         ShortestBarValue: string;
@@ -4907,461 +4922,21 @@ declare namespace Access {
 
     interface FormatConditions {
         /** @param Operator [Operator=0] */
-        Add(Type: AcFormatConditionType, Operator?: AcFormatConditionOperator, Expression1?: any, Expression2?: any): FormatCondition;
+        Add(Type: AcFormatConditionType.acExpression, Operator: undefined, Expression1: string | number | boolean): FormatCondition;
+
+        /** @param Operator [Operator=0] */
+        Add(Type: AcFormatConditionType, Operator: AcFormatConditionOperator.acBetween | AcFormatConditionOperator.acNotBetween, Expression1: string | number | boolean, Expression2: string | number | boolean): FormatCondition;
+
+        /** @param Operator [Operator=0] */
+        Add(Type: AcFormatConditionType, Operator?: AcFormatConditionOperator, Expression1?: string | number | boolean): FormatCondition;
+
         readonly Application: Application;
         readonly Count: number;
         Delete(): void;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): FormatCondition;
+        Item(Index: number): FormatCondition;
         readonly Parent: any;
-        (Index: any): FormatCondition;
-    }
-
-    class FormOld {
-        private 'Access.FormOld_typekey': FormOld;
-        private constructor();
-        _Evaluate(bstrExpr: string, ...ppsa: any[]): any;
-        _Name: string;
-        accChild(varChild: any): any;
-        readonly accChildCount: number;
-        accDefaultAction(varChild?: any): string;
-        accDescription(varChild?: any): string;
-        accDoDefaultAction(varChild?: any): void;
-        readonly accFocus: any;
-        accHelp(varChild?: any): string;
-        accHelpTopic(pszHelpFile: string, varChild?: any): number;
-        accHitTest(xLeft: number, yTop: number): any;
-        accKeyboardShortcut(varChild?: any): string;
-        accLocation(pxLeft: number, pyTop: number, pcxWidth: number, pcyHeight: number, varChild?: any): void;
-        accName(varChild?: any): string;
-        accNavigate(navDir: number, varStart?: any): any;
-        readonly accParent: any;
-        accRole(varChild?: any): any;
-        accSelect(flagsSelect: number, varChild?: any): void;
-        readonly accSelection: any;
-        accState(varChild?: any): any;
-        accValue(varChild?: any): string;
-        acHiddenCurrentPage: number;
-        readonly ActiveControl: Control;
-        AfterDelConfirm: string;
-        AfterInsert: string;
-        AfterUpdate: string;
-        AllowAdditions: boolean;
-        AllowDeletions: boolean;
-        AllowDesignChanges: boolean;
-        AllowEditing: boolean;
-        AllowEdits: boolean;
-        AllowFilters: boolean;
-        AllowUpdating: number;
-        readonly Application: Application;
-        AutoCenter: boolean;
-        AutoResize: boolean;
-        BeforeDelConfirm: string;
-        BeforeInsert: string;
-        BeforeUpdate: string;
-        Bookmark: any;
-        BorderStyle: number;
-        Caption: string;
-        CloseButton: boolean;
-        readonly ConnectControl: Control;
-        ConnectSynch: number;
-        ControlBox: boolean;
-        readonly Controls: Controls;
-        Count: number;
-        CurrentRecord: number;
-        CurrentSectionLeft: number;
-        CurrentSectionTop: number;
-        CurrentView: number;
-        Cycle: number;
-        DataEntry: boolean;
-        DatasheetBackColor: number;
-        DatasheetCellsEffect: number;
-        DatasheetFontHeight: number;
-        DatasheetFontItalic: boolean;
-        DatasheetFontName: string;
-        DatasheetFontUnderline: boolean;
-        DatasheetFontWeight: number;
-        DatasheetForeColor: number;
-        DatasheetGridlinesBehavior: number;
-        DatasheetGridlinesColor: number;
-        DefaultControl(ControlType: number): Control;
-        DefaultEditing: number;
-        DefaultView: number;
-        Dirty: boolean;
-        DividingLines: boolean;
-        readonly Dynaset: any;
-        FastLaserPrinting: boolean;
-        Filter: string;
-        FilterOn: boolean;
-        readonly Form: Form;
-        FormName: string;
-        FrozenColumns: number;
-
-        /**
-         * @param Right [Right=0]
-         * @param Down [Down=0]
-         */
-        GoToPage(PageNumber: number, Right?: number, Down?: number): void;
-        GridX: number;
-        GridY: number;
-        HasModule: boolean;
-        HelpContextId: number;
-        HelpFile: string;
-        Hwnd: number;
-        InputParameters: string;
-        InsideHeight: number;
-        InsideWidth: number;
-        KeyPreview: boolean;
-        LayoutForPrint: boolean;
-        LogicalPageHeight: number;
-        LogicalPageWidth: number;
-        MaxButton: boolean;
-        MaxRecButton: boolean;
-        MaxRecords: number;
-        MenuBar: string;
-        MinButton: boolean;
-        MinMaxButtons: number;
-        Modal: boolean;
-        readonly Module: Module;
-        Name: string;
-        NavigationButtons: boolean;
-        readonly NewRecord: number;
-        OnActivate: string;
-        OnApplyFilter: string;
-        OnClick: string;
-        OnClose: string;
-        OnCurrent: string;
-        OnDblClick: string;
-        OnDeactivate: string;
-        OnDelete: string;
-        OnDirty: string;
-        OnError: string;
-        OnFilter: string;
-        OnGotFocus: string;
-        OnInsert: string;
-        OnKeyDown: string;
-        OnKeyPress: string;
-        OnKeyUp: string;
-        OnLoad: string;
-        OnLostFocus: string;
-        OnMenu: string;
-        OnMouseDown: string;
-        OnMouseMove: string;
-        OnMouseUp: string;
-        OnOpen: string;
-        OnResize: string;
-        OnTimer: string;
-        OnUnload: string;
-        OpenArgs: any;
-        OrderBy: string;
-        OrderByOn: boolean;
-        Orientation: number;
-        Page: number;
-        Pages: number;
-        Painting: boolean;
-        PaintPalette: any;
-        PaletteSource: string;
-        readonly Parent: any;
-        Picture: string;
-        PictureAlignment: number;
-        PictureData: any;
-        PicturePalette: any;
-        PictureSizeMode: number;
-        PictureTiling: boolean;
-        PictureType: number;
-        PopUp: boolean;
-        readonly Properties: Properties;
-        PrtDevMode: any;
-        PrtDevNames: any;
-        PrtMip: any;
-        Recalc(): void;
-        RecordLocks: number;
-        RecordSelectors: boolean;
-        Recordset: any;
-        readonly RecordsetClone: any;
-        RecordsetType: number;
-        RecordSource: string;
-        Refresh(): void;
-        Repaint(): void;
-        Requery(): void;
-        ResyncCommand: string;
-        RowHeight: number;
-        ScrollBars: number;
-        Section(Index: any): Section;
-        SelHeight: number;
-        SelLeft: number;
-        SelTop: number;
-        SelWidth: number;
-        ServerFilter: string;
-        ServerFilterByForm: boolean;
-        SetFocus(): void;
-        ShortcutMenu: boolean;
-        ShortcutMenuBar: string;
-        ShowGrid: boolean;
-        SubdatasheetExpanded: boolean;
-        SubdatasheetHeight: number;
-        TabularCharSet: number;
-        TabularFamily: number;
-        Tag: string;
-        TimerInterval: number;
-        Toolbar: string;
-        Undo(): void;
-        UniqueTable: string;
-        ViewsAllowed: number;
-        Visible: boolean;
-        WhatsThisButton: boolean;
-        Width: number;
-        WindowHeight: number;
-        WindowWidth: number;
-        ZoomControl: number;
-    }
-
-    class FormOldV10 {
-        private 'Access.FormOldV10_typekey': FormOldV10;
-        private constructor();
-        _Evaluate(bstrExpr: string, ...ppsa: any[]): any;
-        _Name: string;
-        accChild(varChild: any): any;
-        readonly accChildCount: number;
-        accDefaultAction(varChild?: any): string;
-        accDescription(varChild?: any): string;
-        accDoDefaultAction(varChild?: any): void;
-        readonly accFocus: any;
-        accHelp(varChild?: any): string;
-        accHelpTopic(pszHelpFile: string, varChild?: any): number;
-        accHitTest(xLeft: number, yTop: number): any;
-        accKeyboardShortcut(varChild?: any): string;
-        accLocation(pxLeft: number, pyTop: number, pcxWidth: number, pcyHeight: number, varChild?: any): void;
-        accName(varChild?: any): string;
-        accNavigate(navDir: number, varStart?: any): any;
-        readonly accParent: any;
-        accRole(varChild?: any): any;
-        accSelect(flagsSelect: number, varChild?: any): void;
-        readonly accSelection: any;
-        accState(varChild?: any): any;
-        accValue(varChild?: any): string;
-        acHiddenCurrentPage: number;
-        readonly ActiveControl: Control;
-        AfterBeginTransaction: string;
-        AfterCommitTransaction: string;
-        AfterDelConfirm: string;
-        AfterFinalRender: string;
-        AfterInsert: string;
-        AfterLayout: string;
-        AfterRender: string;
-        AfterUpdate: string;
-        AllowAdditions: boolean;
-        AllowDatasheetView: boolean;
-        AllowDeletions: boolean;
-        AllowDesignChanges: boolean;
-        AllowEditing: boolean;
-        AllowEdits: boolean;
-        AllowFilters: boolean;
-        AllowFormView: boolean;
-        AllowPivotChartView: boolean;
-        AllowPivotTableView: boolean;
-        AllowUpdating: number;
-        readonly Application: Application;
-        AutoCenter: boolean;
-        AutoResize: boolean;
-        BatchUpdates: boolean;
-        BeforeBeginTransaction: string;
-        BeforeCommitTransaction: string;
-        BeforeDelConfirm: string;
-        BeforeInsert: string;
-        BeforeQuery: string;
-        BeforeRender: string;
-        BeforeScreenTip: string;
-        BeforeUpdate: string;
-        BeginBatchEdit: string;
-        Bookmark: any;
-        BorderStyle: number;
-        Caption: string;
-        readonly ChartSpace: any;
-        CloseButton: boolean;
-        CommandBeforeExecute: string;
-        CommandChecked: string;
-        CommandEnabled: string;
-        CommandExecute: string;
-        CommitOnClose: number;
-        CommitOnNavigation: boolean;
-        readonly ConnectControl: Control;
-        ConnectSynch: number;
-        ControlBox: boolean;
-        readonly Controls: Controls;
-        Count: number;
-        CurrentRecord: number;
-        CurrentSectionLeft: number;
-        CurrentSectionTop: number;
-        CurrentView: number;
-        Cycle: number;
-        DataChange: string;
-        DataEntry: boolean;
-        DataSetChange: string;
-        DatasheetBackColor: number;
-        DatasheetBorderLineStyle: number;
-        DatasheetCellsEffect: number;
-        DatasheetColumnHeaderUnderlineStyle: number;
-        DatasheetFontHeight: number;
-        DatasheetFontItalic: boolean;
-        DatasheetFontName: string;
-        DatasheetFontUnderline: boolean;
-        DatasheetFontWeight: number;
-        DatasheetForeColor: number;
-        DatasheetGridlinesBehavior: number;
-        DatasheetGridlinesColor: number;
-        DefaultControl(ControlType: number): Control;
-        DefaultEditing: number;
-        DefaultView: number;
-        Dirty: boolean;
-        DividingLines: boolean;
-        readonly Dynaset: any;
-        FastLaserPrinting: boolean;
-        FetchDefaults: boolean;
-        Filter: string;
-        FilterOn: boolean;
-        readonly Form: Form;
-        FormName: string;
-        FrozenColumns: number;
-
-        /**
-         * @param Right [Right=0]
-         * @param Down [Down=0]
-         */
-        GoToPage(PageNumber: number, Right?: number, Down?: number): void;
-        GridX: number;
-        GridY: number;
-        HasModule: boolean;
-        HelpContextId: number;
-        HelpFile: string;
-        HorizontalDatasheetGridlineStyle: number;
-        Hwnd: number;
-        InputParameters: string;
-        InsideHeight: number;
-        InsideWidth: number;
-        KeyPreview: boolean;
-        LayoutForPrint: boolean;
-        LogicalPageHeight: number;
-        LogicalPageWidth: number;
-        MaxButton: boolean;
-        MaxRecButton: boolean;
-        MaxRecords: number;
-        MenuBar: string;
-        MinButton: boolean;
-        MinMaxButtons: number;
-        Modal: boolean;
-        readonly Module: Module;
-        MouseWheel: string;
-        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
-        Moveable: boolean;
-        Name: string;
-        NavigationButtons: boolean;
-        readonly NewRecord: number;
-        OnActivate: string;
-        OnApplyFilter: string;
-        OnClick: string;
-        OnClose: string;
-        OnConnect: string;
-        OnCurrent: string;
-        OnDblClick: string;
-        OnDeactivate: string;
-        OnDelete: string;
-        OnDirty: string;
-        OnDisconnect: string;
-        OnError: string;
-        OnFilter: string;
-        OnGotFocus: string;
-        OnInsert: string;
-        OnKeyDown: string;
-        OnKeyPress: string;
-        OnKeyUp: string;
-        OnLoad: string;
-        OnLostFocus: string;
-        OnMenu: string;
-        OnMouseDown: string;
-        OnMouseMove: string;
-        OnMouseUp: string;
-        OnOpen: string;
-        OnRecordExit: string;
-        OnResize: string;
-        OnTimer: string;
-        OnUndo: string;
-        OnUnload: string;
-        OpenArgs: any;
-        OrderBy: string;
-        OrderByOn: boolean;
-        Orientation: number;
-        Page: number;
-        Pages: number;
-        Painting: boolean;
-        PaintPalette: any;
-        PaletteSource: string;
-        readonly Parent: any;
-        Picture: string;
-        PictureAlignment: number;
-        PictureData: any;
-        PicturePalette: any;
-        PictureSizeMode: number;
-        PictureTiling: boolean;
-        PictureType: number;
-        readonly PivotTable: any;
-        PivotTableChange: string;
-        PopUp: boolean;
-        Printer: Printer;
-        readonly Properties: Properties;
-        PrtDevMode: any;
-        PrtDevNames: any;
-        PrtMip: any;
-        Query: string;
-        Recalc(): void;
-        RecordLocks: number;
-        RecordSelectors: boolean;
-        Recordset: any;
-        readonly RecordsetClone: any;
-        RecordsetType: number;
-        RecordSource: string;
-        RecordSourceQualifier: string;
-        Refresh(): void;
-        Repaint(): void;
-        Requery(): void;
-        ResyncCommand: string;
-        RollbackTransaction: string;
-        RowHeight: number;
-        ScrollBars: number;
-        Section(Index: any): Section;
-        SelectionChange: string;
-        SelHeight: number;
-        SelLeft: number;
-        SelTop: number;
-        SelWidth: number;
-        ServerFilter: string;
-        ServerFilterByForm: boolean;
-        SetFocus(): void;
-        ShortcutMenu: boolean;
-        ShortcutMenuBar: string;
-        ShowGrid: boolean;
-        SubdatasheetExpanded: boolean;
-        SubdatasheetHeight: number;
-        TabularCharSet: number;
-        TabularFamily: number;
-        Tag: string;
-        TimerInterval: number;
-        Toolbar: string;
-        Undo(): void;
-        UndoBatchEdit: string;
-        UniqueTable: string;
-        UseDefaultPrinter: boolean;
-        VerticalDatasheetGridlineStyle: number;
-        ViewChange: string;
-        ViewsAllowed: number;
-        Visible: boolean;
-        WhatsThisButton: boolean;
-        Width: number;
-        WindowHeight: number;
-        readonly WindowLeft: number;
-        readonly WindowTop: number;
-        WindowWidth: number;
-        ZoomControl: number;
+        (Index: number): FormatCondition;
     }
 
     interface Forms {
@@ -5508,7 +5083,7 @@ declare namespace Access {
         readonly Application: Application;
         Delete(): void;
         Description: string;
-        Execute(Prompt?: any): void;
+        Execute(Prompt?: boolean): void;
         IsMemberSafe(dispid: number): boolean;
         Name: string;
         readonly Parent: any;
@@ -5521,9 +5096,9 @@ declare namespace Access {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): ImportExportSpecification;
+        Item(Index: number | string): ImportExportSpecification;
         readonly Parent: any;
-        (Index: any): ImportExportSpecification;
+        (Index: number | string): ImportExportSpecification;
     }
 
     class Label {
@@ -5710,7 +5285,7 @@ declare namespace Access {
         accState(varChild?: any): any;
         accValue(varChild?: any): string;
         AddColon: boolean;
-        AddItem(Item: string, Index?: any): void;
+        AddItem(Item: string, Index?: number): void;
         AfterUpdate: string;
         AfterUpdateMacro: string;
         AllowValueListEdits: boolean;
@@ -5731,7 +5306,7 @@ declare namespace Access {
         BorderWidth: number;
         BottomPadding: number;
         BoundColumn: number;
-        Column(Index: number, Row?: any): any;
+        Column(Index: number, Row?: number): any;
         ColumnCount: number;
         ColumnHeads: boolean;
         ColumnHidden: boolean;
@@ -5828,8 +5403,8 @@ declare namespace Access {
         readonly Parent: any;
         readonly Properties: Properties;
         ReadingOrder: number;
-        Recordset: any;
-        RemoveItem(Index: any): void;
+        Recordset: DAO.Recordset | ADODB.Recordset;
+        RemoveItem(Index: number | string): void;
         Requery(): void;
         RightPadding: number;
         RowSource: string;
@@ -5927,9 +5502,9 @@ declare namespace Access {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): Module;
+        Item(Index: number | string): Module;
         readonly Parent: any;
-        (Index: any): Module;
+        (Index: number | string): Module;
     }
 
     class NavigationButton {
@@ -6396,9 +5971,9 @@ declare namespace Access {
     interface Operations {
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): Operation;
+        Item(Index: number | string): Operation;
         readonly Parent: any;
-        (Index: any): Operation;
+        (Index: number | string): Operation;
     }
 
     class OptionButton {
@@ -6737,12 +6312,12 @@ declare namespace Access {
     }
 
     interface Pages {
-        Add(Before?: any): Page;
+        Add(Before?: number): Page;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): Page;
-        Remove(Item?: any): void;
-        (Index: any): Page;
+        Item(Index: number | string): Page;
+        Remove(Item?: number): void;
+        (Index: number | string): Page;
     }
 
     class PaletteButton {
@@ -6863,18 +6438,18 @@ declare namespace Access {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): Printer;
+        Item(Index: number | string): Printer;
         readonly Parent: any;
-        (Index: any): Printer;
+        (Index: number | string): Printer;
     }
 
     interface Properties {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): any;
+        Item(Index: number | string): AccessProperty;
         readonly Parent: any;
-        (Index: any): any;
+        (Index: number | string): AccessProperty;
     }
 
     class Rectangle {
@@ -6950,10 +6525,10 @@ declare namespace Access {
         AddFromGuid(Guid: string, Major: number, Minor: number): Reference;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(var_0: any): Reference;
+        Item(var_0: number | string): Reference;
         readonly Parent: any;
         Remove(Reference: Reference): void;
-        (var_0: any): Reference;
+        (var_0: number | string): Reference;
     }
 
     class Report {
@@ -7083,7 +6658,7 @@ declare namespace Access {
         OnTimerMacro: string;
         OnUnload: string;
         OnUnloadMacro: string;
-        OpenArgs: any;
+        OpenArgs: string;
         OrderBy: string;
         OrderByOn: boolean;
         OrderByOnLoad: boolean;
@@ -7115,7 +6690,7 @@ declare namespace Access {
         PrtMip: any;
         PSet(flags: number, X: number, Y: number, color: number): void;
         RecordLocks: number;
-        Recordset: any;
+        Recordset: DAO.Recordset | ADODB.Recordset | null;
         RecordSource: string;
         RecordSourceQualifier: string;
         readonly Report: Report;
@@ -7128,7 +6703,7 @@ declare namespace Access {
         ScaleTop: number;
         ScaleWidth: number;
         ScrollBars: number;
-        Section(Index: any): Section;
+        Section(Index: AcReportSection | string): Section;
         SectionOld(Index: any): Section;
         ServerFilter: string;
         readonly Shape: string;
@@ -7150,279 +6725,31 @@ declare namespace Access {
         ZoomControl: number;
     }
 
-    class ReportOld {
-        private 'Access.ReportOld_typekey': ReportOld;
-        private constructor();
-        _Evaluate(bstrExpr: string, ...ppsa: any[]): any;
-        _Name: string;
-        acHiddenCurrentPage: number;
-        readonly ActiveControl: Control;
-        readonly Application: Application;
-        Caption: string;
-        Circle(flags: number, X: number, Y: number, radius: number, color: number, start: number, end: number, aspect: number): void;
-        readonly Controls: Controls;
-        Count: number;
-        CurrentRecord: number;
-        CurrentX: number;
-        CurrentY: number;
-        DateGrouping: number;
-        DefaultControl(ControlType: number): Control;
-        Dirty: boolean;
-        DrawMode: number;
-        DrawStyle: number;
-        DrawWidth: number;
-        FastLaserPrinting: boolean;
-        FillColor: number;
-        FillStyle: number;
-        Filter: string;
-        FilterOn: boolean;
-        FontBold: number;
-        FontItalic: number;
-        FontName: string;
-        FontSize: number;
-        FontUnderline: number;
-        ForeColor: number;
-        FormatCount: number;
-        FormName: string;
-        GridX: number;
-        GridY: number;
-        GroupLevel(Index: number): GroupLevel;
-        GrpKeepTogether: number;
-        HasData: number;
-        HasModule: boolean;
-        Height: number;
-        HelpContextId: number;
-        HelpFile: string;
-        Hwnd: number;
-        InputParameters: string;
-        LayoutForPrint: boolean;
-        Left: number;
-        Line(flags: number, x1: number, y1: number, x2: number, y2: number, color: number): void;
-        LogicalPageHeight: number;
-        LogicalPageWidth: number;
-        MaxButton: boolean;
-        MenuBar: string;
-        MinButton: boolean;
-        readonly Module: Module;
-        MoveLayout: boolean;
-        Name: string;
-        NextRecord: boolean;
-        OnActivate: string;
-        OnClose: string;
-        OnDeactivate: string;
-        OnError: string;
-        OnMenu: string;
-        OnNoData: string;
-        OnOpen: string;
-        OnPage: string;
-        OrderBy: string;
-        OrderByOn: boolean;
-        Orientation: number;
-        Page: number;
-        PageFooter: number;
-        PageHeader: number;
-        Pages: number;
-        Painting: boolean;
-        PaintPalette: any;
-        PaletteSource: string;
-        readonly Parent: any;
-        Picture: string;
-        PictureAlignment: number;
-        PictureData: any;
-        PicturePages: number;
-        PicturePalette: any;
-        PictureSizeMode: number;
-        PictureTiling: boolean;
-        PictureType: number;
-        Print(Expr: string): void;
-        PrintCount: number;
-        PrintSection: boolean;
-        readonly Properties: Properties;
-        PrtDevMode: any;
-        PrtDevNames: any;
-        PrtMip: any;
-        PSet(flags: number, X: number, Y: number, color: number): void;
-        RecordLocks: number;
-        RecordSource: string;
-        readonly Report: Report;
-        Scale(flags: number, x1: number, y1: number, x2: number, y2: number): void;
-        ScaleHeight: number;
-        ScaleLeft: number;
-        ScaleMode: number;
-        ScaleTop: number;
-        ScaleWidth: number;
-        Section(Index: any): Section;
-        ServerFilter: string;
-        ShortcutMenuBar: string;
-        Tag: string;
-        TextHeight(Expr: string): number;
-        TextWidth(Expr: string): number;
-        Toolbar: string;
-        Top: number;
-        Visible: boolean;
-        Width: number;
-        ZoomControl: number;
-    }
-
-    class ReportOldV10 {
-        private 'Access.ReportOldV10_typekey': ReportOldV10;
-        private constructor();
-        _Evaluate(bstrExpr: string, ...ppsa: any[]): any;
-        _Name: string;
-        acHiddenCurrentPage: number;
-        readonly ActiveControl: Control;
-        readonly Application: Application;
-        AutoCenter: boolean;
-        AutoResize: boolean;
-        BorderStyle: number;
-        Caption: string;
-        Circle(flags: number, X: number, Y: number, radius: number, color: number, start: number, end: number, aspect: number): void;
-        CloseButton: boolean;
-        ControlBox: boolean;
-        readonly Controls: Controls;
-        Count: number;
-        CurrentRecord: number;
-        CurrentX: number;
-        CurrentY: number;
-        DateGrouping: number;
-        DefaultControl(ControlType: number): Control;
-        Dirty: boolean;
-        DrawMode: number;
-        DrawStyle: number;
-        DrawWidth: number;
-        FastLaserPrinting: boolean;
-        FillColor: number;
-        FillStyle: number;
-        Filter: string;
-        FilterOn: boolean;
-        FontBold: number;
-        FontItalic: number;
-        FontName: string;
-        FontSize: number;
-        FontUnderline: number;
-        ForeColor: number;
-        FormatCount: number;
-        FormName: string;
-        GridX: number;
-        GridY: number;
-        GroupLevel(Index: number): GroupLevel;
-        GrpKeepTogether: number;
-        HasData: number;
-        HasModule: boolean;
-        Height: number;
-        HelpContextId: number;
-        HelpFile: string;
-        Hwnd: number;
-        InputParameters: string;
-        LayoutForPrint: boolean;
-        Left: number;
-        Line(flags: number, x1: number, y1: number, x2: number, y2: number, color: number): void;
-        LogicalPageHeight: number;
-        LogicalPageWidth: number;
-        MaxButton: boolean;
-        MenuBar: string;
-        MinButton: boolean;
-        MinMaxButtons: number;
-        Modal: boolean;
-        readonly Module: Module;
-        Move(Left: number, Top?: number, Width?: number, Height?: number): void;
-        Moveable: boolean;
-        MoveLayout: boolean;
-        Name: string;
-        NextRecord: boolean;
-        OnActivate: string;
-        OnClose: string;
-        OnDeactivate: string;
-        OnError: string;
-        OnMenu: string;
-        OnNoData: string;
-        OnOpen: string;
-        OnPage: string;
-        OpenArgs: any;
-        OrderBy: string;
-        OrderByOn: boolean;
-        Orientation: number;
-        Page: number;
-        PageFooter: number;
-        PageHeader: number;
-        Pages: number;
-        Painting: boolean;
-        PaintPalette: any;
-        PaletteSource: string;
-        readonly Parent: any;
-        Picture: string;
-        PictureAlignment: number;
-        PictureData: any;
-        PicturePages: number;
-        PicturePalette: any;
-        PictureSizeMode: number;
-        PictureTiling: boolean;
-        PictureType: number;
-        PopUp: boolean;
-        Print(Expr: string): void;
-        PrintCount: number;
-        Printer: Printer;
-        PrintSection: boolean;
-        readonly Properties: Properties;
-        PrtDevMode: any;
-        PrtDevNames: any;
-        PrtMip: any;
-        PSet(flags: number, X: number, Y: number, color: number): void;
-        RecordLocks: number;
-        Recordset: any;
-        RecordSource: string;
-        RecordSourceQualifier: string;
-        readonly Report: Report;
-        Scale(flags: number, x1: number, y1: number, x2: number, y2: number): void;
-        ScaleHeight: number;
-        ScaleLeft: number;
-        ScaleMode: number;
-        ScaleTop: number;
-        ScaleWidth: number;
-        Section(Index: any): Section;
-        ServerFilter: string;
-        readonly Shape: string;
-        ShortcutMenuBar: string;
-        Tag: string;
-        TextHeight(Expr: string): number;
-        TextWidth(Expr: string): number;
-        Toolbar: string;
-        Top: number;
-        UseDefaultPrinter: boolean;
-        Visible: boolean;
-        Width: number;
-        WindowHeight: number;
-        readonly WindowLeft: number;
-        readonly WindowTop: number;
-        WindowWidth: number;
-        ZoomControl: number;
-    }
-
     interface Reports {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): Report;
+        Item(Index: string | number): Report;
         readonly Parent: any;
-        (Index: any): Report;
+        (Index: string | number): Report;
     }
 
     class ReturnVar {
         private 'Access.ReturnVar_typekey': ReturnVar;
         private constructor();
-        readonly _Value: any;
+        readonly _Value: string | number;
         IsMemberSafe(dispid: number): boolean;
         readonly Name: string;
-        readonly Value: any;
+        readonly Value: string | number;
     }
 
     interface ReturnVars {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): ReturnVar;
+        Item(Index: number | string): ReturnVar;
         readonly Parent: any;
-        (Index: any): ReturnVar;
+        (Index: string | number): ReturnVar;
     }
 
     class Screen {
@@ -7542,9 +6869,9 @@ declare namespace Access {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): SmartTagAction;
+        Item(Index: number | string): SmartTagAction;
         readonly Parent: any;
-        (Index: any): SmartTagAction;
+        (Index: number | string): SmartTagAction;
     }
 
     interface SmartTagProperties {
@@ -7552,9 +6879,9 @@ declare namespace Access {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): SmartTagProperty;
+        Item(Index: number | string): SmartTagProperty;
         readonly Parent: any;
-        (Index: any): SmartTagProperty;
+        (Index: number | string): SmartTagProperty;
     }
 
     class SmartTagProperty {
@@ -7571,9 +6898,9 @@ declare namespace Access {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): SmartTag;
+        Item(Index: number | string): SmartTag;
         readonly Parent: any;
-        (Index: any): SmartTag;
+        (Index: number | string): SmartTag;
     }
 
     class SubForm {
@@ -7828,22 +7155,22 @@ declare namespace Access {
     class TempVar {
         private 'Access.TempVar_typekey': TempVar;
         private constructor();
-        _Value: any;
+        _Value: number | string | boolean;
         IsMemberSafe(dispid: number): boolean;
         readonly Name: string;
-        Value: any;
+        Value: number | string | boolean;
     }
 
     interface TempVars {
-        Add(Name: string, Value: any): void;
+        Add(Name: string, Value: number | string | boolean): void;
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): TempVar;
+        Item(Index: number | string): TempVar;
         readonly Parent: any;
-        Remove(var_0: any): void;
+        Remove(Index: number | string): void;
         RemoveAll(): void;
-        (Index: any): TempVar;
+        (Index: number | string): TempVar;
     }
 
     class TextBox {
@@ -8367,9 +7694,9 @@ declare namespace Access {
         readonly Application: Application;
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): WebService;
+        Item(Index: number | string): WebService;
         readonly Parent: any;
-        (Index: any): WebService;
+        (Index: number | string): WebService;
     }
 
     class WizHook {
@@ -8427,7 +7754,7 @@ declare namespace Access {
         NameFromActid(Actid: number): string;
         ObjTypOfRecordSource(RecordSource: string): number;
         OfficeAddInDir(): string;
-        OpenEmScript(pProperty: _AccessProperty, OpenMode: number, Extra: number, Version: number): number;
+        OpenEmScript(pProperty: AccessProperty, OpenMode: number, Extra: number, Version: number): number;
         OpenPictureFile(File: string, Cancelled: boolean): boolean;
         OpenScript(Script: string, Label: string, OpenMode: number, Extra: number, Version: number): number;
         ReportLeaksToFile(fRptToFile: boolean, bstrFileOut: string): void;
@@ -8459,9 +7786,9 @@ declare namespace Access {
     interface WSParameters {
         readonly Count: number;
         IsMemberSafe(dispid: number): boolean;
-        Item(Index: any): WSParameter;
+        Item(Index: number | string): WSParameter;
         readonly Parent: any;
-        (Index: any): WSParameter;
+        (Index: number | string): WSParameter;
     }
 
     namespace EventHelperTypes {
@@ -8469,12 +7796,12 @@ declare namespace Access {
 
         interface WebBrowserControl_BeforeNavigate2_Parameter {
             Cancel: boolean;
-            readonly flags: any;
+            readonly flags: number;
             readonly Headers: any;
             readonly pDisp: any;
             readonly PostData: any;
-            readonly TargetFrameName: any;
-            readonly URL: any;
+            readonly TargetFrameName: string | null;
+            readonly URL: string;
         }
     }
 }
@@ -8543,48 +7870,6 @@ interface ActiveXObject {
     on(obj: Access.Form, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.Form, parameter: {KeyAscii: number}) => void): void;
     on(obj: Access.Form, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.Form, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.Form, event: 'MouseWheel', argNames: ['Page', 'Count'], handler: (this: Access.Form, parameter: {readonly Page: boolean, readonly Count: number}) => void): void;
-    on(obj: Access.FormOld, event: 'AfterBeginTransaction' | 'AfterCommitTransaction' | 'RollbackTransaction', argNames: ['Connection'], handler: (this: Access.FormOld, parameter: {readonly Connection: ADODB.Connection}) => void): void;
-    on(obj: Access.FormOld, event: 'AfterDelConfirm', argNames: ['Status'], handler: (this: Access.FormOld, parameter: {Status: number}) => void): void;
-    on(obj: Access.FormOld, event: 'AfterFinalRender' | 'AfterLayout', argNames: ['drawObject'], handler: (this: Access.FormOld, parameter: {readonly drawObject: any}) => void): void;
-    on(obj: Access.FormOld, event: 'AfterRender', argNames: ['drawObject', 'chartObject'], handler: (this: Access.FormOld, parameter: {readonly drawObject: any, readonly chartObject: any}) => void): void;
-    on(obj: Access.FormOld, event: 'ApplyFilter', argNames: ['Cancel', 'ApplyType'], handler: (this: Access.FormOld, parameter: {Cancel: number, ApplyType: number}) => void): void;
-    on(obj: Access.FormOld, event: 'BeforeBeginTransaction' | 'BeforeCommitTransaction', argNames: ['Cancel', 'Connection'], handler: (this: Access.FormOld, parameter: {Cancel: number, readonly Connection: ADODB.Connection}) => void): void;
-    on(obj: Access.FormOld, event: 'BeforeDelConfirm', argNames: ['Cancel', 'Response'], handler: (this: Access.FormOld, parameter: {Cancel: number, Response: number}) => void): void;
-    on(obj: Access.FormOld, event: 'BeforeInsert' | 'BeforeUpdate' | 'BeginBatchEdit' | 'DblClick' | 'Delete' | 'Dirty' | 'Open' | 'RecordExit' | 'Undo' | 'UndoBatchEdit' | 'Unload', argNames: ['Cancel'], handler: (this: Access.FormOld, parameter: {Cancel: number}) => void): void;
-    on(obj: Access.FormOld, event: 'BeforeRender', argNames: ['drawObject', 'chartObject', 'Cancel'], handler: (this: Access.FormOld, parameter: {readonly drawObject: any, readonly chartObject: any, readonly Cancel: any}) => void): void;
-    on(obj: Access.FormOld, event: 'BeforeScreenTip', argNames: ['ScreenTipText', 'SourceObject'], handler: (this: Access.FormOld, parameter: {readonly ScreenTipText: any, readonly SourceObject: any}) => void): void;
-    on(obj: Access.FormOld, event: 'CommandBeforeExecute', argNames: ['Command', 'Cancel'], handler: (this: Access.FormOld, parameter: {readonly Command: any, readonly Cancel: any}) => void): void;
-    on(obj: Access.FormOld, event: 'CommandChecked', argNames: ['Command', 'Checked'], handler: (this: Access.FormOld, parameter: {readonly Command: any, readonly Checked: any}) => void): void;
-    on(obj: Access.FormOld, event: 'CommandEnabled', argNames: ['Command', 'Enabled'], handler: (this: Access.FormOld, parameter: {readonly Command: any, readonly Enabled: any}) => void): void;
-    on(obj: Access.FormOld, event: 'CommandExecute', argNames: ['Command'], handler: (this: Access.FormOld, parameter: {readonly Command: any}) => void): void;
-    on(obj: Access.FormOld, event: 'DataChange' | 'PivotTableChange' | 'ViewChange', argNames: ['Reason'], handler: (this: Access.FormOld, parameter: {readonly Reason: number}) => void): void;
-    on(obj: Access.FormOld, event: 'Error', argNames: ['DataErr', 'Response'], handler: (this: Access.FormOld, parameter: {DataErr: number, Response: number}) => void): void;
-    on(obj: Access.FormOld, event: 'Filter', argNames: ['Cancel', 'FilterType'], handler: (this: Access.FormOld, parameter: {Cancel: number, FilterType: number}) => void): void;
-    on(obj: Access.FormOld, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.FormOld, parameter: {KeyCode: number, Shift: number}) => void): void;
-    on(obj: Access.FormOld, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.FormOld, parameter: {KeyAscii: number}) => void): void;
-    on(obj: Access.FormOld, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.FormOld, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
-    on(obj: Access.FormOld, event: 'MouseWheel', argNames: ['Page', 'Count'], handler: (this: Access.FormOld, parameter: {readonly Page: boolean, readonly Count: number}) => void): void;
-    on(obj: Access.FormOldV10, event: 'AfterBeginTransaction' | 'AfterCommitTransaction' | 'RollbackTransaction', argNames: ['Connection'], handler: (this: Access.FormOldV10, parameter: {readonly Connection: ADODB.Connection}) => void): void;
-    on(obj: Access.FormOldV10, event: 'AfterDelConfirm', argNames: ['Status'], handler: (this: Access.FormOldV10, parameter: {Status: number}) => void): void;
-    on(obj: Access.FormOldV10, event: 'AfterFinalRender' | 'AfterLayout', argNames: ['drawObject'], handler: (this: Access.FormOldV10, parameter: {readonly drawObject: any}) => void): void;
-    on(obj: Access.FormOldV10, event: 'AfterRender', argNames: ['drawObject', 'chartObject'], handler: (this: Access.FormOldV10, parameter: {readonly drawObject: any, readonly chartObject: any}) => void): void;
-    on(obj: Access.FormOldV10, event: 'ApplyFilter', argNames: ['Cancel', 'ApplyType'], handler: (this: Access.FormOldV10, parameter: {Cancel: number, ApplyType: number}) => void): void;
-    on(obj: Access.FormOldV10, event: 'BeforeBeginTransaction' | 'BeforeCommitTransaction', argNames: ['Cancel', 'Connection'], handler: (this: Access.FormOldV10, parameter: {Cancel: number, readonly Connection: ADODB.Connection}) => void): void;
-    on(obj: Access.FormOldV10, event: 'BeforeDelConfirm', argNames: ['Cancel', 'Response'], handler: (this: Access.FormOldV10, parameter: {Cancel: number, Response: number}) => void): void;
-    on(obj: Access.FormOldV10, event: 'BeforeInsert' | 'BeforeUpdate' | 'BeginBatchEdit' | 'DblClick' | 'Delete' | 'Dirty' | 'Open' | 'RecordExit' | 'Undo' | 'UndoBatchEdit' | 'Unload', argNames: ['Cancel'], handler: (this: Access.FormOldV10, parameter: {Cancel: number}) => void): void;
-    on(obj: Access.FormOldV10, event: 'BeforeRender', argNames: ['drawObject', 'chartObject', 'Cancel'], handler: (this: Access.FormOldV10, parameter: {readonly drawObject: any, readonly chartObject: any, readonly Cancel: any}) => void): void;
-    on(obj: Access.FormOldV10, event: 'BeforeScreenTip', argNames: ['ScreenTipText', 'SourceObject'], handler: (this: Access.FormOldV10, parameter: {readonly ScreenTipText: any, readonly SourceObject: any}) => void): void;
-    on(obj: Access.FormOldV10, event: 'CommandBeforeExecute', argNames: ['Command', 'Cancel'], handler: (this: Access.FormOldV10, parameter: {readonly Command: any, readonly Cancel: any}) => void): void;
-    on(obj: Access.FormOldV10, event: 'CommandChecked', argNames: ['Command', 'Checked'], handler: (this: Access.FormOldV10, parameter: {readonly Command: any, readonly Checked: any}) => void): void;
-    on(obj: Access.FormOldV10, event: 'CommandEnabled', argNames: ['Command', 'Enabled'], handler: (this: Access.FormOldV10, parameter: {readonly Command: any, readonly Enabled: any}) => void): void;
-    on(obj: Access.FormOldV10, event: 'CommandExecute', argNames: ['Command'], handler: (this: Access.FormOldV10, parameter: {readonly Command: any}) => void): void;
-    on(obj: Access.FormOldV10, event: 'DataChange' | 'PivotTableChange' | 'ViewChange', argNames: ['Reason'], handler: (this: Access.FormOldV10, parameter: {readonly Reason: number}) => void): void;
-    on(obj: Access.FormOldV10, event: 'Error', argNames: ['DataErr', 'Response'], handler: (this: Access.FormOldV10, parameter: {DataErr: number, Response: number}) => void): void;
-    on(obj: Access.FormOldV10, event: 'Filter', argNames: ['Cancel', 'FilterType'], handler: (this: Access.FormOldV10, parameter: {Cancel: number, FilterType: number}) => void): void;
-    on(obj: Access.FormOldV10, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.FormOldV10, parameter: {KeyCode: number, Shift: number}) => void): void;
-    on(obj: Access.FormOldV10, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.FormOldV10, parameter: {KeyAscii: number}) => void): void;
-    on(obj: Access.FormOldV10, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.FormOldV10, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
-    on(obj: Access.FormOldV10, event: 'MouseWheel', argNames: ['Page', 'Count'], handler: (this: Access.FormOldV10, parameter: {readonly Page: boolean, readonly Count: number}) => void): void;
     on(obj: Access.Image, event: 'DblClick', argNames: ['Cancel'], handler: (this: Access.Image, parameter: {Cancel: number}) => void): void;
     on(obj: Access.Image, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.Image, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.Label, event: 'DblClick', argNames: ['Cancel'], handler: (this: Access.Label, parameter: {Cancel: number}) => void): void;
@@ -8627,10 +7912,6 @@ interface ActiveXObject {
     on(obj: Access.Report, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.Report, parameter: {KeyAscii: number}) => void): void;
     on(obj: Access.Report, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.Report, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.Report, event: 'MouseWheel', argNames: ['Page', 'Count'], handler: (this: Access.Report, parameter: {readonly Page: boolean, readonly Count: number}) => void): void;
-    on(obj: Access.ReportOld, event: 'Error', argNames: ['DataErr', 'Response'], handler: (this: Access.ReportOld, parameter: {DataErr: number, Response: number}) => void): void;
-    on(obj: Access.ReportOld, event: 'NoData' | 'Open', argNames: ['Cancel'], handler: (this: Access.ReportOld, parameter: {Cancel: number}) => void): void;
-    on(obj: Access.ReportOldV10, event: 'Error', argNames: ['DataErr', 'Response'], handler: (this: Access.ReportOldV10, parameter: {DataErr: number, Response: number}) => void): void;
-    on(obj: Access.ReportOldV10, event: 'NoData' | 'Open', argNames: ['Cancel'], handler: (this: Access.ReportOldV10, parameter: {Cancel: number}) => void): void;
     on(obj: Access.Section, event: 'DblClick', argNames: ['Cancel'], handler: (this: Access.Section, parameter: {Cancel: number}) => void): void;
     on(obj: Access.Section, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.Section, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
     on(obj: Access.SubForm, event: 'Exit', argNames: ['Cancel'], handler: (this: Access.SubForm, parameter: {Cancel: number}) => void): void;
@@ -8653,7 +7934,7 @@ interface ActiveXObject {
     on(obj: Access.WebBrowserControl, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access.WebBrowserControl, parameter: {KeyCode: number, Shift: number}) => void): void;
     on(obj: Access.WebBrowserControl, event: 'KeyPress', argNames: ['KeyAscii'], handler: (this: Access.WebBrowserControl, parameter: {KeyAscii: number}) => void): void;
     on(obj: Access.WebBrowserControl, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'X', 'Y'], handler: (this: Access.WebBrowserControl, parameter: {Button: number, Shift: number, X: number, Y: number}) => void): void;
-    on(obj: Access.WebBrowserControl, event: 'NavigateError', argNames: ['pDisp', 'URL', 'TargetFrameName', 'StatusCode', 'Cancel'], handler: (this: Access.WebBrowserControl, parameter: {readonly pDisp: any, readonly URL: any, readonly TargetFrameName: any, readonly StatusCode: any, Cancel: boolean}) => void): void;
+    on(obj: Access.WebBrowserControl, event: 'NavigateError', argNames: ['pDisp', 'URL', 'TargetFrameName', 'StatusCode', 'Cancel'], handler: (this: Access.WebBrowserControl, parameter: {readonly pDisp: any, readonly URL: string, readonly TargetFrameName: string | null, readonly StatusCode: any, Cancel: boolean}) => void): void;
     on(obj: Access.WebBrowserControl, event: 'ProgressChange', argNames: ['Progress', 'ProgressMax'], handler: (this: Access.WebBrowserControl, parameter: {readonly Progress: number, readonly ProgressMax: number}) => void): void;
     on(obj: Access.WebBrowserControl, event: 'Updated', argNames: ['Code'], handler: (this: Access.WebBrowserControl, parameter: {Code: number}) => void): void;
     on(obj: Access._CheckBoxInOption, event: 'AfterUpdate' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access._CheckBoxInOption, parameter: {}) => void): void;
@@ -8669,8 +7950,6 @@ interface ActiveXObject {
     on(obj: Access.CommandButton, event: 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.CommandButton, parameter: {}) => void): void;
     on(obj: Access.CustomControl, event: 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.CustomControl, parameter: {}) => void): void;
     on(obj: Access.Form, event: 'Activate' | 'AfterInsert' | 'AfterUpdate' | 'BeforeQuery' | 'Click' | 'Close' | 'Current' | 'DataSetChange' | 'Deactivate' | 'GotFocus' | 'Load' | 'LostFocus' | 'OnConnect' | 'OnDisconnect' | 'Query' | 'Resize' | 'SelectionChange' | 'Timer', handler: (this: Access.Form, parameter: {}) => void): void;
-    on(obj: Access.FormOld, event: 'Activate' | 'AfterInsert' | 'AfterUpdate' | 'BeforeQuery' | 'Click' | 'Close' | 'Current' | 'DataSetChange' | 'Deactivate' | 'GotFocus' | 'Load' | 'LostFocus' | 'OnConnect' | 'OnDisconnect' | 'Query' | 'Resize' | 'SelectionChange' | 'Timer', handler: (this: Access.FormOld, parameter: {}) => void): void;
-    on(obj: Access.FormOldV10, event: 'Activate' | 'AfterInsert' | 'AfterUpdate' | 'BeforeQuery' | 'Click' | 'Close' | 'Current' | 'DataSetChange' | 'Deactivate' | 'GotFocus' | 'Load' | 'LostFocus' | 'OnConnect' | 'OnDisconnect' | 'Query' | 'Resize' | 'SelectionChange' | 'Timer', handler: (this: Access.FormOldV10, parameter: {}) => void): void;
     on(obj: Access.Image, event: 'Click', handler: (this: Access.Image, parameter: {}) => void): void;
     on(obj: Access.Label, event: 'Click', handler: (this: Access.Label, parameter: {}) => void): void;
     on(obj: Access.ListBox, event: 'AfterUpdate' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.ListBox, parameter: {}) => void): void;
@@ -8683,8 +7962,6 @@ interface ActiveXObject {
     on(obj: Access.PaletteButton, event: 'AfterUpdate' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.PaletteButton, parameter: {}) => void): void;
     on(obj: Access.Rectangle, event: 'Click', handler: (this: Access.Rectangle, parameter: {}) => void): void;
     on(obj: Access.Report, event: 'Activate' | 'Click' | 'Close' | 'Current' | 'Deactivate' | 'GotFocus' | 'Load' | 'LostFocus' | 'Page' | 'Resize' | 'Timer', handler: (this: Access.Report, parameter: {}) => void): void;
-    on(obj: Access.ReportOld, event: 'Activate' | 'Close' | 'Deactivate' | 'Page', handler: (this: Access.ReportOld, parameter: {}) => void): void;
-    on(obj: Access.ReportOldV10, event: 'Activate' | 'Close' | 'Deactivate' | 'Page', handler: (this: Access.ReportOldV10, parameter: {}) => void): void;
     on(obj: Access.Section, event: 'Click' | 'Paint', handler: (this: Access.Section, parameter: {}) => void): void;
     on(obj: Access.SubForm, event: 'Enter', handler: (this: Access.SubForm, parameter: {}) => void): void;
     on(obj: Access.SubReport, event: 'Enter', handler: (this: Access.SubReport, parameter: {}) => void): void;
@@ -8692,7 +7969,7 @@ interface ActiveXObject {
     on(obj: Access.TextBox, event: 'AfterUpdate' | 'Change' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.TextBox, parameter: {}) => void): void;
     on(obj: Access.ToggleButton, event: 'AfterUpdate' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.ToggleButton, parameter: {}) => void): void;
     on(obj: Access.WebBrowserControl, event: 'AfterUpdate' | 'Change' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.WebBrowserControl, parameter: {}) => void): void;
-    set(obj: Access._CheckBoxInOption | Access._ChildLabel | Access._CustomControlInReport | Access._OptionButtonInOption | Access._ToggleButtonInOption | Access.Attachment | Access.BoundObjectFrame | Access.CheckBox | Access.ComboBox | Access.CommandButton | Access.CustomControl | Access.EmptyCell | Access.Form | Access.FormOld | Access.FormOldV10 | Access.Label | Access.ListBox | Access.NavigationButton | Access.NavigationControl | Access.ObjectFrame | Access.OptionButton | Access.OptionGroup | Access.Page | Access.SubForm | Access.TabControl | Access.TextBox | Access.ToggleButton | Access.WebBrowserControl, propertyName: 'accName' | 'accValue', parameterTypes: [any], newValue: string): void;
+    set(obj: Access._CheckBoxInOption | Access._ChildLabel | Access._CustomControlInReport | Access._OptionButtonInOption | Access._ToggleButtonInOption | Access.Attachment | Access.BoundObjectFrame | Access.CheckBox | Access.ComboBox | Access.CommandButton | Access.CustomControl | Access.EmptyCell | Access.Form | Access.Label | Access.ListBox | Access.NavigationButton | Access.NavigationControl | Access.ObjectFrame | Access.OptionButton | Access.OptionGroup | Access.Page | Access.SubForm | Access.TabControl | Access.TextBox | Access.ToggleButton | Access.WebBrowserControl, propertyName: 'accName' | 'accValue', parameterTypes: [any], newValue: string): void;
     set(obj: Access._ControlInReportEvents | Access.ComboBox | Access.Control | Access.ListBox, propertyName: 'Selected', parameterTypes: [number], newValue: number): void;
     new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
 }

From 4ee2a16c775c7ba0d69ce919ac968749bd0e57b5 Mon Sep 17 00:00:00 2001
From: stuartlo <stuartlo@microsoft.com>
Date: Mon, 21 May 2018 17:56:18 -0700
Subject: [PATCH 310/575] Update typings to CKEditor v4.9.2

---
 types/ckeditor/ckeditor-tests.ts |   12 +-
 types/ckeditor/index.d.ts        | 3510 ++++++++++++++++++------------
 2 files changed, 2172 insertions(+), 1350 deletions(-)

diff --git a/types/ckeditor/ckeditor-tests.ts b/types/ckeditor/ckeditor-tests.ts
index 1a906bc26e..21288c1f93 100644
--- a/types/ckeditor/ckeditor-tests.ts
+++ b/types/ckeditor/ckeditor-tests.ts
@@ -6,9 +6,9 @@ function test_CKEDITOR() {
     CKEDITOR.skinName = 'moono';
     CKEDITOR.skinName = 'myskin,/customstuff/myskin/';
     var editor = new CKEDITOR.editor();
-    if (editor.getSelection().getType() == CKEDITOR.SELECTION_ELEMENT)
-        if (editor.getSelection().getType() == CKEDITOR.SELECTION_NONE)
-            if (editor.getSelection().getType() == CKEDITOR.SELECTION_TEXT)
+    if (editor.getSelection(true).getType() == CKEDITOR.SELECTION_ELEMENT)
+        if (editor.getSelection(false).getType() == CKEDITOR.SELECTION_NONE)
+            if (editor.getSelection(true).getType() == CKEDITOR.SELECTION_TEXT)
                 alert(CKEDITOR.basePath);
     if (CKEDITOR.currentInstance)
         alert(CKEDITOR.currentInstance.name);
@@ -268,11 +268,11 @@ function test_dom_range() {
     alert(range.collapsed);
     range.selectNodeContents(range.document.getBody());
     range.selectNodeContents(editor.document.getBody());
-    alert(range.endContainer.getName());
+    alert(range.endContainer.getPrivate());
     range.selectNodeContents(editor.document.getBody());
     alert(range.endOffset);
     range.selectNodeContents(editor.document.getBody());
-    alert(range.startContainer.getName());
+    alert(range.startContainer.getDocument());
     range.selectNodeContents(editor.document.getBody());
     alert(range.startOffset);
 }
@@ -558,7 +558,7 @@ function test_selection() {
     var editor = new CKEDITOR.editor();
     var testNode = CKEDITOR.document.getById('myElement');
 
-    var selection = editor.getSelection();
+    var selection = editor.getSelection(true);
     var ranges = selection.getRanges();
     for (var i = 0, c = ranges.length; i < c; i++) {
         var range = ranges[i];
diff --git a/types/ckeditor/index.d.ts b/types/ckeditor/index.d.ts
index 3370479bff..b6cef62744 100644
--- a/types/ckeditor/index.d.ts
+++ b/types/ckeditor/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for CKEditor
-// Project: http://ckeditor.com/
+// Type definitions for CKEditor 4.9.2
+// Project: https://ckeditor.com/ckeditor-4/
 // Definitions by: Thomas Wittwer <https://github.com/wittwert>
+//                 Stuart Long <https://github.com/stuartlong>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // WORK-IN-PROGRESS: Any contribution support welcomed.
@@ -13,101 +14,120 @@ declare namespace CKEDITOR {
 
     // Config options
     var disableAutoInline: boolean;
-    var disableObjectResizing: boolean;
     var replaceClass: string;
     var skinName: string;
 
     // Properties
-    var ALT: number;
-    var CTRL: number;
-    var DIALOG_RESIZE_BOTH: number;
-    var DIALOG_RESIZE_HEIGHT: number;
-    var DIALOG_RESIZE_NONE: number;
-    var DIALOG_RESIZE_WIDTH: number;
-    var DIALOG_STATE_IDLE: number;
-    var DIALOG_STATE_BUSY: number;
-    var ELEMENT_MODE_APPENDTO: number;
-    var ELEMENT_MODE_INLINE: number;
-    var ELEMENT_MODE_NONE: number;
-    var ELEMENT_MODE_REPLACE: number;
-    var END: number;
-    var ENTER_BR: number;
-    var ENTER_P: number;
-    var EVENT_PHASE_AT_TARGET: number;
-    var EVENT_PHASE_BUBBLING: number;
-    var EVENT_PHASE_CAPTURING: number;
-    var LINEUTILS_AFTER: number;
-    var LINEUTILS_BEFORE: number;
-    var LINEUTIS_INSIDE: number;
-    var NODE_COMMENT: number;
-    var NODE_DOCUMENT: number;
-    var NODE_DOCUMENT_FRAGMENT: number;
-    var NODE_ELEMENT: number;
-    var NODE_TEXT: number;
-    var POSITION_BEFORE_START: number;
-    var POSITION_BEFORE_END: number;
-    var POSITION_AFTER_START: number;
-    var POSITION_AFTER_END: number;
-    var SELECTION_ELEMENT: number;
-    var SELECTION_NONE: number;
-    var SELECTION_TEXT: number;
-    var SHIFT: number;
-    var SHRINK_ELEMENT: number;
-    var SHRINK_TEXT: number;
-    var START: number;
-    var STYLE_BLOCK: string;
-    var STYLE_INLINE: string;
-    var STYLE_OBJECT: string;
-    var TRISTATE_DISABLED: number;
-    var TRISTATE_OFF: number;
-    var TRISTATE_ON: number;
-    var UI_BUTTON: string;
-    var UI_MENUBUTTON: string;
-    var UI_PANEL: string;
-    var UI_PANELBUTTON: string;
-    var UI_RICHCOMBO: string;
-    var UI_SEPARATOR: string;
+    const ALT: number;
+    const CTRL: number;
+    const DATA_TRANSFER_CROSS_EDITORS: number;
+    const DATA_TRANSFER_EXTERNAL: number;
+    const DATA_TRANSFER_INTERNAL: number;
+    const DIALOG_RESIZE_BOTH: number;
+    const DIALOG_RESIZE_HEIGHT: number;
+    const DIALOG_RESIZE_NONE: number;
+    const DIALOG_RESIZE_WIDTH: number;
+    const DIALOG_STATE_BUSY: number;
+    const DIALOG_STATE_IDLE: number;
+    const ELEMENT_MODE_APPENDTO: number;
+    const ELEMENT_MODE_INLINE: number;
+    const ELEMENT_MODE_NONE: number;
+    const ELEMENT_MODE_REPLACE: number;
+    const END: number;
+    const ENLARGE_BLOCK_CONTENTS: number;
+    const ENLARGE_ELEMENT: number;
+    const ENLARGE_INLINE: number;
+    const ENLARGE_LIST_ITEM_CONTENTS: number;
+    const ENTER_BR: number;
+    const ENTER_DIV: number;
+    const ENTER_P: number;
+    const EVENT_PHASE_AT_TARGET: number;
+    const EVENT_PHASE_BUBBLING: number;
+    const EVENT_PHASE_CAPTURING: number;
+    const FILTER_SKIP_TREE: number;
+    const LINEUTILS_AFTER: number;
+    const LINEUTILS_BEFORE: number;
+    const LINEUTIS_INSIDE: number;
+    const MOUSE_BUTTON_LEFT: number;
+    const MOUSE_BUTTON_MIDDLE: number;
+    const MOUSE_BUTTON_RIGHT: number;
+    const NODE_COMMENT: number;
+    const NODE_DOCUMENT: number;
+    const NODE_DOCUMENT_FRAGMENT: number;
+    const NODE_ELEMENT: number;
+    const NODE_TEXT: number;
+    const POSITION_AFTER_END: number;
+    const POSITION_AFTER_START: number;
+    const POSITION_BEFORE_END: number;
+    const POSITION_BEFORE_START: number;
+    const POSITION_CONTAINS: number;
+    const POSITION_DISCONNECTED: number;
+    const POSITION_FOLLOWING: number;
+    const POSITION_IDENTICAL: number;
+    const POSITION_IS_CONTAINED: number;
+    const POSITION_PRECEDING: number;
+    const SELECTION_ELEMENT: number;
+    const SELECTION_NONE: number;
+    const SELECTION_TEXT: number;
+    const SHIFT: number;
+    const SHRINK_ELEMENT: number;
+    const SHRINK_TEXT: number;
+    const START: number;
+    const STYLE_BLOCK: string;
+    const STYLE_INLINE: string;
+    const STYLE_OBJECT: string;
+    const TRISTATE_DISABLED: number;
+    const TRISTATE_OFF: number;
+    const TRISTATE_ON: number;
+    const UI_BUTTON: string;
+    const UI_MENUBUTTON: string;
+    const UI_PANEL: string;
+    const UI_PANELBUTTON: string;
+    const UI_RICHCOMBO: string;
+    const UI_SEPARATOR: string;
+    const VERBOSITY_ERROR: number;
+    const VERBOSITY_WARN: number;
+
     var basePath: string;
     var currentInstance: editor;
     var document: dom.document;
-    var env: environmentConfig;
-    var instances: { [id: string]: editor | undefined };
+    var instances: { [id: string]: editor };
     var loadFullCoreTimeout: number;
     var revision: string;
     var rnd: number;
     var status: string;
     var timestamp: string;
+    var verbosity: number;
     var version: string;
-    var config: config;
+    const config: config;
 
     // Methods
     function add(editor: editor): void;
     function addCss(css: string): void;
     function addTemplate(name: string, source: string): template;
-    function appendTo(element: string, config?: config, data?: string): editor;
-    function appendTo(element: HTMLElement, config?: config, data?: string): editor;
+    function appendTo(element: string | HTMLElement, config?: config, data?: string): editor;
     function domReady(): void;
-    function dialogCommand(dialogName: string): void;
     function editorConfig(config: config): void;
+    function error(errorCode: string, additionalData?: any): void;
     function getCss(): string;
     function getTemplate(name: string): template;
     function getUrl(resource: string): string;
-    function inline(element: string, instanceConfig?: config): editor;
-    function inline(element: HTMLElement, instanceConfig?: config): editor;
+    function inline(element: string | HTMLElement, instanceConfig?: config): editor;
     function inlineAll(): void;
     function loadFullCore(): void;
     function replace(element: string | HTMLTextAreaElement, config?: config): editor;
     function replaceAll(className?: string): void;
     function replaceAll(assertionFunction: (textarea: HTMLTextAreaElement, config: config) => boolean): void;
+    function warn(errorCode: string, additionalData?: any): void;
 
     // Event interface
     function capture(): void;
-    function define(name: string, meta: Object): void;
-    function fire(eventName: string, data?: Object, editor?: editor): any;
-    function fireOnce(eventName: string, data?: Object, editor?: editor): any;
+    function define(name: string, meta: { [key: string]: any }): void;
+    function fire(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
+    function fireOnce(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
     function hasListeners(eventName: string): boolean;
-    function on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: Object, listenerData?: Object, priority?: number): void;
-    function once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: Object, listenerData?: Object, priority?: number): void;
+    function on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any }, listenerData?: { [key: string]: any }, priority?: number): void;
+    function once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any }, listenerData?: { [key: string]: any }, priority?: number): void;
     function removeAllListeners(): void;
     function removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
 
@@ -124,29 +144,31 @@ declare namespace CKEDITOR {
             collapsed: boolean;
         }
 
-        class comment {
-
-            // Properties
-            type: number;
-
-            // Methods
-            constructor(comment: string, ownerDocument?: document);
-            constructor(comment: Object, ownerDocument?: document);
-            getOuterHtml(): string;
-
+        interface bookmark2 {
+            start: number[];
+            end: number[];
+            startOffset: number;
+            endOffset: number;
+            collapsed: boolean;
+            normalized: boolean;
+            is2: boolean;
         }
 
+        class comment extends node {
+            readonly type: number;
+
+            constructor(comment: string | Node, ownerDocument?: document);
+            getOuterHtml(): string;
+        }
 
         class document extends domObject {
+            readonly $: Document;
+            readonly type: number;
 
-            // Properties
-            type: number;
-
-            // Methods
-            constructor(domDocument: Object);
+            constructor(domDocument: { [key: string]: any });
             appendStyleSheet(cssFileUrl: string): void;
-            appendStyleText(cssStyleText: string): Object;
-            createElement(name: string, attribsAndStyles?: { attributes: Object; styles: Object; }): element;
+            appendStyleText(cssStyleText: string): CSSStyleSheet;
+            createElement(name: string, attribsAndStyles?: { attributes: { [key: string]: any }; styles: { [key: string]: any }; }): element;
             createText(text: string): element;
             find(selector: string): nodeList;
             findOne(selector: string): element;
@@ -161,61 +183,45 @@ declare namespace CKEDITOR {
             getSelection(): selection;
             getWindow(): window;
             write(html: string): void;
-
         }
 
+        class documentFragment extends node {
+            readonly type: number;
 
-        class documentFragment {
-
-            // Properties
-            type: number;
-
-            // Methods
-            constructor(nodeOrDoc: Object);
+            constructor(nodeOrDoc: { [key: string]: any });
             insertAfterNode(node: node): void;
-
         }
 
-
         class domObject extends event {
+            readonly $: any;
 
-            // Properties
-            $: HTMLElement;
-
-            // Methods
-            constructor(nativeDomObject: Object);
+            constructor(nativeDomObject: { [key: string]: any });
             clearCustomData(): void;
             equals(object: any): boolean;
+            fire(eventName: string, data?: any, editor?: editor): any;
             getCustomData(key: string): any;
             getPrivate(): any;
             getUniqueId(): number;
             removeAllListeners(): void;
-            removeCustomData(key: string): Object;
-            setCustomData(key: string, value: Object): domObject;
-
+            removeCustomData(key: string): any;
+            setCustomData(key: string, value: any): domObject;
         }
 
-
         class element extends node {
+            readonly $: HTMLElement;
+            readonly type: number;
 
-            // Properties
-            type: number;
-
-            // Methods
             constructor(element: string, ownerDocument?: document);
             constructor(element: HTMLElement, ownerDocument?: document);
             addClass(className: string): void;
-            append(node: node, toStart?: boolean): node;
-            append(node: string, toStart?: boolean): node;
+            append(node: node | string, toStart?: boolean): node;
             appendBogus(force: boolean): void;
             appendHtml(html: string): void;
             appendText(text: string): node;
             breakParent(parent: element): void;
             contains(node: node): boolean;
-            copyAttributes(dest: element, skipAttributes: Object): void;
-            data(name: string): string;
-            data(name: string, value: string): void;
-            data(name: string, value: boolean): void;
+            copyAttributes(dest: element, skipAttributes: { [key: string]: string }): void;
+            data(name: string, value?: string | false): string;
             disableContextMenu(): void;
             find(selector: string): nodeList;
             findOne(selector: string): element;
@@ -224,23 +230,22 @@ declare namespace CKEDITOR {
             focusPrevious(ignoreChildren?: boolean, indexToUse?: number): void;
             forEach(callback: (node: node) => void, type?: number, skipRoot?: boolean): void;
             getAttribute(name: string): string;
-            getBogus(): Object;
-            getChild(indices: number): node;
-            getChild(indices: number[]): node;
+            getBogus(): node | boolean;
+            getChild(indices: number | number[]): node;
             getChildCount(): number;
             getChildren(): nodeList;
-            getClientRect(): any;
+            getClientRect(): ClientRect;
             getComputedStyle(propertyName: string): string;
             getDirection(useComputed: boolean): string;
             getDocumentPosition(refDocument: document): position;
-            getDtd(): any;
+            getDtd(): dtdDefinition;
             getEditor(): editor;
             getElementsByTag(tagName: string): nodeList;
-            getFirst(evaluator?: Function): node;
+            getFirst(evaluator?: (node: node) => boolean): node;
             getFrameDocument(): document;
             getHtml(): string;
             getId(): string;
-            getLast(evaluator?: Function): node;
+            getLast(evaluator?: (node: node) => boolean): node;
             getName(): string;
             getNameAtt(): string;
             getOuterHtml(): string;
@@ -257,7 +262,7 @@ declare namespace CKEDITOR {
             hide(): void;
             is(...name: string[]): boolean;
             is(name: any): boolean;
-            isBlockBoundary(customNodeNames: Object): boolean;
+            isBlockBoundary(customNodeNames: { [tagName: string]: 1 }): boolean;
             isEditable(textCursor?: boolean): boolean;
             isEmptyInlineRemoveable(): boolean;
             isIdentical(otherElement: element): boolean;
@@ -273,205 +278,40 @@ declare namespace CKEDITOR {
             scrollIntoParent(parent: window, alignToTop: boolean, hscroll: boolean): void;
             scrollIntoView(alignToTop?: boolean): void;
             setAttribute(name: string, value: string): element;
-            setAttributes(attributesPairs: Object): element;
+            setAttributes(attributesPairs: { [key: string]: string }): element;
             setHtml(html: string): string;
             setOpacity(opacity: number): void;
             setSize(type: string, size: number, isBorderBox: boolean): void;
-            setState(state: number, base?: Object, useAria?: Object): void;
+            setState(state: number, base?: string, useAria?: boolean): void;
             setStyle(name: string, value: string): element;
-            setStyles(stylesPair: Object): element;
+            setStyles(stylesPair: { [key: string]: string }): element;
             setText(text: string): string;
             setValue(value: string): element;
             show(): void;
             unselectable(): void;
 
             //static method
-            static clearAllMarkers(database: Object): Object;
-            static clearMarkers(database: Object, element: Object, removeFromDatabase: Object): void;
+            static clearAllMarkers(database: any): any;
+            static clearMarkers(database: any, element: dom.element, removeFromDatabase: boolean): void;
             static createFromHtml(html: string): element;
-            static get(element: string): element;
-            static get(element: any): element;
-            static setMarker(database: Object, element: Object, name: Object, value: Object): domObject;
-
+            static get(element: string | HTMLElement | element): element;
+            static setMarker(database: any, element: dom.element, name: string, value: any): dom.element;
         }
 
-
         class elementPath {
-            constructor(startNode: element, root: element);
-            constructor(startNode: element);
-            block: element;
-            blockLimit: element;
-            root: element;
-            elements: element[];
+            readonly block: element;
+            readonly blockLimit: element;
+            readonly elements: element[];
+            readonly lastElement: element;
+            readonly root: element;
+
+            constructor(startNode: element, root?: element);
             compare(otherPath: elementPath): boolean;
-            contains(query: string, excludeRoot?: boolean, fromTop?: boolean): element;
-            contains(query: string[], excludeRoot?: boolean, fromTop?: boolean): element;
-            contains(query: (element: element) => boolean, excludeRoot?: boolean, fromTop?: boolean): element;
-            contains(query: Object, excludeRoot?: boolean, fromTop?: boolean): element;
-            contains(query: element, excludeRoot?: boolean, fromTop?: boolean): element;
+            contains(query: string | string[] | ((element: element) => boolean) | { [key: string]: any } | element, excludeRoot?: boolean, fromTop?: boolean): element;
+            direction(): 'ltr' | 'rtl';
             isContextFor(tag: string): boolean;
-            direction(): string;
         }
 
-
-        class range {
-            constructor(root: element);
-            constructor(root: document);
-            startContainer: any;
-            startOffset: number;
-            endContainer: any;
-            endOffset: number;
-            collapsed: boolean;
-            isDocRoot: boolean;
-            document: document;
-            root: element;
-            clone(): range;
-            collapse(toStart?: boolean): boolean;
-            cloneContents(): documentFragment;
-            deleteContents(mergeThen?: boolean): void;
-            extractContents(mergeThen?: boolean): documentFragment;
-            createBookmark(serializable?: boolean): bookmark;
-            createBookmark2(normalized?: boolean): Object;
-            createIterator(): iterator;
-            moveToBookmark(bookmark: Object): void;
-            getBoundaryNodes(): { startNode: node; endNode: node; };
-            getCommonAncestor(includeSelf?: boolean, ignoreTextNode?: boolean): element;
-            optimize(): void;
-            optimizeBookmark(): void;
-            trim(ignoreStart?: boolean, ignoreEnd?: boolean): void;
-            enlarge(unit: number, excludeBrs?: boolean): void;
-            shrink(mode: number, selectContents: boolean): void;
-            insertNode(node: node): void;
-            moveToPosition(node: node, position: Object): void;
-            moveToRange(range: range): void;
-            selectNodeContents(node: node): void;
-            setStart(startNode: node, startOffset: number): void;
-            setEnd(endNode: node, endOffset: number): void;
-            setEndAfter(node: node): void;
-            setEndBefore(node: node): void;
-            setStartAfter(node: node): void;
-            setStartBefore(node: node): void;
-            setStartAt(node: node, position: number): void;
-            setEndAt(node: node, position: number): void;
-            fixBlock(isStart: boolean, blockTag: Object): Object;
-            select(): selection;
-            splitBlock(blockTag: Object): Object;
-            splitElement(toSplit: element): element;
-            removeEmptyBlocksAtEnd(atEnd: boolean): void;
-            startPath(): elementPath;
-            endPath(): elementPath;
-            checkBoundaryOfElement(element: element, checkType: number): boolean;
-            checkStartOfBlock(): boolean;
-            checkEndOfBlock(): boolean;
-            getPreviousNode(evaluator: Function, guard: Function, boundary: element): element;
-            getNextNode(evaluator: Function, guard: Function, boundary: element): element;
-            checkReadOnly(): boolean;
-            moveToElementEditablePosition(element: element, isMoveToEnd: boolean): boolean;
-            movetoClosestEditablePosition(element: element, isMoveToEnd: boolean): boolean;
-            moveToElementEditStart(target: Object): boolean;
-            moveToElementEditEnd(target: Object): boolean;
-            getEnclosedNode(): node;
-            getTouchedStartNode(): node;
-            getTouchedEndNode(): node;
-            getNextEditableNode(): Object;
-            getPreviousEditableNode(): Object;
-            scrollIntoView(): void;
-        }
-
-
-        interface rangeListIterator {
-
-        }
-
-        class selection {
-            document: document;
-            isFake: boolean;
-            isLocked: boolean;
-            rev: number;
-            root: element;
-            constructor(target: document);
-            constructor(target: element);
-            constructor(target: selection);
-            createBookmarks(serializable: Object): bookmark[];
-            createBookmarks2(normalized: Object): Object[];
-            fake(element: element): void;
-            getCommonAncestor(): element;
-            getNative(): Object;
-            getRanges(onlyEditables?: boolean): any[];
-            getSelectedElement(): element;
-            getSelectedText(): string;
-            getStartElement(): element;
-            getType(): number;
-            isHidden(): boolean;
-            lock(): void;
-            removeAllRanges(): void;
-            reset(): void;
-            scrollIntoView(): void;
-            selectBookmarks(bookmarks: any[]): selection;
-            selectElement(element: element): void;
-            selectRanges(ranges: any[]): void;
-            unlock(restore: Object): void;
-        }
-
-
-        class rangeList {
-            constructor(ranges: range[]);
-            constructor(range: range);
-            createIterator(): rangeListIterator;
-            createBokmarks(serializable?: boolean): bookmark[];
-            createBookmarks2(normalized?: boolean): Object[];
-            moveToBookmark(bookmarks: Object[]): void;
-        }
-
-
-        class iterator {
-            constructor(range: range);
-            getNextParagraph(blockTag?: string): element;
-            activeFilter: filter;
-            enforceRealBlocks: boolean;
-            enlargeBr: boolean;
-            filter: filter;
-        }
-
-
-        class node extends domObject {
-            constructor(domNode: Node);
-            appendTo(element: element): element;
-            clone(includeChildren: boolean, cloneId: boolean): node;
-            hasPrevious(): boolean;
-            hasNext(): boolean;
-            insertAfter(node: node): node;
-            insertBefore(node: node): node;
-            insertBeforeMe(node: node): node;
-            getAddress(normalized?: boolean): Object[];
-            getDocument(): document;
-            getIndex(normalized?: boolean): number;
-            getNextSourceNode(startFromSibling: Object, nodeType: Object, guard: Object): void;
-            getPreviousSourceNode(startFromSibling: Object, nodeType: Object, guard: Object): void;
-            getPrevious(evaluator?: Function): node;
-            getNext(evaluator?: Function): node;
-            getParent(allowFragmentParent?: boolean): element;
-            getParents(closerFirst?: boolean): node[];
-            getCommonAncestor(node: Object): void;
-            getPosition(otherNode: Object): void;
-            getAscendant(reference: string, includeSelf?: boolean): node;
-            hasAscendant(name: Object, includeSelf: any): boolean;
-            remove(preserveChildren?: boolean): node;
-            replace(nodeToReplace: node): void;
-            trim(): void;
-            ltrim(): void;
-            rtrim(): void;
-            isReadOnly(): boolean;
-        }
-
-
-        class nodeList {
-            constructor(nativeList: Object);
-            count(): number;
-            getItem(index: number): node;
-        }
-
-
         class event {
             constructor(domEvent: Event);
             getKey(): number;
@@ -481,89 +321,243 @@ declare namespace CKEDITOR {
             getTarget(): node;
             getPhase(): number;
             getPhaseOffset(): position;
-            on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: Object, listenerData?: Object, priority?: number): Object;
+            on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: any, listenerData?: any, priority?: number): { removeListener: () => void };
         }
 
+        class iterator {
+            readonly activeFilter: filter;
+            enforceRealBlocks: boolean;
+            enlargeBr: boolean;
+            readonly filter: filter;
+            forceBrBreak: boolean;
+            readonly range: range;
+            constructor(range: range);
+            getNextParagraph(blockTag?: string): element;
+        }
+
+        class node extends domObject {
+            constructor(domNode: Node);
+            appendTo(element: element): element;
+            clone(includeChildren: boolean, cloneId: boolean): node;
+            hasPrevious(): boolean;
+            hasNext(): boolean;
+            insertAfter(node: node): node;
+            insertBefore(node: node): node;
+            insertBeforeMe(node: node): node;
+            getAddress(normalized?: boolean): number[];
+            getAscendant(reference: string, includeSelf?: boolean): node;
+            getCommonAncestor(node: node): void;
+            getDocument(): document;
+            getIndex(normalized?: boolean): number;
+            getNext(evaluator?: (node: node) => boolean): node;
+            getNextSourceNode(startFromSibling: boolean, nodeType: number, guard: node | ((node: node) => boolean)): void;
+            getParent(allowFragmentParent?: boolean): element;
+            getParents(closerFirst?: boolean): node[];
+            getPosition(otherNode: node): void;
+            getPrevious(evaluator?: (node: node) => boolean): node;
+            getPreviousSourceNode(startFromSibling: boolean, nodeType: number, guard: node | ((node: node) => boolean)): void;
+            hasAscendant(name: string, includeSelf: boolean): boolean;
+            remove(preserveChildren?: boolean): node;
+            replace(nodeToReplace: node): void;
+            trim(): void;
+            ltrim(): void;
+            rtrim(): void;
+            isReadOnly(): boolean;
+        }
+
+        class nodeList {
+            constructor(nativeList: NodeList);
+            count(): number;
+            getItem(index: number): node;
+            toArray(): node[];
+        }
+
+        class range {
+            readonly collapsed: boolean;
+            readonly document: document;
+            readonly endContainer: element | text;
+            readonly endOffset: number;
+            readonly root: element;
+            readonly startContainer: element | text;
+            readonly startOffset: number;
+
+            constructor(root: element | document);
+            checkBoundaryOfElement(element: element, checkType: number): boolean;
+            checkEndOfBlock(): boolean;
+            checkReadOnly(): boolean;
+            checkStartOfBlock(): boolean;
+            clone(cloneId?: boolean): range;
+            cloneContents(): documentFragment;
+            collapse(toStart?: boolean): boolean;
+            createBookmark(serializable?: boolean): bookmark;
+            createBookmark2(normalized?: boolean): bookmark2;
+            createIterator(): iterator;
+            deleteContents(mergeThen?: boolean): void;
+            endPath(): elementPath;
+            enlarge(unit: number, excludeBrs?: boolean): void;
+            extractContents(mergeThen?: boolean, cloneId?: boolean): documentFragment;
+            fixBlock(isStart: boolean, blockTag: string): element;
+            getBoundaryNodes(): { startNode: node; endNode: node; };
+            getCommonAncestor(includeSelf?: boolean, ignoreTextNode?: boolean): element;
+            getEnclosedNode(): node;
+            getNextEditableNode(): element | text;
+            getNextNode(evaluator: (element: dom.element) => boolean, guard?: (element: dom.element) => boolean, boundary?: element): element;
+            getPreviousEditableNode(): element | text;
+            getPreviousNode(evaluator: (element: dom.element) => boolean, guard?: (element: dom.element) => boolean, boundary?: element): element;
+            getTouchedEndNode(): node;
+            getTouchedStartNode(): node;
+            insertNode(node: node): void;
+            moveToBookmark(bookmark: bookmark | bookmark2): void;
+            moveToClosestEditablePosition(element?: element, isMoveForward?: boolean): boolean;
+            moveToElementEditEnd(target: element): boolean;
+            moveToElementEditStart(target: element): boolean;
+            moveToElementEditablePosition(element: element, isMoveToEnd: boolean): boolean;
+            moveToPosition(node: node, position: number): void;
+            moveToRange(range: range): void;
+            optimize(): void;
+            optimizeBookmark(): void;
+            removeEmptyBlocksAtEnd(atEnd: boolean): void;
+            scrollIntoView(): void;
+            select(): selection;
+            selectNodeContents(node: node): void;
+            setEnd(endNode: node, endOffset: number): void;
+            setEndAfter(node: node): void;
+            setEndAt(node: node, position: number): void;
+            setEndBefore(node: node): void;
+            setStart(startNode: node, startOffset: number): void;
+            setStartAfter(node: node): void;
+            setStartAt(node: node, position: number): void;
+            setStartBefore(node: node): void;
+            shrink(mode: number, selectContents?: boolean, options?: boolean | shrinkOptions): void;
+            splitBlock(cloneId?: boolean): void;
+            splitElement(toSplit: element, cloneId?: boolean): element;
+            startPath(): elementPath;
+            trim(ignoreStart?: boolean, ignoreEnd?: boolean): void;
+
+            static mergeRanges(ranges: range[]): range[];
+        }
+
+        interface shrinkOptions {
+            shrinkOnBlockBoundary?: boolean,
+            skipBogus?: boolean
+        }
+
+        class rangeList {
+            constructor(ranges?: range | range[]);
+            createBokmarks(serializable?: boolean): bookmark[];
+            createBookmarks2(normalized?: boolean): bookmark2[];
+            createIterator(): rangeListIterator;
+            moveToBookmarks(bookmarks: bookmark[]): void;
+        }
+
+
+        interface rangeListIterator {
+            getNextRange(mergeConsequent?: boolean): range;
+        }
+
+        // see https://docs.com/ckeditor4/latest/api/CKEDITOR_dom_selection.html
+        class selection {
+            readonly FILLING_CHAR_SEQUENCE: string;
+            readonly document: document;
+            readonly isFake: boolean;
+            readonly isLocked: boolean;
+            readonly rev: number;
+            readonly root: element;
+
+            constructor(target: document | element | selection);
+            createBookmarks(serializable: any): bookmark[];
+            createBookmarks2(normalized: any): bookmark2[];
+            fake(element: element, ariaLabel?: boolean): void;
+            getCommonAncestor(): element;
+            getNative(): Selection;
+            getRanges(onlyEditables?: boolean): range[];
+            getSelectedElement(): element;
+            getSelectedText(): string;
+            getStartElement(): element;
+            getType(): number;
+            isCollapsed(): boolean;
+            isHidden(): boolean;
+            isInTable(allowPartialSelection?: boolean): boolean;
+            lock(): void;
+            removeAllRanges(): void;
+            reset(): void;
+            scrollIntoView(): void;
+            selectBookmarks(bookmarks: (bookmark | bookmark2)[]): selection;
+            selectElement(element: element): void;
+            selectRanges(ranges: range[]): void;
+            unlock(restore: boolean): void;
+        }
+
+        class text extends node {
+            readonly $: Text;
+            readonly type: number;
+
+            constructor(text: Text | string, ownerDocument?: document);
+            getLength(): number;
+            getText(): string;
+            setText(text: string): void;
+            split(offset: number): text;
+            substring(indexA: number, indexB?: number): void;
+        }
+
+        class walker {
+            evaluator: (node: node) => boolean;
+            guard: (node: node) => boolean;
+
+            static validEmptyBlockContainers: { [key: string]: any };
+
+            constructor(range: range);
+            checkBackward(): boolean;
+            checkForward(): boolean;
+            end(): void;
+            lastBackward(): node;
+            lastForward(): node;
+            next(): node;
+            previous(): node;
+            reset(): void;
+
+            static blockBoundary(customNodeNames: any): (node: node) => boolean;
+            static bogus(isReject?: boolean): (node: node) => boolean;
+            static bookmark(contentOnly?: boolean, isReject?: boolean): (node: node) => boolean;
+            static editable(isReject?: boolean): (node: node) => boolean;
+            static empty(isReject?: boolean): (node: node) => boolean;
+            static ignored(isReject?: boolean): (node: node) => boolean;
+            static invisible(isReject?: boolean): (node: node) => boolean;
+            static listItemBoundary(): (node: node) => boolean;
+            static nodeType(type: number, isReject?: boolean): (node: node) => boolean;
+            static temp(isReject?: boolean): (node: node) => boolean;
+            static whitespaces(isReject?: boolean): (node: node) => boolean;
+        }
 
         interface position {
             x: number;
             y: number;
         }
 
-
         interface widthAndHeight {
             width: number;
             height: number;
         }
 
-
-        class text extends node {
-            constructor(text: Text, ownerDocument?: document);
-            constructor(text: string, ownerDocument?: document);
-            type: number;
-            getLength(): number;
-            getText(): string;
-            setText(text: string): void;
-            split(offset: number): text;
-            substring(indexA: number, indexB: number): void;
-        }
-
-
         class window extends domObject {
-            constructor(domWindow: Object);
+            constructor(domWindow: Window);
             focus(): void;
             getViewPaneSize(): widthAndHeight;
             getScrollPosition(): position;
             getFrame(): element;
         }
-
-
-        class walker {
-            constructor(range: range);
-            end(): void;
-            next(): node;
-            previous(): node;
-            checkForward(): boolean;
-            checkBackward(): boolean;
-            lastForward(): node;
-            lastBackward(): node;
-            reset(): void;
-            //static methods till the end
-            blockBoundary(customNodeNames: Object): Function;
-            listItemBoundary(): Function;
-            bookmark(contentOnly?: boolean, isReject?: boolean): Function;
-            whitespaces(isReject?: boolean): Function;
-            invisible(isReject?: boolean): Function;
-            nodeType(type: number, isReject?: boolean): Function;
-            bogus(isReject?: boolean): Function;
-            temp(isReject?: boolean): Function;
-            ignored(isReject?: boolean): Function;
-            editable(isReject?: boolean): Function;
-        }
-
     }
 
 
     namespace ajax {
-
-        // Methods
-        function load(url: string, callback?: Function): string;
-        function loadXml(url: string, callback?: Function): xml;
-
+        function load(url: string, callback?: (data: any) => void): string;
+        function loadXml(url: string, callback?: (data: any) => void): xml;
+        function post(url: string, data: any, contentType?: string, callback?: (data: any) => void): void;
     }
 
 
-    interface xml {
-
-    }
-
-
-    class command extends event {
-
-        // Properties
-        contextSensitive: boolean;
-        editorFocus: boolean;
-        modes: any;
+    class command extends event implements commandDefinition {
+        fakeKeystroke: number;
         previousState: number;
         state: number;
         uiItems: any[];
@@ -573,53 +567,31 @@ declare namespace CKEDITOR {
         checkAllowed(noCache: boolean): boolean;
         disable(): void;
         enable(): void;
-        exec(data?: Object): boolean;
+        exec(data?: { [key: string]: any }): boolean;
         refresh(editor: editor, path: dom.elementPath): void;
         setState(newState: number): boolean;
         toggleState(): void;
 
     }
 
-
-    class focusManager {
-        // Properties
-        currentActive: dom.domObject;
-        hasFocus: boolean;
-
-        // Methods
-        constructor(editor: editor);
-        focus(currentActive?: dom.element): void;
-        lock(): void;
-        unlock(): void;
-        blur(noDelay?: boolean): void;
-        add(element: dom.element, isCapture: boolean): void;
-        remove(element: dom.element): void;
+    interface commandDefinition {
+        async?: boolean;
+        canUndo?: boolean;
+        context?: boolean;
+        contextSensitive?: boolean;
+        editorFocus?: boolean;
+        fakeKeystroke?: number;
+        modes?: { [key: string]: any };
+        startDisabled?: boolean;
+        readOnly?: boolean;
+        exec(editor: editor, data?: any): boolean;
+        refresh?(editor: editor, path: dom.elementPath): void;
     }
 
-    interface keystrokeHandler {
-
-    }
-
-    interface toolbarGroups {
-        name?: string;
-        groups?: string[];
-    }
-
-    namespace config {
-        interface styleObject {
-            name?: string;
-            element: string;
-            attributes?: Object;
-            styles?: Object;
-            overrides?: Object;
-        }
-    }
-
-    // Currently very incomplete. See here for all options that should be included:
-    // http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fileTools_defaultFileName
+    // https://docs.com/ckeditor4/latest/api/CKEDITOR_config.html
     interface config {
-        allowedContent?: boolean | string | Object | CKEDITOR.style;
-        autoEmbed_widget?: string | Function;
+        allowedContent?: boolean | filter.allowedContentRules;
+        autoEmbed_widget?: string | ((url: string) => string);
         autoGrow_bottomSpace?: number;
         autoGrow_maxHeight?: number;
         autoGrow_minHeight?: number;
@@ -634,10 +606,13 @@ declare namespace CKEDITOR {
         bodyId?: string;
         browserContextMenuOnCtrl?: boolean;
 
-        clipboard_defaultContentType?: string; // html | text
+        clipboard_defaultContentType?: 'html' | 'text';
         clipboard_notificationDuration?: number;
+        cloudServices_tokenUrl?: string;
+        cloudServices_uploadUrl?: string;
+        codeSnippetGeshi_url?: string;
         codeSnippet_codeClass?: string;
-        codeSnippet_languages?: Object;
+        codeSnippet_languages?: { [key: string]: any };
         coceSnippet_theme?: string;
         colorButton_backStyle?: config.styleObject;
         colorButton_colors?: string;
@@ -649,6 +624,11 @@ declare namespace CKEDITOR {
         contentsCss?: string | string[];
         contentsLangDirection?: string;
         contentsLanguage?: string;
+        copyFormatting_allowRules?: string;
+        copyFormatting_allowedContexts?: boolean | string[];
+        copyFormatting_keystrokeCopy?: number;
+        copyFormatting_keystrokePaste?: number;
+        copyFormatting_outerCursor?: boolean;
         coreStyles_bold?: config.styleObject;
         coreStyles_italic?: config.styleObject;
         coreStyles_strike?: config.styleObject;
@@ -660,7 +640,7 @@ declare namespace CKEDITOR {
         dataIndentationChars?: string;
         defaultLanguage?: string;
         devtools_styles?: string;
-        devtools_textCallback?: Function;
+        devtools_textCallback?: (editor: editor, dialog: dialog, element: dom.element, tabName: string) => string;
         dialog_backgroundCoverColor?: string;
         dialog_backgroundCoverOpacity?: number;
         dialog_buttonsOrder?: string;
@@ -670,11 +650,15 @@ declare namespace CKEDITOR {
         disableNativeSpellChecker?: boolean;
         disableNativeTableHandles?: boolean;
         disableNativeObjectResizing?: boolean;
-        disableNativeReadonlySTyling?: boolean;
-        disallowedContent?: string | Object; // Documentation calls it CKEDITOR.filter.disallowedContentRules, but it is just a non-governed object or string.
+        disableNativeReadonlyStyling?: boolean;
+        disallowedContent?: filter.disallowedContentRules;
         div_wrapTable?: boolean;
         docType?: string;
 
+        easyimage_class?: string;
+        easyimage_defaultStyle?: string;
+        easyimage_styles?: { [key: string]: any };
+        easyimage_toolbar?: string[] | string;
         emailProtection?: string;
         embed_provider?: string;
         enableTabKeyTools?: boolean;
@@ -684,21 +668,23 @@ declare namespace CKEDITOR {
         entities_greek?: boolean;
         entities_latin?: boolean;
         entities_processNumerical?: boolean | string;
-        extraAllowedContent?: string | Object;
+        extraAllowedContent?: filter.allowedContentRules;
         extraPlugins?: string;
 
         fileTools_defaultFileName?: string;
+        fileTools_requestHeaders?: { [key: string]: any };
         filebrowserBrowseUrl?: string;
         filebrowserFlashBrowseUrl?: string;
         filebrowserFlashUploadUrl?: string;
         filebrowserImageBrowseLinkUrl?: string;
         filebrowserImageBrowseUrl?: string;
         filebrowserImageUploadUrl?: string;
+        filebrowserUploadMethod?: string;
         filebrowserUploadUrl?: string;
         filebrowserWindowFeatures?: string;
         filebrowserWindowHeight?: number | string;
         filebrowserWindowWidth?: number | string;
-        fillEmptyBlocks?: boolean | Function;
+        fillEmptyBlocks?: boolean | ((element: htmlParser.element) => boolean);
         find_highlight?: config.styleObject;
         flashAddEmbedTag?: boolean;
         flashConvertOnEdit?: boolean;
@@ -737,6 +723,7 @@ declare namespace CKEDITOR {
 
         ignoreEmptyParagraph?: boolean;
         image2_alignClasses?: string[];
+        image2_altRequired?: boolean;
         image2_captionedClass?: string;
         image2_disableResizer?: boolean;
         image2_prefillDimensions?: boolean;
@@ -751,7 +738,7 @@ declare namespace CKEDITOR {
         jqueryOverrideVal?: boolean;
         justifyClasses?: string[];
 
-        keystrokes?: any[]; // Number, string pair really... silly structure... they should fix this.
+        keystrokes?: [number, string][];
 
         language?: string;
         language_list?: string[];
@@ -766,9 +753,10 @@ declare namespace CKEDITOR {
         magicline_keystrokePrevious?: number;
         magicline_tabuList?: string[];
         magicline_triggerOffset?: number;
+        mathJaxClass?: string;
         mathJaxLib?: string;
         menu_groups?: string;
-        menu_subMenuDelay?: string;
+        menu_subMenuDelay?: number;
 
         newpage_html?: string;
         notification_duration?: number;
@@ -781,6 +769,8 @@ declare namespace CKEDITOR {
         pasteFromWordPromptCleanup?: boolean;
         pasteFromWordRemoveFontStyles?: boolean;
         pasteFromWorkRemoveStyles?: boolean;
+        pasteFromWord_heuristicsEdgeList?: boolean;
+        pasteFromWord_inlineImages?: boolean;
         plugins?: string;
         protectedSource?: RegExp[];
 
@@ -815,7 +805,7 @@ declare namespace CKEDITOR {
         scayt_minWordLength?: number;
         scayt_moreSuggestions?: string;
         scayt_multiLanguageMode?: boolean;
-        scayt_multiLanguageStyles?: Object;
+        scayt_multiLanguageStyles?: { [key: string]: any };
         scayt_sLang?: string;
         scayt_serviceHost?: string;
         scayt_servicePath?: string;
@@ -825,7 +815,7 @@ declare namespace CKEDITOR {
         scayt_uiTabs?: string;
         scayt_userDictionaryName?: string;
 
-        sharedSpaces?: CKEDITOR.sharedSpace;
+        sharedSpaces?: sharedSpace;
         shiftEnterMode?: number;
         skin?: string;
         smiley_columns?: number;
@@ -833,8 +823,8 @@ declare namespace CKEDITOR {
         smiley_images?: string[];
         smiley_path?: string;
         sourceAreaTabSize?: number;
-        specialChars?: any[]; // Seems to be an array of a string, or a two-element string-array
-        startupFocus?: boolean;
+        specialChars?: (string | [string, string])[];
+        startupFocus?: string | boolean;
         startupMode?: string;
         startupOutlineBlocks?: boolean;
         startupShowBorders?: boolean;
@@ -845,7 +835,7 @@ declare namespace CKEDITOR {
         tabIndex?: number;
         tabSpaces?: number;
         templates?: string;
-        templates_files?: Object;
+        templates_files?: { [key: string]: any };
         templates_replaceContent?: boolean;
         title?: string | boolean;
         toolbar?: string | (string | string[] | { name: string, items?: string[], groups?: string[] })[] | null;
@@ -865,527 +855,197 @@ declare namespace CKEDITOR {
         wsc_customDictionaryIds?: string;
         wsc_customLoaderScript?: string;
         wsc_customerId?: string;
+        wsc_height?: string;
         wsc_lang?: string;
+        wsc_left?: string;
+        wsc_top?: string;
         wsc_userDictionaryName?: string;
+        wsc_width?: string;
     }
 
-
-    interface feature {
-
-    }
-
-
-    interface sharedSpace {
-        top?: string | HTMLElement;
-        bottom?: string | HTMLElement;
-    }
-
-    module skin {
-        var icons: { [name: string]: { path: string } };
-        function addIcon(name: string, path: string, offset?: number, bgsize?: string): void;
-    }
-
-    class style {
-        constructor(something: { element: string, attributes: { [att: string]: string } });
-        applyToRange(range: Range, editor: editor): void;
-    }
-
-    class editable extends dom.element {
-        constructor(editor: editor, element: HTMLElement | dom.element);
-        hasFocus: boolean;
-        attachListener(obj: event | editable, eventName: string, listenerFunction: (ei: eventInfo) => void,
-            scopeobj?: {}, listenerData?: any, priority?: number): listenerRegistration;
-    }
-
-
-    class menu {
-        constructor();
-        add(item: any): void;
-        addListener(listenerFn: (startElement: dom.element, selection: dom.selection, path: dom.elementPath) => any): void;
-        hide(returnFocus?: boolean): void;
-        removeAll(): void;
-        show(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
-    }
-
-
-    namespace plugins {
-
-        class contextMenu extends menu {
-            constructor(editor: editor);
-            addTarget(element: dom.element, nativeContextMenuOnCtrl?: boolean): void;
-            open(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
-        }
-
-
-        namespace link {
-            var emptyAnchorFix: boolean;
-            var fakeAnchor: boolean;
-            var synAnchorSelector: boolean;
-            function getEditorAnchors(editor: editor): dom.element[];
-            function getSelectedLink(editor: editor): dom.elementPath;
-            function tryRestoreFakeAnchor(editor: editor, element: dom.element): dom.element;
-        }
-
-
-        namespace widget {
-
-            namespace nestedEditable {
-                interface definition {
-                    allowedContent?: any;
-                    pathName?: string;
-                    selector?: string;
-                }
-            }
-
-            class nestedEditable extends CKEDITOR.dom.element {
-                editor: CKEDITOR.editor;
-                enterMode: number;
-                filter: CKEDITOR.filter;
-                shiftEnterMode: number;
-
-                constructor(editor: CKEDITOR.editor, element: CKEDITOR.dom.element, config: { filter?: CKEDITOR.filter });
-                getData(): string;
-                setData(data: string): void;
-            }
-
-
-            interface definition {
-                allowedContent?: any;
-                button?: string;
-                contentForms?: Object;
-                contentTransformations?: Object;
-                data?: Object | Function;
-                defaults?: Object;
-                dialog?: string;
-                downcast?: string | Function;
-                downcasts?: Object;
-                draggable?: boolean;
-                edit?: Function;
-                editables?: Object;
-                init?: Function;
-                inline?: boolean;
-                insert?: Function;
-                mask?: boolean;
-                name?: string;
-                parts?: Object;
-                pathName?: string;
-                requiredContent?: string | CKEDITOR.style;
-                styleToAllowedContentRules?: Function;
-                styleableElements?: string;
-                template?: string | CKEDITOR.template;
-                upcast?: string | Function;
-                upcastPriority?: number;
-                upcasts?: Object;
-
-                toFeature?(): CKEDITOR.feature;
-            }
-
-            class repository {
-                add(name: string, widgetDef: CKEDITOR.plugins.widget.definition): void;
-                addUpcastCallback(callback: Function): void;
-                capture(): void;
-                checkSelection(): void;
-                checkWidgets(options?: { initOnlyNew?: boolean; focusInited?: boolean }): void;
-                define(name: string, meta?: { errorProof?: boolean }): void;
-                del(widget: CKEDITOR.plugins.widget): void;
-                destroy(widget: CKEDITOR.plugins.widget, offline?: boolean): void;
-                destroyAll(offline?: boolean): void;
-                finalizeCreation(container: any): void;
-                focused: widget;
-                fire(eventName: string, data: Object, editor: editor): any; // should be boolean | Object
-                getByElement(element: any, checkWrapperOnly: boolean): CKEDITOR.plugins.widget;
-                hasListeners(eventName: string): boolean;
-                initOn(element: dom.element, widgetDef?: CKEDITOR.plugins.widget.definition, startupData?: Object): CKEDITOR.plugins.widget;
-                initOn(element: dom.element, widgetDef?: string, startupData?: Object): CKEDITOR.plugins.widget;
-                initOnAll(container?: dom.element): CKEDITOR.plugins.widget[];
-                instances: { [id: string]: widget };
-                on(eventName: string, listenerFunction: Function, scopeObj?: Object, listenerData?: Object, priority?: number): any;
-                once(): void;
-                parseElementClasses(classes: string): any;
-                removeAllListeners(eventName: string, listenerFunction: Function): void;
-                wrapElement(element: any, widgetName?: string): any;
-            }
-        }
-
-        class widget implements CKEDITOR.plugins.widget.definition {
-            allowedContent: any;
-            button: string;
-            contentForms: any;
-            contentTransformations: any;
-            data: any;
-            dataReady: boolean;
-            defaults: any;
-            definition: CKEDITOR.plugins.widget.definition;
-            dialog: string;
-            downcast: string | Function;
-            downcasts: any;
-            draggable: boolean;
-            editables: any;
-            editor: CKEDITOR.editor;
-            element: CKEDITOR.dom.element;
-            focusedEditable: CKEDITOR.plugins.widget.nestedEditable
-            id: number;
-            init: Function;
-            inited: boolean;
-            inline: boolean;
-            insert: Function;
-            mask: boolean;
-            name: string;
-            parts: any;
-            pathName: string;
-            ready: boolean;
-            repository: CKEDITOR.plugins.widget.repository;
-            requiredContent: string | CKEDITOR.style;
-            styleToAllowedContentRules: Function;
-            styleableElements: string;
-            template: CKEDITOR.template;
-            upcast: string | Function;
-            upcastPriority: number;
-            upcasts: any;
-            wrapper: CKEDITOR.dom.element;
-
-            constructor(widgetsRepo: CKEDITOR.plugins.widget.repository, id: number, element: CKEDITOR.dom.element, widgetDef: CKEDITOR.plugins.widget.definition, starupData?: Object);
-
-            addClass(className: string): void;
-            applyStyle(style: CKEDITOR.style): void;
-            capture(): void;
-            checkStyleActive(style: CKEDITOR.style): boolean;
-            define(name: string, meta: { errorProof?: boolean }): void;
-            destroy(offline?: boolean): void;
-            destroyEditable(editableName: string, offline?: boolean): void;
-            edit(): boolean;
-            fire(eventName: string, data?: Object, editor?: CKEDITOR.editor): any;
-            fireOnce(eventName: string, data?: Object, editor?: CKEDITOR.editor): any;
-            focus(): void;
-            getClasses(): any;
-            hasClass(className: string, Whether: boolean): void;
-            hasListeners(eventName: string): boolean;
-            initEditable(editableName: string, definition: CKEDITOR.plugins.widget.nestedEditable.definition): boolean;
-            isInited(): boolean;
-            isReady(): boolean;
-            on(eventName: string, listenerFunction: Function,
-                scopeObj?: Object, listenerData?: Object, priority?: number): any;
-            once(): void;
-            removeAllListeners(): void;
-            removeClass(className: string): void;
-            removeListener(eventName: string, listenerFunction: Function): void;
-            removeStyle(style: CKEDITOR.style): void;
-            setData(keyOrData: string | Object, value: Object): CKEDITOR.plugins.widget;
-            setFocused(selected: boolean): CKEDITOR.plugins.widget;
-            setSelected(selected: boolean): CKEDITOR.plugins.widget;
-            toFeature(): CKEDITOR.feature;
-            updateDragHandlerPosition(): void;
-        }
-
-        interface IPluginDefinition {
-            hidpi?: boolean;
-            lang?: string | string[];
-            requires?: string | string[];
-            afterInit?(editor: editor): any;
-            beforeInit?(editor: editor): any;
-            init?(editor: editor): void;
-            onLoad?(): any;
-            icons?: string;
-        }
-
-        function add(name: string, definition: IPluginDefinition): void;
-        function add(name: string): void;
-        function addExternal(name: string, path: string, fileName?: string): void;
-        function get(name: string): any;
-        function getFilePath(name: string): string;
-        function getPath(name: string): string;
-        function load(name: string, callback: Function, scope?: Object): void;
-        function setLang(pluginName: string, languageCode: string, languageEntries: any): void;
-        var registered: {[key: string]: IPluginDefinition};
-    }
-
-    interface IMenuItemDefinition {
-        label:string,
-        command:string,
-        icon: string
-        group:string,
-        order:number
-    }
-
-    class editor extends event {
-        activeEnterMode: number;
-        activeFilter: filter;
-        activeShiftEnterMode: number;
-        blockless: boolean;
-        config: config;
-        container: dom.element;
-        contextMenu: plugins.contextMenu;
-        dataProcessor: dataProcessor;
-        document: dom.document;
-        element: dom.element;
-        elementMode: number;
-        enterMode: number;
-        filter: filter;
-        focusManager: focusManager;
-        id: string;
-        keystrokeHandler: keystrokeHandler;
-        lang: any;
-        langCode: string;
-        mode: string;
-        name: string;
-        plugins: any;
-        readOnly: boolean;
-        shiftEnterMode: number;
-        status: string;
-        tabIndex: number;
-        templates: any;
-        title: any;
-        toolbar: any;
-        ui: ui;
-        widgets: plugins.widget.repository;
-        window: dom.window;
-        constructor(instanceConfig?: Object, element?: dom.element, mode?: number);
-        addCommand(commandName: string, commandDefinition: commandDefinition): void;
-        addFeature(feature: feature): boolean;
-        addMenuGroup(name: string, order?: number): void;
-        addMenuItem(name: string, definition?: IMenuItemDefinition): void;
-        addMenuItems(definitions: {[id:string]:IMenuItemDefinition}): void;
-        addMode(mode: string, exec: () => void): void;
-        addRemoveFormatFilter(func: Function): void;
-        applyStyle(style: style): void;
-        attachStyleStateChange(style: style, callback: Function): void;
-        checkDirty(): boolean;
-        commands:any;
-        createFakeElement(realElement: Object, className: Object, realElementType: Object, isResizable: Object): void;
-        createFakeParserElement(realElement: Object, className: Object, realElementType: Object, isResizable: Object): void;
-        createRange(): dom.range;
-        destroy(noUpdate?: boolean): void;
-        editable(): editable | null;
-        editable(elementOrEditable: dom.element): void;
-        editable(elementOrEditable: editable): void;
-        elementPath(startNode?: dom.node): dom.elementPath;
-        execCommand(commandName: string, data?: Object): boolean;
-        focus(): void;
-        forceNextSelectionCheck(): void;
-        getClipboardData(options: Object, callback: Function): void;
-        getColorFromDialog(callback: Function, scope?: Object): void;
-        getCommand(commandName: string): command;
-        getData(noEvents?: Object): string;
-        getMenuItem(name: string): Object;
-        getResizable(forContents: boolean): dom.element;
-        getSelectedHtml(toString?: false): dom.documentFragment;
-        getSelectedHtml(toString: true): string;
-        getSelectedHtml(toString?: boolean): CKEDITOR.dom.documentFragment | string;
-        getSelection(forceRealSelection?: boolean): dom.selection;
-        getSnapshot(): string;
-        getStylesSet(callback: Function): void;
-        getUiColor(): string;
-        insertElement(element: dom.element): void;
-        insertHtml(html: string, mode?: string): void;
-        insertText(text: string): void;
-        loadSnapshot(snapshot: Object): void;
-        lockSelection(sel?: dom.selection): boolean;
-        openDialog(dialogName: string, callback: Function): dialog;
-        popup(url: string, width?: number, height?: number, options?: string): void;
-        popup(url: string, width?: string, height?: number, options?: string): void;
-        popup(url: string, width?: number, height?: string, options?: string): void;
-        popup(url: string, width?: string, height?: string, options?: string): void;
-        removeMenuItem(name: string): void;
-        removeStyle(style: style): void;
-        resetDirty(): void;
-        resetUndo(): void;
-        resize(width: number, height: number, isContentHeight?: boolean, resizeInner?: boolean): void;
-        resize(width: string, height: number, isContentHeight?: boolean, resizeInner?: boolean): void;
-        resize(width: number, height: string, isContentHeight?: boolean, resizeInner?: boolean): void;
-        resize(width: string, height: string, isContentHeight?: boolean, resizeInner?: boolean): void;
-        restoreRealElement(fakeElement: Object): dom.element;
-        selectionChange(checkNow?: boolean): void;
-        setActiveEnterMode(enterMode: number, shiftEnterMode: number): void;
-        setActiveFilter(filter: filter): void;
-        setData(data: string, options?: { internal?: boolean; callback?: Function; noSnapshot?: boolean; }): void;
-        setKeystroke(keystroke: number, behavior?: string): void;
-        setKeystroke(keystroke: any[], behavior?: string): void;
-        setKeystroke(keystroke: number, behavior?: boolean): void;
-        setKeystroke(keystroke: any[], behavior?: boolean): void;
-        setMode(newMode: string, callback: Function): void;
-        setReadOnly(isReadOnly?: boolean): void;
-        setUiColor(color: string): void;
-        unlockSelection(restore?: boolean): void;
-        updateElement(): void;
-    }
-
-    namespace editor {
-        interface eventObject {
-            activeEnterModeChange?: (evt: CKEDITOR.eventInfo) => void;
-            activeFilterChange?: (evt: CKEDITOR.eventInfo) => void;
-            afterCommandExec?: (evt: CKEDITOR.eventInfo) => void;
-            afterInsertHtml?: (evt: CKEDITOR.eventInfo) => void;
-            afterPaste?: (evt: CKEDITOR.eventInfo) => void;
-            afterPasteFromWord?: (evt: CKEDITOR.eventInfo) => void;
-            afterSetData?: (evt: CKEDITOR.eventInfo) => void;
-            afterUndoImage?: (evt: CKEDITOR.eventInfo) => void;
-            ariaEditorHelpLabel?: (evt: CKEDITOR.eventInfo) => void;
-            ariaWidget?: (evt: CKEDITOR.eventInfo) => void;
-            autogrow?: (evt: CKEDITOR.eventInfo) => void;
-
-            beforeCommandExec?: (evt: CKEDITOR.eventInfo) => void;
-            beforeDestroy?: (evt: CKEDITOR.eventInfo) => void;
-            beforeGetData?: (evt: CKEDITOR.eventInfo) => void;
-            beforeModeUnload?: (evt: CKEDITOR.eventInfo) => void;
-            beforeSetMode?: (evt: CKEDITOR.eventInfo) => void;
-            beforeUndoImage?: (evt: CKEDITOR.eventInfo) => void;
-            blur?: (evt: CKEDITOR.eventInfo) => void;
-
-            change?: (evt: CKEDITOR.eventInfo) => void;
-            configLoaded?: (evt: CKEDITOR.eventInfo) => void;
-            contentDirChanged?: (evt: CKEDITOR.eventInfo) => void;
-            contentDom?: (evt: CKEDITOR.eventInfo) => void;
-            contentDomInvalidated?: (evt: CKEDITOR.eventInfo) => void;
-            contentDomUnload?: (evt: CKEDITOR.eventInfo) => void;
-            customConfigLoaded?: (evt: CKEDITOR.eventInfo) => void;
-
-            dataFiltered?: (evt: CKEDITOR.eventInfo) => void;
-            dataReady?: (evt: CKEDITOR.eventInfo) => void;
-            destroy?: (evt: CKEDITOR.eventInfo) => void;
-            dialogHide?: (evt: CKEDITOR.eventInfo) => void;
-            dialogShow?: (evt: CKEDITOR.eventInfo) => void;
-            dirChanged?: (evt: CKEDITOR.eventInfo) => void;
-            doubleclick?: (evt: CKEDITOR.eventInfo) => void;
-            dragend?: (evt: CKEDITOR.eventInfo) => void;
-            dragstart?: (evt: CKEDITOR.eventInfo) => void;
-            drop?: (evt: CKEDITOR.eventInfo) => void;
-
-            elementsPathUpdate?: (evt: CKEDITOR.eventInfo) => void;
-
-            fileUploadRequest?: (evt: CKEDITOR.eventInfo) => void;
-            fileUploadResponse?: (evt: CKEDITOR.eventInfo) => void;
-            floatingSpaceLayout?: (evt: CKEDITOR.eventInfo) => void;
-            focus?: (evt: CKEDITOR.eventInfo) => void;
-
-            getData?: (evt: CKEDITOR.eventInfo) => void;
-            getSnapshot?: (evt: CKEDITOR.eventInfo) => void;
-
-            insertElement?: (evt: CKEDITOR.eventInfo) => void;
-            insertHtml?: (evt: CKEDITOR.eventInfo) => void;
-            insertText?: (evt: CKEDITOR.eventInfo) => void;
-            instanceReady?: (evt: CKEDITOR.eventInfo) => void;
-
-            key?: (evt: CKEDITOR.eventInfo) => void;
-
-            langLoaded?: (evt: CKEDITOR.eventInfo) => void;
-            loadSnapshot?: (evt: CKEDITOR.eventInfo) => void;
-            loaded?: (evt: CKEDITOR.eventInfo) => void;
-            lockSnapshot?: (evt: CKEDITOR.eventInfo) => void;
-            maximize?: (evt: CKEDITOR.eventInfo) => void;
-            menuShow?: (evt: CKEDITOR.eventInfo) => void;
-            mode?: (evt: CKEDITOR.eventInfo) => void;
-
-            notificationHide?: (evt: CKEDITOR.eventInfo) => void;
-            notificationShow?: (evt: CKEDITOR.eventInfo) => void;
-            notificationUpdate?: (evt: CKEDITOR.eventInfo) => void;
-
-            paste?: (evt: CKEDITOR.eventInfo) => void;
-            pasteFromWord?: (evt: CKEDITOR.eventInfo) => void;
-            pluginsLoaded?: (evt: CKEDITOR.eventInfo) => void;
-
-            readOnly?: (evt: CKEDITOR.eventInfo) => void;
-            removeFormatCleanup?: (evt: CKEDITOR.eventInfo) => void;
-            required?: (evt: CKEDITOR.eventInfo) => void;
-            resize?: (evt: CKEDITOR.eventInfo) => void;
-
-            save?: (evt: CKEDITOR.eventInfo) => void;
-            saveSnapshot?: (evt: CKEDITOR.eventInfo) => void;
-            selectionChange?: (evt: CKEDITOR.eventInfo) => void;
-            setData?: (evt: CKEDITOR.eventInfo) => void;
-            stylesSet?: (evt: CKEDITOR.eventInfo) => void;
-
-            template?: (evt: CKEDITOR.eventInfo) => void;
-            toDataFormat?: (evt: CKEDITOR.eventInfo) => void;
-            toHtml?: (evt: CKEDITOR.eventInfo) => void;
-
-            unlockSnapshot?: (evt: CKEDITOR.eventInfo) => void;
-            updateSnapshot?: (evt: CKEDITOR.eventInfo) => void;
-
-            widgetDefinition?: (evt: CKEDITOR.eventInfo) => void;
-        }
-    }
-
-    interface eventInfo {
-        data: any;
-        editor: editor;
-        listenerData: any;
-        name: string;
-        sender: any;
-        cancel(): void;
-        removeListener(): void;
-        stop(): void;
-    }
-
-    module filter {
-        interface allowedContentRules {
-
-        }
-    }
-
-    class filter {
-        allow(newRules: CKEDITOR.filter.allowedContentRules, featureName?: string, overrideCustom?: boolean): boolean;
-
-    }
-
-    interface buttonDefinition {
-        icon?: string;
-        iconOffset?: number;
-        label : string;
-        command : string;
-        toolbar : string;
-    }
-
-    interface template {
-
-    }
-
-
     interface dataProcessor {
         toDataFormat(html: string, fixForBody: string): void;
         toHtml(data: string, fixForBody?: string): void;
     }
 
-    class htmlDataProcessor {
-        dataFilter: htmlParser.filter;
-        htmlFilter: htmlParser.filter;
-        writer: htmlParser.basicWriter;
+    class dialog {
+        readonly state: number;
 
-        constructor(editor: editor);
-        toDataFormat(html: string, options?: Object): string;
-        toHtml(data: string, options?: Object): string;
+        constructor(editor: editor, dialogName: string);
+
+        addFocusable(element: dom.element, index?: number): void;
+        addPage(contents: { [key: string]: any }): void;
+        click(id: string): any;
+        commitContent(): void;
+        diableButton(id: string): void;
+        enableButton(id: string): void;
+        foreach(fn: () => void): dialog;
+        getButton(id: string): ui.dialog.button;
+        getContentElement(pageId: string, elementId: string): ui.dialog.uiElement;
+        getElement(): dom.element;
+        getName(): string;
+        getPageCount(): number;
+        getParentEditor(): editor;
+        getPosition(): { [key: string]: any };
+        getSelectedElement(): dom.element;
+        getSize(): { [key: string]: any };
+        getValueOf(pageId: string, elementId: string): any;
+        hide(): void;
+        hidePage(id: string): void;
+        layout(): void;
+        move(x: number, y: number, save: boolean): void;
+        reset(): dialog;
+        resize(width: number, height: number): void;
+        selectPage(id: string): void;
+        setState(state: number): void;
+        setValueOf(pageId: string, elementId: string, value: any): void;
+        setupContent(): void;
+        show(): void;
+        showPage(id: string): void;
+        updateStyle(): void;
+
+        static add(name: string, dialogDefinition: string | ((editor: editor) => dialog.IDialogDefinition)): void;
+        static addIframe(name: string, title: string, minWidth: number, minHeight: number, onContentLoad?: () => void, userDefinition?: { [key: string]: any }): void;
+        static addUIElement(typeName: string, builder: () => void): void;
+        static cancelButton(): void;
+        static exists(name: string | number): void; // NOTE: documentation says object, but it's an array accessor, so really a string or number will work
+        static getCurrent(): dialog;
+        static isTabEnabled(editor: editor, dialogName: string, tabName: string): boolean;
+        static okButton(): void;
     }
 
+    namespace dialog {
 
-    class event {
-        constructor();
-        useCapture: boolean;
-        capture(): void;
-        define(name: string, meta: Object): void;
-        fire(eventName: string, data?: Object, editor?: editor): any;
-        fireOnce(eventName: string, data?: Object, editor?: editor): any;
-        hasListeners(eventName: string): boolean;
-        on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: Object | null, listenerData?: Object | null, priority?: number): listenerRegistration;
-        once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: Object | null, listenerData?: Object | null, priority?: number): listenerRegistration;
-        removeAllListeners(): void;
-        removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
-        static implementOn(targetObject: Object): void;
+        namespace definition {
+
+            interface button extends uiElement {
+                disabled?: boolean;
+            }
+
+            interface checkbox extends uiElement {
+                default?: string;
+                validate?: () => boolean;
+            }
+
+            interface content {
+                accessKey?: string;
+                elements?: dialog.definition.uiElement[];
+                id?: string;
+                label?: string;
+                title?: string;
+            }
+
+            interface file extends labeledElement {
+                action?: string;
+                size?: string;
+                validate?: () => boolean;
+            }
+
+            interface fileButton extends uiElement {
+                filebrowser?: string;
+                for?: string;
+                validate?: () => boolean;
+            }
+
+            interface hbox extends uiElement {
+                children?: ui.dialog.uiElement[];
+                height?: number;
+                padding?: number;
+                validate?: () => boolean;
+                widths?: number[];
+            }
+
+            interface html extends uiElement {
+                html?: string;
+            }
+
+            interface labeledElement extends uiElement {
+                controlStyle?: string;
+                inputStyle?: string;
+                labelLayout?: string;
+                labelStyle?: string;
+                widths?: number[];
+            }
+
+            interface radio extends labeledElement {
+                default?: string;
+                items?: string[] | (string[])[];
+                validate?: () => boolean;
+            }
+
+            interface select extends labeledElement {
+                default?: string;
+                items?: string[] | (string[])[];
+                multiple?: boolean;
+                size?: number;
+                validate?: () => boolean;
+            }
+
+            interface textarea extends labeledElement {
+                bidi?: boolean;
+                cols?: number;
+                default?: string;
+                rows?: number;
+                validate?: () => boolean;
+            }
+
+            interface textInput extends labeledElement {
+                bidi?: boolean;
+                default?: string;
+                maxLength?: number;
+                size?: number;
+                validate?: () => boolean;
+            }
+
+            interface uiElement {
+                align?: string;
+                className?: string;
+                commit?: (widget: plugins.widget) => void;
+                id?: string;
+                label?: string;
+                onHide?: (elem: ui.dialog.uiElement) => void;
+                onLoad?: (elem: ui.dialog.uiElement) => void;
+                onShow?: (elem: ui.dialog.uiElement) => void;
+                requiredContent?: string | { [key: string]: any } | style;
+                setup?: (widget: plugins.widget) => void;
+                style?: string;
+                title?: string;
+                type?: string;
+            }
+
+            interface vbox extends uiElement {
+                children?: ui.dialog.uiElement[];
+                expand?: boolean;
+                heights?: number[];
+                padding?: number;
+                styles?: string;
+                width?: number[];
+            }
+        }
+
+        interface IDialogDefinition {
+            buttons?: dialog.definition.button[];
+            contents?: dialog.definition.content[];
+            height?: number;
+            minHeight?: number;
+            minWidth?: number;
+            onCancel?: () => void;
+            onLoad?: () => void;
+            onOk?: () => void;
+            onShow?: () => void;
+            onHide?: () => void;
+            resizable?: number;
+            title?: string;
+            width?: number;
+        }
     }
 
+    class dialogCommand {
+        value: any;
 
-    interface commandDefinition {
-        async?: boolean;
-        canUndo?: boolean;
-        context?: boolean;
-        contextSensitive?: boolean;
-        editorFocus?: boolean;
-        modes?: Object;
-        startDisabled?: boolean;
-        exec(editor: editor, data?: Object): boolean;
-        readOnly?: boolean;
-        refresh?(editor: editor, path: dom.elementPath): void;
+        constructor(dialogName: string, ext?: { tabId?: string });
     }
 
-
     interface dtdDefinition {
         [outerTagName: string]: {[innerTagName: string]: 1};
         $block:          {[tagName: string]: 1};
@@ -1407,117 +1067,1429 @@ declare namespace CKEDITOR {
     }
 
     var dtd: dtdDefinition;
+    
+    class editable extends dom.element {
+        hasFocus: boolean;
+        readonly status: string;
 
+        constructor(editor: editor, element: HTMLElement | dom.element);
+        attachClass(className: string): void;
+        attachListener(obj: event | editable, eventName: string, listenerFunction: (ei: eventInfo) => void, scopeobj?: {}, listenerData?: any, priority?: number): listenerRegistration;
+        changeAttr(attr: string, val: string): void;
+        detach(): void;
+        insertElement(element: dom.element, range?: dom.range): void;
+        insertHtml(data: string, mode?: string, range?: dom.range): void;
+        insertText(text: dom.text): void;
+        isInline(): boolean;
+        setReadOnly(isReadOnly: boolean): void;
+    }
+
+    class editor extends event {
+        readonly activeEnterMode: number;
+        readonly activeFilter: filter;
+        readonly activeShiftEnterMode: number;
+        readonly blockless: boolean;
+        readonly config: config;
+        readonly container: dom.element;
+        readonly contextMenu: plugins.contextMenu;
+        copyFormatting: plugins.copyformatting.state;
+        dataProcessor: dataProcessor;
+        readonly document: dom.document;
+        readonly element: dom.element;
+        readonly elementMode: number;
+        readonly enterMode: number;
+        readonly filter: filter;
+        readonly focusManager: focusManager;
+        readonly id: string;
+        readonly keystrokeHandler: keystrokeHandler;
+        readonly lang: any;
+        readonly langCode: string;
+        readonly mode: string;
+        readonly name: string;
+        readonly pasteFilter: filter;
+        readonly plugins: any;
+        readonly readOnly: boolean;
+        readonly shiftEnterMode: number;
+        readonly status: string;
+        readonly tabIndex: number;
+        readonly templates: any;
+        readonly title: any;
+        readonly toolbar: any;
+        readonly ui: ui;
+        readonly widgets: plugins.widget.repository;
+        readonly window: dom.window;
+
+        constructor(instanceConfig?: config, element?: dom.element, mode?: number);
+        addCommand(commandName: string, commandDefinition: commandDefinition): void;
+        addContentsCss(cssPath: string): void;
+        addFeature(feature: feature): boolean;
+        addMenuGroup(name: string, order?: number): void;
+        addMenuItem(name: string, definition?: IMenuItemDefinition): void;
+        addMenuItems(definitions: { [id:string]: IMenuItemDefinition }): void;
+        addMode(mode: string, exec: () => void): void;
+        addRemoveFormatFilter(func: (element: dom.element) => boolean): void;
+        applyStyle(style: style): void;
+        attachStyleStateChange(style: style, callback: (state: number) => void): void;
+        checkDirty(): boolean;
+        createFakeElement(realElement: dom.element, className: string, realElementType: string, isResizable: boolean): void;
+        createFakeParserElement(realElement: dom.element, className: string, realElementType: string, isResizable: boolean): void;
+        createRange(): dom.range;
+        destroy(noUpdate?: boolean): void;
+        editable(elementOrEditable?: dom.element | editable): editable;
+        elementPath(startNode?: dom.node): dom.elementPath;
+        execCommand(commandName: string, data?: any): boolean;
+        extractSelectedHtml(toString?: boolean, removeEmptyBlock?: boolean): dom.documentFragment | string | void;
+        focus(): void;
+        forceNextSelectionCheck(): void;
+        getClipboardData(callbackOrOptions: { title: string } | ((data: any) => void), callback: (data: any) => void): void;
+        getColorFromDialog(callback: (color: string) => void, scope?: { [key: string]: any }): void;
+        getCommand(commandName: string): command;
+        getCommandKeystroke(command: command | string): number | null;
+        getData(internal: boolean): string;
+        getMenuItem(name: string): IMenuItemDefinition;
+        getResizable(forContents: boolean): dom.element;
+        getSelectedHtml(toString?: false): dom.documentFragment;
+        getSelectedHtml(toString: true): string;
+        getSelectedHtml(toString?: boolean): dom.documentFragment | string;
+        getSelection(forceRealSelection: boolean): dom.selection;
+        getSnapshot(): string;
+        getStylesSet(callback: (stylesDefinitions: style.definition[]) => void): void;
+        getUiColor(): string;
+        insertElement(element: dom.element): void;
+        insertHtml(html: string, mode?: string, range?: dom.range): void;
+        insertText(text: string): void;
+        loadSnapshot(snapshot: any): void;
+        lockSelection(sel?: dom.selection): boolean;
+        openDialog(dialogName: string, callback: () => void): dialog;
+        popup(url: string, width?: number | string, height?: number | string, options?: string): void;
+        removeMenuItem(name: string): void;
+        removeStyle(style: style): void;
+        resetDirty(): void;
+        resetUndo(): void;
+        resize(width: number | string, height: number | string, isContentHeight?: boolean, resizeInner?: boolean): void;
+        restoreRealElement(fakeElement: dom.element): dom.element;
+        selectionChange(checkNow?: boolean): void;
+        setActiveEnterMode(enterMode: number, shiftEnterMode: number): void;
+        setActiveFilter(filter: filter): void;
+        setData(data: string, options?: { internal?: boolean; callback?: () => void; noSnapshot?: boolean; }): void;
+        setKeystroke(keystroke: number, behavior: string | boolean): void;
+        setKeystroke(keystroke: [number, string | boolean][]): void;
+        setMode(newMode: string, callback: () => void): void;
+        setReadOnly(isReadOnly?: boolean): void;
+        setUiColor(color: string): void;
+        showNotification(message: string, type: plugins.notification.type, progressOrDuration: number): plugins.notification;
+        unlockSelection(restore?: boolean): void;
+        updateElement(): void;
+    }
+
+    namespace editor {
+        interface eventObject {
+            activeEnterModeChange?: (evt: eventInfo) => void;
+            activeFilterChange?: (evt: eventInfo) => void;
+            afterCommandExec?: (evt: eventInfo) => void;
+            afterInsertHtml?: (evt: eventInfo) => void;
+            afterPaste?: (evt: eventInfo) => void;
+            afterPasteFromWord?: (evt: eventInfo) => void;
+            afterSetData?: (evt: eventInfo) => void;
+            afterUndoImage?: (evt: eventInfo) => void;
+            ariaEditorHelpLabel?: (evt: eventInfo) => void;
+            ariaWidget?: (evt: eventInfo) => void;
+            autogrow?: (evt: eventInfo) => void;
+
+            beforeCommandExec?: (evt: eventInfo) => void;
+            beforeDestroy?: (evt: eventInfo) => void;
+            beforeGetData?: (evt: eventInfo) => void;
+            beforeModeUnload?: (evt: eventInfo) => void;
+            beforeSetMode?: (evt: eventInfo) => void;
+            beforeUndoImage?: (evt: eventInfo) => void;
+            blur?: (evt: eventInfo) => void;
+
+            change?: (evt: eventInfo) => void;
+            configLoaded?: (evt: eventInfo) => void;
+            contentDirChanged?: (evt: eventInfo) => void;
+            contentDom?: (evt: eventInfo) => void;
+            contentDomInvalidated?: (evt: eventInfo) => void;
+            contentDomUnload?: (evt: eventInfo) => void;
+            customConfigLoaded?: (evt: eventInfo) => void;
+
+            dataFiltered?: (evt: eventInfo) => void;
+            dataReady?: (evt: eventInfo) => void;
+            destroy?: (evt: eventInfo) => void;
+            dialogHide?: (evt: eventInfo) => void;
+            dialogShow?: (evt: eventInfo) => void;
+            dirChanged?: (evt: eventInfo) => void;
+            doubleclick?: (evt: eventInfo) => void;
+            dragend?: (evt: eventInfo) => void;
+            dragstart?: (evt: eventInfo) => void;
+            drop?: (evt: eventInfo) => void;
+
+            elementsPathUpdate?: (evt: eventInfo) => void;
+
+            fileUploadRequest?: (evt: eventInfo) => void;
+            fileUploadResponse?: (evt: eventInfo) => void;
+            floatingSpaceLayout?: (evt: eventInfo) => void;
+            focus?: (evt: eventInfo) => void;
+
+            getData?: (evt: eventInfo) => void;
+            getSnapshot?: (evt: eventInfo) => void;
+
+            insertElement?: (evt: eventInfo) => void;
+            insertHtml?: (evt: eventInfo) => void;
+            insertText?: (evt: eventInfo) => void;
+            instanceReady?: (evt: eventInfo) => void;
+
+            key?: (evt: eventInfo) => void;
+
+            langLoaded?: (evt: eventInfo) => void;
+            loadSnapshot?: (evt: eventInfo) => void;
+            loaded?: (evt: eventInfo) => void;
+            lockSnapshot?: (evt: eventInfo) => void;
+            maximize?: (evt: eventInfo) => void;
+            menuShow?: (evt: eventInfo) => void;
+            mode?: (evt: eventInfo) => void;
+
+            notificationHide?: (evt: eventInfo) => void;
+            notificationShow?: (evt: eventInfo) => void;
+            notificationUpdate?: (evt: eventInfo) => void;
+
+            paste?: (evt: eventInfo) => void;
+            pasteFromWord?: (evt: eventInfo) => void;
+            pluginsLoaded?: (evt: eventInfo) => void;
+
+            readOnly?: (evt: eventInfo) => void;
+            removeFormatCleanup?: (evt: eventInfo) => void;
+            required?: (evt: eventInfo) => void;
+            resize?: (evt: eventInfo) => void;
+
+            save?: (evt: eventInfo) => void;
+            saveSnapshot?: (evt: eventInfo) => void;
+            selectionChange?: (evt: eventInfo) => void;
+            setData?: (evt: eventInfo) => void;
+            stylesSet?: (evt: eventInfo) => void;
+
+            template?: (evt: eventInfo) => void;
+            toDataFormat?: (evt: eventInfo) => void;
+            toHtml?: (evt: eventInfo) => void;
+
+            unlockSnapshot?: (evt: eventInfo) => void;
+            updateSnapshot?: (evt: eventInfo) => void;
+
+            widgetDefinition?: (evt: eventInfo) => void;
+        }
+    }
+
+    namespace env {
+        var air: boolean;
+        var chrome: boolean;
+        var cssClass: string;
+        var edge: boolean;
+        var gecko: boolean;
+        var hc: boolean;
+        var hidpi: boolean;
+        var iOS: boolean;
+        var ie: boolean;
+        var isCompatible: boolean;
+        var mac: boolean;
+        var needsBrFiller: boolean;
+        var needsNbspFiller: boolean;
+        var quirks: boolean;
+        var safari: boolean;
+        var version: number;
+        var webkit: boolean;
+
+        function secure(): boolean;
+    }
+
+    class event {
+        static useCapture: boolean;
+        
+        constructor();
+        capture(): void;
+        define(name: string, meta: { [key: string]: any }): void;
+        fire(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
+        fireOnce(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
+        hasListeners(eventName: string): boolean;
+        on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any } | null, listenerData?: any, priority?: number): listenerRegistration;
+        once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any } | null, listenerData?: any, priority?: number): listenerRegistration;
+        removeAllListeners(): void;
+        removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
+
+        static implementOn(targetObject: { [key: string]: any }): void;
+    }
+
+    interface eventInfo {
+        data: any;
+        editor: editor;
+        listenerData: any;
+        name: string;
+        sender: { [key: string]: any };
+        
+        cancel(): void;
+        removeListener(): void;
+        stop(): void;
+    }
+
+    interface feature {
+        allowedContent?: filter.allowedContentRules;
+        contentForms?: any;
+        contentTransformations?: any;
+        name?: string;
+        requiredContent?: string | style;
+        toFeature?: () => feature;
+    }
+
+    namespace fileTools {
+        var isFileUploadSupported: boolean;
+
+        function addUploadWidget(editor: editor, name: string, def: uploadWidgetDefinition): void;
+        function bindNotification(editor: editor, fileLoader: fileLoader): void;
+        function getUploadUrl(config: { [key: string]: any }, type?: string): string;
+        function isTypeSupported(file: Blob, supportedTypes: RegExp): boolean;
+        function markElement(element: dom.element, widgetName: string, loaderId: number): void;
+
+        class fileLoader extends event {
+            readonly data: string;
+            readonly file: Blob;
+            readonly fileName: string;
+            readonly id: number;
+            readonly loaded: number;
+            readonly message: string;
+            readonly reader: FileReader;
+            readonly responseData: any;
+            status: string;
+            readonly total: number;
+            readonly uploadTotal: number;
+            readonly uploadUrl: string;
+            readonly uploaded: string;
+            readonly url: string;
+            readonly xhr: XMLHttpRequest;
+
+            constructor(editor: editor, fileOrData: Blob | string, fileName?: string);
+            abort(): void;
+            isFinished(): boolean;
+            load(): void;
+            loadAndUpload(url: string, additionalRequestParameters?: any): void;
+            update(): void;
+            upload(url: string, additionalRequestParameters?: any): void;
+        }
+
+        class uploadRepository extends event {
+            readonly loaders: fileLoader[];
+
+            constructor(editor: editor);
+            create(fileOrData: Blob | string, fileName: string, loaderType?: any): fileLoader;
+            isFinished(): boolean;
+        }
+
+        interface uploadWidgetDefinition extends plugins.widget.definition {
+            additionalRequestParameters: any;
+            fileToElement: (pastedFile: any) => HTMLElement;
+            loadMethod: string;
+            loaderType: any;
+            onAbort: () => boolean;
+            onError: () => boolean;
+            onLoaded: () => boolean;
+            onUploaded: () => boolean;
+            onUploading: () => boolean;
+            replaceWith: () => any;
+            skipNotifications: boolean;
+            supportedTypes: string;
+            uploadUrl: string;
+        }
+    }
+
+    module filter {
+        type allowedContentRule = string | style | { [key: string]: any};
+        type allowedContentRules = allowedContentRule | allowedContentRule[];
+        type contentRule = string | style;
+        type disallowedContentRules = string | { [key: string]: any};
+
+        interface transformation {
+            check?: string;
+            element?: string | style;
+            left?: (element: htmlParser.element | style) => boolean;
+            right: (element: htmlParser.element, tools: string | filter.transformationTools) => boolean;
+        }
+
+        var transformationTools: transformationTools;
+
+        interface transformationTools {
+            alignmentToAttribute(element: htmlParser.element): void;
+            alignmentToStyle(element: htmlParser.element): void;
+            lengthToAttribute(element: htmlParser.element, styleName: string, attrName?: string): void;
+            lengthToStyle(element: htmlParser.element, styleName: string, attrName?: string): void;
+            matchesTyle(element: htmlParser.element, style: style): void;
+            sizeToAttribute(element: htmlParser.element): void;
+            sizeToStyle(element: htmlParser.element): void;
+            splitBorderShorthand(element: htmlParser.element): void;
+            splitMarginShorthand(element: htmlParser.element): void;
+            transform(element: htmlParser.element, form: style | string): void;
+        }
+    }
+
+    class filter {
+        readonly allowedContent: filter.allowedContentRules[];
+        readonly customConfig: boolean;
+        readonly disabled: boolean;
+        readonly disallowedContent: any[];
+        readonly editor: editor;
+        readonly elementCallbacks:((element: htmlParser.element) => number)[];
+        readonly id: number;
+
+        static instances: { [id: string]: filter };
+
+        constructor(editorOrRules: editor | filter.allowedContentRules);
+        addContentForms(forms: any[]): void;
+        addElementCallback(callback: (element: htmlParser.element) => number): void;
+        addFeature(feature: feature): boolean;
+        addTransformations(transformations: (string | filter.transformation)[][]): void;
+        allow(newRules: filter.allowedContentRules, featureName?: string, overrideCustom?: boolean): boolean;
+        applyTo(fragment: htmlParser.fragment | htmlParser.element, toHrml: boolean, transformOnly: boolean, enterMode: number): boolean;
+        check(test: filter.contentRule, applyTransformations?: boolean, strictCheck?: boolean): boolean;
+        checkFeature(feature: feature): boolean;
+        clone(): filter;
+        destroy(): void;
+        disable(): void;
+        disallow(newRules: filter.disallowedContentRules): void;
+        getAllowedEnterMode(defaultMode: number, reverse?: boolean): number;
+    }
+
+    class focusManager {
+        currentActive: dom.domObject;
+        hasFocus: boolean;
+
+        constructor(editor: editor);
+        add(element: dom.element, isCapture: boolean): void;
+        blur(noDelay?: boolean): void;
+        focus(currentActive?: dom.element): void;
+        lock(): void;
+        remove(element: dom.element): void;
+        unlock(): void;
+    }
+
+    class htmlDataProcessor implements dataProcessor {
+        dataFilter: htmlParser.filter;
+        htmlFilter: htmlParser.filter;
+        writer: htmlParser.basicWriter;
+
+        constructor(editor: editor);
+        toDataFormat(html: string, options?: string | { context?: string, filter?: filter, enterMode?: number }): string;
+        toHtml(data: string, options?: string | htmlDataProcessorOptions): string;
+    }
+
+    interface htmlDataProcessorOptions {
+        context?: string;
+        fixForBody?: boolean;
+        filter?: filter;
+        dontFilter?: boolean;
+        enterMode?: number;
+        protectedWhitespaces?: boolean;
+    }
+
+    namespace htmlParser {
+        class basicWriter {
+            constructor();
+            attribute(attName: string, attValue: string): void;
+            closeTag(tagName: string): void;
+            comment(comment: string): void;
+            getHtml(reset: boolean): string;
+            openTag(tagName: string, attributes: { [key: string]: string }): void;
+            openTagClose(tagName: string, isSelfClose: boolean): void;
+            reset(): void;
+            text(text: string): void;
+            write(data: string): void;
+        }
+
+        class cdata extends node {
+            constructor(value: string);
+            type: number;
+            writeHtml(writer: htmlParser.basicWriter): void;
+        }
+
+        class comment extends node {
+            type: number;
+            value: string;
+
+            constructor(value: string);
+            filter(filter: filter): boolean;
+            writeHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
+        }
+
+        class cssStyle {
+            constructor(elementOrStyleText: htmlParser.element | string);
+            populate(obj: htmlParser.element | dom.element | { [key: string]: any}): void;
+        }
+
+        class element extends node {
+            attributes: { [name: string]: string };
+            children: htmlParser.node[];
+            name: string;
+            type: number;
+
+            constructor(name: string, attributes: { [name: string]: string });
+            add(node: node, index?: number): void;
+            addClass(className: string): void;
+            clone(): element;
+            filter(filter: htmlParser.filter): boolean;
+            filterChildren(filter: htmlParser.filter): void;
+            find(criteria: string | ((el: htmlParser.node) => boolean), recursive?: boolean): htmlParser.node[];
+            forEach(callback: (node: htmlParser.node) => void | false, type?: number, skipRoot?: boolean): void;
+            getFirst(condition: string | { [key: string]: string } | ((node: htmlParser.node) => boolean)): htmlParser.node;
+            getHtml(): string;
+            getOuterHtml(): string;
+            hasClass(className: string): boolean;
+            removeClass(className: string): void;
+            replaceWithChildren(): void;
+            setHtml(html: string): void;
+            split(index: number): htmlParser.element;
+            writeChildrenHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
+            writeHtml(writer: basicWriter, filter?: htmlParser.filter): void;
+        }
+
+        class filter {
+            attributeNameRules: filterRulesGroup;
+            attributesRules: { [name: string]: filterRulesGroup };
+            commentRules: filterRulesGroup;
+            elementNameRules: filterRulesGroup;
+            elementsRules: { [name: string]: filterRulesGroup };
+            id: number;
+            rootRules: filterRulesGroup;
+            textRules: filterRulesGroup;
+
+            constructor(rules?: filterRulesDefinition);
+            addRules(rules: filterRulesDefinition, options?: number | { priority?: number; applyToAll?: boolean; }): void;
+            applyTo(node: node): void;
+        }
+
+        interface filterRulesDefinition {
+            elementNames: any;
+            attributeNames: any;
+            elements: any;
+            attributes: any;
+            text: any;
+            comment: any;
+            root: any;
+        }
+
+        class filterRulesGroup {
+            rules: { value: rule, priority: number, option: ruleOptions }[];
+
+            add(rule: rule, priority: number, options: ruleOptions): void;
+            addMany(rules: { [key: string]: any }[], priority: number, options: ruleOptions): void;
+            exec(currentValue: htmlParser.node | htmlParser.fragment | string): htmlParser.node | htmlParser.fragment | string;
+            execOnName(currentName: string): string;
+            findIndex(priority: number): number;
+        }
+
+        class fragment {
+            children: htmlParser.node[];
+            parent: htmlParser.fragment;
+            readonly type: number;
+
+            constructor();
+
+            add(node: htmlParser.node, index?: number): void;
+            filter(filter: htmlParser.filter): void;
+            filterChildren(filter: htmlParser.filter, filterRoot?: boolean): void;
+            forEach(callback: (node: htmlParser.node,) => void | false, type?: number, skipRoot?: boolean): void;
+            writeChildrenHtml(writer: basicWriter, filter?: htmlParser.filter, filterRoot?: boolean): void;
+            writeHtml(writer: basicWriter, filter?: htmlParser.filter): void;
+
+            static fromBBCode(source: string): htmlParser.fragment;
+            static fromHtml(fragmentHtml: string, parent?: htmlParser.element | string, fixingBlock?: string | boolean): fragment | htmlParser.element;
+        }
+
+        class node {
+            constructor();
+            getAscendant(condition: string | { [name: string]: string | ((node: htmlParser.element) => boolean)}): element;
+            getIndex(): number;
+            insertAfter(node: node): void;
+            insertBefore(node: node): void;
+            remove(): node;
+            replaceWith(node: node): void;
+            wrapWith(wrapper: element): element;
+        }
+
+        type rule = ((value: htmlParser.node | htmlParser.fragment | string) => boolean) | [ string, string ];
+
+        interface ruleOptions {
+            applyToAll?: boolean,
+            excludeNestedEditable?: boolean
+        }
+
+        class text extends node {
+            constructor(value: string);
+            type: number;
+            filter(filter: filter): boolean;
+            writeHtml(writer: basicWriter, filter?: filter): void;
+        }
+    }
+
+    class htmlWriter extends htmlParser.basicWriter {
+        indentationChars: string;
+        lineBreakChars: string;
+        selfClosingEnd: string;
+
+        indentation(): void;
+        lineBreak(): void;
+        setRules(tagName: string, rules: { [key: string]: any }): void;
+    }
+
+    class keystrokeHandler {
+        blockedKeystrokes: { [key: number]: string | boolean };
+        keystrokes: { [key: number]: string | boolean };
+
+        constructor(editor: editor);
+
+        attach(domObject: dom.domObject): void;
+    }
+
+    namespace lang {
+        var languages: { [code: string]: number };
+        var rtl: { [code: string]: number };
+
+        function detect(defaultLanguage: string, probeLanguage?: string): string;
+        function load(languageCode: string, defaultLanguage: string, callback: (code: string, entries: any) => void): void;
+    }
+
+    namespace loader {
+        var loadedScripts: string[];
+        var scripts: string[];
+
+        function load(scriptName: string, defer?: boolean): void;
+        function loadPending(): void;
+    }
+
+    class menu {
+        constructor();
+
+        add(item: any): void;
+        addListener(listenerFn: (startElement: dom.element, selection: dom.selection, path: dom.elementPath) => any): void;
+        findItemByCommandName(commandName: string): { item: any, element: dom.element };
+        hide(returnFocus?: boolean): void;
+        removeAll(): void;
+        show(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
+    }
+
+    interface pluginDefinition {
+        hidpi?: boolean;
+        lang?: string | string[];
+        requires?: string | string[];
+
+        afterInit?(editor: editor): any;
+        beforeInit?(editor: editor): any;
+        init?(editor: editor): void;
+        onLoad?(): any;
+    }
+
+    namespace plugins {
+
+        namespace cloudservices {
+            class cloudServicesLoader extends fileTools.fileLoader {
+                customToken: string;
+
+                constructor(editor: editor, fileOrData: Blob | string, fileName?: string, token?: string);
+                loadAndUpload(url?: string, additionalRequestParameters?: any): void;
+                upload(url?: string, additionalRequestParameters?: any): void;
+            }
+        }
+
+        class autoEmbed {
+            getWidgetDefinition(editor: editor, url: string): widget.definition;
+        }
+
+        namespace balloontoolbar {
+            const PRIORITY: { [pri: string]: number };
+
+            class context {
+                editor: editor;
+                options: contextDefinition;
+                toolbar: ui.balloonToolbar;
+
+                constructor(editor: editor, options: contextDefinition);
+                destroy(): void;
+                hide(): void;
+                refresh(): void;
+                show(pointedElement?: dom.element): void;
+            }
+
+            interface contextDefinition {
+                cssSelector?: string;
+                priority?: number;
+                widgets?: string[] | string;
+
+                refresh?: (editor: editor, path: dom.elementPath, selection: dom.selection) => dom.element;
+            }
+
+            class contextManager {
+                editor: editor;
+
+                constructor(editor: editor);
+                add(context: context): void;
+                check(selection?: dom.selection): void;
+                create(options: contextDefinition): context;
+                destroy(): void;
+                hide(): void;
+            }
+        }
+
+        namespace clipboard {
+            const isCustomCopyCutSupported: boolean;
+            const isCustomDataTypesSupported: boolean;
+            const isFileApiSupported:  boolean;
+            const mainPasteEvent: string;
+
+            function addPasteButton(editor: editor, name: string, definition: { [key: string]: any}): void;
+            function canClipboardApiBeTrusted(dataTransfer: dataTransfer, editor: editor): boolean;
+            function getDropTarget(editor: editor): dom.domObject;
+            function getRangeAtDropPosition(domEvent: Event, editor: editor): dom.range;
+            function initDragDataTransfer(evt?: dom.event, editor?: editor): void;
+            function initPasteDataTransfer(evt?: dom.event, sourceEditor?: editor): void;
+            function preventDefaultDropOnElement(element: dom.element): void;
+            function resetDragDataTransfer(): void;
+
+            class dataTransfer {
+                readonly $: DataTransfer;
+                readonly id: string;
+                readonly sourceEditor: editor;
+
+                constructor(nativeDataTransfer?: DataTransfer, editor?: editor);
+                cacheData(): void;
+                getData(type: string, getNative?: boolean): string;
+                getFile(i: number): File;
+                getFilesCount(): number;
+                getTransferType(targetEditor: editor): number;
+                isEmpty(): boolean;
+                setData(type: string, value: string): void;
+                storeId(): void;
+            }
+
+            class fallbackDataTransfer {
+                constructor(dataTransfer: dataTransfer);
+                getData(type: string, getNative?: boolean): string;
+                isRequired(): boolean;
+                setData(type: string, value: string): string;
+            }
+        }
+
+        namespace condesnippet {
+            function setHighlighter(highlighter: highlighter): void;
+
+            class highlighter {
+                highlighter: (code: string, lang: string, callback: (highlightedCode: string) => void) => void;
+                init: (ready: () => void) => void;
+                languages: { [lang: string]: string };
+                readonly queue: ((code: string, lang: string, callback: (highlightedCode: string) => void) => void)[];
+                readonly ready: boolean;
+
+                highlight(code: string, lang: string, callback: (highlightedCode: string) => void): void;
+            }
+        }
+
+        class contextMenu extends menu {
+            constructor(editor: editor);
+            addTarget(element: dom.element, nativeContextMenuOnCtrl?: boolean): void;
+            open(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
+        }
+
+        namespace copyformatting {
+            var breakOnElements: string[];
+            var elementsForInlineTransform: string[];
+            var excludedAttributes: string[];
+            var excludedAttributesFromInlineTransform: string[];
+            var inlineBoundary: string[];
+            var preservedElements: string[];
+
+            class state extends event {
+                editor: editor;
+                filter: filter;
+                sticky: boolean;
+                styles: style[];
+
+                constructor(editor: editor);
+            }
+        }
+
+        namespace easyimage {
+
+        }
+
+        namespace embedBase {
+            function createWidgetBaseDefinition(editor: editor): baseDefinition;
+
+            interface baseDefinition extends widget.definition {
+                providerUrl: template;
+                urlRegExp: RegExp;
+
+                getErrorMessage(messageTypeOrMessage: string, url?: string, suffix?: string): string;
+                isUrlValid(url: string): boolean;
+                loadContent(url: string, callback?: () => void, errorCallback?: (error: string) => void, noNotifications?: boolean): request;
+            }
+
+            interface request {
+                callback: () => void;
+                errorCallback: (error: string) => void;
+                response: { [key: string]: string };
+                task: notificationAggregator.task;
+                url: string;
+
+                cancel(): void;
+            }
+        }
+
+        namespace image2 {
+            function checkHasNaturalRatio(image: dom.element): boolean;
+            function getLinkAttributesGetter(): (editor: editor, data: { [key: string]: string }) => { set: { [tag: string]: string }, removed: string[] };
+            function getLinkAttributesParser(): (editor: editor, element: dom.element) => { [key: string]: string };
+            function getNatural(image: dom.element): { [key: string]: string };
+        }
+
+        namespace imagebase {
+            var featuresDefinitions: { [key: string]: string };
+
+            function addFeature(editor: editor, name: string, definition: imageWidgetDefinition): imageWidgetDefinition;
+            function addImageWidget(editor: editor, name: string, definition: imageWidgetDefinition): void;
+
+            interface imageWidgetDefinition extends widget.definition {
+                features: string[];
+                upcast: string;
+            }
+
+            class progressBar extends progressReporter {
+                bar: dom.element;
+
+                constructor();
+
+            }
+
+            class progressReporter {
+                wrapper: dom.element;
+
+                constructor(wrapperHtml?: string);
+                aborted(): void;
+                bindLoader(loader: fileTools.fileLoader): void;
+                done(): void;
+                failed(): void;
+                remove(): void;
+                updated(progress: number): void;
+            }
+        }
+
+        namespace indent {
+            function registerCommands(editor: editor, commands: { [key: string]: command} ): void;
+
+            class genericDefinition implements commandDefinition {
+                async: boolean;
+                canUndo: boolean;
+                context: boolean;
+                contextSensitive: boolean;
+                editorFocus: boolean;
+                fakeKeystroke: number;
+                readonly isIndent: boolean;
+                modes: { [key: string]: any };
+                readOnly: boolean;
+                startDisabled: boolean;
+
+                exec(editor: editor, data?: any): boolean;
+                refresh?(editor: editor, path: dom.elementPath): void;
+            }
+
+            class specificDefinition {
+                database: { [key: string]: any };
+                readonly enterBr: boolean;
+                readonly indentKey: { [key: string]: any };
+                readonly isIndent: boolean;
+                readonly jobs: { [priority: string]: { refresh: (editor: editor, path: dom.elementPath) => number, exec: (editor: editor) => boolean } };
+                readonly relatedGlobal: { [key: string]: any };
+
+                execJob(editor: editor, priority: number): boolean;
+                getContext(node: dom.elementPath): dom.element;
+                refreshJob(editor: editor, priority: number): number;
+            }
+        }
+
+        namespace indentList {
+            function firstItemInPath(query: string | string[] | { [tagName: string]: any} | dom.element | ((element: dom.element) => boolean)): boolean;
+        }
+
+        namespace link {
+            // DEPRECATED 4.3.3
+            const emptyAnchorFix: boolean;
+
+            // DEPRECATED 4.3.3
+            const fakeAnchor: boolean;
+
+            // DEPRECATED 4.3.3
+            const synAnchorSelector: boolean;
+
+            function getEditorAnchors(editor: editor): dom.element[];
+            function getLinkAttributes(editor: editor, data: { [key: string]: any}): { set: { [key: string]: string }, removed: string[] }
+            function getSelectedLink(editor: editor, returnMultiple?: boolean): dom.element | dom.element[];
+            function parseLinkAttributes(editor: editor, element: dom.element): { [key: string]: any };
+            function showDisplayTextForElement(element: dom.element, editor: editor): boolean;
+            function tryRestoreFakeAnchor(editor: editor, element: dom.element): dom.element;
+        }
+
+        class list {
+            arrayToList(listArray: any, database: any, paragraphMode: any, dir: any): void;
+            listToArray(listNode: any, database: any, baseArray: any, baseIndentLevel: any, grandparentNode: any): void;
+        }
+
+        class notification {
+            readonly area: notification.area;
+            readonly duration: number;
+            readonly editor: editor;
+            readonly element: dom.element;
+            readonly id: number;
+            readonly message: string;
+            readonly progress: number;
+            readonly type: notification.type;
+
+            constructor(editor: editor, options: notification.options);
+            hide(): void;
+            isVisible(): boolean;
+            show(): void;
+            update(options: notification.updateOptions): void;
+        }
+
+        namespace notification {
+            interface area {
+                readonly editor: editor;
+                readonly element: dom.element;
+                readonly notifications: notification[];
+
+                add(notification: notification): void;
+                remove(notification: notification): void;
+            }
+
+            interface optionsBase {
+                duration?: number;
+                progress?: number;
+                type?: type;
+            }
+
+            interface options extends optionsBase {
+                message: string;
+            }
+
+            interface updateOptions extends optionsBase  {
+                message?: string;
+                important?: boolean;
+            }
+
+            type type = 'info' | 'warning' | 'success' | 'progress';
+        }
+
+        class notificationAggregator extends event {
+            readonly editor: editor;
+            readonly notification: notification;
+
+            constructor(editor: editor, message: string, singularMessage?: string);
+            createTask(options?: { weight?: number }): notificationAggregator.task;
+            getDoneTaskCount(): number;
+            getPercentage(): number;
+            getTaskCount(): number;
+            isFinished(): boolean;
+            update(): void;
+        }
+
+        namespace notificationAggregator {
+            class task extends event {
+                constructor(weight?: number);
+                cancel(): void;
+                done(): void;
+                isCanceled(): boolean;
+                isDone(): boolean;
+                update(weight: number): void;
+            }
+        }
+
+        namespace pastefromword {
+            class lists {
+                numbering: lists.numbering;
+            }
+
+            namespace lists {
+                class numbering {
+                    getStyle(marker: string): string;
+                    toNumber(marker: string, markerType: string): number;
+                }
+            }
+
+            class styles {
+                pushStylesLower(element: htmlParser.element, exceptions: { [style: string]: boolean }, wrapText?: boolean ): boolean;
+            }
+        }
+
+        namespace tableselection {
+            function getCellsBetween(first: dom.element, last: dom.element): dom.element[];
+        }
+
+        namespace widget {
+            var WRAPPER_CLASS_PREFIX: string;
+            
+            function getNestedEditable(guard: dom.element, node: dom.node): dom.element;
+            function isDomDragHandler(node: dom.node): boolean;
+            function isDomDragHandlerContainer(node: dom.node): boolean;
+            function isDomNestedEditable(node: dom.node): boolean;
+            function isDomWidget(node: dom.node): boolean;
+            function isDomWidgetElement(node: dom.node): boolean;
+            function isDomWidgetWrapper(node: dom.node): boolean;
+            function isParserWidgetElement(node: dom.node): boolean;
+            function isParserWidgetWrapper(node: dom.node): boolean;
+
+            namespace nestedEditable {
+                interface definition {
+                    allowedContent?: filter.allowedContentRules;
+                    disallowedContent?: filter.disallowedContentRules;
+                    pathName?: string;
+                    selector?: string;
+                }
+            }
+
+            class nestedEditable extends dom.element {
+                readonly editor: editor;
+                readonly enterMode: number;
+                readonly filter: filter;
+                readonly shiftEnterMode: number;
+
+                constructor(editor: editor, element: dom.element, config: { filter?: filter });
+                getData(): string;
+                setData(data: string): void;
+            }
+
+
+            interface definition extends feature {
+                button?: string;
+                data?: (evt: eventInfo) => void;
+                defaults?: { [key: string]: any };
+                dialog?: string;
+                downcast?: string | ((element: htmlParser.element) => void);
+                downcasts?: { [key: string]: any };
+                draggable?: boolean;
+                edit?: () => void;
+                editables?: { [key: string]: any };
+                getLabel?: () => any;
+                init?: () => void;
+                inline?: boolean;
+                insert?: () => void;
+                mask?: boolean;
+                parts?: { [key: string]: any };
+                pathName?: string;
+                styleToAllowedContentRules?: (style: style) => filter.allowedContentRules;
+                styleableElements?: string;
+                template?: string | template;
+                upcast?: string | ((element: htmlParser.element, data: any) => boolean);
+                upcastPriority?: number;
+                upcasts?: { [key: string]: any };
+            }
+
+            class repository extends event {
+                readonly editor: editor;
+                readonly focused: widget;
+                readonly instances: { [id: string]: widget };
+                readonly registered: { [name: string]: definition };
+                readonly selected: widget[];
+                readonly widgetHoldingFocusedEditable: widget;
+
+                add(name: string, widgetDef: plugins.widget.definition): void;
+                addUpcastCallback(callback: (element: htmlParser.element, data: any) => boolean): void;
+                checkSelection(): void;
+                checkWidgets(options?: { initOnlyNew?: boolean; focusInited?: boolean }): void;
+                del(widget: plugins.widget): void;
+                destroy(widget: plugins.widget, offline?: boolean): void;
+                destroyAll(offline?: boolean): void;
+                finalizeCreation(container: any): void;
+                getByElement(element: any, checkWrapperOnly: boolean): plugins.widget;
+                initOn(element: dom.element, widgetDef?: plugins.widget.definition, startupData?: { [key: string]: any }): plugins.widget;
+                initOn(element: dom.element, widgetDef?: string, startupData?: { [key: string]: any }): plugins.widget;
+                initOnAll(container?: dom.element): plugins.widget[];
+                parseElementClasses(classes: string): any;
+                wrapElement(element: any, widgetName?: string): any;
+            }
+
+            class widgetselection {
+                addFillers(editable: editable): boolean;
+                removeFillers(editable: editable): void;
+            }
+        }
+
+        class widget extends event implements widget.definition {
+            readonly dataReady: boolean;
+            readonly definition: plugins.widget.definition;
+            readonly editor: editor;
+            readonly element: dom.element;
+            readonly focusedEditable: plugins.widget.nestedEditable
+            readonly id: number;
+            readonly inited: boolean;
+            readonly ready: boolean;
+            readonly repository: plugins.widget.repository;
+            readonly wrapper: dom.element;
+
+            constructor(widgetsRepo: plugins.widget.repository, id: number, element: dom.element, widgetDef: plugins.widget.definition, starupData?: any);
+
+            addClass(className: string): void;
+            applyStyle(style: style): void;
+            checkStyleActive(style: style): boolean;
+            destroy(offline?: boolean): void;
+            destroyEditable(editableName: string, offline?: boolean): void;
+            edit(): boolean;
+            focus(): void;
+            getClasses(): any;
+            hasClass(className: string, Whether: boolean): void;
+            initEditable(editableName: string, definition: plugins.widget.nestedEditable.definition): boolean;
+            isInited(): boolean;
+            isReady(): boolean;
+            removeClass(className: string): void;
+            removeStyle(style: style): void;
+            setData(keyOrData: any, value: any): plugins.widget;
+            setFocused(selected: boolean): plugins.widget;
+            setSelected(selected: boolean): plugins.widget;
+            updateDragHandlerPosition(): void;
+        }
+
+        function add(name: string, definition: pluginDefinition): void;
+        function add(name: string): void;
+        function addExternal(name: string, path: string, fileName?: string): void;
+        function get(name: string): any;
+        function getFilePath(name: string): string;
+        function getPath(name: string): string;
+        function load(name: string, callback: (plugins: string[]) => void, scope?: { [key: string]: any }): void;
+        function setLang(pluginName: string, languageCode: string, languageEntries: any): void;
+        var registered: {[key: string]: pluginDefinition};
+    }
+
+    class resourceManager {
+        basePath: string;
+        externals: { [key: string]: any };
+        fileName: string;
+        loaded: { [key: string]: any };
+        registered: { [key: string]: any };
+
+        constructor(basePath: string, fileName: string);
+        add(name: string, definition?: pluginDefinition): void;
+        addExternal(names: string, path: string, fileName?: string): void;
+        get(name: string): pluginDefinition;
+        getFilePath(name: string): string;
+        getPath(name: string): string;
+        load(name: string | string[], callback: (loaded: string[]) => void, scope?: { [key: string]: any }): void; 
+    }
+
+    // see https://docs.com/ckeditor4/latest/api/CKEDITOR_scriptLoader.html
+    namespace scriptLoader {
+        function load(scriptUrls: string | string[], callback: (succeededUrls: boolean | string[], failedUrls?: string[]) => void, scope?: any, showBusy?: boolean): void;
+        function queue(scriptUrl: string, callback?: (succeeded: boolean) => void): void;
+    }
+
+    namespace skin {
+        var icons: { [name: string]: { path: string } };
+        var name: string;
+        var ua: { [name: string]: any };
+
+        function addIcon(name: string, path: string, offset?: number, bgsize?: string): void;
+        function chameleon(editor: string, part: string): void;
+        function getIconStyle(name: string, rtl?: boolean, overridePath?: number, overrideBgsize?: string): any;
+        function getPath(part: string): any;
+        function loadPart(part: string, fn: () => void): void;
+        function path(): string;
+    }
+
+    namespace style {
+        function addCustomHandler(defintion: customHandler): style;
+        function getStyleText(style: definition): string;
+
+        namespace customHandlers {
+            class widget extends style {
+                group: any[];
+                widget: string;
+                checkElement(element: dom.element): boolean;
+                getClassesArray(): string[];
+                getDefintion(): definition;
+                removeStylesFromSameGroup(editor: editor): boolean;
+            }
+        }
+
+        interface definition {
+            attributes?: { [att: string]: string },
+            element: string,
+            name?: string,
+            styles?: { [att: string]: string },
+            type?: string | number
+        }
+
+        interface customHandler {
+            type: string | number;
+            setup?: (style: definition) => void;
+            assignedTo?: number;
+        }
+    }
+
+    class style {
+        alwaysRemoveElement: boolean;
+        includeReadonly: boolean;
+        constructor(styleDefinition: style.definition, variableValues: any);
+        apply(editor: editor): void;
+        applyToObject(element: dom.element, editor: editor): void; 
+        applyToRange(range: Range, editor: editor): void;
+        buildPreview(label?: string): string;
+        checkActive(elementPath: dom.elementPath, editor: editor): boolean;
+        checkApplicable(elementPath: dom.elementPath, editor: editor, filter?: filter): boolean;
+        checkElementMatch(element: dom.element, fullMatch: boolean, editor: editor): boolean;
+        checkElementRemovable(element: dom.element, fullMatch: boolean, editor: editor): boolean;
+        getDefintion(): style.definition;
+        remove(editor: editor): void;
+        removeFromRange(range: Range, editor: editor): void;
+        toAllowedContentRules(editor?: editor): filter.allowedContentRules;
+    }
+
+    class styleCommand {
+        constructor(style: style, ext?: any);
+        exec(editor: editor): void;
+    }
+
+    var stylesSet: resourceManager;
+
+    class template {
+        readonly source: string;
+
+        constructor(source: string);
+        output(data: any, buffer?: any[]): string | number;
+    }
+
+    namespace tools {
+        function addFunction(fn: () => any, scope?: any): number;
+        function arrayCompare(arrayA: any[], arrayB: any[]): boolean;
+        function clone(source: { [key: string]: any }): { [key: string]: any };
+        function copy(source: { [key: string]: any }): { [key: string]: any };
+        function createClass(definition: { [key: string]: any }): any;
+        function cssStyleToDomStyle(cssName: string): string;
+        function cssVendorPrefix(property: string, value: string, asString?: boolean): { [cssClass: string]: string | number };
+        function defer<T extends Function>(fn: T): T;
+        function enableHtml5Elements(doc: Document | DocumentFragment, withAppend?: boolean): void;
+        function escapeCss(selector: string): string;
+        function eventsBuffer(minInterval: number, output: () => void, scopeObj: any): { input: () => void, reset: () => void };
+        function extend(target: { [key: string]: any }, source: { [key: string]: any }, overwrite: boolean, properties: { [key: string]: any }): { [key: string]: any };
+        function fixDomain(): boolean;
+        function genKey(subKey: string): string;
+        function getCookie(name: string): string;
+        function getCsrfToken(): string;
+        function getIndex<T>(array: T[], compareFunction: (element: T) => boolean): number;
+        function getMouseButton(evt: dom.event): boolean;
+        function getNextId(): string;
+        function getNextNumber(): number;
+        function getUniqueId(): string;
+        function htmlDecode(text: string): string;
+        function htmlDecodeAttr(text: string): string;
+        function htmlEncode(text: string): string;
+        function htmlEncodeAttr(text: string): string;
+        function indexOf<T>(array: T[], value: T | ((el: T) => boolean)): number;
+        function isArray<T>(object: any): object is T[];
+        function isEmpty(object: { [key: string]: any }): boolean;
+        function keystrokeToArray(lang: { [key: string]: any }, keystroke: number): { display: string[], aria: string[] };
+        function keystrokeToString(lang: { [key: string]: any }, keystroke: number): { display: string, aria: string };
+        function ltrim(str: string): string;
+        function normalizeCssText(styleText: string, nativeNormalize: boolean): string;
+        function normalizeHex(styleText: string): string;
+        function objectCompare(left: { [key: string]: any }, right: { [key: string]: any }, onlyLef?: boolean): boolean;
+        function objectKeys(obj: { [key: string]: any }): string[];
+        function override<T extends Function>(originalFunction: T, functionBuilder: (originalFunction: T) => T): T;
+        function parseCssText(styleText: string, normalize?: boolean, nativeNormalize?: boolean): { [key: string]: any };
+        function prototypedCopy(source:  { [key: string]: any }):  { [key: string]: any };
+        function removeFunction(ref: number): void;
+        function repeat(str: string, times: number): string;
+        function rtrim(str: string): string;
+        function search<T>(array: T[], value: T | ((element: T) => boolean)): T;
+        function setCookie(name: string, value: string): void;
+        function setTimeout(func: Function, milliseconds?: number, scope?: { [key: string]: any }, args?: any, ownerWindow?: Window): number;
+        function transformPlainTextToHtml(text: string, etnerMode: number): string;
+        function trim(str: string): string;
+        function tryThese(fn: Function[]): any;
+        function writeCssText(styles: { [key: string]: any }, sort?: boolean): string;
+
+        namespace array {
+            function every<T>(array: T[], fn: (value: T, index: number, array: T[]) => boolean, thisArg?: { [key: string]: any }): boolean;
+            function filter<T>(array: T[], fn: (value: T, index: number, array: T[]) => boolean, thisArg?: { [key: string]: any }): T[];
+            function forEach<T>(array: T[], fn: (value: T, index: number, array: T[]) => void, thisArg?: { [key: string]: any }): void;
+            function isArray(object: any): boolean;
+            function map<T, K>(array: T[], fn: (value: T) => K, thisArg?: { [key: string]: any }): K[];
+            function reduce<T, K>(array: T[], fn: (accumulator: K, a: T, index: number, array: T[]) => K, initial: K, thisArg?: { [key: string]: any }): K;
+        }
+
+        namespace object {
+            function findKey(obj: { [key: string]: any }, value: any): string;
+            function merge(obj1: { [key: string]: any }, obj2: { [key: string]: any }): { [key: string]: any };
+        }
+
+        namespace style {
+            namespace parse {
+                function background(value: string): { color: string, unprocessed: string};
+                function border(value: string): { width: string, style: string, color: string };
+                function margin(value: string): { top: number, right: number, bottom: number, left: number };
+            }
+        }
+    }
 
     class ui extends event {
         constructor(editor: editor);
-        add(name: string, type: Object, definition: Object): void;
+        add(name: string, type: { [key: string]: any }, definition: { [key: string]: any }): void;
         addButton(name: string, definition: buttonDefinition): void;
-        addHandler(type: Object, handler: Object): void;
-    }
-
-    class environmentConfig  {
-        air : boolean;
-        chrome : boolean;
-        cssClass : string;
-        edge : boolean;
-        gecko : boolean;
-        hc : boolean;
-        hidpi : boolean;
-        iOS : boolean;
-        ie : boolean;
-        isCompatible : boolean;
-        mac : boolean;
-        needsBrFiller : boolean;
-        needsNbspFiller : boolean;
-        quirks : boolean;
-        safari : boolean;
-        version : number;
-        webkit : boolean;
-        secure( ) : boolean;
+        addHandler(type: { [key: string]: any }, handler: { [key: string]: any }): void;
+        addRichCombo(name: string, definition: { [key: string]: any }): void;
+        addToolbarGroup(name: string, previous: number | string, subgroupOf?: string): void;
+        create(name: string): { [key: string]: any };
+        get(name: string): { [key: string]: any };
+        space(name: string): dom.element;
+        spaceId(name: string): string;
     }
 
     namespace ui {
         namespace dialog {
-            class uiElement {
-                eventProcessors: any;
-
-                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[], nodeNameArg?: Function | string, stylesArg?: Function | Object, attributesArg?: Function | Object, contentsArg?: Function | string); // Not sure that the htmlList array type is right.
-
-                accessKeyDown(dialog: CKEDITOR.dialog, key: string): void;
-                accessKeyUp(dialog: CKEDITOR.dialog, key: string): void;
-                disable(): void;
-                enable(): void;
-                focus(): CKEDITOR.ui.dialog.uiElement;
-                getDialog(): CKEDITOR.dialog;
-                getElement(): CKEDITOR.dom.element;
-                getInputElement(): CKEDITOR.dom.element;
-                getValue(): any;
-                isChanged(): boolean;
-                isEnabled(): boolean;
-                isFocusable(): boolean;
-                isVisible(): boolean;
-                registerEvents(definition: CKEDITOR.dialog.definition.uiElement): CKEDITOR.ui.dialog.uiElement;
-                selectParentTab(): CKEDITOR.ui.dialog.uiElement;
-                setValue(value: Object, noChangeEvent: boolean): CKEDITOR.ui.dialog.uiElement;
-
-                // Change event?
-            }
-
-
             class button extends uiElement {
-                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+                constructor(dialog: dialog, elementDefinition: definitions.button, htmlList: any[]);
 
                 accessKeyDown(): void;
                 accessKeyUp(): void;
                 click(): any;
             }
 
-
             class checkbox extends uiElement {
-                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+                constructor(dialog: dialog, elementDefinition: definitions.checkbox, htmlList: any[]);
 
                 accessKeyUp(): void;
-                getInputElement(): CKEDITOR.dom.element;
                 getValue(): boolean;
-                setValue(checked: boolean, noChangeEvent: boolean): any; // returns void according to doc, but cannot override base class like that
+                setValue(checked: boolean, noChangeEvent: boolean): undefined;
             }
 
+            namespace definitions {
+                interface button {
+                    label: string;
+                    disabled?: boolean;
+                }
+
+                interface checkbox {
+                    checked?: boolean;
+                    validate?: () => boolean;
+                    label?: string;
+                }
+
+                interface fieldSet {
+                    label?: string;
+                    children: any[];
+                }
+
+                interface file {
+                    validate?: () => boolean;
+                }
+
+                interface fileButton {
+                    for: string;
+                    validate?: () => boolean;
+                }
+
+                interface hbox {
+                    widths?: string[];
+                    height?: string;
+                    padding?: string;
+                    align?: string;
+                }
+
+                interface html {
+                    html: string;
+                }
+
+                interface iframeElement {
+                    src: string;
+                    width: string;
+                    height: string;
+                    onContentLoad?: () => void;
+                }
+
+                interface labeledElement {
+                    label: string;
+                    labelLayout?: 'horizontal' | 'vertical';
+                    widths?: [ string, string ];
+                    role?: string;
+                    includeLabel?: boolean;
+                }
+
+                interface radio {
+                    default: any;
+                    validate?: () => boolean;
+                    items: ([string, string] | [string])[];
+                }
+
+                interface select {
+                    default: any;
+                    validate?: () => boolean;
+                    items: ([string, string] | [string])[];
+                    multiple?: boolean;
+                    size?: number;
+                }
+
+                interface textarea {
+                    rows?: number;
+                    cols?: number;
+                    default?: string;
+                    validate?: () => boolean;
+                }
+
+                interface textInput {
+                    default?: string;
+                    validate?: () => boolean;
+                    maxLength?: number;
+                    size?: string;
+                }
+
+                interface uiElement {
+                    id: string;
+                    type: number;
+                    title?: string;
+                    hidden?: boolean;
+                    className?: string;
+                    style?: string;
+                    accessKey?: string;
+                }
+
+                interface vbox {
+                    width?: string;
+                    heights?: string[];
+                    align?: string;
+                    padding?: string;
+                    expand?: boolean;
+                }
+            }
 
             class fieldset extends uiElement {
-                constructor(dialog: CKEDITOR.dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: CKEDITOR.dialog.definition.uiElement);
+                constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.fieldSet);
             }
 
 
-            class file extends CKEDITOR.ui.dialog.labeledElement {
-                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+            class file extends ui.dialog.labeledElement {
+                constructor(dialog: dialog, elementDefinition: definitions.file, htmlList: any[]);
 
                 getAction(): string;
-                getInputElement(): CKEDITOR.dom.element;
-                registerEvents(definition: Object): CKEDITOR.ui.dialog.file;
+                registerEvents(definition: { [key: string]: any }): file;
                 reset(): void;
                 setInitValue(): void;
-                submit(): CKEDITOR.ui.dialog.file;
+                submit(): file;
             }
 
 
-            class fileButton extends CKEDITOR.ui.dialog.button {
-                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
-
-                // formLoaded event ??
+            class fileButton extends button {
+                constructor(dialog: dialog, elementDefinition: definitions.fileButton, htmlList: any[]);
             }
 
 
             class hbox extends uiElement {
-                constructor(dialog: CKEDITOR.dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: CKEDITOR.dialog.definition.uiElement);
+                constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.hbox);
 
-                getChild(indices: number): CKEDITOR.ui.dialog.uiElement;
-                getChild(indices: number[]): CKEDITOR.ui.dialog.uiElement[];
+                getChild(indices: number): ui.dialog.uiElement;
+                getChild(indices: number[]): ui.dialog.uiElement[];
             }
 
 
             class html extends uiElement {
-                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+                constructor(dialog: dialog, elementDefinition: definitions.html, htmlList: any[]);
 
             }
 
@@ -1528,422 +2500,272 @@ declare namespace CKEDITOR {
 
 
             class labeledElement extends uiElement {
-                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[], contentHtml: Function);
+                constructor(dialog: dialog, elementDefinition: definitions.labeledElement, htmlList: any[], contentHtml: () => string);
 
                 getLabel(): string;
-                setlabel(label: string): CKEDITOR.ui.dialog.labeledElement;
+                setlabel(label: string): ui.dialog.labeledElement;
             }
 
 
-            class radio extends CKEDITOR.ui.dialog.labeledElement {
-                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+            class radio extends ui.dialog.labeledElement {
+                constructor(dialog: dialog, elementDefinition: definitions.radio, htmlList: any[]);
 
                 accessKeyUp(): void;
                 getValue(): string;
-                setValue(value: string, noChangeEvent: boolean): any; // returns void according to doc, but cannot override base class like that
+                setValue(value: string, noChangeEvent: boolean): undefined;
             }
 
 
             class select extends uiElement {
-                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+                constructor(dialog: dialog, elementDefinition: definitions.select, htmlList: any[]);
 
-                add(label: string, value?: string, indexedDB?: number): CKEDITOR.ui.dialog.select;
-                clear(): CKEDITOR.ui.dialog.select;
-                getInputElement(): CKEDITOR.dom.element;
-                remove(index: number): CKEDITOR.ui.dialog.select;
+                add(label: string, value?: string, indexedDB?: number): select;
+                clear(): select;
+                remove(index: number): select;
             }
 
 
-            class textarea extends CKEDITOR.ui.dialog.labeledElement {
-                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+            class textarea extends labeledElement {
+                constructor(dialog: dialog, elementDefinition: definitions.textarea, htmlList: any[]);
             }
 
 
-            class textInput extends CKEDITOR.ui.dialog.labeledElement {
-                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+            class textInput extends ui.dialog.labeledElement {
+                constructor(dialog: dialog, elementDefinition: definitions.textInput, htmlList: any[]);
 
                 accessKeyUp(): void;
-                focus(): any; // returns void according to doc, but cannot override base class like that
+                focus(): undefined;
                 getDirectionMarker(): string;
-                getInputElement(): CKEDITOR.dom.element;
                 getValue(): string;
                 select(): void;
                 setDirectionMarker(dir: string): void;
-                setValue(value: string, noChangeEvent: boolean): CKEDITOR.ui.dialog.textInput;
+                setValue(value: string, noChangeEvent: boolean): textInput;
+            }
+
+            class uiElement {
+                eventProcessors: any;
+
+                constructor(dialog: dialog, elementDefinition: definitions.uiElement, htmlList: any[], nodeNameArg?: () => string | string, stylesArg?: () => { [key: string]: any } | { [key: string]: any }, attributesArg?: () => { [key: string]: any } | { [key: string]: any }, contentsArg?: () => { [key: string]: any } | string); // Not sure that the htmlList array type is right.
+
+                accessKeyDown(dialog: dialog, key: string): void;
+                accessKeyUp(dialog: dialog, key: string): void;
+                disable(): void;
+                enable(): void;
+                focus(): ui.dialog.uiElement;
+                getDialog(): dialog;
+                getElement(): dom.element;
+                getInputElement(): dom.element;
+                getValue(): any;
+                isChanged(): boolean;
+                isEnabled(): boolean;
+                isFocusable(): boolean;
+                isVisible(): boolean;
+                registerEvents(definition: CKEDITOR.dialog.definition.uiElement): ui.dialog.uiElement;
+                selectParentTab(): ui.dialog.uiElement;
+                setValue(value: any, noChangeEvent: boolean): ui.dialog.uiElement;
+            }
+
+            class vbox extends hbox {
+                constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.vbox);
             }
         }
-    }
 
-    class dialog {
-        state: number;
+        class balloonPanel {
+            activeShowListeners: { [id: number]: { removeListener: listenerRegistration }};
+            editor: editor;
+            focusables: { [id: number]: dom.element };
+            height: string;
+            parts: balloonPanel.parts;
+            rect: balloonPanel.rect;
+            showListeners: { [id: number]: () => listenerRegistration };
+            templateDefinitions: balloonPanel.templateDefinitions;
+            templates: balloonPanel.templates;
+            triangleHeight: number;
+            triangleMinDistance: number;
+            triangleWidth: number;
+            width: number;
 
-        constructor(editor: Object, dialogName: string);
+            activeShowListener(id: number): void;
+            activateShowListeners(): void;
+            addShowListener(listener: () => listenerRegistration): listenerRegistration;
+            attach(element: dom.element, options?: dom.element | boolean | { focusElement?: dom.element | boolean, show?: boolean }): void;
+            blur(): void;
+            build(): void;
+            deactivateShowListener(id: number): void;
+            deregisterFocusable(element: dom.element): void;
+            destroy(): void;
+            getHeight(): number;
+            getWidth(): number;
+            hide(): void;
+            move(top: number, left: number): void;
+            registerFocusable(element: dom.element): void;
+            removeShowListener(id: number): void;
+            resize(width: number, height: number): void;
+            setTitle(title: string): void;
+            setTriangle(side: 'left' | 'right' | 'top' | 'bottom'): void;
+            show(): void;
+        }
 
-        addFocusable(element: CKEDITOR.dom.element, index?: number): void;
-        addPage(contents: Object): void;
-        click(id: string): Object;
-        commitContent(): void;
-        diableButton(id: string): void;
-        enableButton(id: string): void;
-        foreach(fn: Function): CKEDITOR.dialog;
-        getButton(id: string): CKEDITOR.ui.dialog.button;
-        getContentElement(pageId: string, elementId: string): CKEDITOR.ui.dialog.uiElement;
-        getElement(): CKEDITOR.dom.element;
-        getName(): string;
-        getPageCount(): number;
-        getParentEditor(): CKEDITOR.editor;
-        getPosition(): Object;
-        getSelectedElement(): CKEDITOR.dom.element;
-        getSize(): Object;
-        getValueOf(pageId: string, elementId: string): Object;
-        hide(): void;
-        hidePage(id: string): void;
-        layout(): void;
-        move(x: number, y: number, save: boolean): void;
-        reset(): CKEDITOR.dialog;
-        resize(width: number, height: number): void;
-        selectPage(id: string): void;
-        setState(state: number): void;
-        setValueOf(pageId: string, elementId: string, value: Object): void;
-        setupContent(): void;
-        show(): void;
-        showPage(id: string): void;
-        updateStyle(): void;
-
-        // NOTE: Static methods are added to dialog module
-    }
-
-
-    namespace dialog {
-
-        namespace definition {
-
-            interface button extends uiElement {
-                disabled?: boolean;
-                label?: string;
-            }
-
-
-            interface checkbox extends uiElement {
-                default?: string;
-                label?: string;
-                validate?: Function;
-            }
-
-
-            interface content {
-                accessKey?: string;
-                elements?: CKEDITOR.dialog.definition.uiElement[];
-                id?: string;
-                label?: string;
+        namespace balloonPanel {
+            interface definition {
+                content?: string;
                 title?: string;
             }
 
-
-            interface file extends labeledElement {
-                action?: string;
-                size?: string;
-                validate?: Function;
+            interface templates {
+                close?: template;
+                content?: template;
+                panel?: template;
+                title?: template;
+                triangle?: template;
+                triangleInner?: template;
+                triangleOuter?: template; 
             }
-
-
-            interface fileButton extends uiElement {
-                filebrowser?: string;
-                for?: string;
-                label?: string;
-                styles?: string;
+    
+            interface templateDefinitions {
+                close?: string;
+                content?: string;
+                panel?: string;
+                title?: string;
+                triangle?: string;
+                triangleInner?: string;
+                triangleOuter?: string;
             }
-
-
-            interface hbox extends uiElement {
-                children?: CKEDITOR.ui.dialog.uiElement[];
+    
+            interface rect {
                 height?: number;
-                padding?: number;
-                validate?: Function;
-                widths?: number[];
+                left?: number;
+                top?: number;
+                visible?: boolean;
+                width?: number;
             }
-
-
-            interface html extends uiElement {
-                html?: string;
-            }
-
-
-            interface labeledElement extends uiElement {
-                controlStyle?: string;
-                inputStyle?: string;
-                label?: string;
-                labelLayout?: string;
-                labelStyle?: string;
-                widths?: number[];
-            }
-
-
-            interface radio extends labeledElement {
-                default?: string;
-                items?: string[] | (string[])[];
-                validate?: Function;
-            }
-
-
-
-            interface select extends labeledElement {
-                default?: string;
-                items?: string[] | (string[])[];
-                multiple?: boolean;
-                size?: number;
-                validate?: Function;
-            }
-
-
-
-            interface textarea extends labeledElement {
-                bidi?: boolean;
-                cols?: number;
-                default?: string;
-                rows?: number;
-                validate?: Function;
-            }
-
-
-            interface textInput extends labeledElement {
-                bidi?: boolean;
-                default?: string;
-                maxLength?: number;
-                size?: number;
-                validate?: Function;
-            }
-
-
-            interface uiElement {
-                align?: string;
-                className?: string;
-                commit?: (widget: CKEDITOR.plugins.widget) => void;
-                id?: string;
-                onHide?: (elem: CKEDITOR.ui.dialog.uiElement) => void;
-                onLoad?: (elem: CKEDITOR.ui.dialog.uiElement) => void;
-                onShow?: (elem: CKEDITOR.ui.dialog.uiElement) => void;
-                requiredcontent?: string | Object | CKEDITOR.style;
-                setup?: (widget: CKEDITOR.plugins.widget) => void;
-                style?: string;
-                title?: string;
-                type?: string;
-            }
-
-
-            interface vbox extends uiElement {
-                children?: CKEDITOR.ui.dialog.uiElement[];
-                expand?: boolean;
-                heights?: number[];
-                padding?: number;
-                styles?: string;
-                width?: number[];
+    
+            interface parts {
+                close?: dom.element;
+                content?: dom.element;
+                panel?: dom.element;
+                title?: dom.element;
+                triangle?: dom.element;
+                triangleInner?: dom.element;
+                triangleOuter?: dom.element;
             }
         }
 
-        interface IDialogDefinition {
-            buttons?: CKEDITOR.dialog.definition.button[];
-            contents?: CKEDITOR.dialog.definition.content[];
-            height?: number;
-            minHeight?: number;
-            minWidth?: number;
-            onCancel?: Function;
-            onLoad?: Function;
-            onOk?: Function;
-            onShow?: Function;
-            onHide?: Function;
-            resizable?: number;
-            title?: string;
-            width?: number;
+        class balloonToolbar {
+            constructor(editor: editor, definition: { [key: string]: any });
+            addItem(name: string, element: button | richCombo): void;
+            addItems(elements: { [itemName: string]: button | richCombo }): void;
+            deleteItem(name: string): void;
+            destroy(): void;
+            getItem(name: string): button | richCombo;
+            hide(): void;
+            refresh(): void;
+            show(): void;
         }
 
-        function add(name: string, path: string): void;
-        function add(name: string, dialogDefinition: (editor: CKEDITOR.editor) => IDialogDefinition): void;
-        function addIframe(name: string, title: string, minWidth: number, minHeight: number, onContentLoad?: Function, userDefinition?: Object): void;
-        function addUIElement(typeName: string, builder: Function): void;
-        function cancelButton(): void;
-        function exists(name: string | number): void; // NOTE: documentation says object, but it's an array accessor, so really a string or number will work
-        function getCurrent(): CKEDITOR.dialog;
-        function isTabEnabled(editor: CKEDITOR.editor, dialogName: string, tabName: string): boolean;
-        function okButton(): void;
+        class button {
+            static readonly handler: handlerDefinition<button>;
+
+            constructor(definition: { [key: string]: any });
+            getState(): number;
+            render(editor: editor, output: string[]): void;
+            setState(state: number): void;
+            toFeature(editor: editor): feature;
+        }
+
+        class floatPanel {
+            constructor(editor: editor, parentElement: dom.element, definition: { [key: string]: any }, level: number);
+            addBlock(name: string, block: { [key: string]: any }): void;
+            addListBlock(name: string, multiSelect: boolean): void;
+            allowBlur(allow: boolean): void;
+            blur(): void;
+            focus(): void;
+            getBlock(name: string): panel.block;
+            hide(returnFocus: boolean): void;
+            hideChild(restoreFocus: boolean): void;
+            reposition(): void;
+            showAsChild(panel: floatPanel, blckName: string, offsetParent: dom.element, corner: number, offsetX?: number, offsetY?: number): void;
+            showBlock(name: string, offsetParent: dom.element, corner: number, offsetX?: number, offsetY?: number, callback?: () => void): void;
+        }
+
+        class handlerDefinition<T> {
+            contentsElement: dom.element;
+            create(definition: { [key: string]: any }): T;
+        }
+
+        class menuButton extends button {
+
+        }
+
+        class panel {
+            constructor(document: dom.document, definition: { [key: string]: any });
+            addBlock(name: string, block: { [key: string]: any }): void;
+            getBlock(name: string): panel.block;
+            render(editor: editor, output?: string[]): void;
+            showBlock(name: string): void;
+        }
+
+        namespace panel {
+            class block {
+                getItems(): dom.nodeList;
+                markItem(index: number): void;
+            }
+
+            const handler: handlerDefinition<panel>;
+        }
+
+        class panelButton extends button {
+
+        }
+
+        class richCombo {
+            static readonly handler: handlerDefinition<richCombo>;
+            render(editor: editor, output: string[]): void;
+        }
     }
 
+    class xml {
+        baseXml: any;
 
-    namespace htmlParser {
-
-        class basicWriter {
-            constructor();
-            openTag(tagName: string, attributes: Object): void;
-            openTagClose(tagName: string, isSelfClose: boolean): void;
-            attribute(attName: string, attValue: string): void;
-            closeTag(tagName: string): void;
-            text(text: string): void;
-            comment(comment: string): void;
-            write(data: string): void;
-            reset(): void;
-            getHtml(reset: boolean): string;
-        }
-
-
-        class node {
-            constructor();
-            remove(preserveChildren?: boolean): node;
-            replaceWith(node: node): void;
-            insertAfter(node: node): void;
-            insertBefore(node: node): void;
-            getAscendant(condition: string): element;
-            getAscendant(condition: Object): element;
-            getAscendant(condition: Function): element;
-            wrapWith(wrapper: element): element;
-            getIndex(): number;
-        }
-
-
-        class filter {
-            constructor(rules?: filterRulesDefinition);
-            id: number;
-            elementNameRules: filterRulesGroup;
-            attributeNameRules: filterRulesGroup;
-            elementsRules: any;
-            attributesRules: any;
-            textRules: filterRulesGroup;
-            commentRules: filterRulesGroup;
-            rootRules: filterRulesGroup;
-            addRules(rules: filterRulesDefinition, options?: number): void;
-            addRules(rules: filterRulesDefinition, options?: { priority?: number; applyToAll?: boolean; }): void;
-            applyTo(node: node): void;
-        }
-
-
-        interface filterRulesDefinition {
-
-        }
-
-
-        class filterRulesGroup {
-            rules: Object[];
-            add(rule: Function, priority: number, options: Object): void;
-            add(rule: Object[], priority: number, options: Object): void;
-            addMany(rules: Object[], priority: number, options: Object): void;
-            findIndex(priority: number): number;
-            exec(currentValue: Object): any;
-            execOnName(currentName: string): string;
-        }
-
-
-        class cdata extends node {
-            constructor(value: string);
-            type: number;
-            writeHtml(writer: basicWriter): void;
-        }
-
-
-        class comment extends node {
-            constructor(value: string);
-            type: number;
-            filter(filter: filter): boolean;
-            value: string;
-            writeHtml(writer: basicWriter, filter: filter): void;
-        }
-
-
-        class element extends node {
-            constructor(name: string, attributes: Object);
-            name: string;
-            attributes: any;
-            children: any[];
-            type: number;
-            add(node: node): number;
-            add(node: node, index: number): void;
-            addClass(className: string): void;
-            clone(): element;
-            filter(filter: filter): boolean;
-            filterChildren(filter: filter): void;
-            forEach(callback: (node: node, type?: number) => void|false, type?: number, skipRoot?: boolean): void;
-            writeHtml(writer: basicWriter, filter: filter): void;
-            writeChildrenHtml(writer: basicWriter, filter: filter): void;
-            replaceWithChildren(): void;
-            forEach(callback: (node: node, type?: number) => boolean): void;
-            getFirst(condition: string): node;
-            getFirst(condition: Object): node;
-            getFirst(condition: Function): node;
-            getHtml(): string;
-            setHtml(html: string): void;
-            getOuterHtml(): string;
-            split(index: number): element;
-            removeClass(className: string): void;
-            hasClass(className: string): boolean;
-        }
-
-
-        class fragment {
-            constructor();
-            children: any[];
-            parent: any;
-            type: number;
-            static fromHtml(fragmentHtml: string): fragment;
-            static fromHtml(fragmentHtml: string, parent?: element, fixingBlock?: string): fragment | element;
-            static fromHtml(fragmentHtml: string, parent: null, fixingBlock?: string): fragment;
-            static fromHtml(fragmentHtml: string, parent?: string, fixingBlock?: string): fragment | element;
-            static fromHtml(fragmentHtml: string, parent?: element, fixingBlock?: boolean): fragment | element;
-            static fromHtml(fragmentHtml: string, parent?: string, fixingBlock?: boolean): fragment | element;
-            add(node: node, index?: number): void;
-            filter(filter: filter): void;
-            filterChildren(filter: filter, filterRoot?: boolean): void;
-            forEach(callback: (node: node, type?: number) => void|false, type?: number, skipRoot?: boolean): void;
-            writeHtml(writer: basicWriter, filter?: filter): void;
-            writeChildrenHtml(writer: basicWriter, filter?: filter, filterRoot?: boolean): void;
-            forEach(callback: (node: node, type?: number) => boolean, type?: number, skipRoot?: boolean): void;
-        }
-
-
-        class cssStyle {
-            constructor(element: element);
-            constructor(styleText: string);
-            populate(obj: element): void;
-            populate(obj: dom.element): void;
-            populate(obj: Object): void;
-        }
-
-
-        class text extends node {
-            constructor(value: string);
-            type: number;
-            filter(filter: filter): boolean;
-            writeHtml(writer: basicWriter, filter?: filter): void;
-        }
-
+        constructor(xmlObjectOrData: any);
+        getInnerXml(xpath: string, contextNode?: any): string;
+        selectNodes(xpath: string, contextNode?: any): any[];
+        selectSingleNode(xpath: string, contextNode?: any): any;
     }
 
-    class htmlWriter extends htmlParser.basicWriter {
-        indentationChars: string;
-        lineBreakChars: string;
-        selfClosingEnd: string;
-
-        indentation(): void;
-        lineBreak(): void;
-        setRules(tagName: string, rules: Object): void;
+    interface toolbarGroups {
+        name?: string;
+        groups?: string[];
     }
 
-
-    namespace tools {
-        var callFunction: Function;
-        function clone(source: Object): Object;
-        function copy(source: Object): Object;
-        function enableHtml5Elements(doc: Object, withAppend?: Boolean): void;
-        function isArray<T>(object: any|null|undefined): object is T[];
-        function override<T extends Function>(originalFunction: T, functionBuilder: (originalFunction: T) => T): T;
-        function parseCssText(styleText: string, normalize?: Boolean, nativeNormalize?: Boolean): { [key: string]: string }
-        function prototypedCopy(source: Object): Object;
-        function writeCssText(style: { [key: string]: string }, sort?: Boolean): string;
+    namespace config {
+        interface styleObject {
+            name?: string;
+            element: string;
+            attributes?: { [key: string]: any };
+            styles?: { [key: string]: any };
+            overrides?: { [key: string]: any };
+        }
     }
 
+    interface sharedSpace {
+        top?: string | HTMLElement;
+        bottom?: string | HTMLElement;
+    }
 
-    namespace lang {
-        var languages: any;
-        var rtl: any;
+    interface IMenuItemDefinition {
+        label:string,
+        command:string,
+        icon: string
+        group:string,
+        order:number
+    }
 
-        function load(languageCode: string, defaultLanguage: string, callback: Function): void;
-        function detect(defaultLanguage: string, probeLanguage: string): string;
+    interface buttonDefinition {
+        icon?: string;
+        iconOffset?: number;
+        label: string;
+        command: string;
+        toolbar: string;
     }
 }

From 7a0be64b12a8b640d62fe904e7d3ed9c5af47e82 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Tue, 22 May 2018 03:36:37 +0200
Subject: [PATCH 311/575] Added wizard objects library definitions

---
 types/activex-access/index.d.ts | 235 +++++++++++++++++++++++++++++++-
 types/activex-stdole/index.d.ts |   6 +
 2 files changed, 240 insertions(+), 1 deletion(-)

diff --git a/types/activex-access/index.d.ts b/types/activex-access/index.d.ts
index 02b985ebc3..d0bf798652 100644
--- a/types/activex-access/index.d.ts
+++ b/types/activex-access/index.d.ts
@@ -7806,6 +7806,224 @@ declare namespace Access {
     }
 }
 
+declare namespace AccWizObjects {
+    const enum WIZ_CSIDL_FLAGS {
+        WIZ_CSIDL_APPDATA = 26,
+        WIZ_CSIDL_BITBUCKET = 10,
+        WIZ_CSIDL_COMMON_DESKTOPDIRECTORY = 25,
+        WIZ_CSIDL_COMMON_PROGRAMS = 23,
+        WIZ_CSIDL_COMMON_STARTMENU = 22,
+        WIZ_CSIDL_COMMON_STARTUP = 24,
+        WIZ_CSIDL_CONTROLS = 3,
+        WIZ_CSIDL_DESKTOP = 0,
+        WIZ_CSIDL_DESKTOPDIRECTORY = 16,
+        WIZ_CSIDL_DRIVES = 17,
+        WIZ_CSIDL_FAVORITES = 6,
+        WIZ_CSIDL_FONTS = 20,
+        WIZ_CSIDL_NETHOOD = 19,
+        WIZ_CSIDL_NETWORK = 18,
+        WIZ_CSIDL_PERSONAL = 5,
+        WIZ_CSIDL_PRINTERS = 4,
+        WIZ_CSIDL_PRINTHOOD = 27,
+        WIZ_CSIDL_PROGRAMS = 2,
+        WIZ_CSIDL_RECENT = 8,
+        WIZ_CSIDL_SENDTO = 9,
+        WIZ_CSIDL_STARTMENU = 11,
+        WIZ_CSIDL_STARTUP = 7,
+        WIZ_CSIDL_TEMPLATES = 21,
+    }
+
+    const enum WIZ_SLGP_FLAGS {
+        WIZ_SLGP_SHORTPATH = 1,
+        WIZ_SLGP_UNCPRIORITY = 2,
+    }
+
+    const enum WIZ_SLR_FLAGS {
+        WIZ_SLR_ANY_MATCH = 2,
+        WIZ_SLR_NO_UI = 1,
+        WIZ_SLR_UPDATE = 4,
+    }
+
+    const enum WIZ_SW_FLAGS {
+        WIZ_SW_MAXIMIZE = 3,
+        WIZ_SW_MINIMIZE = 7,
+        WIZ_SW_NORMAL = 5,
+    }
+
+    /** Field List Control */
+    class FieldList {
+        private 'AccWizObjects.FieldList_typekey': FieldList;
+        private constructor();
+        AddFieldList(bstrCaption: string, nLeft: number, nTop: number, nWidth: number, nHeight: number, nMultiSelectType: number, cCols: number, fShowPictures: boolean): void;
+        AddJoinLine(IFieldList: number, iField: number, iForeignFieldList: number, iForeignField: number, lAttribs: number): void;
+        DeleteFieldList(IFieldList: number): void;
+        DeleteJoinLine(IJoinLine: number): void;
+        readonly FieldListCount: number;
+        FieldLists(IFieldList: number): any;
+        HScrollPos: number;
+        readonly JoinLineCount: number;
+        JoinLines(IJoinLine: number): any;
+        PersistentHighlight: boolean;
+        Picture: stdole.IPictureDisp;
+        PictureCols: number;
+        PictureRows: number;
+        ScrollBars: number;
+        SelectedFieldListIndex: number;
+        SetCursor(nCursorID: number): void;
+        VScrollPos: number;
+    }
+
+    /** ImexGrid Control */
+    class ImexGrid {
+        private 'AccWizObjects.ImexGrid_typekey': ImexGrid;
+        private constructor();
+        AddColumn(ColumnCaption: string, ColumnWidth: number, Index: number): void;
+        AddRow(RowText: string, Index: number): void;
+        AllowColumnSizing: boolean;
+        BackColor: stdole.OLE_COLOR;
+        CalcBestColumns(): void;
+        Caption: string;
+        ClearColumns(): void;
+        ClearRows(): void;
+        ColumnClickBehavior: number;
+        readonly ColumnCount: number;
+        Columns(ColumnNumber: number): any;
+        ColumnState: any;
+        DeleteColumn(Index: number): void;
+        DeleteRow(Index: number): void;
+        Delimiters: string;
+        DrawTextLogicalOrder: boolean;
+        FirstRowNumber: number;
+        Font: stdole.IFontDisp;
+        GridBackColor: stdole.OLE_COLOR;
+        GridFont: stdole.IFontDisp;
+        GridHeader: number;
+        Painting: boolean;
+        Refresh(): void;
+        ResetHScrollPos(): void;
+        ResetVScrollPos(): void;
+        readonly RowCount: number;
+        RowText(RowNumber: number): string;
+        ShowColLines: boolean;
+        ShowRowHeaders: boolean;
+        StringDelimiters: string;
+    }
+
+    interface WIZ_FILETIME {
+        readonly dwHighDateTime: number;
+        readonly dwLowDateTime: number;
+    }
+
+    interface WIZ_WIN32_FIND_DATA {
+        readonly cAlternate: SafeArray<number>;
+        readonly cFileName: SafeArray<number>;
+        readonly dwFileAttributes: number;
+        readonly dwReserved0: number;
+        readonly dwReserved1: number;
+        readonly ftCreationTime: WIZ_FILETIME;
+        readonly ftLastAccessTime: WIZ_FILETIME;
+        readonly ftLastWriteTime: WIZ_FILETIME;
+        readonly nFileSizeHigh: number;
+        readonly nFileSizeLow: number;
+    }
+
+    /** WizShellLinkA Class */
+    class WizShellLinkA {
+        private 'AccWizObjects.WizShellLinkA_typekey': WizShellLinkA;
+        private constructor();
+
+        /** GetArguments */
+        GetArguments(pszArgs: string, cchMaxPath: number): void;
+
+        /** GetDescription */
+        GetDescription(pszName: string, cchMaxName: number): void;
+
+        /** GetHotkey */
+        GetHotkey(pwHotkey: number): void;
+
+        /** GetIconLocation */
+        GetIconLocation(pszIconPath: string, cchIconPath: number, piIcon: number): void;
+
+        /** GetIDList */
+        GetIDList(ppidl: WIZ_CSIDL_FLAGS): void;
+
+        /** GetPath */
+        GetPath(pszFile: string, cchMaxPath: number, pfd: WIZ_WIN32_FIND_DATA, fflags: number): void;
+
+        /** GetShowCmd */
+        GetShowCmd(piShowCmd: WIZ_SW_FLAGS): void;
+
+        /** GetWorkingDirectory */
+        GetWorkingDirectory(pszDir: string, cchMaxPath: number): void;
+
+        /** Resolve */
+        Resolve(hWnd: number, fflags: number): void;
+
+        /** SetArguments */
+        SetArguments(pszArgs: string): void;
+
+        /** SetDescription */
+        SetDescription(pszName: string): void;
+
+        /** SetHotkey */
+        SetHotkey(wHotkey: number): void;
+
+        /** SetIconLocation */
+        SetIconLocation(pszIconPath: string, iIcon: number): void;
+
+        /** SetIDList */
+        SetIDList(pidl: WIZ_CSIDL_FLAGS): void;
+
+        /** SetPath */
+        SetPath(pszFile: string): void;
+
+        /** SetRelativePath */
+        SetRelativePath(pszPathRel: string, dwReserved: number): void;
+
+        /** SetShowCmd */
+        SetShowCmd(iShowCmd: WIZ_SW_FLAGS): void;
+
+        /** SetWorkingDirectory */
+        SetWorkingDirectory(pszDir: string): void;
+    }
+
+    namespace EventHelperTypes {
+        type FieldList_DragOver_ArgNames = ['SourceCtlName', 'SourceFieldList', 'SourceRow', 'State', 'X', 'Y'];
+
+        type FieldList_FldListDragDrop_ArgNames = ['SourceCtlName', 'SourceFieldList', 'SourceRow', 'TargetCtlName', 'TargetFieldList', 'TargetRow'];
+
+        type FieldList_FldListDragOver_ArgNames = ['SourceCtlName', 'SourceFieldList', 'SourceRow', 'TargetCtlName', 'TargetFieldList', 'TargetRow', 'State'];
+
+        interface FieldList_DragOver_Parameter {
+            readonly SourceCtlName: string;
+            readonly SourceFieldList: number;
+            readonly SourceRow: number;
+            readonly State: number;
+            readonly X: number;
+            readonly Y: number;
+        }
+
+        interface FieldList_FldListDragDrop_Parameter {
+            readonly SourceCtlName: string;
+            readonly SourceFieldList: number;
+            readonly SourceRow: number;
+            readonly TargetCtlName: string;
+            readonly TargetFieldList: number;
+            readonly TargetRow: number;
+        }
+
+        interface FieldList_FldListDragOver_Parameter {
+            readonly SourceCtlName: string;
+            readonly SourceFieldList: number;
+            readonly SourceRow: number;
+            readonly State: number;
+            readonly TargetCtlName: string;
+            readonly TargetFieldList: number;
+            readonly TargetRow: number;
+        }
+    }
+}
+
 interface ActiveXObject {
     on(obj: Access._CheckBoxInOption, event: 'BeforeUpdate' | 'DblClick' | 'Exit', argNames: ['Cancel'], handler: (this: Access._CheckBoxInOption, parameter: {Cancel: number}) => void): void;
     on(obj: Access._CheckBoxInOption, event: 'KeyDown' | 'KeyUp', argNames: ['KeyCode', 'Shift'], handler: (this: Access._CheckBoxInOption, parameter: {KeyCode: number, Shift: number}) => void): void;
@@ -7969,11 +8187,26 @@ interface ActiveXObject {
     on(obj: Access.TextBox, event: 'AfterUpdate' | 'Change' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.TextBox, parameter: {}) => void): void;
     on(obj: Access.ToggleButton, event: 'AfterUpdate' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.ToggleButton, parameter: {}) => void): void;
     on(obj: Access.WebBrowserControl, event: 'AfterUpdate' | 'Change' | 'Click' | 'Enter' | 'GotFocus' | 'LostFocus', handler: (this: Access.WebBrowserControl, parameter: {}) => void): void;
+    on(obj: AccWizObjects.FieldList, event: 'DragDrop', argNames: ['SourceCtlName', 'SourceFieldList', 'SourceRow', 'X', 'Y'], handler: (this: AccWizObjects.FieldList, parameter: { readonly SourceCtlName: string, readonly SourceFieldList: number, readonly SourceRow: number, readonly X: number, readonly Y: number }) => void): void;
+    on(obj: AccWizObjects.FieldList, event: 'DragOver', argNames: AccWizObjects.EventHelperTypes.FieldList_DragOver_ArgNames, handler: (this: AccWizObjects.FieldList, parameter: AccWizObjects.EventHelperTypes.FieldList_DragOver_Parameter) => void): void;
+    on(obj: AccWizObjects.FieldList, event: 'FldListCheckItem' | 'FldListClick' | 'FldListDblClick' | 'FldListHdrDblClick', argNames: ['FieldList'], handler: (this: AccWizObjects.FieldList, parameter: { readonly FieldList: number }) => void): void;
+    on(obj: AccWizObjects.FieldList, event: 'FldListDragDrop', argNames: AccWizObjects.EventHelperTypes.FieldList_FldListDragDrop_ArgNames, handler: (this: AccWizObjects.FieldList, parameter: AccWizObjects.EventHelperTypes.FieldList_FldListDragDrop_Parameter) => void): void;
+    on(obj: AccWizObjects.FieldList, event: 'FldListDragOver', argNames: AccWizObjects.EventHelperTypes.FieldList_FldListDragOver_ArgNames, handler: (this: AccWizObjects.FieldList, parameter: AccWizObjects.EventHelperTypes.FieldList_FldListDragOver_Parameter) => void): void;
+    on(obj: AccWizObjects.FieldList, event: 'FldListGotFocus' | 'FldListLostFocus', argNames: ['FieldListIndex'], handler: (this: AccWizObjects.FieldList, parameter: { readonly FieldListIndex: number }) => void): void;
+    on(obj: AccWizObjects.FieldList, event: 'FldListKeyDown' | 'FldListKeyUp', argNames: ['FieldList', 'KeyCode', 'Shift'], handler: (this: AccWizObjects.FieldList, parameter: { readonly FieldList: number, KeyCode: number, readonly Shift: number }) => void): void;
+    on(obj: AccWizObjects.FieldList, event: 'FldListKeyPress', argNames: ['FieldList', 'KeyAscii'], handler: (this: AccWizObjects.FieldList, parameter: { readonly FieldList: number, KeyAscii: number }) => void): void;
+    on(obj: AccWizObjects.FieldList, event: 'FldListMouseDown' | 'FldListMouseMove' | 'FldListMouseUp', argNames: ['FieldList', 'Button', 'Shift', 'X', 'Y'], handler: (this: AccWizObjects.FieldList, parameter: { readonly FieldList: number, readonly Button: number, readonly Shift: number, readonly X: stdole.OLE_XPOS_PIXELS, readonly Y: stdole.OLE_YPOS_PIXELS }) => void): void;
+    on(obj: AccWizObjects.ImexGrid, event: 'ColumnCreated' | 'ColumnDeleted' | 'ColumnSelected' | 'ColumnSized', argNames: ['Column'], handler: (this: AccWizObjects.ImexGrid, parameter: { readonly Column: number }) => void): void;
+    on(obj: AccWizObjects.FieldList, event: 'AfterStartup', handler: (this: AccWizObjects.FieldList, parameter: {}) => void): void;
     set(obj: Access._CheckBoxInOption | Access._ChildLabel | Access._CustomControlInReport | Access._OptionButtonInOption | Access._ToggleButtonInOption | Access.Attachment | Access.BoundObjectFrame | Access.CheckBox | Access.ComboBox | Access.CommandButton | Access.CustomControl | Access.EmptyCell | Access.Form | Access.Label | Access.ListBox | Access.NavigationButton | Access.NavigationControl | Access.ObjectFrame | Access.OptionButton | Access.OptionGroup | Access.Page | Access.SubForm | Access.TabControl | Access.TextBox | Access.ToggleButton | Access.WebBrowserControl, propertyName: 'accName' | 'accValue', parameterTypes: [any], newValue: string): void;
     set(obj: Access._ControlInReportEvents | Access.ComboBox | Access.Control | Access.ListBox, propertyName: 'Selected', parameterTypes: [number], newValue: number): void;
-    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
+    set(obj: AccWizObjects.ImexGrid, propertyName: 'Columns', parameterTypes: [number], newValue: any): void;
+    set(obj: AccWizObjects.ImexGrid, propertyName: 'RowText', parameterTypes: [number], newValue: string): void;
 }
 
 interface ActiveXObjectNameMap {
     'Access.Application': Access.Application;
+    'ACCWIZ.FieldListCtrl': AccWizObjects.FieldList;
+    'ACCWIZ.ImexGridCtrl': AccWizObjects.ImexGrid;
+    lnkfile: AccWizObjects.WizShellLinkA;
 }
diff --git a/types/activex-stdole/index.d.ts b/types/activex-stdole/index.d.ts
index 34b12e4219..070a84a30a 100644
--- a/types/activex-stdole/index.d.ts
+++ b/types/activex-stdole/index.d.ts
@@ -7,14 +7,20 @@
 /// <reference types="activex-interop" />
 
 declare namespace stdole {
+    type IFontDisp = StdFont;
+
     type IPictureDisp = StdPicture;
 
     type OLE_COLOR = number;
 
     type OLE_XPOS_CONTAINER = number;
 
+    type OLE_XPOS_PIXELS = number;
+
     type OLE_YPOS_CONTAINER = number;
 
+    type OLE_YPOS_PIXELS = number;
+
     const enum LoadPictureConstants {
         Color = 4,
         Default = 0,

From 0f4790a00e307ad9e4b76ab9513225a43149aa64 Mon Sep 17 00:00:00 2001
From: segayuu <segayuu@gmail.com>
Date: Tue, 22 May 2018 11:20:17 +0900
Subject: [PATCH 312/575] Create @types/iferr

---
 types/iferr/iferr-tests.ts | 38 ++++++++++++++++++++++++++++++++++++++
 types/iferr/index.d.ts     | 29 +++++++++++++++++++++++++++++
 types/iferr/tsconfig.json  | 16 ++++++++++++++++
 types/iferr/tslint.json    |  1 +
 4 files changed, 84 insertions(+)
 create mode 100644 types/iferr/iferr-tests.ts
 create mode 100644 types/iferr/index.d.ts
 create mode 100644 types/iferr/tsconfig.json
 create mode 100644 types/iferr/tslint.json

diff --git a/types/iferr/iferr-tests.ts b/types/iferr/iferr-tests.ts
new file mode 100644
index 0000000000..f7377358cf
--- /dev/null
+++ b/types/iferr/iferr-tests.ts
@@ -0,0 +1,38 @@
+/// <reference types="node" />
+
+import * as fs from "fs";
+import iferr = require("iferr");
+
+const { tiferr, throwerr, printerr } = iferr;
+
+const { readFile } = fs;
+
+const errcb = (err: Error | undefined) => { throw err; };
+
+readFile("test.txt", iferr(errcb, result => {
+    Buffer.from("test", "utf8") === result;
+}));
+
+readFile("test.txt", "utf8", iferr(errcb, result => {
+    "test" === result;
+}));
+
+readFile("test.txt", tiferr(errcb, result => {
+    Buffer.from("test", "utf8") === result;
+}));
+
+readFile("test.txt", "utf8", tiferr(errcb, result => {
+    "test" === result;
+}));
+
+readFile("test.txt", throwerr(result => {
+    Buffer.from("test", "utf8") === result;
+}));
+
+readFile("test.txt", "utf8", throwerr(result => {
+    "test" === result;
+}));
+
+readFile("test.txt", printerr);
+
+readFile("test.txt", "utf8", printerr);
diff --git a/types/iferr/index.d.ts b/types/iferr/index.d.ts
new file mode 100644
index 0000000000..a330a3455c
--- /dev/null
+++ b/types/iferr/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for iferr
+// Project: https://github.com/shesek/iferr/
+// Definitions by: segayuu <https://github.com/segayuu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare type nodeCallback<T> = (err: Error | undefined, ...a: T[]) => any;
+
+// Delegates to `succ` on sucecss or to `fail` on error
+// ex: Thing.load(123, iferr(cb, thing => ...))
+declare function iferr<T>(fail: (err: Error | undefined) => void, succ: (...result: T[]) => void): nodeCallback<T>
+
+declare namespace iferr {
+    // Delegates to `succ` on sucecss or to `fail` on error
+    // ex: Thing.load(123, iferr(cb, thing => ...))
+    export function iferr<T>(fail: (err: Error | undefined) => void, succ: (...result: T[]) => void): nodeCallback<T>
+
+    // Like iferr, but also catches errors thrown from `succ` and passes to `fail`
+    export function tiferr<T>(fail: (err: Error | undefined) => void, succ: (...result: T[]) => void): nodeCallback<T>
+
+    // Delegate to the success function on success, throws the error otherwise
+    // ex: Thing.load(123, throwerr(thing => ...))
+    export function throwerr<T>(succ: (...result: T[]) => void): nodeCallback<T>
+
+    // Prints errors when one is passed, or does nothing otherwise
+    // ex: Thing.load(123, printerr)
+    export function printerr(): nodeCallback<any>;
+}
+
+export = iferr;
diff --git a/types/iferr/tsconfig.json b/types/iferr/tsconfig.json
new file mode 100644
index 0000000000..5496e49b42
--- /dev/null
+++ b/types/iferr/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", "iferr-tests.ts"]
+}
diff --git a/types/iferr/tslint.json b/types/iferr/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/iferr/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 0e76900909c9f128ef78965b5e33cfd83c675e9d Mon Sep 17 00:00:00 2001
From: segayuu <segayuu@gmail.com>
Date: Tue, 22 May 2018 11:25:13 +0900
Subject: [PATCH 313/575] fix format

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

diff --git a/types/iferr/index.d.ts b/types/iferr/index.d.ts
index a330a3455c..740333576d 100644
--- a/types/iferr/index.d.ts
+++ b/types/iferr/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for iferr
+// Type definitions for iferr 1.0
 // Project: https://github.com/shesek/iferr/
 // Definitions by: segayuu <https://github.com/segayuu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -7,19 +7,19 @@ declare type nodeCallback<T> = (err: Error | undefined, ...a: T[]) => any;
 
 // Delegates to `succ` on sucecss or to `fail` on error
 // ex: Thing.load(123, iferr(cb, thing => ...))
-declare function iferr<T>(fail: (err: Error | undefined) => void, succ: (...result: T[]) => void): nodeCallback<T>
+declare function iferr<T>(fail: (err: Error | undefined) => void, succ: (...result: T[]) => void): nodeCallback<T>;
 
 declare namespace iferr {
     // Delegates to `succ` on sucecss or to `fail` on error
     // ex: Thing.load(123, iferr(cb, thing => ...))
-    export function iferr<T>(fail: (err: Error | undefined) => void, succ: (...result: T[]) => void): nodeCallback<T>
+    export function iferr<T>(fail: (err: Error | undefined) => void, succ: (...result: T[]) => void): nodeCallback<T>;
 
     // Like iferr, but also catches errors thrown from `succ` and passes to `fail`
-    export function tiferr<T>(fail: (err: Error | undefined) => void, succ: (...result: T[]) => void): nodeCallback<T>
+    export function tiferr<T>(fail: (err: Error | undefined) => void, succ: (...result: T[]) => void): nodeCallback<T>;
 
     // Delegate to the success function on success, throws the error otherwise
     // ex: Thing.load(123, throwerr(thing => ...))
-    export function throwerr<T>(succ: (...result: T[]) => void): nodeCallback<T>
+    export function throwerr<T>(succ: (...result: T[]) => void): nodeCallback<T>;
 
     // Prints errors when one is passed, or does nothing otherwise
     // ex: Thing.load(123, printerr)

From 39ae1c9015a03ca081e8ff25896c5440d78ad60b Mon Sep 17 00:00:00 2001
From: segayuu <segayuu@gmail.com>
Date: Tue, 22 May 2018 11:29:19 +0900
Subject: [PATCH 314/575] fix lint: strict-export-declare-modifiers

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

diff --git a/types/iferr/index.d.ts b/types/iferr/index.d.ts
index 740333576d..367a0e2527 100644
--- a/types/iferr/index.d.ts
+++ b/types/iferr/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: segayuu <https://github.com/segayuu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare type nodeCallback<T> = (err: Error | undefined, ...a: T[]) => any;
+type nodeCallback<T> = (err: Error | undefined, ...a: T[]) => any;
 
 // Delegates to `succ` on sucecss or to `fail` on error
 // ex: Thing.load(123, iferr(cb, thing => ...))
@@ -12,18 +12,18 @@ declare function iferr<T>(fail: (err: Error | undefined) => void, succ: (...resu
 declare namespace iferr {
     // Delegates to `succ` on sucecss or to `fail` on error
     // ex: Thing.load(123, iferr(cb, thing => ...))
-    export function iferr<T>(fail: (err: Error | undefined) => void, succ: (...result: T[]) => void): nodeCallback<T>;
+    function iferr<T>(fail: (err: Error | undefined) => void, succ: (...result: T[]) => void): nodeCallback<T>;
 
     // Like iferr, but also catches errors thrown from `succ` and passes to `fail`
-    export function tiferr<T>(fail: (err: Error | undefined) => void, succ: (...result: T[]) => void): nodeCallback<T>;
+    function tiferr<T>(fail: (err: Error | undefined) => void, succ: (...result: T[]) => void): nodeCallback<T>;
 
     // Delegate to the success function on success, throws the error otherwise
     // ex: Thing.load(123, throwerr(thing => ...))
-    export function throwerr<T>(succ: (...result: T[]) => void): nodeCallback<T>;
+    function throwerr<T>(succ: (...result: T[]) => void): nodeCallback<T>;
 
     // Prints errors when one is passed, or does nothing otherwise
     // ex: Thing.load(123, printerr)
-    export function printerr(): nodeCallback<any>;
+    function printerr(): nodeCallback<any>;
 }
 
 export = iferr;

From 2025c31a923c7de26e3a0f370d2c4d0f51163616 Mon Sep 17 00:00:00 2001
From: segayuu <segayuu@gmail.com>
Date: Tue, 22 May 2018 11:41:47 +0900
Subject: [PATCH 315/575] fix format from dts-gen

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

diff --git a/types/iferr/index.d.ts b/types/iferr/index.d.ts
index 367a0e2527..c65c270b49 100644
--- a/types/iferr/index.d.ts
+++ b/types/iferr/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for iferr 1.0
-// Project: https://github.com/shesek/iferr/
+// Project: https://github.com/shesek/iferr
 // Definitions by: segayuu <https://github.com/segayuu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/types/iferr/tsconfig.json b/types/iferr/tsconfig.json
index 5496e49b42..db97bdf495 100644
--- a/types/iferr/tsconfig.json
+++ b/types/iferr/tsconfig.json
@@ -1,16 +1,23 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es6"],
+        "lib": [
+            "es6"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
         "baseUrl": "../",
-        "typeRoots": ["../"],
+        "typeRoots": [
+            "../"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "strictFunctionTypes": true
     },
-    "files": ["index.d.ts", "iferr-tests.ts"]
+    "files": [
+        "index.d.ts",
+        "iferr-tests.ts"
+    ]
 }

From 10bc9fc21d369868ea82eb83f06b1c28dd5d929a Mon Sep 17 00:00:00 2001
From: Cerberuser <computers05@mail.ru>
Date: Tue, 22 May 2018 10:43:21 +0700
Subject: [PATCH 316/575] Added extensions usage for cytoscape

---
 types/cytoscape/index.d.ts | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/types/cytoscape/index.d.ts b/types/cytoscape/index.d.ts
index 4da9cd9ca0..15df29a1f3 100644
--- a/types/cytoscape/index.d.ts
+++ b/types/cytoscape/index.d.ts
@@ -4527,4 +4527,23 @@ declare namespace cytoscape {
          */
         promise(animationEvent?: "completed" | "complete" | "frame"): Promise<EventObject>;
     }
-}
+
+    /**
+     * Cytoscape extension type
+     * Definition of an extension would be in following form:
+     * @example
+     * declare module 'cytoscape-ext' {
+     *  const ext: cytoscape.Ext;
+     *  export = ext;
+     * }
+     */
+    type Ext = (cytoscape: Function) => void;
+    /**
+     * Register imported extension into cytoscape
+     * @param module Entry point for the extension, got by module = require('cy-ext')
+     * or by import module from 'cy-ext'
+     * http://js.cytoscape.org/#extensions
+     */
+    function use(module: Ext): void;
+
+}
\ No newline at end of file

From 8464f21b179717a911d918d33b0ece05a55da12b Mon Sep 17 00:00:00 2001
From: Cerberuser <computers05@mail.ru>
Date: Tue, 22 May 2018 11:17:12 +0700
Subject: [PATCH 317/575] Fix for extension type definition

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

diff --git a/types/cytoscape/index.d.ts b/types/cytoscape/index.d.ts
index 15df29a1f3..18c3c0d1b5 100644
--- a/types/cytoscape/index.d.ts
+++ b/types/cytoscape/index.d.ts
@@ -4,6 +4,7 @@
 //                  Shenghan Gao <https://github.com/wy193777>
 //                  Yuri Pereira Constante <https://github.com/ypconstante>
 //                  Jan-Niclas Struewer <https://github.com/janniclas>
+//                  Cerberuser <https://github.com/cerberuser>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 //
 // Translation from Objects in help to Typescript interface.
@@ -4537,7 +4538,7 @@ declare namespace cytoscape {
      *  export = ext;
      * }
      */
-    type Ext = (cytoscape: Function) => void;
+    type Ext = (cytoscape: (options?: CytoscapeOptions) => Core) => void;
     /**
      * Register imported extension into cytoscape
      * @param module Entry point for the extension, got by module = require('cy-ext')
@@ -4545,5 +4546,4 @@ declare namespace cytoscape {
      * http://js.cytoscape.org/#extensions
      */
     function use(module: Ext): void;
-
-}
\ No newline at end of file
+}

From 1b5b5ddfa1cb698e776be29034a80aaabc5fff6f Mon Sep 17 00:00:00 2001
From: Christian Rackerseder <git@echooff.de>
Date: Tue, 22 May 2018 07:06:11 +0200
Subject: [PATCH 318/575] Fixed import in test

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

diff --git a/types/loadjs/test/loadjs-tests.ts b/types/loadjs/test/loadjs-tests.ts
index 0168130361..e61df50ec8 100644
--- a/types/loadjs/test/loadjs-tests.ts
+++ b/types/loadjs/test/loadjs-tests.ts
@@ -1,4 +1,4 @@
-import * as importedLoadJs from 'loadjs';
+import importedLoadJs = require('loadjs');
 
 const loadOptions: importedLoadJs.LoadOptions = {
     before: (path, scriptEl) => {},

From a11c01b085e76ab8bac1d11aea3ad44dbb29b4d6 Mon Sep 17 00:00:00 2001
From: Peter Safranek <pe8ter@mac.com>
Date: Sun, 20 May 2018 01:03:28 -0700
Subject: [PATCH 319/575] Add typings for just-extend.

---
 types/just-extend/index.d.ts           | 11 ++++++
 types/just-extend/just-extend-tests.ts | 52 ++++++++++++++++++++++++++
 types/just-extend/tsconfig.json        | 23 ++++++++++++
 types/just-extend/tslint.json          |  1 +
 4 files changed, 87 insertions(+)
 create mode 100644 types/just-extend/index.d.ts
 create mode 100644 types/just-extend/just-extend-tests.ts
 create mode 100644 types/just-extend/tsconfig.json
 create mode 100644 types/just-extend/tslint.json

diff --git a/types/just-extend/index.d.ts b/types/just-extend/index.d.ts
new file mode 100644
index 0000000000..7aceac4b35
--- /dev/null
+++ b/types/just-extend/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for just-extend 1.1
+// Project: https://github.com/angus-c/just#readme
+// Definitions by: Peter Safranek <https://github.com/pe8ter>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare function extend(obj1: object, ...objn: any[]): object;
+
+declare function extend(deep: boolean, obj1: object, ...objn: any[]): object;
+
+export = extend;
diff --git a/types/just-extend/just-extend-tests.ts b/types/just-extend/just-extend-tests.ts
new file mode 100644
index 0000000000..74d5101430
--- /dev/null
+++ b/types/just-extend/just-extend-tests.ts
@@ -0,0 +1,52 @@
+import extend = require("just-extend");
+
+// Pass single `object`.
+extend({}); // $ExpectType object
+extend([]); // $ExpectType object
+extend(() => {}); // $ExpectType object
+
+// Pass single `object`, then `any`.
+extend({}, 0); // $ExpectType object
+extend({}, ""); // $ExpectType object
+extend({}, false); // $ExpectType object
+extend({}, null); // $ExpectType object
+extend({}, undefined); // $ExpectType object
+extend({}, {}); // $ExpectType object
+extend({}, []); // $ExpectType object
+extend({}, () => {}); // $ExpectType object
+
+// Pass variadic args.
+extend({}, 0, "", false, null, undefined, {}, [], () => {}); // $ExpectType object
+
+// Pass `boolean`, then single `object`.
+extend(true, {}); // $ExpectType object
+extend(true, []); // $ExpectType object
+extend(true, () => {}); // $ExpectType object
+
+// Pass `boolean`, single `object`, then `any`.
+extend(true, {}, 0); // $ExpectType object
+extend(true, {}, ""); // $ExpectType object
+extend(true, {}, false); // $ExpectType object
+extend(true, {}, null); // $ExpectType object
+extend(true, {}, undefined); // $ExpectType object
+extend(true, {}, {}); // $ExpectType object
+extend(true, {}, []); // $ExpectType object
+extend(true, {}, () => {}); // $ExpectType object
+
+// Pass `boolean`, then variadic args.
+extend(true, {}, 0, "", false, null, undefined, {}, [], () => {}); // $ExpectType object
+
+// Incorrect extendee `object`.
+extend(); // $ExpectError
+extend(0); // $ExpectError
+extend(""); // $ExpectError
+extend(false); // $ExpectError
+extend(null); // $ExpectError
+extend(undefined); // $ExpectError
+
+// Pass `boolean` with incorrect extendee `object`.
+extend(true, 0); // $ExpectError
+extend(true, ""); // $ExpectError
+extend(true, false); // $ExpectError
+extend(true, null); // $ExpectError
+extend(true, undefined); // $ExpectError
diff --git a/types/just-extend/tsconfig.json b/types/just-extend/tsconfig.json
new file mode 100644
index 0000000000..deec8db29c
--- /dev/null
+++ b/types/just-extend/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",
+        "just-extend-tests.ts"
+    ]
+}
diff --git a/types/just-extend/tslint.json b/types/just-extend/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/just-extend/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 73b332fdfcd3d2676e0f4dacc6a9e019cdd11bc0 Mon Sep 17 00:00:00 2001
From: "Amir.Tugi@Gmail.com" <Amir.T@logz.io>
Date: Tue, 22 May 2018 09:00:28 +0300
Subject: [PATCH 320/575] Add decleration file for express-paginate

---
 .../express-paginate-tests.ts                 | 26 +++++++++++++++++++
 types/express-paginate/index.d.ts             | 21 +++++++++++++++
 types/express-paginate/tsconfig.json          | 22 ++++++++++++++++
 types/express-paginate/tslint.json            |  1 +
 4 files changed, 70 insertions(+)
 create mode 100644 types/express-paginate/express-paginate-tests.ts
 create mode 100644 types/express-paginate/index.d.ts
 create mode 100644 types/express-paginate/tsconfig.json
 create mode 100644 types/express-paginate/tslint.json

diff --git a/types/express-paginate/express-paginate-tests.ts b/types/express-paginate/express-paginate-tests.ts
new file mode 100644
index 0000000000..5847bf2b1b
--- /dev/null
+++ b/types/express-paginate/express-paginate-tests.ts
@@ -0,0 +1,26 @@
+import * as express from 'express';
+import * as paginate from 'express-paginate';
+
+declare function findAndCountAll(params: object): Promise<{count: number, rows: object[]}>;
+
+const app = express();
+
+app.use(paginate.middleware(10, 50))
+
+app.get('/users', async (req: paginate.PaginatedRequest, res, next) => {
+    // req.skip should be available
+    return findAndCountAll({limit: req.query.limit, offset: req.skip})
+        .then(results => {
+            const itemCount = results.count;
+            const pageCount = Math.ceil(results.count / req.query.limit);
+            res.render('users/all_users', {
+                users: results.rows,
+                pageCount,
+                itemCount,
+                currentPageHref: paginate.href(req)(false, req.params),
+                // Instead of exposing this to the html template, we'll test this here and pass a static number
+                hasNextPages: paginate.hasNextPages(req)(pageCount),
+                pages: paginate.getArrayPages(req)(3, pageCount, req.query.page)
+            });
+        }).catch(err => next(err))
+});
diff --git a/types/express-paginate/index.d.ts b/types/express-paginate/index.d.ts
new file mode 100644
index 0000000000..7352dbee95
--- /dev/null
+++ b/types/express-paginate/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for express-paginate 1.0
+// Project: https://github.com/niftylettuce/express-paginate
+// Definitions by: My Self <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as express from 'express';
+
+interface PageElement {
+    number: number;
+    url: typeof href;
+}
+
+export interface PaginatedRequest extends express.Request {
+    skip: number;
+    offset: number;
+}
+
+export function middleware(limit: number, maxLimit: number): (req: express.Request, res: express.Response, next: express.NextFunction) => void;
+export function hasNextPages(req: express.Request): (pageCount: number) => boolean;
+export function href(req: express.Request): (prev: object | boolean, params: object) => string;
+export function getArrayPages(req: express.Request): (limit: number, pageCount: number, currentPage: number) => PageElement[];
diff --git a/types/express-paginate/tsconfig.json b/types/express-paginate/tsconfig.json
new file mode 100644
index 0000000000..61a6c089fc
--- /dev/null
+++ b/types/express-paginate/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",
+        "express-paginate-tests.ts"
+    ]
+}
diff --git a/types/express-paginate/tslint.json b/types/express-paginate/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/express-paginate/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 38b841e1c89c11483a67b99a9710a60872f36726 Mon Sep 17 00:00:00 2001
From: Zhenia Spirin <spirin@arview.pro>
Date: Tue, 22 May 2018 13:39:51 +0700
Subject: [PATCH 321/575] Added keepLocalTime converting option

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

diff --git a/types/moment-timezone/index.d.ts b/types/moment-timezone/index.d.ts
index da5e42bc2d..3a8228dc35 100644
--- a/types/moment-timezone/index.d.ts
+++ b/types/moment-timezone/index.d.ts
@@ -58,7 +58,7 @@ declare module "moment" {
 
     interface Moment {
         tz(): string;
-        tz(timezone: string): Moment;
+        tz(timezone: string, keepLocalTime?: boolean): Moment;
         zoneAbbr(): string;
         zoneName(): string;
     }
diff --git a/types/moment-timezone/moment-timezone-tests.ts b/types/moment-timezone/moment-timezone-tests.ts
index 66bb7403ea..9c0ff9508f 100644
--- a/types/moment-timezone/moment-timezone-tests.ts
+++ b/types/moment-timezone/moment-timezone-tests.ts
@@ -23,6 +23,7 @@ const language = "en";
 
 moment.tz();
 moment.tz("America/Los_Angeles");
+moment.tz("America/Los_Angeles").tz("Asia/Tomsk", true);
 
 moment.tz(num, "America/Los_Angeles");
 moment.tz(arr, "America/Los_Angeles");

From 061b46150a4bbcf406a7494663944c6350d80aaa Mon Sep 17 00:00:00 2001
From: "Amir.Tugi@Gmail.com" <Amir.T@logz.io>
Date: Tue, 22 May 2018 10:16:14 +0300
Subject: [PATCH 322/575] Add fixes for strictFunctionType

---
 types/express-paginate/express-paginate-tests.ts |  2 +-
 types/express-paginate/index.d.ts                | 14 +++++++++-----
 types/express-paginate/tsconfig.json             |  1 +
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/types/express-paginate/express-paginate-tests.ts b/types/express-paginate/express-paginate-tests.ts
index 5847bf2b1b..d31c70362c 100644
--- a/types/express-paginate/express-paginate-tests.ts
+++ b/types/express-paginate/express-paginate-tests.ts
@@ -7,7 +7,7 @@ const app = express();
 
 app.use(paginate.middleware(10, 50))
 
-app.get('/users', async (req: paginate.PaginatedRequest, res, next) => {
+app.get('/users', async (req, res, next) => {
     // req.skip should be available
     return findAndCountAll({limit: req.query.limit, offset: req.skip})
         .then(results => {
diff --git a/types/express-paginate/index.d.ts b/types/express-paginate/index.d.ts
index 7352dbee95..94411c2fe4 100644
--- a/types/express-paginate/index.d.ts
+++ b/types/express-paginate/index.d.ts
@@ -5,16 +5,20 @@
 
 import * as express from 'express';
 
+declare global {
+    namespace Express {
+        export interface Request {
+            skip?: number,
+            offset?: number,
+        }
+    }
+}
+
 interface PageElement {
     number: number;
     url: typeof href;
 }
 
-export interface PaginatedRequest extends express.Request {
-    skip: number;
-    offset: number;
-}
-
 export function middleware(limit: number, maxLimit: number): (req: express.Request, res: express.Response, next: express.NextFunction) => void;
 export function hasNextPages(req: express.Request): (pageCount: number) => boolean;
 export function href(req: express.Request): (prev: object | boolean, params: object) => string;
diff --git a/types/express-paginate/tsconfig.json b/types/express-paginate/tsconfig.json
index 61a6c089fc..9370f2106b 100644
--- a/types/express-paginate/tsconfig.json
+++ b/types/express-paginate/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From f4b3dcad41394e5fdeef67d08d7faa0b9de5c0e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marius=20=C5=BDil=C4=97nas?=
 <spookiecookie@users.noreply.github.com>
Date: Tue, 22 May 2018 10:22:33 +0300
Subject: [PATCH 323/575] Typo fix

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

diff --git a/types/tedious/index.d.ts b/types/tedious/index.d.ts
index 409ff67878..287e62d187 100644
--- a/types/tedious/index.d.ts
+++ b/types/tedious/index.d.ts
@@ -336,7 +336,7 @@ export declare class Request extends events.EventEmitter {
 
     /**
      * Add an input parameter to the request.
-     * @param name The parameter name. This should correspond to a parameter in the SQL, or a parameter that a called procedure expects. The name should not start '@'.
+     * @param name The parameter name. This should correspond to a parameter in the SQL, or a parameter that a called procedure expects. The name should not start with '@'.
      * @param type One of the supported data types.
      * @param value The value that the parameter is to be given. The Javascript type of the argument should match that documented for data types.
      * @param options Additional type options. Optional.

From bfdbdd2d6dcb2f9a484ac3c8142c6a7a8f3f3c7b Mon Sep 17 00:00:00 2001
From: "Amir.Tugi@Gmail.com" <Amir.T@logz.io>
Date: Tue, 22 May 2018 10:35:04 +0300
Subject: [PATCH 324/575] Mark limit and maxLimit as optional

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

diff --git a/types/express-paginate/index.d.ts b/types/express-paginate/index.d.ts
index 94411c2fe4..403bd92979 100644
--- a/types/express-paginate/index.d.ts
+++ b/types/express-paginate/index.d.ts
@@ -19,7 +19,7 @@ interface PageElement {
     url: typeof href;
 }
 
-export function middleware(limit: number, maxLimit: number): (req: express.Request, res: express.Response, next: express.NextFunction) => void;
+export function middleware(limit?: number, maxLimit?: number): (req: express.Request, res: express.Response, next: express.NextFunction) => void;
 export function hasNextPages(req: express.Request): (pageCount: number) => boolean;
 export function href(req: express.Request): (prev: object | boolean, params: object) => string;
 export function getArrayPages(req: express.Request): (limit: number, pageCount: number, currentPage: number) => PageElement[];

From 7b1ffa62c26de6dec4295784f4dce6469f1a7d8c Mon Sep 17 00:00:00 2001
From: Vincent Biret <vincentbiret@hotmail.com>
Date: Tue, 22 May 2018 10:57:04 +0200
Subject: [PATCH 325/575] fixing a bug where SharePoint type definitions would
 include an implicit any

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

diff --git a/types/sharepoint/index.d.ts b/types/sharepoint/index.d.ts
index 4852d8440c..a3c49d670d 100644
--- a/types/sharepoint/index.d.ts
+++ b/types/sharepoint/index.d.ts
@@ -2158,7 +2158,7 @@ declare namespace SP {
     let ClientObjectCollection: ClientObjectCollectionConstructor;
 
     interface ClientObjectList<T> extends SP.ClientObjectCollection<T> {
-        new(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPath, childItemType: any);
+        new(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPath, childItemType: any): ClientObjectList<T>;
         fromJson(initValue: any): void;
         customFromJson(initValue: any): boolean;
     }
@@ -2210,7 +2210,7 @@ declare namespace SP {
     class ClientRequestSucceededEventArgs extends SP.ClientRequestEventArgs {
     }
     interface ClientRuntimeContext extends Sys.IDisposable {
-        new(serverRelativeUrlOrFullUrl: string);
+        new(serverRelativeUrlOrFullUrl: string): ClientRuntimeContext;
         get_url(): string;
         get_viaUrl(): string;
         set_viaUrl(value: string): void;

From 11bf2bb552772515399647d9e1fb6a10e6810624 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vincentbiret@hotmail.com>
Date: Tue, 22 May 2018 11:18:00 +0200
Subject: [PATCH 326/575] sharepoint: fixed linting to match new rules

---
 types/sharepoint/index.d.ts  | 30 +++++++++++++++---------------
 types/sharepoint/tslint.json |  1 +
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/types/sharepoint/index.d.ts b/types/sharepoint/index.d.ts
index a3c49d670d..9cf6abfa2b 100644
--- a/types/sharepoint/index.d.ts
+++ b/types/sharepoint/index.d.ts
@@ -5309,11 +5309,11 @@ declare namespace Microsoft.SharePoint.Client.Search {
         }
 
         interface StringCollection extends SP.ClientObjectCollection<string> {
-            itemAt: (index: number) => string;
-            get_item: (index: number) => string;
-            get_childItemType: () => typeof String;
-            add: (property: string) => void;
-            clear: () => void;
+            itemAt(index: number): string;
+            get_item(index: number): string;
+            get_childItemType(): typeof String;
+            add(property: string): void;
+            clear(): void;
         }
         interface StringCollectionConstructor {
             new(context: SP.ClientContext): StringCollection;
@@ -5393,11 +5393,11 @@ declare namespace Microsoft.SharePoint.Client.Search {
             static queryPropertyValueToObject: (val: QueryPropertyValue) => any;
         }
         interface ReorderingRuleCollection extends SP.ClientObjectCollection<ReorderingRule> {
-            itemAt: (index: number) => ReorderingRule;
-            get_item: (index: number) => ReorderingRule;
-            get_childItemType: () => typeof ReorderingRule;
-            add: (property: ReorderingRule) => void;
-            clear: () => void;
+            itemAt(index: number): ReorderingRule;
+            get_item(index: number): ReorderingRule;
+            get_childItemType(): typeof ReorderingRule;
+            add(property: ReorderingRule): void;
+            clear(): void;
         }
 
         enum ReorderingRuleMatchType {
@@ -5424,11 +5424,11 @@ declare namespace Microsoft.SharePoint.Client.Search {
         }
 
         interface SortCollection extends SP.ClientObjectCollection<Sort> {
-            itemAt: (index: number) => Sort;
-            get_item: (index: number) => Sort;
-            get_childItemType: () => typeof Sort;
-            add: (strProperty: string, sortDirection: SortDirection) => void;
-            clear: () => void;
+            itemAt(index: number): Sort;
+            get_item(index: number): Sort;
+            get_childItemType(): typeof Sort;
+            add(strProperty: string, sortDirection: SortDirection): void;
+            clear(): void;
         }
 
         enum SortDirection {
diff --git a/types/sharepoint/tslint.json b/types/sharepoint/tslint.json
index c1514ba316..06bd920191 100644
--- a/types/sharepoint/tslint.json
+++ b/types/sharepoint/tslint.json
@@ -8,6 +8,7 @@
         "no-any-union": false,
         "no-const-enum": false,
         "no-duplicate-imports": false,
+        "no-empty-interface": false,
         "no-inferrable-types": false,
         "no-namespace": false,
         "no-mergeable-namespace": false,

From 5aafbff1756ac3f044f048e319d9e6900756d7bb Mon Sep 17 00:00:00 2001
From: Alessio Paccoia <alessio.paccoia@cubbit.net>
Date: Tue, 22 May 2018 11:20:21 +0200
Subject: [PATCH 327/575] Test import fix

---
 types/ps-tree/ps-tree-tests.ts | 2 +-
 types/ps-tree/tsconfig.json    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/ps-tree/ps-tree-tests.ts b/types/ps-tree/ps-tree-tests.ts
index 9af8b9f53c..2ef6c48c27 100644
--- a/types/ps-tree/ps-tree-tests.ts
+++ b/types/ps-tree/ps-tree-tests.ts
@@ -1,4 +1,4 @@
-import * as ps_tree from "ps-tree";
+import ps_tree from "ps-tree";
 
 ps_tree(1, () => {}); // $ExpectType void
 ps_tree(1, (error: Error, children: ReadonlyArray<ps_tree.PS>) => {
diff --git a/types/ps-tree/tsconfig.json b/types/ps-tree/tsconfig.json
index 4f3bd8dcfc..9bb8c2d8e1 100644
--- a/types/ps-tree/tsconfig.json
+++ b/types/ps-tree/tsconfig.json
@@ -1,5 +1,6 @@
 {
     "compilerOptions": {
+        "esModuleInterop": true,
         "module": "commonjs",
         "lib": [
             "es6"

From f256322874b3fc39bcc43d8433e36b4b99402c61 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vincentbiret@hotmail.com>
Date: Tue, 22 May 2018 11:21:35 +0200
Subject: [PATCH 328/575] sharepoint: further fixed constructors declarations
 following recommendations

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

diff --git a/types/sharepoint/index.d.ts b/types/sharepoint/index.d.ts
index 9cf6abfa2b..cbf55ba3f7 100644
--- a/types/sharepoint/index.d.ts
+++ b/types/sharepoint/index.d.ts
@@ -2157,15 +2157,11 @@ declare namespace SP {
     }
     let ClientObjectCollection: ClientObjectCollectionConstructor;
 
-    interface ClientObjectList<T> extends SP.ClientObjectCollection<T> {
-        new(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPath, childItemType: any): ClientObjectList<T>;
+    class ClientObjectList<T> extends SP.ClientObjectCollection<T> {
+        constructor(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPath, childItemType: any);
         fromJson(initValue: any): void;
         customFromJson(initValue: any): boolean;
     }
-    interface ClientObjectListConstructor {
-        new<T>(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPath, childItemType: any): ClientObjectList<T>;
-    }
-    let ClientObjectList: ClientObjectListConstructor;
     class ClientObjectPrototype {
         retrieve(propertyNames?: string[]): void;
         retrieveObject(propertyName: string): SP.ClientObjectPrototype;
@@ -2209,8 +2205,8 @@ declare namespace SP {
     }
     class ClientRequestSucceededEventArgs extends SP.ClientRequestEventArgs {
     }
-    interface ClientRuntimeContext extends Sys.IDisposable {
-        new(serverRelativeUrlOrFullUrl: string): ClientRuntimeContext;
+    class ClientRuntimeContext implements Sys.IDisposable {
+        constructor(serverRelativeUrlOrFullUrl: string);
         get_url(): string;
         get_viaUrl(): string;
         set_viaUrl(value: string): void;

From e8754a341a0cc6a2fb061146149ff435ab83e29c Mon Sep 17 00:00:00 2001
From: Vincent Biret <vincentbiret@hotmail.com>
Date: Tue, 22 May 2018 11:23:17 +0200
Subject: [PATCH 329/575] sharepoint: bumped required version for typescript

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

diff --git a/types/sharepoint/index.d.ts b/types/sharepoint/index.d.ts
index cbf55ba3f7..fc7de5cf3d 100644
--- a/types/sharepoint/index.d.ts
+++ b/types/sharepoint/index.d.ts
@@ -6,7 +6,7 @@
 //                 Tero Arvola <https://github.com/teroarvola>
 //                 Dennis George <https://github.com/dennispg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.5
 
 /// <reference types="microsoft-ajax" />
 

From 72d83339ddd56e99e06959c5f659a48bf48e9571 Mon Sep 17 00:00:00 2001
From: Alessio Paccoia <alessio.paccoia@cubbit.net>
Date: Tue, 22 May 2018 11:33:17 +0200
Subject: [PATCH 330/575] Add typescript version to header

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

diff --git a/types/ps-tree/index.d.ts b/types/ps-tree/index.d.ts
index a915c9f547..ff60b6241e 100644
--- a/types/ps-tree/index.d.ts
+++ b/types/ps-tree/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://github.com/indexzero/ps-tree
 // Definitions by: Alessio Paccoia <https://github.com/alessiopcc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
 
 declare namespace ps_tree {
     interface PS {

From 6891a455e9b34b7668ed1429604cad59fe485c0b Mon Sep 17 00:00:00 2001
From: KevinRamharak <kevinramharak_95@hotmail.com>
Date: Tue, 22 May 2018 11:34:47 +0200
Subject: [PATCH 331/575] changed import statement and added tests

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

diff --git a/types/module-alias/index.d.ts b/types/module-alias/index.d.ts
index 159b78111b..09fd2f7ed8 100644
--- a/types/module-alias/index.d.ts
+++ b/types/module-alias/index.d.ts
@@ -10,6 +10,9 @@ export = init;
  */
 declare function init(options?: string | init.Options): void;
 
+/**
+ * Exported functoins
+ */
 declare namespace init {
     function isPathMatchesAlias(path: string, alias: string): boolean;
 
diff --git a/types/module-alias/module-alias-tests.ts b/types/module-alias/module-alias-tests.ts
index 06f56f3ac2..6e5ddfc7ee 100644
--- a/types/module-alias/module-alias-tests.ts
+++ b/types/module-alias/module-alias-tests.ts
@@ -1,3 +1,12 @@
-import * as moduleAlias from 'module-alias';
+import moduleAlias = require('module-alias');
+
+moduleAlias('path'); // $ExpectType void
+moduleAlias({ base : 'path' }); // $ExpectType void
 
 moduleAlias.isPathMatchesAlias('./path', '@alias'); // $ExpectType boolean
+
+moduleAlias.addPath('path'); // $ExpectType void
+moduleAlias.addAliases({ alias : 'path', anotherAlias : 'anotherPath' }); // $ExpectType void
+moduleAlias.addAlias('@alias', 'somePath'); // $ExpectType void
+
+moduleAlias.reset(); // $ExpectType void

From 031b5fc38e0eadc3ccea165940f6ed951795c819 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vincentbiret@hotmail.com>
Date: Tue, 22 May 2018 11:35:10 +0200
Subject: [PATCH 332/575] sharepoint: further fixed constructors declarations

---
 types/sharepoint/index.d.ts | 45 ++++++++++++-------------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/types/sharepoint/index.d.ts b/types/sharepoint/index.d.ts
index fc7de5cf3d..5340aa5983 100644
--- a/types/sharepoint/index.d.ts
+++ b/types/sharepoint/index.d.ts
@@ -106,8 +106,8 @@ declare namespace SP {
         static resizeImageToSquareLength(imgElement: HTMLImageElement, squareLength: number): void;
     }
 
-    interface PageContextInfo {
-        new(): PageContextInfoInstance;
+    class PageContextInfo {
+        constructor();
         get_siteServerRelativeUrl(): string;
         get_webServerRelativeUrl(): string;
         get_webAbsoluteUrl(): string;
@@ -132,7 +132,6 @@ declare namespace SP {
     interface PageContextInfoInstance {
         get_pagePersonalizationScope(): string;
     }
-    let PageContextInfo: PageContextInfo;
 
     class ContextPermissions {
         has(perm: number): boolean;
@@ -2139,7 +2138,8 @@ declare namespace SP {
         constructor();
     }
     /** Provides a base class for a collection of objects on a remote client. */
-    interface ClientObjectCollection<T> extends SP.ClientObject, IEnumerable<T> {
+    class ClientObjectCollection<T> extends SP.ClientObject implements IEnumerable<T> {
+        constructor();
         get_areItemsAvailable(): boolean;
         /** Gets the data for all of the items in the collection. */
         retrieveItems(): SP.ClientObjectPrototype;
@@ -2152,11 +2152,6 @@ declare namespace SP {
         getItemAtIndex(index: number): T;
         fromJson(obj: any): void;
     }
-    interface ClientObjectCollectionConstructor {
-        new<T>(): ClientObjectCollection<T>;
-    }
-    let ClientObjectCollection: ClientObjectCollectionConstructor;
-
     class ClientObjectList<T> extends SP.ClientObjectCollection<T> {
         constructor(context: SP.ClientRuntimeContext, objectPath: SP.ObjectPath, childItemType: any);
         fromJson(initValue: any): void;
@@ -2443,16 +2438,13 @@ declare namespace SP {
         assemblyVersion: string;
         wssMajorVersion: string;
     }
-    interface ClientContext extends SP.ClientRuntimeContext {
+    class ClientContext extends SP.ClientRuntimeContext {
+        constructor(serverRelativeUrlOrFullUrl?: string);
         get_web(): SP.Web;
         get_site(): SP.Site;
         get_serverVersion(): string;
+        static get_current(): SP.ClientContext;
     }
-    interface ClientContextConstructor {
-        new(serverRelativeUrlOrFullUrl?: string): ClientContext;
-        get_current(): SP.ClientContext;
-    }
-    let ClientContext: ClientContextConstructor;
     enum ULSTraceLevel {
         verbose,
     }
@@ -4398,18 +4390,15 @@ declare namespace SP {
         update(): void;
         deleteObject(): void;
     }
-    interface RoleDefinitionBindingCollectionConstructor {
-        new(context: SP.ClientRuntimeContext): SP.RoleDefinitionBindingCollection;
-        newObject(context: SP.ClientRuntimeContext): SP.RoleDefinitionBindingCollection;
-    }
-    interface RoleDefinitionBindingCollection extends SP.ClientObjectCollection<RoleDefinition> {
+    class RoleDefinitionBindingCollection extends SP.ClientObjectCollection<RoleDefinition> {
+        constructor(context: SP.ClientRuntimeContext);
         itemAt(index: number): SP.RoleDefinition;
         get_item(index: number): SP.RoleDefinition;
         add(roleDefinition: SP.RoleDefinition): void;
         remove(roleDefinition: SP.RoleDefinition): void;
         removeAll(): void;
+        static newObject(context: SP.ClientRuntimeContext): SP.RoleDefinitionBindingCollection;
     }
-    let RoleDefinitionBindingCollection: RoleDefinitionBindingCollectionConstructor;
     interface RoleDefinitionCollection extends SP.ClientObjectCollection<RoleDefinition> {
         itemAt(index: number): SP.RoleDefinition;
         get_item(index: number): SP.RoleDefinition;
@@ -5304,17 +5293,14 @@ declare namespace Microsoft.SharePoint.Client.Search {
             exportPopularQueries: (web: SP.Web, sourceId: SP.Guid) => SP.JsonObjectResult;
         }
 
-        interface StringCollection extends SP.ClientObjectCollection<string> {
+        class StringCollection extends SP.ClientObjectCollection<string> {
+            constructor(context: SP.ClientContext);
             itemAt(index: number): string;
             get_item(index: number): string;
             get_childItemType(): typeof String;
             add(property: string): void;
             clear(): void;
         }
-        interface StringCollectionConstructor {
-            new(context: SP.ClientContext): StringCollection;
-        }
-        let StringCollection: StringCollectionConstructor;
 
         class QueryPersonalizationData extends SP.ClientObject {
             // It's really empty;
@@ -6924,15 +6910,12 @@ declare namespace SP {
             getValidatedString(value: TaxonomyFieldValue): SP.StringResult;
         }
 
-        interface TaxonomyFieldValueCollection extends SP.ClientObjectCollection<TaxonomyFieldValue> {
+        class TaxonomyFieldValueCollection extends SP.ClientObjectCollection<TaxonomyFieldValue> {
+            constructor(context: SP.ClientContext, fieldValue: string, creatingField: SP.Field);
             itemAt(index: number): TaxonomyFieldValue;
             get_item(index: number): TaxonomyFieldValue;
             populateFromLabelGuidPairs(text: string): void;
         }
-        interface TaxonomyFieldValueCollectionConstructor {
-            new(context: SP.ClientContext, fieldValue: string, creatingField: SP.Field): TaxonomyFieldValueCollection;
-        }
-        let TaxonomyFieldValueCollection: TaxonomyFieldValueCollectionConstructor;
 
         class TaxonomyFieldValue extends SP.ClientValueObject {
             get_label(): string;

From 12611f18174fd35b0b68a59d9f83eb11cc8ac655 Mon Sep 17 00:00:00 2001
From: Niklas Lindgren <niklas@musicglue.com>
Date: Tue, 22 May 2018 10:33:28 +0100
Subject: [PATCH 333/575] fix: drop patch revision from version target

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

diff --git a/types/node-fetch/index.d.ts b/types/node-fetch/index.d.ts
index 47638e382f..4a58733faf 100644
--- a/types/node-fetch/index.d.ts
+++ b/types/node-fetch/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for node-fetch v2.1.2
+// Type definitions for node-fetch 2.1
 // Project: https://github.com/bitinn/node-fetch
 // Definitions by: Torsten Werner <https://github.com/torstenwerner>
 //                 Niklas Lindgren <https://github.com/nikcorg>

From 25dc914d1a7f32d188d011c140d63cd7e07a6106 Mon Sep 17 00:00:00 2001
From: Niklas Lindgren <niklas@musicglue.com>
Date: Tue, 22 May 2018 10:45:25 +0100
Subject: [PATCH 334/575] chore: enable linting rules

---
 types/node-fetch/tslint.json | 78 +-----------------------------------
 1 file changed, 1 insertion(+), 77 deletions(-)

diff --git a/types/node-fetch/tslint.json b/types/node-fetch/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/node-fetch/tslint.json
+++ b/types/node-fetch/tslint.json
@@ -1,79 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
+    "extends": "dtslint/dt.json"
 }

From 78cdbacb040e77e5232bea80a69384b14b1c9fe0 Mon Sep 17 00:00:00 2001
From: Niklas Lindgren <niklas@musicglue.com>
Date: Tue, 22 May 2018 10:46:34 +0100
Subject: [PATCH 335/575] fix: address linting errors

---
 types/node-fetch/index.d.ts          | 45 ++++++++++++++--------------
 types/node-fetch/node-fetch-tests.ts | 32 ++++++++++----------
 2 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/types/node-fetch/index.d.ts b/types/node-fetch/index.d.ts
index 4a58733faf..1ea5542691 100644
--- a/types/node-fetch/index.d.ts
+++ b/types/node-fetch/index.d.ts
@@ -4,7 +4,7 @@
 //                 Niklas Lindgren <https://github.com/nikcorg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-///<reference types="node" />
+/// <reference types="node" />
 
 import { Agent } from "http";
 
@@ -18,7 +18,7 @@ export class Request extends Body {
     referrer: string;
     url: string;
 
-    //node-fetch extensions to the whatwg/fetch spec
+    // node-fetch extensions to the whatwg/fetch spec
     agent?: Agent;
     compress: boolean;
     counter: number;
@@ -30,24 +30,24 @@ export class Request extends Body {
     timeout: number;
 }
 
-interface RequestInit {
-    //whatwg/fetch standard options
+export interface RequestInit {
+    // whatwg/fetch standard options
     body?: BodyInit;
     headers?: HeaderInit | { [index: string]: string };
     method?: string;
     redirect?: RequestRedirect;
 
-    //node-fetch extensions
-    agent?: Agent; //=null http.Agent instance, allows custom proxy, certificate etc.
-    compress?: boolean; //=true support gzip/deflate content encoding. false to disable
-    follow?: number; //=20 maximum redirect count. 0 to not follow redirect
-    size?: number; //=0 maximum response body size in bytes. 0 to disable
-    timeout?: number; //=0 req/res timeout in ms, it resets on redirect. 0 to disable (OS limit applies)
+    // node-fetch extensions
+    agent?: Agent; // =null http.Agent instance, allows custom proxy, certificate etc.
+    compress?: boolean; // =true support gzip/deflate content encoding. false to disable
+    follow?: number; // =20 maximum redirect count. 0 to not follow redirect
+    size?: number; // =0 maximum response body size in bytes. 0 to disable
+    timeout?: number; // =0 req/res timeout in ms, it resets on redirect. 0 to disable (OS limit applies)
 
-    //node-fetch does not support mode, cache or credentials options
+    // node-fetch does not support mode, cache or credentials options
 }
 
-type RequestContext =
+export type RequestContext =
     "audio"
     | "beacon"
     | "cspreport"
@@ -81,11 +81,11 @@ type RequestContext =
     | "worker"
     | "xmlhttprequest"
     | "xslt";
-type RequestMode = "cors" | "no-cors" | "same-origin";
-type RequestRedirect = "error" | "follow" | "manual";
-type RequestCredentials = "omit" | "include" | "same-origin";
+export type RequestMode = "cors" | "no-cors" | "same-origin";
+export type RequestRedirect = "error" | "follow" | "manual";
+export type RequestCredentials = "omit" | "include" | "same-origin";
 
-type RequestCache =
+export type RequestCache =
     "default"
     | "force-cache"
     | "no-cache"
@@ -99,7 +99,7 @@ export class Headers implements Iterable<[string, string]> {
     append(name: string, value: string): void;
     delete(name: string): void;
     get(name: string): string | null;
-    getAll(name: string): Array<string>;
+    getAll(name: string): string[];
     has(name: string): boolean;
     raw(): { [k: string]: string };
     set(name: string, value: string): void;
@@ -125,7 +125,6 @@ export class Body {
     bodyUsed: boolean;
     buffer(): Promise<Buffer>;
     json(): Promise<any>;
-    json<T>(): Promise<T>;
     text(): Promise<string>;
     textConverted(): Promise<string>;
 }
@@ -150,7 +149,7 @@ export class Response extends Body {
     url: string;
 }
 
-type ResponseType =
+export type ResponseType =
     "basic"
     | "cors"
     | "default"
@@ -158,15 +157,15 @@ type ResponseType =
     | "opaque"
     | "opaqueredirect";
 
-interface ResponseInit {
+export interface ResponseInit {
     headers?: HeaderInit;
     status: number;
     statusText?: string;
 }
 
-type HeaderInit = Array<string> | Headers;
-type BodyInit = ArrayBuffer | ArrayBufferView | NodeJS.ReadableStream | string;
-type RequestInfo = string | Request;
+export type HeaderInit = Headers | string[];
+export type BodyInit = ArrayBuffer | ArrayBufferView | NodeJS.ReadableStream | string;
+export type RequestInfo = string | Request;
 
 export default function fetch(
     url: string | Request,
diff --git a/types/node-fetch/node-fetch-tests.ts b/types/node-fetch/node-fetch-tests.ts
index 564a31fe79..6f78a512cf 100644
--- a/types/node-fetch/node-fetch-tests.ts
+++ b/types/node-fetch/node-fetch-tests.ts
@@ -2,26 +2,26 @@ import fetch, { Headers, Request, RequestInit, Response } from 'node-fetch';
 import { Agent } from "http";
 
 function test_fetchUrlWithOptions() {
-	var headers = new Headers();
+	const headers = new Headers();
 	headers.append("Content-Type", "application/json");
-	var requestOptions: RequestInit = {
-		method: "POST",
-		headers: headers,
+	const requestOptions: RequestInit = {
 		compress: true,
 		follow: 10,
+		headers,
+		method: "POST",
 		redirect: 'manual',
 		size: 100,
-		timeout: 5000
+		timeout: 5000,
 	};
 	handlePromise(fetch("http://www.andlabs.net/html5/uCOR.php", requestOptions));
 }
 
 function test_fetchUrlWithHeadersObject() {
-	var requestOptions: RequestInit = {
-		method: "POST",
+	const requestOptions: RequestInit = {
 		headers: {
 			'Content-Type': 'application/json'
-		}
+		},
+		method: "POST",
 	};
 	handlePromise(fetch("http://www.andlabs.net/html5/uCOR.php", requestOptions));
 }
@@ -35,17 +35,17 @@ function test_fetchUrlArrayBuffer() {
 }
 
 function test_fetchUrlWithRequestObject() {
-	var requestOptions: RequestInit = {
+	const requestOptions: RequestInit = {
 		method: "POST",
 		headers: {
 			'Content-Type': 'application/json'
 		}
 	};
-	var request: Request = new Request("http://www.andlabs.net/html5/uCOR.php", requestOptions);
-	var timeout: number = request.timeout;
-	var size: number = request.size;
-	var agent: Agent = request.agent;
-	var protocol: string = request.protocol
+	const request: Request = new Request("http://www.andlabs.net/html5/uCOR.php", requestOptions);
+	const timeout: number = request.timeout;
+	const size: number = request.size;
+	const agent: Agent = request.agent;
+	const protocol: string = request.protocol;
 
 	handlePromise(fetch(request));
 }
@@ -58,7 +58,7 @@ function test_globalFetchVar() {
 }
 
 function handlePromise(promise: Promise<Response>, isArrayBuffer: boolean = false) {
-	promise.then((response):Promise<string | ArrayBuffer> => {
+	promise.then((response): Promise<string | ArrayBuffer> => {
 		if (response.type === 'basic') {
 			// for test only
 		}
@@ -67,7 +67,7 @@ function handlePromise(promise: Promise<Response>, isArrayBuffer: boolean = fals
 		} else {
 			return response.text();
 		}
-	}).then((text:string | ArrayBuffer) => {
+	}).then((text: string | ArrayBuffer) => {
 		console.log(text);
 	});
 }

From cfbe9c05a5b3de542f195d4fbe7baeec3092d120 Mon Sep 17 00:00:00 2001
From: segayuu <segayuu@gmail.com>
Date: Tue, 22 May 2018 18:47:07 +0900
Subject: [PATCH 336/575] When err is undefined, fail is not executed

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

diff --git a/types/iferr/iferr-tests.ts b/types/iferr/iferr-tests.ts
index f7377358cf..ce1bea725e 100644
--- a/types/iferr/iferr-tests.ts
+++ b/types/iferr/iferr-tests.ts
@@ -7,7 +7,7 @@ const { tiferr, throwerr, printerr } = iferr;
 
 const { readFile } = fs;
 
-const errcb = (err: Error | undefined) => { throw err; };
+const errcb = (err: Error) => { throw err; };
 
 readFile("test.txt", iferr(errcb, result => {
     Buffer.from("test", "utf8") === result;
diff --git a/types/iferr/index.d.ts b/types/iferr/index.d.ts
index c65c270b49..0b40866559 100644
--- a/types/iferr/index.d.ts
+++ b/types/iferr/index.d.ts
@@ -7,15 +7,15 @@ type nodeCallback<T> = (err: Error | undefined, ...a: T[]) => any;
 
 // Delegates to `succ` on sucecss or to `fail` on error
 // ex: Thing.load(123, iferr(cb, thing => ...))
-declare function iferr<T>(fail: (err: Error | undefined) => void, succ: (...result: T[]) => void): nodeCallback<T>;
+declare function iferr<T>(fail: (err: Error) => void, succ: (...result: T[]) => void): nodeCallback<T>;
 
 declare namespace iferr {
     // Delegates to `succ` on sucecss or to `fail` on error
     // ex: Thing.load(123, iferr(cb, thing => ...))
-    function iferr<T>(fail: (err: Error | undefined) => void, succ: (...result: T[]) => void): nodeCallback<T>;
+    function iferr<T>(fail: (err: Error) => void, succ: (...result: T[]) => void): nodeCallback<T>;
 
     // Like iferr, but also catches errors thrown from `succ` and passes to `fail`
-    function tiferr<T>(fail: (err: Error | undefined) => void, succ: (...result: T[]) => void): nodeCallback<T>;
+    function tiferr<T>(fail: (err: Error) => void, succ: (...result: T[]) => void): nodeCallback<T>;
 
     // Delegate to the success function on success, throws the error otherwise
     // ex: Thing.load(123, throwerr(thing => ...))

From 634784f8c12b9c56b73737a8ee237b972224ea1b Mon Sep 17 00:00:00 2001
From: Nguyen Xuan Khanh <xuankhanh963@gmail.com>
Date: Tue, 22 May 2018 17:50:07 +0700
Subject: [PATCH 337/575] Tests for Grid, Form. Button, ColorButton

---
 types/proton-native/test/index.tsx | 66 +++++++++++++++++++++++++++---
 1 file changed, 60 insertions(+), 6 deletions(-)

diff --git a/types/proton-native/test/index.tsx b/types/proton-native/test/index.tsx
index 1b12be9894..8fcf7c7046 100644
--- a/types/proton-native/test/index.tsx
+++ b/types/proton-native/test/index.tsx
@@ -1,11 +1,18 @@
 import * as React from "react";
 import {
-    render,
     App,
     Area,
+    Box,
+    Button,
+    Checkbox,
+    ColorButton,
+    Form,
+    Grid,
     Group,
     Menu,
     RadioButtons,
+    render,
+    Text,
     Window,
 } from "proton-native";
 
@@ -58,11 +65,11 @@ class RectangleTest extends React.Component {
                 <Window title="Example" size={{ w: 500, h: 500 }}>
                 <Area>
                     <Area.Rectangle
-                    x="10"
-                    y="10"
-                    width="100"
-                    height="200"
-                    fill="blue"
+                        x="10"
+                        y="10"
+                        width="100"
+                        height="200"
+                        fill="blue"
                     />
                 </Area>
                 </Window>
@@ -70,3 +77,50 @@ class RectangleTest extends React.Component {
         );
     }
 }
+
+class GridTest extends React.Component {
+    render() {
+        return (
+            <App>
+                <Window title="ExampleGrid" size={{ w: 500, h: 500 }}>
+                <Grid>
+                    <Box
+                        align={{h: false, v: false}}
+                        row={0}
+                        column={0}
+                    >
+                        <Text>0-0</Text>
+                    </Box>
+                    <Box
+                        align={{h: false, v: false}}
+                        row={0}
+                        column={1}
+                    >
+                        <Checkbox>Enable</Checkbox>
+                    </Box>
+                    <Box
+                        align={{h: false, v: false}}
+                        row={1}
+                        column={0}
+                    >
+                        <Button
+                            onClick={() => {
+                                const doSomething = 1;
+                            }}
+                        >
+                            Open file
+                        </Button>
+                    </Box>
+                    <Box
+                        align={{h: false, v: false}}
+                        row={1}
+                        column={1}
+                    >
+                        <Form><ColorButton label={"Test"}/></Form>
+                    </Box>
+                </Grid>
+                </Window>
+            </App>
+        );
+    }
+}

From 4ad5d42d17dfb697be5834053cb32ba705d2a66d Mon Sep 17 00:00:00 2001
From: Nguyen Xuan Khanh <xuankhanh963@gmail.com>
Date: Tue, 22 May 2018 17:52:22 +0700
Subject: [PATCH 338/575] Added Grid children, label, stretchy props

Specified children type for some components.
Slider: added `max`, `min` props
ColorButton: onClick to onChange
Removed undocumented components.
---
 types/proton-native/index.d.ts | 205 ++++++++++++++++-----------------
 1 file changed, 101 insertions(+), 104 deletions(-)

diff --git a/types/proton-native/index.d.ts b/types/proton-native/index.d.ts
index bf06ad879c..b49efe6014 100644
--- a/types/proton-native/index.d.ts
+++ b/types/proton-native/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for proton-native 0.55
+// Type definitions for proton-native 1.1
 // Project: https://github.com/kusti8/proton-native
 // Definitions by: Nguyen Xuan Khanh <https://github.com/khanhas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -18,7 +18,7 @@ export interface AppProps {
  */
 export class App extends React.Component<AppProps> { }
 
-export interface AreaBaseProps {
+export interface AreaBaseProps extends GridChildrenProps, Label, Stretchy {
     /**
      * The fill color for the component.
      */
@@ -258,12 +258,7 @@ export class Area extends React.Component<AreaProps> {
     static Rectangle: typeof AreaRectangle;
 }
 
-/**
- * Undocumented
- */
-export class AreaInternal extends React.Component { }
-
-export interface BoxProps {
+export interface BoxProps extends GridChildrenProps, Label, Stretchy {
     /**
      * Whether the Box is enabled.
      */
@@ -284,7 +279,11 @@ export interface BoxProps {
 
 export class Box extends React.Component<BoxProps> { }
 
-export interface ButtonProps {
+export interface ButtonProps extends GridChildrenProps, Label, Stretchy {
+    /**
+     * The text to display in the button.
+     */
+    children?: string;
     /**
      * Whether the button can be clicked.
      */
@@ -304,15 +303,19 @@ export interface ButtonProps {
  */
 export class Button extends React.Component<ButtonProps> { }
 
-export interface CheckboxProps {
-    /**
-     * Whether the checkbox can be used.
-     */
-    enabled?: boolean;
+export interface CheckboxProps extends GridChildrenProps, Label, Stretchy {
     /**
      * Whether the checkbox is checked or not.
      */
     checked?: boolean;
+    /**
+     * The text to display next to the check box.
+     */
+    children?: string;
+    /**
+     * Whether the checkbox can be used.
+     */
+    enabled?: boolean;
     /**
      * Called when the checkbox is clicked. The current checkbox state is passed as an argument.
      */
@@ -325,7 +328,7 @@ export interface CheckboxProps {
 
 export class Checkbox extends React.Component<CheckboxProps> { }
 
-export interface ColorButtonProps {
+export interface ColorButtonProps extends GridChildrenProps, Label, Stretchy {
     /**
      * The initial color for the ColorButton. Can be passed as standard color seen in CSS (a color name, hex, rgb, rgba, hsl, hsla).
      */
@@ -333,7 +336,7 @@ export interface ColorButtonProps {
     /**
      * Called when the color is changed for the ColorButton. The current color is passed as an object of RGBA.
      */
-    onClick?: (color: {
+    onChange?: (color: {
         r: number,
         g: number,
         b: number,
@@ -346,32 +349,7 @@ export interface ColorButtonProps {
  */
 export class ColorButton extends React.Component<ColorButtonProps> { }
 
-/**
- * Undocumented
- */
-export class Combobox extends React.Component { }
-
-/**
- * Undocumented
- */
-export class ComboboxItem extends React.Component { }
-
-/**
- * Undocumented
- */
-export class EditableCombobox extends React.Component { }
-
-/**
- * Undocumented
- */
-export class Entry extends React.Component { }
-
-/**
- * Undocumented
- */
-export class FontButton extends React.Component { }
-
-export interface FormProps {
+export interface FormProps extends GridChildrenProps, Stretchy {
     /**
      * Whether the Form is enabled.
      */
@@ -438,7 +416,11 @@ export interface GridProps {
  */
 export class Grid extends React.Component<GridProps> { }
 
-export interface GroupProps {
+export interface GroupProps extends GridChildrenProps, Label, Stretchy {
+    /**
+     * Group can only have one child. To have more than one child, use boxes.
+     */
+    children?: JSX.Element;
     /**
      * Whether the Group is enabled.
      */
@@ -459,18 +441,17 @@ export interface GroupProps {
 
 /**
  * A named group of components.
+ *
+ * **Note:** Group can only have one child. To have more than one child, use boxes
  */
 export class Group extends React.Component<GroupProps> { }
 
-/**
- * Undocumented
- */
-export class HorizontalBox extends React.Component { }
-
-/**
- * Undocumented
- */
-export class HorizontalSeparator extends React.Component { }
+export interface Label {
+    /**
+     * Label for Form and Tab children
+     */
+    label?: string;
+}
 
 export interface MenuProps {
     /**
@@ -480,6 +461,14 @@ export interface MenuProps {
 }
 
 export interface MenuItemProps {
+    /**
+     * The text to display for the menu item.
+     */
+    children?: string;
+    /**
+     * If the type is `Check`, then set whether it is checked or not.
+     */
+    checked?: boolean;
     /**
      * How the menu item is displayed.
      *
@@ -491,16 +480,15 @@ export interface MenuItemProps {
      * - `Item` - a normal menu button. This is the default.
      */
     type?: 'Check' | 'Quit' | 'About' | 'Preferences' | 'Separator' | 'Item';
-    /**
-     * If the type is `Check`, then set whether it is checked or not.
-     */
-    checked?: boolean;
     /**
      * Called when the menu item is clicked. If the type is `Check`, then it passes whether it is checked as an argument.
      */
     onClick?: (checked: boolean) => void;
 }
 
+/**
+ * A single item in a Menu.
+ */
 export class MenuItem extends React.Component<MenuItemProps> { }
 
 /**
@@ -515,27 +503,7 @@ export class Menu extends React.Component<MenuProps> {
     static Item: typeof MenuItem;
 }
 
-/**
- * Undocumented
- */
-export class MenuBar extends React.Component { }
-
-/**
- * Undocumented
- */
-export class MenuBarItem extends React.Component { }
-
-/**
- * Undocumented
- */
-export class MultilineEntry extends React.Component { }
-
-/**
- * Undocumented
- */
-export class PasswordEntry extends React.Component { }
-
-export interface PickerProps {
+export interface PickerProps extends GridChildrenProps, Label, Stretchy {
     /**
      * Whether the user can enter their own custom text in addition to the drop down menu.
      */
@@ -571,7 +539,7 @@ export interface PickerProps {
  */
 export class Picker extends React.Component<PickerProps> { }
 
-export interface ProgressBarProps {
+export interface ProgressBarProps extends GridChildrenProps, Label, Stretchy {
     /**
      * Whether the ProgressBar is enabled.
      */
@@ -591,14 +559,13 @@ export interface ProgressBarProps {
  */
 export class ProgressBar extends React.Component<ProgressBarProps> { }
 
-/**
- * Undocumented
- */
-export class RadioButton extends React.Component { }
+export interface RadioButtonsItemProps {
+    children: string;
+}
 
-export class RadioButtonItem extends React.Component { }
+export class RadioButtonsItem extends React.Component<RadioButtonsItemProps> { }
 
-export interface RadioButtonsProps {
+export interface RadioButtonsProps extends GridChildrenProps, Label, Stretchy {
     /**
      * Whether the RadioButtons can be used.
      */
@@ -623,10 +590,10 @@ export interface RadioButtonsProps {
  * Every child must be a RadioButtons.Item, that requires a string child that is the label to display to the right of the RadioButton.
  */
 export class RadioButtons extends React.Component<RadioButtonsProps> {
-    static Item: typeof RadioButtonItem;
+    static Item: typeof RadioButtonsItem;
 }
 
-export interface SeparatorProps {
+export interface SeparatorProps extends GridChildrenProps, Label, Stretchy {
     /**
      * Whether the Separator is enabled.
      */
@@ -646,11 +613,19 @@ export interface SeparatorProps {
  */
 export class Separator extends React.Component<SeparatorProps> { }
 
-export interface SliderProps {
+export interface SliderProps extends GridChildrenProps, Label, Stretchy {
     /**
      * Whether the Slider is enabled.
      */
     enabled?: boolean;
+    /**
+     * The minimum value for the slider.
+     */
+    min?: number;
+    /**
+     * The maximum value for the slider.
+     */
+    max?: number;
     /**
      * Called when the value of the slider is changed. The current value is passed as an argument.
      */
@@ -670,7 +645,7 @@ export interface SliderProps {
  */
 export class Slider extends React.Component<SliderProps> { }
 
-export interface SpinBoxProps {
+export interface SpinBoxProps extends GridChildrenProps, Label, Stretchy {
     /**
      * Whether the Spinbox is enabled.
      */
@@ -694,7 +669,20 @@ export interface SpinBoxProps {
  */
 export class SpinBox extends React.Component<SpinBoxProps> { }
 
-export interface TabProps {
+export interface Stretchy {
+    /**
+     * Whether the component should stretch to fill the available space. Defaults to true.
+     *
+     * Excluded on:
+     * - Tabs
+     * - Grid children
+     * - Combobox/RadioButton Items
+     * - MenuBar
+     */
+    stretchy?: boolean;
+}
+
+export interface TabProps extends GridChildrenProps {
     /**
      * Whether the Tab is enabled.
      */
@@ -712,12 +700,23 @@ export interface TabProps {
  */
 export class Tab extends React.Component<TabProps> { }
 
+export interface TextProps extends GridChildrenProps, Label, Stretchy {
+    /**
+     * The text to display.
+     */
+    children?: string;
+}
+
 /**
  * Displays some text.
  */
-export class Text extends React.Component { }
+export class Text extends React.Component<TextProps> { }
 
-export interface TextInputProps {
+export interface TextInputProps extends GridChildrenProps, Label, Stretchy {
+    /**
+     * The default text in the TextInput.
+     */
+    children?: string;
     /**
      * Whether the TextInput can be used.
      */
@@ -749,21 +748,15 @@ export interface TextInputProps {
  */
 export class TextInput extends React.Component<TextInputProps> { }
 
-/**
- * Undocumented
- */
-export class VerticalBox extends React.Component { }
-
-/**
- * Undocumented
- */
-export class VerticalSeparator extends React.Component { }
-
 export interface WindowProps {
     /**
      * Whether the window will have a border on the inside.
      */
     borderless?: boolean;
+    /**
+     * Window can only have one child. To have more than one child, use boxes.
+     */
+    children?: JSX.Element;
     /**
      * Whether the window is closed. If set to closed, then the window will be closed.
      */
@@ -810,10 +803,15 @@ export interface WindowProps {
 
 /**
  * The window is the basis where all other components reside.
+ *
+ * **Note:** Window can only have one child. To have more than one child, use boxes.
  */
 export class Window extends React.Component<WindowProps> { }
 
-export function render(element: JSX.Element): React.ReactNode;
+/**
+ * Renders the input component
+ */
+export function render(element: JSX.Element): void;
 
 /**
  * A method to display an alert, or a dialog to save or open a file.
@@ -830,8 +828,7 @@ export function Dialog(
     options?: {
         title: string,
         description?: string
-    }
-    | {
+    } | {
         title?: string,
         description: string
     }

From 571f1889da6d4220551c2b877d2ad24ef40865c5 Mon Sep 17 00:00:00 2001
From: "Amir.Tugi@Gmail.com" <Amir.T@logz.io>
Date: Tue, 22 May 2018 15:23:39 +0300
Subject: [PATCH 339/575] Fix tests

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

diff --git a/types/express-paginate/express-paginate-tests.ts b/types/express-paginate/express-paginate-tests.ts
index d31c70362c..20f1a0a558 100644
--- a/types/express-paginate/express-paginate-tests.ts
+++ b/types/express-paginate/express-paginate-tests.ts
@@ -5,7 +5,7 @@ declare function findAndCountAll(params: object): Promise<{count: number, rows:
 
 const app = express();
 
-app.use(paginate.middleware(10, 50))
+app.use(paginate.middleware(10, 50));
 
 app.get('/users', async (req, res, next) => {
     // req.skip should be available
@@ -22,5 +22,5 @@ app.get('/users', async (req, res, next) => {
                 hasNextPages: paginate.hasNextPages(req)(pageCount),
                 pages: paginate.getArrayPages(req)(3, pageCount, req.query.page)
             });
-        }).catch(err => next(err))
+        }).catch(next);
 });
diff --git a/types/express-paginate/index.d.ts b/types/express-paginate/index.d.ts
index 403bd92979..1f722d1b28 100644
--- a/types/express-paginate/index.d.ts
+++ b/types/express-paginate/index.d.ts
@@ -2,19 +2,20 @@
 // Project: https://github.com/niftylettuce/express-paginate
 // Definitions by: My Self <https://github.com/me>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
 
 import * as express from 'express';
 
 declare global {
     namespace Express {
-        export interface Request {
-            skip?: number,
-            offset?: number,
+        interface Request {
+            skip?: number;
+            offset?: number;
         }
     }
 }
 
-interface PageElement {
+export interface PageElement {
     number: number;
     url: typeof href;
 }

From f4f78cffa35452fd094bd52ba38c91e71f89db46 Mon Sep 17 00:00:00 2001
From: Dmitry Mazurok <mazurok@outlook.com>
Date: Tue, 22 May 2018 20:45:49 +0700
Subject: [PATCH 340/575] [@types/mem-fs-editor] Add 'commit' override and
 'object' -> 'any'

---
 types/mem-fs-editor/index.d.ts             | 29 ++++++++++++----------
 types/mem-fs-editor/mem-fs-editor-tests.ts | 16 ++++++++++++
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/types/mem-fs-editor/index.d.ts b/types/mem-fs-editor/index.d.ts
index 01234bbc0c..60f5b51867 100644
--- a/types/mem-fs-editor/index.d.ts
+++ b/types/mem-fs-editor/index.d.ts
@@ -17,30 +17,33 @@ export function create(store: Store): memFsEditor.Editor;
 export namespace memFsEditor {
     type Contents = string|Buffer;
 
-    type ReplacerFunc = (key: string, value: any) => string|null|undefined;
+    type ReplacerFunc = (key: string, value: any) => any;
 
     type Space = string|number;
 
     type ProcessFunc = (contents: Buffer) => Contents;
 
+    type Callback = (err: any) => any;
+
     interface CopyOptions {
         process?: ProcessFunc;
         globOptions?: GlobOptions;
     }
 
     interface Editor {
-        read: (filepath: string, options?: { raw: boolean, defaults: string }) => string;
-        readJSON: (filepath: string, defaults?: string) => string;
-        write: (filepath: string, contents: Contents) => void;
-        writeJSON: (filepath: string, contents: object, replacer?: ReplacerFunc, space?: Space) => void;
-        append: (filepath: string, contents: Contents, options?: { trimEnd: boolean, separator: string }) => void;
-        extendJSON: (filepath: string, contents: object, replacer?: ReplacerFunc, space?: Space) => void;
-        delete: (filepath: string, options?: { globOptions: GlobOptions }) => void;
-        copy: (from: string, to: string, options?: CopyOptions) => void;
-        copyTpl: (from: string, to: string, context: object, templateOptions?: TemplateOptions, copyOptions?: CopyOptions) => void;
-        move: (from: string, to: string, options?: { globOptions: GlobOptions }) => void;
-        exists: (filepath: string) => boolean;
-        commit: (filters: ReadonlyArray<Transform>, callback: () => void) => void;
+        read(filepath: string, options?: { raw: boolean, defaults: string }): string;
+        readJSON(filepath: string, defaults?: any): any;
+        write(filepath: string, contents: Contents): void;
+        writeJSON(filepath: string, contents: any, replacer?: ReplacerFunc, space?: Space): void;
+        append(filepath: string, contents: Contents, options?: { trimEnd: boolean, separator: string }): void;
+        extendJSON(filepath: string, contents: object, replacer?: ReplacerFunc, space?: Space): void;
+        delete(filepath: string, options?: { globOptions: GlobOptions }): void;
+        copy(from: string, to: string, options?: CopyOptions): void;
+        copyTpl(from: string, to: string, context: object, templateOptions?: TemplateOptions, copyOptions?: CopyOptions): void;
+        move(from: string, to: string, options?: { globOptions: GlobOptions }): void;
+        exists(filepath: string): boolean;
+        commit(callback: Callback): void;
+        commit(filters: ReadonlyArray<Transform>, callback: Callback): void;
     }
 
     const prototype: {
diff --git a/types/mem-fs-editor/mem-fs-editor-tests.ts b/types/mem-fs-editor/mem-fs-editor-tests.ts
index 355c714bf9..ff3c52c5a0 100644
--- a/types/mem-fs-editor/mem-fs-editor-tests.ts
+++ b/types/mem-fs-editor/mem-fs-editor-tests.ts
@@ -1,3 +1,5 @@
+import { Transform } from 'stream';
+
 import memFs = require('mem-fs');
 import editor = require('mem-fs-editor');
 
@@ -16,3 +18,17 @@ fs.copy('template.js', 'template.tpl', {
 fs.copyTpl('template.tpl', 'output.js', {
     foo: 'bar'
 });
+
+const obj = fs.readJSON('template.json');
+fs.writeJSON('template.json', obj);
+fs.extendJSON('template.json', {qwer: 'asdf'});
+
+fs.writeJSON('template.json', 'qwer'); // should not be an error, because the parameter is passed to JSON.stringify and it accepts the string
+// fs.extendJSON('template.json', 'qwer'); // should be an error, because it does not make sense to extend a json with string
+
+// should accept both versions of commit - with filters and without:
+const cb = (err: any) => ({adsf: 'adsf'});
+fs.commit(cb);
+
+const filters: Transform[] = [];
+fs.commit(filters, cb);

From acf760be0c5a04c2ffc194855750a336a7a9bb89 Mon Sep 17 00:00:00 2001
From: Pablo Moleri <pmoleri@infragistics.com>
Date: Tue, 22 May 2018 11:01:55 -0300
Subject: [PATCH 341/575] [sequelize] Add explanation for Model.associate?
 method

---
 types/sequelize/index.d.ts         | 9 +++++++++
 types/sequelize/sequelize-tests.ts | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index cc4bef61ba..673225665a 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -4085,6 +4085,15 @@ declare namespace sequelize {
         /**
          * Set associations with other models
          *
+         * Not part of the sequelize API, used as convention to associate models after creation. e.g.:
+         * ```js
+         * Object.keys(models).forEach(modelName => {
+         *   if (models[modelName].associate) {
+         *     models[modelName].associate(models);
+         *   }
+         * });
+         * ```
+         *
          * @param models
          */
         associate?(models: Models): void;
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index bc600c961d..3d2bbdfe05 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -1523,6 +1523,13 @@ s.define( 'ScopeMe', {
     }
 } );
 
+// Test convention method used to associate models after creation
+Object.keys(s.models).forEach(modelName => {
+    if (s.models[modelName].associate) {
+        s.models[modelName].associate(s.models);
+    }
+});
+
 // Generic find options
 interface ChairAttributes {
     id: number;

From c1e00e25e96757183996545fd546cd74b38e7e4e Mon Sep 17 00:00:00 2001
From: "Amir.Tugi@Gmail.com" <Amir.T@logz.io>
Date: Tue, 22 May 2018 17:32:22 +0300
Subject: [PATCH 342/575] Fill correct metadata

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

diff --git a/types/express-paginate/index.d.ts b/types/express-paginate/index.d.ts
index 1f722d1b28..b816d11b1b 100644
--- a/types/express-paginate/index.d.ts
+++ b/types/express-paginate/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for express-paginate 1.0
 // Project: https://github.com/niftylettuce/express-paginate
-// Definitions by: My Self <https://github.com/me>
+// Definitions by: Amir Tugendhaft <https://github.com/AmirTugi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.7
 

From c6f240a492bf43681df0fe8fb9bd37224b0d60e8 Mon Sep 17 00:00:00 2001
From: gmalicky <34336799+gmalicky@users.noreply.github.com>
Date: Tue, 22 May 2018 17:03:42 +0200
Subject: [PATCH 343/575] Fix toMatchElement() definition

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

diff --git a/types/expect-puppeteer/expect-puppeteer-tests.ts b/types/expect-puppeteer/expect-puppeteer-tests.ts
index 84a7e65486..4ad0ce1f3c 100644
--- a/types/expect-puppeteer/expect-puppeteer-tests.ts
+++ b/types/expect-puppeteer/expect-puppeteer-tests.ts
@@ -13,8 +13,9 @@ const testGlobal = async (instance: ElementHandle | Page) => {
     await expect(instance).toMatch("selector");
     await expect(instance).toMatch("selector", { timeout: 777 });
 
-    await expect(instance).toMatchElement("selector", "value");
-    await expect(instance).toMatchElement("selector", "value", { polling: "mutation" });
+    await expect(instance).toMatchElement("selector");
+    await expect(instance).toMatchElement("selector", { polling: "raf", timeout: 777 });
+    await expect(instance).toMatchElement("selector", { polling: "mutation", text: "text" });
 
     await expect(instance).toSelect("selector", "valueOrText");
     await expect(instance).toSelect("selector", "valueOrText", { polling: "raf" });
diff --git a/types/expect-puppeteer/index.d.ts b/types/expect-puppeteer/index.d.ts
index ce20675d37..4d599f99fe 100644
--- a/types/expect-puppeteer/index.d.ts
+++ b/types/expect-puppeteer/index.d.ts
@@ -42,7 +42,7 @@ interface ExpectPuppeteer {
     toDisplayDialog(block: () => Promise<void>): Promise<void>;
     toFill(selector: string, value: string, options?: ExpectTimingActions): Promise<void>;
     toMatch(selector: string, options?: ExpectTimingActions): Promise<void>;
-    toMatchElement(selector: string, value: string, options?: ExpectTimingActions): Promise<void>;
+    toMatchElement(selector: string, options?: ExpectToClickOptions): Promise<void>;
     toSelect(selector: string, valueOrText: string, options?: ExpectTimingActions): Promise<void>;
     toUploadFile(selector: string, filePath: string, options?: ExpectTimingActions): Promise<void>;
 }
@@ -57,7 +57,7 @@ declare global {
             toDisplayDialog(block: () => Promise<void>): Promise<void>;
             toFill(selector: string, value: string, options?: ExpectTimingActions): Promise<void>;
             toMatch(selector: string, options?: ExpectTimingActions): Promise<void>;
-            toMatchElement(selector: string, value: string, options?: ExpectTimingActions): Promise<void>;
+            toMatchElement(selector: string, options?: ExpectToClickOptions): Promise<void>;
             toSelect(selector: string, valueOrText: string, options?: ExpectTimingActions): Promise<void>;
             toUploadFile(selector: string, filePath: string, options?: ExpectTimingActions): Promise<void>;
         }

From 1dd1072c1059059f32c7ca056e493517d7b08846 Mon Sep 17 00:00:00 2001
From: Craig Boland <craig.boland@gmail.com>
Date: Tue, 22 May 2018 11:28:11 -0500
Subject: [PATCH 344/575] Add explicit typing for 'this' references.

---
 types/datatables.net/datatables.net-tests.ts | 9 +++++++++
 types/datatables.net/index.d.ts              | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/types/datatables.net/datatables.net-tests.ts b/types/datatables.net/datatables.net-tests.ts
index 0c9f3db3cc..423dcaf4c9 100644
--- a/types/datatables.net/datatables.net-tests.ts
+++ b/types/datatables.net/datatables.net-tests.ts
@@ -533,6 +533,9 @@ $('#example').on('click', 'tbody td', () => {
 
 cells.every(() => { });
 cells.every((cellRowIdx, cellColIdx, tableLoop, cellLoop) => { });
+cells.every(function(cellRowIdx, cellColIdx, tableLoop, cellLoop) {
+    const cell: DataTables.CellMethods = this;
+});
 
 let cell = dt.cell(":contains('Not shipped')");
 cell = dt.cell(() => { });
@@ -815,6 +818,9 @@ dt.columns.adjust().draw(false); // adjust column sizing and redraw
 
 dt.columns().every(() => { });
 dt.columns().every((colIdx, tableLoop, colLoop) => { });
+dt.columns().every(function(colIdx, tableLoop, colLoop) {
+    const col: DataTables.ColumnMethods = this;
+});
 
 $('#example').on('column-visibility.dt', (e: object, settings: DataTables.Settings, column: number, state: boolean, recalc: boolean | undefined) => {
     const widthRecalced = (recalc || recalc === undefined);
@@ -864,6 +870,9 @@ const rows_12 = dt.rows("selector").nodes();
 const rows_13 = dt.rows.add([{}, {}]);
 dt.rows().every(() => { });
 dt.rows().every((rowIdx, tableLoop, rowLoop) => { });
+dt.rows().every(function(rowIdx, tableLoop, rowLoop) {
+    const row: DataTables.RowMethods = this;
+});
 const rows_14: DataTables.Api = dt.rows("selector").ids();
 const rows_15: DataTables.Api = dt.rows("selector").ids(false);
 
diff --git a/types/datatables.net/index.d.ts b/types/datatables.net/index.d.ts
index c0a37145ab..2fd3f3ae45 100644
--- a/types/datatables.net/index.d.ts
+++ b/types/datatables.net/index.d.ts
@@ -684,7 +684,7 @@ declare namespace DataTables {
          *
          * @param fn Function to execute for every cell selected.
          */
-        every(fn: (cellRowIdx: number, cellColIdx: number, tableLoop: number, cellLoop: number) => void): Api;
+        every(fn: (this: CellMethods, cellRowIdx: number, cellColIdx: number, tableLoop: number, cellLoop: number) => void): Api;
 
         /**
          * Get index information about the selected cells
@@ -812,7 +812,7 @@ declare namespace DataTables {
          *
          * @param fn Function to execute for every column selected.
          */
-        every(fn: (colIdx: number, tableLoop: number, colLoop: number) => void): Api;
+        every(fn: (this: ColumnMethods, colIdx: number, tableLoop: number, colLoop: number) => void): Api;
 
         /**
          * Get the column indexes of the selected columns.
@@ -995,7 +995,7 @@ declare namespace DataTables {
          *
          * @param fn Function to execute for every row selected.
          */
-        every(fn: (rowIdx: number, tableLoop: number, rowLoop: number) => void): Api;
+        every(fn: (this: RowMethods, rowIdx: number, tableLoop: number, rowLoop: number) => void): Api;
 
         /**
          * Get the ids of the selected rows. Since: 1.10.8

From 92281d5ff0151d9e520583b0655e74d92dc441d4 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Tue, 22 May 2018 10:23:34 -0700
Subject: [PATCH 345/575] fix merge changes

---
 types/office-js/index.d.ts | 1013 ++++++++++++++++++++++++++++++------
 1 file changed, 863 insertions(+), 150 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 7ecd02afd1..729b4c1bc1 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -15,7 +15,13 @@ Copyright (c) Microsoft Corporation
 ////////////////////////////////////////////////////////////////
 
 declare namespace Office {
+    /**
+    * Provides a container for APIs that are still in Preview, not released for use in production add-ins.
+    */
     export var Preview: {
+        /**
+         * Initializes the use of custom JavaScript functions in Excel.
+         */
         startCustomFunctions(): Promise<void>;
     }
 
@@ -146,63 +152,105 @@ declare namespace Office {
     // Objects
         /**
         * An object which encapsulates the result of an asynchronous request, including status and error information if the request failed.
-        * 
-        * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
-        *
+        *         
         * @remarks
+        * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+        * 
         * When the function you pass to the `callback` parameter of an "Async" method executes, it receives an AsyncResult object that you can access from the `callback` function's only parameter.
         */
         export interface AsyncResult {
         /**
         * Gets the user-defined item passed to the optional `asyncContext` parameter of the invoked method in the same state as it was passed in. This the user-defined item (which can be of any JavaScript type: String, Number, Boolean, Object, Array, Null, or Undefined) passed to the optional `asyncContext` parameter of the invoked method. Returns Undefined, if you didn't pass anything to the asyncContext parameter.
-        * 
-        * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
+        *         
+        * @remarks
+        * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
         */
         asyncContext: any;
         /**
         * Gets the [AsyncResultStatus](office.asyncresultstatus.md) of the asynchronous operation.
         * 
-        * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
+        * @remarks
+        * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
         */
         status: AsyncResultStatus;
         /**
         * Gets an [Error](office.error.md) object that provides a description of the error, if any error occurred.
         * 
-        * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
+        * @remarks
+        * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
         */
         error: Error;
         /**
         * Gets the payload or content of this asynchronous operation, if any.
+        
+        * @remarks
+        * You access the AsyncResult object in the function passed as the argument to the callback parameter of an "Async" method, such as the `getSelectedDataAsync` and `setSelectedDataAsync` methods of the Document object.
         * 
         * Note: What the value property returns for a particular "Async" method varies depending on the purpose and context of that method. To determine what is returned by the value property for an "Async" method, refer to the "Callback value" section of the method's topic. For a complete listing of the "Async" methods, see the Remarks section of the AsyncResult object topic.
         * 
-        * **Hosts**: Access, Excel, Outlook, PowerPoint, Project, Word
-        * 
-        * @remarks
-        * You access the AsyncResult object in the function passed as the argument to the callback parameter of an "Async" method, such as the `getSelectedDataAsync` and `setSelectedDataAsync` methods of the Document object.
+        * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
         */
         value: any;
     }
+    /**
+    * Represents the runtime environment of the add-in and provides access to key objects of the API.
+    * 
+    * @remarks
+    * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+    */
     export interface Context {
+        /**
+        * Provides information and access to the signed-in user.
+        */ 
         auth: Auth;
+        /**
+        * Gets the locale (language) specified by the user for editing the document or item.
+        */
         contentLanguage: string;
+        /**
+        * Gets the locale (language) specified by the user for the UI of the Office host application.
+        */
         displayLanguage: string;
+        /**
+        * 
+        */
         license: string;
+        /**
+        * Provides access to the properties for Office theme colors.
+        */
         officeTheme: OfficeTheme;
+        /**
+        * Provides access to the properties for Office theme colors.
+        */
         touchEnabled: boolean;
+        /**
+        * Provides objects and methods that you can use to create and manipulate UI components, such as dialog boxes.
+        */
         ui: UI;
+        /**
+        * Contains the host in which the add-in (web application) is running in. Possible values are: Word, Excel, PowerPoint
+        */
         host: HostType;
+        /**
+        * Provides the platform on which the add-in is running. Possible values are: PC, OfficeOnline, Mac, iOS, Android, Universal
+        */
         platform: PlatformType;
+        /**
+        * 
+        */
         diagnostics: {
             host: HostType;
             platform: PlatformType;
             version: string;
         };
+        /**
+        * Provides a method for determining what requirement sets are supported on the current host and platform.
+        */
         requirements: {
             /**
              * Check if the specified requirement set is supported by the host Office application.
-             * @param name - Set name. e.g.: "MatrixBindings".
-             * @param minVersion - The minimum required version.
+             * @param name - Set name; e.g., "MatrixBindings".
+             * @param minVersion - The minimum required version; e.g., "1.4".
              */
             isSetSupported(name: string, minVersion?: number): boolean;
         }
@@ -234,29 +282,42 @@ declare namespace Office {
      */
     export interface UI {
         /**
-        * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
+        * Displays a dialog to show or collect information from the user or to facilitate Web navigation. 
+        *         
+        * @remarks
+        * Hosts: Word, Excel, Outlook, PowerPoint
+        * 
+        * Requirement sets: DialogApi, Mailbox 1.4
+        * 
+        * The initial page must be on the same domain as the parent page (the startAddress parameter). After the initial page loads, you can go to other domains.
+        * 
+        * Any page calling office.context.ui.messageParent must also be on the same domain as the parent page.
+        * 
+        * The following design considerations apply to dialog boxes:
+        * 
+        * - An Office Add-in can have only one dialog box open at any time.
+        * 
+        * - Every dialog box can be moved and resized by the user.
+        * 
+        * - Every dialog box is centered on the screen when opened.
+        * 
+        * - Dialog boxes appear on top of the host application and in the order in which they were created.
+        * 
+        * Use a dialog box to:
+        * 
+        * - Display authentication pages to collect user credentials.
+        * 
+        * - Display an error/progress/input screen from a ShowTaspane or ExecuteAction command.
+        * 
+        * - Temporarily increase the surface area that a user has available to complete a task.
+        * 
+        * Do not use a dialog box to interact with a document. Use a task pane instead.
+        *
         * @param startAddress - Accepts the initial HTTPS URL that opens in the dialog.
+        * @param options - Optional. Accepts a DialogOptions object to define dialog display.
+        * @param callback - Optional. Accepts a callback method to handle the dialog creation attempt. If successful, the AsyncResult.value is a DialogHandler object.
         */
-        displayDialogAsync(startAddress: string): void;
-        /**
-        * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
-        * @param startAddress - Accepts the initial HTTPS URL that opens in the dialog.
-        * @param options - Optional. Accepts a DialogOptions object to define dialog behaviors.
-        */
-        displayDialogAsync(startAddress: string, options: DialogOptions): void;
-        /**
-        * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
-        * @param startAddress - Accepts the initial HTTPS URL that opens in the dialog.
-        * @param callback - Optional. Accepts a callback method to handle the dialog creation attempt.
-        */
-        displayDialogAsync(startAddress: string, callback: (result: AsyncResult) => void): void;
-        /**
-        * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
-        * @param startAddress - Accepts the initial HTTPS URL that opens in the dialog.
-        * @param options - Optional. Accepts a DialogOptions object to define dialog behaviors.
-        * @param callback - Optional. Accepts a callback method to handle the dialog creation attempt.
-        */
-        displayDialogAsync(startAddress: string, options: DialogOptions, callback: (result: AsyncResult) => void): void;
+        displayDialogAsync(startAddress: string, options?: DialogOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Delivers a message from the dialog box to its parent/opener page. The page calling this API must be on the same domain as the parent. 
          * @param messageObject Accepts a message from the dialog to deliver to the add-in.
@@ -265,6 +326,7 @@ declare namespace Office {
         /**
          * Closes the UI container where the JavaScript is executing.
          * 
+         * @remarks
          * The behavior of this method is specified by the following:
          * 
          * - Called from a UI-less command button: No effect. Any dialog opened by displayDialogAsync will remain open.
@@ -273,36 +335,39 @@ declare namespace Office {
          * 
          * - Called from a module extension: No effect.
          * 
-         * Hosts: Outlook - Minimum requirement set: Mailbox 1.5
+         * Hosts: Excel, Word, PowerPoint, Outlook (Minimum requirement set: Mailbox 1.5)
          */
         closeContainer(): void;
     }
     export interface DialogOptions {
         /**
-         * Optional. Defines the width of the dialog as a percentage of the current display. Defaults to 99%. 250px minimum.
+         * Defines the width of the dialog as a percentage of the current display. Defaults to 80%. 250px minimum.
          */
         height?: number,
         /**
-         * Optional. Defines the height of the dialog as a percentage of the current display. Defaults to 99%. 150px minimum.
+         * Defines the height of the dialog as a percentage of the current display. Defaults to 80%. 150px minimum.
          */
         width?: number,
         /**
-         * Optional. Determines whether the dialog box should be displayed within an IFrame. This setting is only applicable in Office Online clients, and is ignored on other platforms.
+         * Determines whether the dialog box should be displayed within an IFrame. This setting is only applicable in Office Online clients, and is ignored by other platforms. If false (default), the dialog will be displayed as a new browser window (pop-up). Recommended for authentication pages that cannot be displayed in an IFrame. If true, the dialog will be displayed as a floating overlay with an IFrame. This is best for user experience and performance.
          */
         displayInIframe?: boolean
     }
     export interface Auth {
         /**
         * Obtains an access token from AAD V 2.0 endpoint to grant the Office host application access to the add-in's web application.
-        * @param callback - Optional. Accepts a callback method to handle the token acquisition attempt. If AsyncResult.status is "succeeded", then AsyncResult.value is the raw AAD v. 2.0-formatted access token.
-        */
-        getAccessTokenAsync(callback: (result: AsyncResult) => void): void;
-        /**
-        * Obtains an access token from AAD V 2.0 endpoint to grant the Office host application access to the add-in's web application.
+        * 
+        * @remarks
+        * Hosts: Excel, OneNote, Outlook, PowerPoint, Word
+        * 
+        * Requirement sets: IdentityAPI
+        * 
+        * 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 to handle the token acquisition attempt. If AsyncResult.status is "succeeded", then AsyncResult.value is the raw AAD v. 2.0-formatted access token.
         */
-        getAccessTokenAsync(options: AuthOptions, callback: (result: AsyncResult) => void): void;
+        getAccessTokenAsync(options?: AuthOptions, callback?: (result: AsyncResult) => void): void;
 
     }
     export interface AuthOptions {
@@ -338,7 +403,11 @@ declare namespace Office {
          */
         close(): void;
         /**
-         * Adds an event handler for DialogMessageReceived or DialogEventReceived
+         * Registers an event handler. The two supported events are: 
+         * 
+         * - DialogMessageReceived. Triggered when the dialog box sends a message to its parent.
+         * 
+         * - DialogEventReceived. Triggered when the dialog box has been closed or otherwise unloaded.
          */
         addEventHandler(eventType: Office.EventType, handler: Function): void;
 
@@ -470,20 +539,20 @@ declare namespace Office {
         /**
          * Occurs when data within the binding is changed.
          * 
+         * @remarks
          * Hosts: Access, Excel, Word
          * 
-         * @remarks
          * To add an event handler for the BindingDataChanged event of a binding, use the addHandlerAsync method of the Binding object. The event handler receives an argument of type BindingDataChangedEventArgs.
          */
         BindingDataChanged,
         /**
          * Occurs when the selection is changed within the binding.
          * 
+         * @remarks
          * Hosts: Access, Excel, Word
          * 
          * Available in Requirement set: BindingEvents
          * 
-         * @remarks
          * To add an event handler for the BindingSelectionChanged event of a binding, use the addHandlerAsync method of the Binding object. The event handler receives an argument of type BindingSelectionChangedEventArgs.
          */
         BindingSelectionChanged,
@@ -544,7 +613,7 @@ declare namespace Office {
          */
         Text,
         /**
-         * Returns the entire document (.pptx or .docx) in Office Open XML (OOXML) format as a byte array.
+         * Returns the entire document (.pptx, .docx, or .xslx) in Office Open XML (OOXML) format as a byte array.
          */
         Compressed,
         /**
@@ -638,11 +707,11 @@ declare namespace Office {
     /**
     * Represents a binding to a section of the document.
     * 
-    * **Hosts**: Access, Excel, Word
-    * 
-    * **Available in Requirement sets**: MatrixBinding, TableBinding, TextBinding
-    * 
     * @remarks
+    * Hosts: Access, Excel, Word
+    * 
+    * Available in Requirement sets: MatrixBinding, TableBinding, TextBinding
+    * 
     * The Binding object exposes the functionality possessed by all bindings regardless of type.
     * 
     * The Binding object is never called directly. It is the abstract parent class of the objects that represent each type of binding: MatrixBinding, TableBinding, or TextBinding. All three of these objects inherit the getDataAsync and setDataAsync methods from the Binding object that enable to you interact with the data in the binding. They also inherit the id and type properties for querying those property values. Additionally, the MatrixBinding and TableBinding objects expose additional methods for matrix- and table-specific features, such as counting the number of rows and columns.
@@ -651,19 +720,22 @@ declare namespace Office {
         /**
         * Get the Document object associated with the binding.
         * 
-        * **Hosts**: Access, Excel, Word
+        * @remarks
+        * Hosts: Access, Excel, Word
         */
         document: Document;
         /**
          * A string that uniquely identifies this binding among the bindings in the same Document object.
          * 
+         * @remarks
          * Hosts: Access, Excel, Word
          */
         id: string;
         /**
         * Gets the type of the binding.
         * 
-        * **Hosts**: Access, Excel, Word
+        * @remarks
+        * Hosts: Access, Excel, Word
         */
         type: BindingType;
         /**
@@ -682,11 +754,11 @@ declare namespace Office {
         /**
          * Returns the data contained within the binding.
          * 
+         * @remarks
          * Hosts: Access, Excel, Word
          * 
          * Available in Requirement sets: MatrixBindings, TableBindings, TextBindings
          * 
-         * @remarks
          * When called from a MatrixBinding or TableBinding, the getDataAsync method will return a subset of the bound values if the optional startRow, startColumn, rowCount, and columnCount parameters are specified (and they specify a contiguous and valid range).
          * 
          * @param options An object with any of the following (example: {coercionType: 'matrix, 'valueFormat: 'formatted', filterType:'all'}):
@@ -715,9 +787,10 @@ declare namespace Office {
         /**
          * Removes the specified handler from the binding for the specified event type.
          * 
-         * **Hosts**: Access, Excel, Word
+         * @remarks
+         * Hosts: Access, Excel, Word
          * 
-         * **Available in Requirement set**: BindingEvents
+         * Available in Requirement set: BindingEvents
          * 
          * @param eventType The event type. For binding can be 'bindingDataChanged' and 'bindingSelectionChanged'
          * @param options An object with any of the following:
@@ -732,9 +805,10 @@ declare namespace Office {
         /**
          * Writes data to the bound section of the document represented by the specified binding object.
          * 
-         * **Hosts**: Access, Excel, Word
+         * @remarks
+         * Hosts: Access, Excel, Word
          * 
-         * **Available in Requirement sets**: MatrixBindings, TableBindings, TextBindings
+         * Available in Requirement sets: MatrixBindings, TableBindings, TextBindings
          * 
          * @param data The data to be set in the current selection. Possible data types by host:
          * 
@@ -770,75 +844,206 @@ declare namespace Office {
          */
         setDataAsync(data: TableData | any, options?: any, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+    * Represents the bindings the add-in has within the document.
+    * 
+    * @remarks
+    * Hosts: 
+    */
     export interface Bindings {
+        /**
+        * Gets a Document object that represents the document associated with this set of bindings.
+        * 
+        *remarks
+        * Hosts: Access, Excel, Word
+        */
         document: Document;
         /**
-         * Creates a binding against a named object in the document
+         * Creates a binding against a named object in the document.
+         * 
+         * @remarks
+         * Hosts: Access, Excel, Word
+         * 
+         * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
+         * 
+         * For Excel, the itemName parameter can refer to a named range or a table.
+         * 
+         * By default, adding a table in Excel assigns the name "Table1" for the first table you add, "Table2" for the second table you add, and so on. To assign a meaningful name for a table in the Excel UI, use the Table Name property on the Table Tools | Design tab of the ribbon.
+         * 
+         *     Note: In Excel, when specifying a table as a named item, you must fully qualify the name to include the worksheet name in the name of the table in this format: "Sheet1!Table1"
+         * 
+         * For Word, the itemName parameter refers to the Title property of a Rich Text content control. (You can't bind to content controls other than the Rich Text content control.)
+         * 
+         * By default, a content control has no Title value assigned. To assign a meaningful name in the Word UI, after inserting a Rich Text content control from the Controls group on the Developer tab of the ribbon, use the Properties command in the Controls group to display the Content Control Properties dialog box. Then set the Title property of the content control to the name you want to reference from your code.
+         * 
+         *     Note: In Word, if there are multiple Rich Text content controls with the same Title property value (name), and you try to bind to one these content controls with this method (by specifying its name as the itemName parameter), the operation will fail.
+         * 
          * @param itemName Name of the bindable object in the document. For Example 'MyExpenses' table in Excel."
-         * @param bindingType The Office BindingType for the data
-         * @param options Syntax example: {id: "BindingID"}
-         *       id: Name of the binding, autogenerated if not supplied.
+         * @param bindingType The Office BindingType for the data. The method returns null if the selected object cannot be coerced into the specified type.
+         * @param options An object like {id: "BindingID"} that has any of the following properties:
+         * 
+         *       id: Unique name of the binding. Autogenerated if not supplied.
+         * 
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         *       columns: The string[] of the columns involved in the binding
+         * 
+         *       columns: The string[] of the columns involved in the binding.
+         * 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addFromNamedItemAsync(itemName: string, bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Create a binding by prompting the user to make a selection on the document.
-         * @param bindingType The Office BindingType for the data
-         * @param options addFromPromptAsyncOptions- e.g. {promptText: "Please select data", id: "mySales"}
-         *       promptText: Greet your users with a friendly word.
+         * 
+         * @remarks
+         * Hosts: Access, Excel
+         * 
+         * Available in Requirement set: Not in a set
+         * 
+         * Adds a binding object of the specified type to the Bindings collection, which will be identified with the supplied id. The method fails if the specified selection cannot be bound.
+         * 
+         * @param bindingType Specifies the type of the binding object to create. Required. Returns null if the selected object cannot be coerced into the specified type.
+         * @param options An object like {promptText: "Please select data", id: "mySales"} with any of the following properties:
+         * 
+         *       promptText: Specifies the string to display in the prompt UI that tells the user what to select. Limited to 200 characters. If no promptText argument is passed, "Please make a selection" is displayed.
+         * 
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         *       id: Identifier.
-         *       sampleData: A TableData that gives sample table in the Dialog.TableData.Headers is [][] of string.
+         * 
+         *       id: Specifies the unique name to be used to identify the new binding object.If no argument is passed for the id parameter, the Binding.id is autogenerated.
+         * 
+         *       sampleData: Specifies a table of sample data displayed in the prompt UI as an example of the kinds of fields (columns) that can be bound by your add-in. The headers provided in the TableData object specify the labels used in the field selection UI. Optional. Note: This parameter is used only in add-ins for Access. It is ignored if provided when calling the method in an add-in for Excel.
+         * 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addFromPromptAsync(bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Create a binding based on what the user's current selection.
-         * @param bindingType The Office BindingType for the data
-         * @param options addFromSelectionAsyncOptions- e.g. {id: "BindingID"}
-         *       id: Identifier.
+         * Create a binding based on the user's current selection.
+         * 
+         * @remarks
+         * Hosts: Access, Excel, Word
+         * 
+         * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
+         * 
+         * Adds the specified type of binding object to the Bindings collection, which will be identified with the supplied id.
+         * 
+         * Note In Excel, if you call the addFromSelectionAsync method passing in the Binding.id of an existing binding, the Binding.type of that binding is used, and its type cannot be changed by specifying a different value for the bindingType parameter.If you need to use an existing id and change the bindingType, call the Bindings.releaseByIdAsync method first to release the binding, and then call the addFromSelectionAsync method to reestablish the binding with a new type.
+         * 
+         * @param bindingType Specifies the type of the binding object to create. Required. Returns null if the selected object cannot be coerced into the specified type.
+         * @param options An object like {id: "BindingID"} with any of the following properties:
+         * 
+         *       id: Specifies the unique name to be used to identify the new binding object.If no argument is passed for the id parameter, the Binding.id is autogenerated.
+         * 
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * 
          *       columns: The string[] of the columns involved in the binding
+         * 
          *       sampleData: A TableData that gives sample table in the Dialog.TableData.Headers is [][] of string.
+         * 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addFromSelectionAsync(bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Gets an array with all the binding objects in the document.
+         * Gets all bindings that were previously created.
+         * 
+         * @remarks
+         * Hosts: Access, Excel, Word
+         * 
+         * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
+         * 
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getAllAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Retrieves a binding based on its Name
-         * @param id The binding id
+         * 
+         * @remarks
+         * Hosts: Access, Excel, Word
+         * 
+         * Available in Requirement set: CustomXmlParts, MatrixBindings, TableBindings, TextBindings
+         * 
+         * Fails if the specified id does not exist.
+         * 
+         * @param id Specifies the unique name of the binding object. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
+          */
         getByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes the binding from the document
-         * @param id The binding id
+         * 
+         * @remarks
+         * Hosts: Access, Excel, Word
+         * 
+         * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
+         * 
+         * Fails if the specified id does not exist.
+         * 
+         * @param id Specifies the unique name to be used to identify the binding object. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         releaseByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+    * Represents the runtime environment of the add-in and provides access to key objects of the API.
+    * 
+    * @remarks
+    * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+    */
     export interface Context {
+        /**
+         * Gets an object that represents the document the content or task pane add-in is interacting with.
+         */
         document: Document;
     }
+    /**
+     * Represents an XML node in a tree in a document.
+     * 
+     * @remarks
+     * Hosts: Word
+     * 
+     * Available in Requirement set: CustomXmlParts
+     */
     export interface CustomXmlNode {
+        /**
+         * Gets the base name of the node without the namespace prefix, if one exists.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         */
         baseName: string;
+        /**
+         * Retrieves the string GUID of the CustomXMLPart.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         */
         namespaceUri: string;
+        /**
+         * Gets the type of the CustomXMLNode.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         */
         nodeType: string;
         /**
-         * Gets the nodes associated with the xPath expression.
-         * @param xPath The xPath expression
+         * Gets the nodes associated with the XPath expression.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * @param xPath The XPath expression that specifies the nodes to get. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -846,13 +1051,25 @@ declare namespace Office {
         getNodesAsync(xPath: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the node value.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getNodeValueAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Asynchronously gets the text of an XML node in a custom XML part.
+         * Gets the text of an XML node in a custom XML part.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -860,6 +1077,12 @@ declare namespace Office {
         getTextAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the node's XML.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -867,6 +1090,12 @@ declare namespace Office {
         getXmlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets the node value.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
          * @param value The value to be set on the node
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -875,6 +1104,12 @@ declare namespace Office {
         setNodeValueAsync(value: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously sets the text of an XML node in a custom XML part.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
          * @param text Required. The text value of the XML node.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -883,6 +1118,12 @@ declare namespace Office {
         setTextAsync(text: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets the node XML.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
          * @param xml The XML to be set on the node
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -890,54 +1131,130 @@ declare namespace Office {
          */
         setXmlAsync(xml: string, options?: any, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+     * Represents a single CustomXMLPart in a CustomXMLParts collection.
+     * 
+     * @remarks
+     * Hosts: Word
+     * 
+     * Available in Requirement set: CustomXmlParts
+     */
     export interface CustomXmlPart {
+        /**
+         * True, if the custom XML part is built in; otherwise false.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         */
         builtIn: boolean;
+        /**
+         * Gets the GUID of the CustomXMLPart.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         */
         id: string;
+        /**
+         * Gets the set of namespace prefix mappings (CustomXMLPrefixMappings) used against the current CustomXMLPart.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         */
         namespaceManager: CustomXmlPrefixMappings;
         /**
          * Adds an event handler to the object using the specified event type.
-         * @param eventType The event type. For CustomXmlPartNode it can be 'nodeDeleted', 'nodeInserted' or 'nodeReplaced'
-         * @param handler The name of the handler
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
+         * 
+         * @param eventType Specifies the type of event to add. Required. For a CustomXmlPart object event, the eventType parameter can be specified as Office.EventType.DataNodeDeleted, Office.EventType.DataNodeInserted, Office.EventType.DataNodeReplaced, or the corresponding text values of these enumerations.
+         * @param handler The event handler function to add, whose only parameter is of type NodeDeletedEventArgs, NodeInsertedEventArgs, or NodeReplaceEventArgs. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        addHandlerAsync(eventType: EventType, handler?: (result: any) => void, options?: any, callback?: (result: AsyncResult) => void): void;
+        addHandlerAsync(eventType: EventType, handler: (result: any) => void, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Deletes the Custom XML Part.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         deleteAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Gets the nodes associated with the xPath expression.
-         * @param xPath The xPath expression
+         * Asynchronously gets any CustomXmlNodes in this custom XML part which match the specified XPath.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * @param xPath An XPath expression that specifies the nodes you want returned. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
+        */
         getNodesAsync(xPath: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Gets the XML for the Custom XML Part.
+         * Asynchronously gets the XML inside this custom XML part.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * @param options Syntax example: {asyncContext:context}
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+        */
+        getXmlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Removes an event handler for the specified event type.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * @param eventType Specifies the type of event to remove. Required.For a CustomXmlPart object event, the eventType parameter can be specified as Office.EventType.DataNodeDeleted, Office.EventType.DataNodeInserted, Office.EventType.DataNodeReplaced, or the corresponding text values of these enumerations.
+         * @param handler The event handler function to remove. If not specified, all event handlers for the specified eventType will be removed.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        getXmlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Removes an event handler from the object using the specified event type.
-         * @param eventType The event type. For CustomXmlPartNode it can be 'nodeDeleted', 'nodeInserted' or 'nodeReplaced'
-         * @param options Syntax example: {handler:eventHandler}
-         *       handler: Indicates a specific handler to be removed, if not specified all handlers are removed
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
-        removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
+        removeHandlerAsync(eventType: EventType, handler?: (result: any) => void, options?: any, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+     * Represents a collection of CustomXmlPart objects.
+     * 
+     * @remarks
+     * Hosts: Word
+     * 
+     * Available in Requirement set: CustomXmlParts
+     */
     export interface CustomXmlParts {
         /**
          * Asynchronously adds a new custom XML part to a file.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
          * @param xml The XML to add to the newly created custom XML part.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -946,7 +1263,13 @@ declare namespace Office {
         addAsync(xml: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the specified custom XML part by its id.
-         * @param id The id of the custom XML part.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * @param id The GUID of the custom XML part, including opening and closing braces. 
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -954,111 +1277,314 @@ declare namespace Office {
         getByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the specified custom XML part(s) by its namespace.
-         * @param ns  The namespace to search.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * @param ns  The namespace URI.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
+        */
         getByNamespaceAsync(ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+     * Represents a collection of CustomXmlPart objects.
+     * 
+     * @remarks
+     * Hosts: Word
+     */
     export interface CustomXmlPrefixMappings {
         /**
-         * Adds a namespace.
-         * @param prefix The namespace prefix
-         * @param ns The namespace URI
+         * Asynchronously adds a prefix to namespace mapping to use when querying an item.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * If no namespace is assigned to the requested prefix, the method returns an empty string ("").
+         * 
+         * @param prefix Specifies the prefix to add to the prefix mapping list. Required.
+         * @param ns Specifies the namespace URI to assign to the newly added prefix. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addNamespaceAsync(prefix: string, ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Gets a namespace  with the specified prefix
-         * @param prefix The namespace prefix
+         * Asynchronously gets the namespace mapped to the specified prefix.
+         * 
+         * @remarks
+         * Hosts: Word
+         *
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * If the prefix already exists in the namespace manager, this method will overwrite the mapping of that prefix except when the prefix is one added or used by the data store internally, in which case it will return an error.
+         * 
+         * @param prefix TSpecifies the prefix to get the namespace for. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getNamespaceAsync(prefix: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Gets a prefix  for  the specified URI
-         * @param ns The namespace URI
+         * Asynchronously gets the prefix for the specified namespace.
+         * 
+         * @remarks
+         * Hosts: Word
+         * 
+         * Available in Requirement set: CustomXmlParts
+         * 
+         * If no prefix is assigned to the requested namespace, the method returns an empty string (""). If there are multiple prefixes specified in the namespace manager, the method returns the first prefix that matches the supplied namespace.
+         * 
+         * @param ns Specifies the namespace to get the prefix for. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
+        */
         getPrefixAsync(ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+     * An abstract class that represents the document the add-in is interacting with.
+     * 
+     * @remarks
+     * Hosts: Access, Excel, PowerPoint, Project, Word
+     */
     export interface Document {
+        /**
+         * Gets an object that provides access to the bindings defined in the document.
+         * 
+         * @remarks
+         * Hosts: Access, Excel, Word
+         * 
+         * You don't instantiate the Document object directly in your script. To call members of the Document object to interact with the current document or worksheet, use Office.context.document in your script.
+         */
         bindings: Bindings;
+        /**
+         * Gets an object that represents the custom XML parts in the document.
+         * 
+         * @remarks
+         * Hosts: Word
+         */
         customXmlParts: CustomXmlParts;
+        /**
+         * Gets the mode the document is in.
+         * 
+         * @remarks
+         * Hosts: Word
+         */
         mode: DocumentMode;
+        /**
+         * Gets an object that represents the saved custom settings of the content or task pane add-in for the current document.
+         * 
+         * @remarks
+         * Hosts: Word
+         */
         settings: Settings;
+        /**
+         * Gets the URL of the document that the host application currently has open. Returns null if the URL is unavailable.
+         * 
+         * @remarks
+         * Hosts: Word
+         */
         url: string;
         /**
-         * Adds an event handler for the specified event type.
-         * @param eventType The event type. For document can be 'DocumentSelectionChanged'
-         * @param handler The name of the handler
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * Adds an event handler for a Document object event.
+         * 
+         * @remarks
+         * Hosts: Excel, PowerPoint, Project, Word
+         * 
+         * Available in Requirement set: DocumentEvents
+         * 
+         * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
+         * 
+         * @param eventType For a Document object event, the eventType parameter can be specified as Office.EventType.Document.SelectionChanged or Office.EventType.Document.ActiveViewChanged, or the corresponding text value of this enumeration.
+         * @param handler The event handler function to add, whose only parameter is of type DocumentSelectionChangedEventArgs. Required.
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Returns the current view of the presentation.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * Returns the state of the current view of the presentation (edit or read).
+         *
+         * @remarks
+         * Hosts: Excel, PowerPoint, Word
+         * 
+         * Available in Requirement set: ActiveView
+         * 
+         * Can trigger an event when the view changes.
+         * 
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
+        */
         getActiveViewAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Gets the entire file in slices of up to 4MB.
+         * Returns the entire document file in slices of up to 4194304 bytes (4 MB). For add-ins for iOS, file slice is supported up to 65536 (64 KB). Note that specifying file slice size of above permitted limit will result in an "Internal Error" failure.
+         * 
+         * @remarks
+         * Hosts: Excel, PowerPoint, Word
+         *
+         * Available in Requirement set: File
+         * 
+         * For add-ins running in Office host applications other than Office for iOS, the getFileAsync method supports getting files in slices of up to 4194304 bytes (4 MB). For add-ins running in Office for iOS apps, the getFileAsync method supports getting files in slices of up to 65536 (64 KB).
+         * 
+         * The fileType parameter can be specified by using the FileType enumeration or text values. But the possible values vary with the host: 
+         * 
+         * Excel Online, Win32, Mac, and iOS: Office.FileType.Compressed
+         * 
+         * PowerPoint on Windows desktop, Mac, and iPad, and PowerPoint Online: Office.FileType.Compressed, Office.FileType.Pdf
+         * 
+         * Word on Windows desktop, Word on Mac, and Word Online: Office.FileType.Compressed, Office.FileType.Pdf, Office.FileType.Text
+         *
+         * Word on iPad: Office.FileType.Compressed, Office.FileType.Text
+         * 
          * @param fileType The format in which the file will be returned
-         * @param options Syntax example: {sliceSize:1024}
+         * @param options An object like {sliceSize:1024} that has any of the following properties:
+         * 
          *       sliceSize: Specifies the desired slice size (in bytes) up to 4MB. If not specified a default slice size of 4MB will be used.
+         * 
+         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getFileAsync(fileType: FileType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets file properties of the current document.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         */
+         * 
+         * @remarks
+         * Hosts: Excel, PowerPoint, Word
+         * 
+         * Available in Requirement set: not in a set
+         * 
+         * You get the file's URL with the url property ( asyncResult.value.url).
+         * 
+         * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+        */
         getFilePropertiesAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Returns the current selection.
-         * @param coercionType The expected shape of the selection.
-         * @param options Syntax example: {valueFormat: 'formatted', filterType:'all'}
+         * Reads the data contained in the current selection in the document.
+         * 
+         * @remarks
+         * Hosts: Access, Excel, PowerPoint, Project, Word
+         * 
+         * Available in Requirement set: Selection
+         * 
+         * The possible values for the coercionType parameter vary by the host:
+         * 
+         * Excel, Excel Online, PowerPoint, PowerPoint Online, Word, and Word Online only: Office.CoercionType.Text (string)
+         * 
+         * Excel, Word, and Word Online only: Office.CoercionType.Matrix (array of arrays)
+         * 
+         * Access, Excel, Word, and Word Online only: Office.CoercionType.Table (TableData object)
+         * 
+         * Word only: Office.CoercionType.Html
+         * 
+         * Word and Word Online only: Office.CoercionType.Ooxml (Office Open XML)
+         * 
+         * PowerPoint and PowerPoint Online only: Office.CoercionType.SlideRange
+         * 
+         * @param coercionType The type of data structure to return. 
+         * @param options An object like {valueFormat: 'formatted', filterType:'all'} that has any of the following properties:
+         * 
          *       valueFormat: Get data with or without format. Use Office.ValueFormat or text value.
-         *       filterType: Get the visible or all the data. Useful when filtering data. Use Office.FilterType or text value.
+         * 
+         *       filterType: Get the visible or all the data. Useful when filtering data. Use Office.FilterType or text value. This parameter is ignored in Word documents.
+         * 
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getSelectedDataAsync(coercionType: CoercionType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Goes to the specified object or location in the document.
+         * 
+         * @remarks
+         * Hosts: Excel, PowerPoint, Word
+         * 
+         * Available in Requirement set: not in a set
+         * 
+         * PowerPoint doesn't support the goToByIdAsync method in Master Views.
+         * 
+         * The behavior caused by the selectionMode option varies by host:
+         * 
+         * In Excel: Office.SelectionMode.Selected selects all content in the binding, or named item. Office.SelectionMode.None for text bindings, selects the cell; for matrix bindings, table bindings, and named items, selects the first data cell (not first cell in header row for tables).
+         * 
+         * In PowerPoint: Office.SelectionMode.Selected selects the slide title or first textbox on the slide. Office.SelectionMode.None Doesn't select anything.
+         * 
+         * In Word: Office.SelectionMode.Selected selects all content in the binding. Office.SelectionMode.None for text bindings, moves the cursor to the beginning of the text; for matrix bindings and table bindings, selects the first data cell (not first cell in header row for tables).
+         * 
          * @param id The identifier of the object or location to go to.
          * @param goToType The type of the location to go to.
-         * @param options Syntax example: {selectionMode:Office.SelectionMode.Selected}
-         *       selectionMode: Use Office.SelectionMode or text value.
+         * @param options An object like {asyncContext:context} with any of the following values:
+         * 
+         *       selectionMode: Specifies whether the location specified by the id parameter is selected (highlighted). Use Office.SelectionMode or text value. See Remarks for more.
+         * 
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         goToByIdAsync(id: string | number, goToType: GoToType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes an event handler for the specified event type.
-         * @param eventType The event type. For document can be 'DocumentSelectionChanged'
-         * @param options Syntax example: {asyncContext:context}
+         * 
+         * @remarks
+         * Hosts: Excel, PowerPoint, Project, Word
+         * 
+         * Available in Requirement set: DocumentEvents
+         * 
+         * @param eventType The event type. For document can be 'Document.SelectionChanged' or 'Document.ActiveViewChanged'.
+         * @param options An object like Syntax example: {asyncContext:context} that has any of the following properties:
+         * 
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         *       handler: The name of the handler. If not specified all handlers are removed
+         * 
+         *       handler: The name of the handler. If not specified all handlers are removed.
+         * 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Writes the specified data into the current selection.
-         * @param data The data to be set. Either a string or value, 2d array or TableData object
-         * @param options Syntax example: {coercionType:Office.CoercionType.Matrix} or {coercionType: 'matrix'}
+         * 
+         * @remarks
+         * Hosts: Access, Excel, PowerPoint, Project, Word, Word Online
+         * 
+         * Available in Requirement set: Selection
+         * 
+         * The possible CoercionTypes that can be used for the data parameter, or for the coercionType option, vary by host:
+         * 
+         * Office.CoercionType.Text: Excel, Word, PowerPoint
+         * 
+         * Office.CoercionType.Matrix: Excel, Word
+         * 
+         * Office.CoercionType.Table: Access, Excel, Word
+         * 
+         * Office.CoercionType.Html: Word
+         * 
+         * Office.CoercionType.Ooxml: Word
+         * 
+         * Office.CoercionType.Image: Excel, Word, PowerPoint
+         * 
+         * @param data The data to be set. Either a string or CoercionType value, 2d array or TableData object.
+         * @param options An object like {coercionType:Office.CoercionType.Matrix} with any of the following properties:
+         * 
          *       coercionType: Explicitly sets the shape of the data object. Use Office.CoercionType or text value. If not supplied is inferred from the data type.
+         * 
+         *       tableOptions: For an inserted table, a list of key-value pairs that specify table formatting options, such as header row, total row, and banded rows 
+         * 
+         *       cellFormat: For an inserted table, a list of key-value pairs that specify a range of columns, rows, or cells and the cell formatting to apply to that range
+         * 
+         *       imageLeft: (number) This option is applicable for inserting images. Indicates the insert location in relation to the left side of the slide for PowerPoint, and its relation to the currently selected cell in Excel. This value is ignored for Word. This value is in points.
+         * 
+         *       imageTop: (number) This option is applicable for inserting images. Indicates the insert location in relation to the top of the slide for PowerPoint, and its relation to the currently selected cell in Excel. This value is ignored for Word. This value is in points.
+         * 
+         *       imageWidth: (number) This option is applicable for inserting images. Indicates the image width. If this option is provided without the imageHeight, the image will scale to match the value of the image width. If both image width and image height are provided, the image will be resized accordingly. If neither the image height or width is provided, the default image size and aspect ratio will be used. This value is in points.
+         * 
+         *       imageHeight: (number) This option is applicable for inserting images. Indicates the image height. If this option is provided without the imageWidth, the image will scale to match the value of the image height. If both image width and image height are provided, the image will be resized accordingly. If neither the image height or width is provided, the default image size and aspect ratio will be used. This value is in points.
+         * 
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
@@ -1088,8 +1614,11 @@ declare namespace Office {
     export interface File {
         /**
          * Gets the document file size in bytes.
+         * 
          * @remarks
          * Hosts: PowerPoint, Word
+         * 
+         * Available in Requirement set: File
          */
         size: number;
         /**
@@ -1104,7 +1633,7 @@ declare namespace Office {
          * No more than two documents are allowed to be in memory; otherwise the Document.getFileAsync operation will fail. Use the File.closeAsync method to close the file when you are finished working with it.
          * 
          * Hosts: PowerPoint, Word
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
          * In the callback function passed to the closeAsync method, you can use the properties of the AsyncResult object to return the following information.
@@ -1114,6 +1643,8 @@ declare namespace Office {
          * |AsyncResult.status|Determine the success or failure of the operation.|
          * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
          * |AsyncResult.asyncContext|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
+         * 
+         * Available in Requirement set: File
          */
         closeAsync(callback?: (result: AsyncResult) => void): void;
         /**
@@ -1121,7 +1652,7 @@ declare namespace Office {
          * @remarks
          * Hosts: PowerPoint, Word
          * @param sliceIndex Specifies the zero-based index of the slice to be retrieved. Required.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
          * In the callback function passed to the getSliceAsync method, you can use the properties of the AsyncResult object to return the following information.
@@ -1131,6 +1662,8 @@ declare namespace Office {
          * |AsyncResult.status|Determine the success or failure of the operation.|
          * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
          * |AsyncResult.asyncContext|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
+         * 
+         * Available in Requirement set: File
          */
         getSliceAsync(sliceIndex: number, callback?: (result: AsyncResult) => void): void;
     }
@@ -1143,18 +1676,19 @@ declare namespace Office {
     /**
     * Represents a binding in two dimensions of rows and columns.
     * 
-    * **Hosts**: Excel, Word
-    * 
-    * **Available in Requirement set**: MatrixBindings
-    * 
     * @remarks
+         * Hosts: Excel, Word
+    * 
+    * Available in Requirement set: MatrixBindings
+    * 
     * The MatrixBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object.
     */
     export interface MatrixBinding extends Binding {
         /**
         * Gets the number of columns in the matrix data structure, as an integer value.
         * 
-        * **Hosts**: Access, Excel, PowerPoint, Project, Word
+        * @remarks
+        * Hosts: Access, Excel, PowerPoint, Project, Word
         * 
         * Available in Requirement set: MatrixBindings
         */
@@ -1162,7 +1696,8 @@ declare namespace Office {
         /**
         * Gets the number of rows in the matrix data structure, as an integer value.
         * 
-        * **Hosts**: Access, Excel, PowerPoint, Project, Word
+        * @remarks
+        * Hosts: Access, Excel, PowerPoint, Project, Word
         * 
         * Available in Requirement set: MatrixBindings
         */
@@ -1179,10 +1714,13 @@ declare namespace Office {
      * The Settings object is automatically loaded as part of the Document object, and is available by calling the settings property of that object when the add-in is activated. The developer is responsible for calling the saveAsync method after adding or deleting settings to save the settings in the document.
      * 
      * Hosts: Access, Excel, PowerPoint, Word
+     * 
+     * Available in Requirement set: Settings
      */
     export interface Settings {
         /**
          * Adds an event handler for the settingsChanged event.
+         * 
          * @remarks
          * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
          * 
@@ -1190,6 +1728,9 @@ declare namespace Office {
          * > Your add-in's code can register a handler for the settingsChanged event when the add-in is running with any Excel client, but the event will fire only when the add-in is loaded with a spreadsheet that is opened in Excel Online, and more than one user is editing the spreadsheet (co-authoring). Therefore, effectively the settingsChanged event is supported only in Excel Online in co-authoring scenarios.
          * 
          * Hosts: Excel
+         * 
+         * Available in Requirement set: Settings
+         * 
          * @param eventType Specifies the type of event to add. Required.
          * @param handler The event handler function to add. Required.
          * @param options Specifies any of the following optional parameters.
@@ -1208,19 +1749,27 @@ declare namespace Office {
         addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Retrieves the specified setting.
+         * 
          * @remarks
          * Hosts: Access, Excel, PowerPoint, Word
+         * 
+         * Available in Requirement set: Settings
+         * 
          * @param settingName The case-sensitive name of the setting to retrieve.
          * @returns An object that has property names mapped to JSON serialized values.
          */
         get(name: string): any;
         /**
          * Reads all settings persisted in the document and refreshes the content or task pane add-in's copy of those settings held in memory.
+         * 
          * @remarks
          * This method is useful in Word and PowerPoint coauthoring scenarios when multiple instances of the same add-in are working against the same document. Because each add-in is working against an in-memory copy of the settings loaded from the document at the time the user opened it, the settings values used by each user can get out of sync. This can happen whenever an instance of the add-in calls the Settings.saveAsync method to persist all of that user's settings to the document. Calling the refreshAsync method from the event handler for the settingsChanged event of the add-in will refresh the settings values for all users.
          * The refreshAsync method can be called from add-ins created for Excel, but since it doesn't support coauthoring there is no reason to do so.
          * 
          * Hosts: Access, Excel, PowerPoint, Word
+         * 
+         * Available in Requirement set: Settings
+         * 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
@@ -1235,21 +1784,29 @@ declare namespace Office {
         refreshAsync(callback?: (result: AsyncResult) => void): void;
         /**
          * Removes the specified setting.
+         * 
          * @remarks
          * null is a valid value for a setting. Therefore, assigning null to the setting will not remove it from the settings property bag.
          * 
          * > [!IMPORTANT]
          * > Be aware that the Settings.remove method affects only the in-memory copy of the settings property bag. To persist the removal of the specified setting in the document, at some point after calling the Settings.remove method and before the add-in is closed, you must call the Settings.saveAsync method.
          * Hosts: Access, Excel, PowerPoint, Word
+         * 
+         * Available in Requirement set: Settings
+         * 
          * @param settingName The case-sensitive name of the setting to remove.
          */
         remove(name: string): void;
         /**
          * Removes an event handler for the settingsChanged event.
+         * 
          * @remarks
          * If the optional handler parameter is omitted when calling the removeHandlerAsync method, all event handlers for the specified eventType will be removed.
          * 
          * Hosts: Access, Excel, PowerPoint
+         * 
+         * Available in Requirement set: Settings
+         * 
          * @param eventType Specifies the type of event to remove. Required.
          * @param options Specifies any of the following optional parameters.
          * @param handler Specifies the name of the handler to remove.
@@ -1287,6 +1844,7 @@ declare namespace Office {
         saveAsync(callback?: (result: AsyncResult) => void): void;
         /**
          * Sets or creates the specified setting.
+         * 
          * @remarks
          * The set method creates a new setting of the specified name if it does not already exist, or sets an existing setting of the specified name in the in-memory copy of the settings property bag. After you call the Settings.saveAsync method, the value is stored in the document as the serialized JSON representation of its data type. A maximum of 2MB is available for the settings of each add-in.
          * 
@@ -1294,6 +1852,9 @@ declare namespace Office {
          * > Be aware that the Settings.set method affects only the in-memory copy of the settings property bag. To make sure that additions or changes to settings will be available to your add-in the next time the document is opened, at some point after calling the Settings.set method and before the add-in is closed, you must call the Settings.saveAsync method to persist settings in the document.
          * 
          * Hosts: Access, Excel, PowerPoint, Word
+         * 
+         * Available in Requirement set: Settings
+         * 
          * @param settingName The case-sensitive name of the setting to set or create.
          * @param value Specifies the value to be stored.
          */
@@ -1301,55 +1862,157 @@ declare namespace Office {
     }
     /**
      * Represents a slice of a document file.
+     * 
      * @remarks
      * The Slice object is accessed with the File.getSliceAsync method.
      * 
      * Hosts: PowerPoint, Word
+     * 
+     * Available in Requirement set: File
      */
     export interface Slice {
         /**
          * Gets the raw data of the file slice in Office.FileType.Text ("text") or Office.FileType.Compressed ("compressed") format as specified by the fileType parameter of the call to the Document.getFileAsync method.
+         * 
          * @remarks
          * Files in the "compressed" format will return a byte array that can be transformed to a base64-encoded string if required.
          * 
          * Hosts: PowerPoint, Word
+         * 
+         * Available in Requirement set: File
          */
         data: any;
         /**
          * Gets the zero-based index of the file slice.
+         * 
          * @remarks
          * Hosts: PowerPoint, Word
+         * 
+         * Available in Requirement set: File
          */
         index: number;
         /**
          * Gets the size of the slice in bytes.
+         * 
          * @remarks
          * Hosts: PowerPoint, Word
+         * 
+         * Available in Requirement set: File
          */
         size: number;
     }
+    /**
+    * Represents a binding in two dimensions of rows and columns, optionally with headers.
+    * 
+    * @remarks
+    * Hosts: Access, Excel, PowerPoint, Project, Word
+    * 
+    * Available in Requirement set: TableBindings
+    * 
+    * The TableBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object.
+    * 
+    * For Excel, note that after you establish a table binding in Excel, each new row a user adds to the table is automatically included in the binding and rowCount increases.
+    */
     export interface TableBinding extends Binding {
+        /**
+        * Gets the number of columns in the TableBinding, as an integer value.
+        * 
+        * @remarks
+        * Hosts: Access, Excel,Word
+        * 
+        * Available in Requirement set: TableBindings
+        */
         columnCount: number;
+        /**
+        * True, if the table has headers; otherwise false.
+        * 
+        * @remarks
+        * Hosts: Access, Excel, PowerPoint, Project, Word
+        * 
+        * Available in Requirement set: TableBindings
+        */
         hasHeaders: boolean;
+         /**
+        * Gets the number of rows in the TableBinding, as an integer value.
+        * 
+        * @remarks
+        * Hosts: Access, Excel,Word
+        * 
+        * Available in Requirement set: TableBindings
+        *
+        * When you insert an empty table by selecting a single row in Excel 2013 and Excel Online (using Table on the Insert tab), both Office host applications create a single row of headers followed by a single blank row. However, if your add-in's script creates a binding for this newly inserted table (for example, by using the addFromSelectionAsync method), and then checks the value of the rowCount property, the value returned will differ depending whether the spreadsheet is open in Excel 2013 or Excel Online.
+
+        * - In Excel on the desktop, rowCount will return 0 (the blank row following the headers is not counted).
+        * 
+        * - In Excel Online, rowCount will return 1 (the blank row following the headers is counted).
+        * 
+        * You can work around this difference in your script by checking if rowCount == 1, and if so, then checking if the row contains all empty strings.
+        * 
+        * In content add-ins for Access, for performance reasons the rowCount property always returns -1.
+        */
         rowCount: number;
         /**
-         * Adds the specified columns to the table
-         * @param tableData A TableData object with the headers and rows
+         * Adds the specified data to the table as additional columns.
+         * 
+         * @remarks
+         * Hosts: Excel, Word
+         * 
+         * Available in Requirement set: TableBindings
+         * 
+         * To add one or more columns specifying the values of the data and headers, pass a TableData object as the data parameter. To add one or more columns specifying only the data, pass an array of arrays ("matrix") as the data parameter.
+         * 
+         * The success or failure of an addColumnsAsync operation is atomic. That is, the entire add columns operation must succeed, or it will be completely rolled back (and the AsyncResult.status property returned to the callback will report failure):
+         * 
+         *  - Each row in the array you pass as the data argument must have the same number of rows as the table being updated. If not, the entire operation will fail.
+         * 
+         *  - Each row and cell in the array must successfully add that row or cell to the table in the newly added column(s). If any row or cell fails to be set for any reason, the entire operation will fail.
+         * 
+         *  - If you pass a TableData object as the data argument, the number of header rows must match that of the table being updated.
+         * 
+         * Additional remark for Excel Online: The total number of cells in the TableData object passed to the data parameter can't exceed 20,000 in a single call to this method.
+         *         
+         * @param tableData An array of arrays ("matrix") or a TableData object that contains one or more columns of data to add to the table. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addColumnsAsync(tableData: TableData | any[][], options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Adds the specified rows to the table
-         * @param rows A 2D array with the rows to add
+         * Adds the specified data to the table as additional rows.
+         * 
+         * @remarks
+         * Hosts: Access, Excel, Word
+         * 
+         * Available in Requirement set: TableBindings
+         * 
+         * To add one or more columns specifying the values of the data and headers, pass a TableData object as the data parameter. To add one or more columns specifying only the data, pass an array of arrays ("matrix") as the data parameter.
+         * 
+         * The success or failure of an addRowsAsync operation is atomic. That is, the entire add columns operation must succeed, or it will be completely rolled back (and the AsyncResult.status property returned to the callback will report failure):
+         * 
+         *  - Each row in the array you pass as the data argument must have the same number of columns as the table being updated. If not, the entire operation will fail.
+         * 
+         *  - Each column and cell in the array must successfully add that column or cell to the table in the newly added rows(s). If any column or cell fails to be set for any reason, the entire operation will fail.
+         * 
+         *  - If you pass a TableData object as the data argument, the number of header rows must match that of the table being updated.
+         * 
+         * Additional remark for Excel Online: The total number of cells in the TableData object passed to the data parameter can't exceed 20,000 in a single call to this method.
+         *         
+         * @param rows An array of arrays ("matrix") or a TableData object that contains one or more rows of data to add to the table. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addRowsAsync(rows: TableData | any[][], options?: any, callback?: (result: AsyncResult) => void): void;
         /**
-         * Clears the table
+         * Deletes all non-header rows and their values in the table, shifting appropriately for the host application.
+         * 
+         * @remarks
+         * Hosts: Access, Excel, Word
+         * 
+         * Available in Requirement set: TableBindings
+         * 
+         * In Excel, if the table has no header row, this method will delete the table itself.
+         *  
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1357,6 +2020,14 @@ declare namespace Office {
         deleteAllDataValuesAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Clears formatting on the bound table.
+         *
+         * @remarks
+         * Hosts: Excel
+         * 
+         * Available in Requirement set: Not in a set
+         * 
+         * See [Format tables in add-ins for Excel](https://docs.microsoft.com/en-us/office/dev/add-ins/excel/excel-add-ins-tables#format-a-table) for more information.
+         * 
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1373,9 +2044,18 @@ declare namespace Office {
         getFormatsAsync(cellReference?: any, formats?: any[], options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets formatting on specified items and data in the table.
+         * 
+         * @remarks
+         * Hosts: Excel
+         * 
+         * Available in Requirement set: Not in a set
+         * 
          * @param formatsInfo Array elements are themselves three-element arrays:[target, type, formats]
+         * 
          *       target: The identifier of the item to format. String.
+         * 
          *       type: The kind of item to format. String.
+         * 
          *       formats: An object literal containing a list of property name-value pairs that define the formatting to apply.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1384,6 +2064,12 @@ declare namespace Office {
         setFormatsAsync(formatsInfo?: any[], options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Updates table formatting options on the bound table.
+         *
+         * @remarks
+         * Hosts: Excel
+         * 
+         * Available in Requirement set: Not in a set
+         * 
          * @param tableOptions An object literal containing a list of property name-value pairs that define the table options to apply.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1393,8 +2079,11 @@ declare namespace Office {
     }
     /**
      * Represents the data in a table or a TableBinding.
+     * 
      * @remarks
      * Hosts: Excel, Word
+     * 
+     * Available in Requirement set: TableBindings
      */
     export class TableData {
         constructor(rows: any[][], headers: any[]);
@@ -1411,6 +2100,8 @@ declare namespace Office {
          * - If you overwrite or update an existing table, the existing headers are not altered.
          * 
          * Hosts: Excel, Word
+         * 
+         * Available in Requirement set: TableBindings
          */
         headers: any[];
         /**
@@ -1425,6 +2116,8 @@ declare namespace Office {
          * - If you overwrite or update an existing table, the existing rows are not altered.
          * 
          * Hosts: Excel, Word
+         * 
+         * Available in Requirement set: TableBindings
          */
         rows: any[][];
     }
@@ -1448,6 +2141,16 @@ declare namespace Office {
          */
         Headers
     }
+    /**
+    * Represents a bound text selection in the document.
+    * 
+    * @remarks
+    * Hosts: Access, Excel, PowerPoint, Project, Word
+    * 
+    * Available in Requirement set: TextBindings
+    * 
+    * The TextBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object. It does not implement any additional properties or methods of its own.
+    */
     export interface TextBinding extends Binding { }
     /**
      * Specifies the project fields that are available as a parameter for the getProjectFieldAsync method.
@@ -3880,8 +4583,17 @@ declare namespace Office {
         phoneNumbers: Array<PhoneNumber>;
         urls: Array<string>;
     }
+    /**
+    * Represents the runtime environment of the add-in and provides access to key objects of the API.
+    * 
+    * @remarks
+    * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+    */
     export interface Context {
         mailbox: Mailbox;
+        /**
+        * Gets an object that represents the saved custom settings of the add-in.
+        */
         roamingSettings: RoamingSettings;
     }
     export interface CustomProperties {
@@ -5114,7 +5826,8 @@ declare namespace Excel {
          *
          * Gets the Binding object that represents the binding that raised the SelectionChanged event.
          * 
-         * **Hosts:** Access, Excel, Word
+         * @remarks
+         * Hosts: Access, Excel, Word
          *
          * [Api set: ExcelApi 1.2]
          */
@@ -46473,4 +47186,4 @@ declare namespace Visio {
 
 ////////////////////////////////////////////////////////////////
 //////////////////////// End Visio APIs ////////////////////////
-////////////////////////////////////////////////////////////////
\ No newline at end of file
+////////////////////////////////////////////////////////////////Contains the host in which the add-in (web application) is running in. Possible values are: Word, Excel, PowerPoint
\ No newline at end of file

From 842c88286cfa9e56e0464b8a34adb2047cd32b70 Mon Sep 17 00:00:00 2001
From: Paito Anderson <pj.paito@gmail.com>
Date: Tue, 22 May 2018 14:12:07 -0400
Subject: [PATCH 346/575] Update for react-bootstrap-typeahead 3.1

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

diff --git a/types/react-bootstrap-typeahead/index.d.ts b/types/react-bootstrap-typeahead/index.d.ts
index 659b2034fd..005a7633ed 100644
--- a/types/react-bootstrap-typeahead/index.d.ts
+++ b/types/react-bootstrap-typeahead/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for react-bootstrap-typeahead 2.3
+// Type definitions for react-bootstrap-typeahead 3.1
 // Project: https://github.com/ericgio/react-bootstrap-typeahead
 // Definitions by: Guymestef <https://github.com/Guymestef>
 //                 Rajab Shakirov <https://github.com/radziksh>
+//                 Paito Anderson <https://github.com/PaitoAnderson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 // TODO: <Highlighter>, <Menu>, <MenuItem>, <Token> components
@@ -75,8 +76,8 @@ export interface TypeaheadProps<T> {
     /* Specify which option key to use for display or a render function. By default, the selector will use the label key. */
     labelKey?: string | ((option: T | string) => string);
 
-    /* Maximum height of the dropdown menu, in px. */
-    maxHeight?: number;
+    /* Maximum height of the dropdown menu. */
+    maxHeight?: string;
 
     /* Maximum number of results to display by default. Mostly done for performance reasons
        so as not to render too many DOM nodes in the case of large data sets. */
@@ -100,8 +101,8 @@ export interface TypeaheadProps<T> {
     /* Invoked when the input is focused. Receives an event. */
     onFocus?: (e: Event) => any;
 
-    /* Invoked when the input value changes. Receives the string value of the input. */
-    onInputChange?: (input: string) => any;
+    /* Invoked when the input value changes. Receives the string value of the input, as well as the original event. */
+    onInputChange?: (input: string, e: Event) => any;
 
     /* Invoked when a key is pressed. Receives an event. */
     onKeyDown?: (e: Event) => any;
@@ -141,9 +142,6 @@ export interface TypeaheadProps<T> {
 
     /* Allows selecting the hinted result by pressing enter. */
     selectHintOnEnter?: boolean;
-
-    /* Propagate event to parent form. */
-    submitFormOnEnter?: boolean;
 }
 
 export const Typeahead: React.ClassicComponentClass<TypeaheadProps<any>>;

From 1aec142aa496f285d8125cc720b7580acd54c7dd Mon Sep 17 00:00:00 2001
From: Paito Anderson <pj.paito@gmail.com>
Date: Tue, 22 May 2018 14:14:16 -0400
Subject: [PATCH 347/575] Added tests

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

diff --git a/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx b/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
index 425bfe313b..10237b1fa0 100644
--- a/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
+++ b/types/react-bootstrap-typeahead/react-bootstrap-typeahead-tests.tsx
@@ -24,6 +24,8 @@ class BasicExample extends React.Component {
                     labelKey="name"
                     multiple={multiple}
                     options={options}
+                    maxHeight='300px'
+                    onInputChange={(value, e) => {}}
                     placeholder="Choose a state..."
                 />
             </div>

From 287fd3f4a1c790088178ead61c40038b4de7c3b3 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSchick@users.noreply.github.com>
Date: Tue, 22 May 2018 12:00:09 -0700
Subject: [PATCH 348/575] fix(inert): augment correct interface (#25922)

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

diff --git a/types/inert/index.d.ts b/types/inert/index.d.ts
index d8c1d90422..3bcbb81a29 100644
--- a/types/inert/index.d.ts
+++ b/types/inert/index.d.ts
@@ -127,7 +127,7 @@ declare const inert: Plugin<inert.OptionalRegistrationOptions>;
 export = inert;
 
 declare module 'hapi' {
-    interface RouteOptions {
+    interface HandlerDecorations {
         /**
          * The file handler
          *

From 5e7310f944e83149b4ab68a3cd966feaf24914a0 Mon Sep 17 00:00:00 2001
From: BryceCicada <chris.nix@gmail.com>
Date: Tue, 22 May 2018 22:27:36 +0100
Subject: [PATCH 349/575] [pegjs] Added support for parser options

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

diff --git a/types/pegjs/index.d.ts b/types/pegjs/index.d.ts
index 722153038b..c5cdb533ec 100644
--- a/types/pegjs/index.d.ts
+++ b/types/pegjs/index.d.ts
@@ -51,8 +51,9 @@ export type GrammarError = PegjsError;
 export var GrammarError: any;
 
 export interface ParserOptions {
-    startRule: string;
-    tracer: any;
+    startRule?: string;
+    tracer?: any;
+    [key: string]: any;
 }
 
 export interface Parser {
diff --git a/types/pegjs/pegjs-tests.ts b/types/pegjs/pegjs-tests.ts
index 267a64b060..f2a3d543ed 100644
--- a/types/pegjs/pegjs-tests.ts
+++ b/types/pegjs/pegjs-tests.ts
@@ -26,6 +26,11 @@ import * as pegjs from 'pegjs';
     })
 }
 
+{
+    let parser: pegjs.Parser = pegjs.generate('start = "a" { return options; }');
+    let parsed: any = parser.parse("a", {a: 42});
+}
+
 try {
     let source: string = pegjs.generate("A = 'test'", {output: "source"});
 } catch (error) {
@@ -44,4 +49,4 @@ try {
     console.log(e.location.end.line);
     console.log(e.message);
     console.log(e.name);
-}
\ No newline at end of file
+}

From 9fe70e21141bc51bac33b2d9709ae1582de3c70a Mon Sep 17 00:00:00 2001
From: Alec Zopf <alec.zopf@gmail.com>
Date: Tue, 22 May 2018 17:32:48 -0400
Subject: [PATCH 350/575] adding types and tests for pg-format module

---
 types/pg-format/index.d.ts         | 23 +++++++++++
 types/pg-format/pg-format-tests.ts | 64 ++++++++++++++++++++++++++++++
 types/pg-format/tsconfig.json      | 23 +++++++++++
 types/pg-format/tslint.json        |  3 ++
 4 files changed, 113 insertions(+)
 create mode 100644 types/pg-format/index.d.ts
 create mode 100644 types/pg-format/pg-format-tests.ts
 create mode 100644 types/pg-format/tsconfig.json
 create mode 100644 types/pg-format/tslint.json

diff --git a/types/pg-format/index.d.ts b/types/pg-format/index.d.ts
new file mode 100644
index 0000000000..e1de1f2ba4
--- /dev/null
+++ b/types/pg-format/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for pg-format 1.0
+// Project: https://github.com/datalanche/node-pg-format
+// Definitions by: Alec Zopf <https://github.com/zopf>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+/// <reference types="node"/>
+export = format;
+
+declare function format(fmt: string, ...args: any[]): string;
+
+declare namespace format {
+    function config(config?: {
+        pattern: {
+            ident?: string,
+            literal?: string,
+            string?: string
+        }
+    }): void;
+    function ident(val: string | number | boolean | any[] | Date): string;
+    function literal(val: string | number | boolean | any[] | Date | object | null | undefined): string;
+    function string(val: string | number | boolean | any[] | Date | object | null | undefined): string;
+    function withArray(fmt: string, array: any[]): string;
+}
diff --git a/types/pg-format/pg-format-tests.ts b/types/pg-format/pg-format-tests.ts
new file mode 100644
index 0000000000..e6239ef575
--- /dev/null
+++ b/types/pg-format/pg-format-tests.ts
@@ -0,0 +1,64 @@
+import format = require('pg-format');
+
+const testDate = new Date(Date.UTC(2012, 11, 14, 13, 6, 43, 152));
+const testArray = [ 'abc', 1, true, null, testDate ];
+const testIdentArray = [ 'abc', 'AbC', 1, true, testDate ];
+const testObject = { a: 1, b: 2 };
+const testNestedArray = [ [1, 2], [3, 4], [5, 6] ];
+
+format.config({
+    pattern: {
+        ident: 'V',
+        literal: 'C',
+        string: 't'
+    }
+});
+format.config();
+
+format('some %s thing %s', 'long', 'here');
+format('%L', testNestedArray);
+
+format.withArray('some %s thing %s', [ 'long', 'here' ]);
+format.withArray('many %s %s', ['things', testNestedArray]);
+
+format.string(undefined);
+format.string(null);
+format.string(true);
+format.string(false);
+format.string(0);
+format.string(15);
+format.string(-15);
+format.string(45.13);
+format.string(-45.13);
+format.string('something');
+format.string(testArray);
+format.string(testNestedArray);
+format.string(testDate);
+format.string(testObject);
+
+format.ident(true);
+format.ident(false);
+format.ident(0);
+format.ident(15);
+format.ident(-15);
+format.ident(45.13);
+format.ident(-45.13);
+format.ident('something');
+format.ident(testIdentArray);
+format.ident(testNestedArray);
+format.ident(testDate);
+
+format.literal(null);
+format.literal(undefined);
+format.literal(true);
+format.literal(false);
+format.literal(0);
+format.literal(15);
+format.literal(-15);
+format.literal(45.13);
+format.literal(-45.13);
+format.literal('something');
+format.literal(testArray);
+format.literal(testNestedArray);
+format.literal(testDate);
+format.literal(testObject);
diff --git a/types/pg-format/tsconfig.json b/types/pg-format/tsconfig.json
new file mode 100644
index 0000000000..185d95cd07
--- /dev/null
+++ b/types/pg-format/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",
+        "pg-format-tests.ts"
+    ]
+}
diff --git a/types/pg-format/tslint.json b/types/pg-format/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/pg-format/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From fd5fd9a23bac3e7a6b000c7413df937e8d40be48 Mon Sep 17 00:00:00 2001
From: Alex <protyagov@gmail.com>
Date: Tue, 22 May 2018 17:31:29 -0500
Subject: [PATCH 351/575] Update index.d.ts

Per documentation at [1] array of data might be numbers or Date objects.

[1] http://dygraphs.com/data.html#array
---
 types/dygraphs/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/dygraphs/index.d.ts b/types/dygraphs/index.d.ts
index 6e45d5ccd7..4a4a9f0492 100644
--- a/types/dygraphs/index.d.ts
+++ b/types/dygraphs/index.d.ts
@@ -6,7 +6,7 @@
 /// <reference types="google.visualization" />
 
 declare namespace dygraphs {
-    type DataArray = number[][];
+    type DataArray = (number|Date)[][];
 
     type Data = string | DataArray | google.visualization.DataTable;
 

From f74c0ea5a182d10087e865583f4652bd3a724391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Johansen=20Amundrud?= <oyvindjam@gmail.com>
Date: Wed, 23 May 2018 01:47:39 +0200
Subject: [PATCH 352/575] Add optional and null

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

diff --git a/types/facebook-instant-games/facebook-instant-games-tests.ts b/types/facebook-instant-games/facebook-instant-games-tests.ts
index 949782c41a..6223c3d5e3 100644
--- a/types/facebook-instant-games/facebook-instant-games-tests.ts
+++ b/types/facebook-instant-games/facebook-instant-games-tests.ts
@@ -1,5 +1,5 @@
 const locale: string = FBInstant.getLocale()!;
-const platform: string = FBInstant.getPlatform();
+const platform: string = FBInstant.getPlatform()!;
 const sdkVersion: string = FBInstant.getSDKVersion();
 FBInstant.initializeAsync().then(() => {});
 FBInstant.setLoadingProgress(10);
diff --git a/types/facebook-instant-games/index.d.ts b/types/facebook-instant-games/index.d.ts
index 74c93c6c96..2e6da873cd 100644
--- a/types/facebook-instant-games/index.d.ts
+++ b/types/facebook-instant-games/index.d.ts
@@ -33,7 +33,7 @@ declare namespace FBInstant {
     /**
      * The platform on which the game is currently running. The value will always be null until FBInstant.initializeAsync() resolves.
      */
-    function getPlatform(): Platform;
+    function getPlatform(): Platform | null;
 
     /**
      * The string representation of this SDK version.
@@ -458,7 +458,7 @@ declare namespace FBInstant {
          * @throws PENDING_REQUEST
          * @throws CLIENT_UNSUPPORTED_OPERATION
          */
-        chooseAsync(options: ContextOptions): Promise<void>;
+        chooseAsync(options?: ContextOptions): Promise<void>;
 
         /**
          * Attempts to create or switch into a context between a specified player and the current player. The returned promise will reject if the player listed is not a Connected Player of the current
@@ -521,7 +521,7 @@ declare namespace FBInstant {
          * @throws INVALID_OPERATION
          * @throws RATE_LIMITED
          */
-        setScoreAsync(score: number, extraData: string): Promise<LeaderboardEntry>;
+        setScoreAsync(score: number, extraData?: string): Promise<LeaderboardEntry>;
 
         /**
          * Retrieves the leaderboard's entry for the current player, or null if the player has not set one yet.

From 69e739a7ab02312393774f44a63e659507da22dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Johansen=20Amundrud?= <oyvindjam@gmail.com>
Date: Wed, 23 May 2018 01:58:50 +0200
Subject: [PATCH 353/575] Add missing function for testing leaderboard

---
 .../facebook-instant-games/facebook-instant-games-tests.ts  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/facebook-instant-games/facebook-instant-games-tests.ts b/types/facebook-instant-games/facebook-instant-games-tests.ts
index 6223c3d5e3..cf93053288 100644
--- a/types/facebook-instant-games/facebook-instant-games-tests.ts
+++ b/types/facebook-instant-games/facebook-instant-games-tests.ts
@@ -70,6 +70,12 @@ FBInstant.getLeaderboardAsync("name").then((leaderboard: FBInstant.Leaderboard)
         const score: number = leaderboardEntry.getScore();
         const timestamp: number = leaderboardEntry.getTimestamp();
     });
+    const contextID: string = leaderboard.getContextID()!;
+    leaderboard.getEntriesAsync(10, 10).then(entries => {});
+    leaderboard.getEntryCountAsync().then((entryCount: number) => {});
+    const name = leaderboard.getName();
+    leaderboard.getPlayerEntryAsync().then(playerEntry => {});
+    leaderboard.setScoreAsync(10).then(leaderboardEntry => {});
 });
 
 FBInstant.player.canSubscribeBotAsync().then((canSubscribeBot: boolean) => {});

From b78b4d15d4c0de3ac5c5cd51d3d2e866c8c91544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Johansen=20Amundrud?= <oyvindjam@gmail.com>
Date: Wed, 23 May 2018 02:03:25 +0200
Subject: [PATCH 354/575] Plural spelling

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

diff --git a/types/facebook-instant-games/index.d.ts b/types/facebook-instant-games/index.d.ts
index 2e6da873cd..c0722b11ec 100644
--- a/types/facebook-instant-games/index.d.ts
+++ b/types/facebook-instant-games/index.d.ts
@@ -174,11 +174,11 @@ declare namespace FBInstant {
      *
      * @param eventName Name of the event. Must be 2 to 40 characters, and can only contain '_', '-', ' ', and alphanumeric characters.
      * @param valueToSum An optional numeric value that FB Analytics can calculate a sum with.
-     * @param parameter An optional object that can contain up to 25 key-value pairs to be logged with the event. Keys must be 2 to 40 characters,
+     * @param parameters An optional object that can contain up to 25 key-value pairs to be logged with the event. Keys must be 2 to 40 characters,
      * and can only contain '_', '-', ' ', and alphanumeric characters. Values must be less than 100 characters in length.
      * @returns The error if the event failed to log; otherwise returns null.
      */
-    function logEvent(eventName: string, valueToSum?: number, parameter?: { [key: string]: string; }): APIError | null;
+    function logEvent(eventName: string, valueToSum?: number, parameters?: { [key: string]: string; }): APIError | null;
 
     /**
      * Set a callback to be fired when a pause event is triggered.

From f46cd6448bb8ba489848cbd6a3df0eccfcf17592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Johansen=20Amundrud?= <oyvindjam@gmail.com>
Date: Wed, 23 May 2018 02:20:51 +0200
Subject: [PATCH 355/575] Add type

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

diff --git a/types/facebook-instant-games/facebook-instant-games-tests.ts b/types/facebook-instant-games/facebook-instant-games-tests.ts
index cf93053288..f8fc559360 100644
--- a/types/facebook-instant-games/facebook-instant-games-tests.ts
+++ b/types/facebook-instant-games/facebook-instant-games-tests.ts
@@ -73,7 +73,7 @@ FBInstant.getLeaderboardAsync("name").then((leaderboard: FBInstant.Leaderboard)
     const contextID: string = leaderboard.getContextID()!;
     leaderboard.getEntriesAsync(10, 10).then(entries => {});
     leaderboard.getEntryCountAsync().then((entryCount: number) => {});
-    const name = leaderboard.getName();
+    const name: string = leaderboard.getName();
     leaderboard.getPlayerEntryAsync().then(playerEntry => {});
     leaderboard.setScoreAsync(10).then(leaderboardEntry => {});
 });

From 202a537935e6aba0a26129968475d56ad238d453 Mon Sep 17 00:00:00 2001
From: stuartlo <stuartlo@microsoft.com>
Date: Tue, 22 May 2018 18:23:25 -0700
Subject: [PATCH 356/575] Fix boolean issue

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

diff --git a/types/ckeditor/index.d.ts b/types/ckeditor/index.d.ts
index b6cef62744..44c40f3699 100644
--- a/types/ckeditor/index.d.ts
+++ b/types/ckeditor/index.d.ts
@@ -221,7 +221,7 @@ declare namespace CKEDITOR {
             breakParent(parent: element): void;
             contains(node: node): boolean;
             copyAttributes(dest: element, skipAttributes: { [key: string]: string }): void;
-            data(name: string, value?: string | false): string;
+            data(name: string, value?: string | boolean): string;
             disableContextMenu(): void;
             find(selector: string): nodeList;
             findOne(selector: string): element;
@@ -1533,7 +1533,7 @@ declare namespace CKEDITOR {
             filter(filter: htmlParser.filter): boolean;
             filterChildren(filter: htmlParser.filter): void;
             find(criteria: string | ((el: htmlParser.node) => boolean), recursive?: boolean): htmlParser.node[];
-            forEach(callback: (node: htmlParser.node) => void | false, type?: number, skipRoot?: boolean): void;
+            forEach(callback: (node: htmlParser.node) => void | boolean, type?: number, skipRoot?: boolean): void;
             getFirst(condition: string | { [key: string]: string } | ((node: htmlParser.node) => boolean)): htmlParser.node;
             getHtml(): string;
             getOuterHtml(): string;
@@ -1591,7 +1591,7 @@ declare namespace CKEDITOR {
             add(node: htmlParser.node, index?: number): void;
             filter(filter: htmlParser.filter): void;
             filterChildren(filter: htmlParser.filter, filterRoot?: boolean): void;
-            forEach(callback: (node: htmlParser.node,) => void | false, type?: number, skipRoot?: boolean): void;
+            forEach(callback: (node: htmlParser.node,) => void | boolean, type?: number, skipRoot?: boolean): void;
             writeChildrenHtml(writer: basicWriter, filter?: htmlParser.filter, filterRoot?: boolean): void;
             writeHtml(writer: basicWriter, filter?: htmlParser.filter): void;
 

From 7f820b490e27ed3cabb8c013ab56b355e7b99fd8 Mon Sep 17 00:00:00 2001
From: Umar Bolatov <bolatovumar@gmail.com>
Date: Tue, 22 May 2018 22:06:29 -0700
Subject: [PATCH 357/575] Fix #25954

---
 types/googlemaps/googlemaps-tests.ts | 20 ++++++++++++++++++++
 types/googlemaps/index.d.ts          | 19 +++++++++++++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/types/googlemaps/googlemaps-tests.ts b/types/googlemaps/googlemaps-tests.ts
index 973a15d03f..561e53f91a 100644
--- a/types/googlemaps/googlemaps-tests.ts
+++ b/types/googlemaps/googlemaps-tests.ts
@@ -40,6 +40,26 @@ let map: google.maps.Map = new google.maps.Map(
     mapOptions
 );
 
+/***** Fitting map to bounds *****/
+map.fitBounds({
+    north: 10,
+    east: 10,
+    west: 10,
+    south: 10
+}, 50);
+
+map.fitBounds({
+    east: 10,
+    north: 10,
+    south: 10,
+    west: 10
+}, {
+    bottom: 100,
+    left: 150,
+    right: 150,
+    top: 50
+});
+
 
 /***** Data *****/
 
diff --git a/types/googlemaps/index.d.ts b/types/googlemaps/index.d.ts
index 5c4cca2eb3..9430698fe6 100644
--- a/types/googlemaps/index.d.ts
+++ b/types/googlemaps/index.d.ts
@@ -1,6 +1,14 @@
 // Type definitions for Google Maps JavaScript API 3.30
 // Project: https://developers.google.com/maps/
-// Definitions by: Folia A/S <http://www.folia.dk>, Chris Wrench <https://github.com/cgwrench>, Kiarash Ghiaseddin <https://github.com/Silver-Connection/DefinitelyTyped>,  Grant Hutchins <https://github.com/nertzy>, Denis Atyasov <https://github.com/xaolas>, Michael McMullin <https://github.com/mrmcnerd>, Martin Costello <https://github.com/martincostello>, Sven Kreiss <https://github.com/svenkreiss>
+// Definitions by:  Folia A/S <http://www.folia.dk>, 
+//                  Chris Wrench <https://github.com/cgwrench>, 
+//                  Kiarash Ghiaseddin <https://github.com/Silver-Connection/DefinitelyTyped>,  
+//                  Grant Hutchins <https://github.com/nertzy>, 
+//                  Denis Atyasov <https://github.com/xaolas>, 
+//                  Michael McMullin <https://github.com/mrmcnerd>, 
+//                  Martin Costello <https://github.com/martincostello>, 
+//                  Sven Kreiss <https://github.com/svenkreiss>
+//                  Umar Bolatov <https://github.com/bolatovumar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /*
@@ -31,7 +39,7 @@ declare namespace google.maps {
     /***** Map *****/
     export class Map extends MVCObject {
         constructor(mapDiv: Element|null, opts?: MapOptions);
-        fitBounds(bounds: LatLngBounds|LatLngBoundsLiteral, padding?: number): void;
+        fitBounds(bounds: LatLngBounds|LatLngBoundsLiteral, padding?: number|Padding): void;
         getBounds(): LatLngBounds|null|undefined;
         getCenter(): LatLng;
         getDiv(): Element;
@@ -58,6 +66,13 @@ declare namespace google.maps {
         setClickableIcons(clickable: boolean): void;
     }
 
+    export interface Padding {
+        bottom: number;
+        left: number;
+        right: number;
+        top: number;
+    }
+
     export interface MapOptions {
         /**
          * Color used for the background of the Map div. This color will be visible when

From 516d4bb607c925d0983048525083051e156c2c25 Mon Sep 17 00:00:00 2001
From: nofree <nofree5th@qq.com>
Date: Wed, 23 May 2018 13:29:32 +0800
Subject: [PATCH 358/575] Fix FontLoader/Font json type declare

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

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index a7f7950a48..1d6831805a 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -1911,7 +1911,7 @@ export class Layers {
 }
 
 export class Font {
-    constructor(jsondata: string);
+    constructor(jsondata: any);
 
     data: string;
 
@@ -2214,7 +2214,7 @@ export class FontLoader {
     manager: LoadingManager;
 
     load(url: string, onLoad?: (responseFont: Font) => void, onProgress?: (event: ProgressEvent) => void, onError?: (event: ErrorEvent) => void): void;
-    parse(json: string): Font;
+    parse(json: any): Font;
 }
 
 /**

From bb5c9b6271338b89b4030942df1c36032963bb32 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vincentbiret@hotmail.com>
Date: Wed, 23 May 2018 09:56:05 +0200
Subject: [PATCH 359/575] sharepoint: removed useless PageCOntextInfoInstance

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

diff --git a/types/sharepoint/index.d.ts b/types/sharepoint/index.d.ts
index 5340aa5983..7238e6c2b8 100644
--- a/types/sharepoint/index.d.ts
+++ b/types/sharepoint/index.d.ts
@@ -108,31 +108,29 @@ declare namespace SP {
 
     class PageContextInfo {
         constructor();
-        get_siteServerRelativeUrl(): string;
-        get_webServerRelativeUrl(): string;
-        get_webAbsoluteUrl(): string;
-        get_serverRequestPath(): string;
-        get_siteAbsoluteUrl(): string;
-        get_webTitle(): string;
-        get_tenantAppVersion(): string;
-        get_isAppWeb(): boolean;
-        get_webLogoUrl(): string;
-        get_webLanguage(): number;
-        get_currentLanguage(): number;
-        get_pageItemId(): number;
-        get_pageListId(): string;
-        get_webPermMasks(): { High: number; Low: number; };
-        get_currentCultureName(): string;
-        get_currentUICultureName(): string;
-        get_clientServerTimeDelta(): number;
-        get_userLoginName(): string;
-        get_webTemplate(): string;
+        static get_clientServerTimeDelta(): number;
+        static get_siteServerRelativeUrl(): string;
+        static get_webServerRelativeUrl(): string;
+        static get_webAbsoluteUrl(): string;
+        static get_serverRequestPath(): string;
+        static get_siteAbsoluteUrl(): string;
+        static get_webTitle(): string;
+        static get_tenantAppVersion(): string;
+        static get_isAppWeb(): boolean;
+        static get_webLogoUrl(): string;
+        static get_webLanguage(): number;
+        static get_currentLanguage(): number;
+        static get_pageItemId(): number;
+        static get_pageListId(): string;
+        static get_webPermMasks(): { High: number; Low: number; };
+        static get_currentCultureName(): string;
+        static get_currentUICultureName(): string;
+        static get_clientServerTimeDelta(): number;
+        static get_userLoginName(): string;
+        static get_webTemplate(): string;
+        static get_pagePersonalizationScope(): string;
+        static get_webPermMasks(): SP.ContextPermissions;
     }
-
-    interface PageContextInfoInstance {
-        get_pagePersonalizationScope(): string;
-    }
-
     class ContextPermissions {
         has(perm: number): boolean;
         hasPermissions(high: number, low: number): boolean;

From 81089459ca8d9791e469fe0e51fbb75c70ce28b0 Mon Sep 17 00:00:00 2001
From: "Amir.Tugi@Gmail.com" <Amir.T@logz.io>
Date: Wed, 23 May 2018 10:59:20 +0300
Subject: [PATCH 360/575] CR Fix

---
 types/express-paginate/express-paginate-tests.ts | 2 +-
 types/express-paginate/index.d.ts                | 2 +-
 types/express-paginate/tsconfig.json             | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/express-paginate/express-paginate-tests.ts b/types/express-paginate/express-paginate-tests.ts
index 20f1a0a558..ddd87ce441 100644
--- a/types/express-paginate/express-paginate-tests.ts
+++ b/types/express-paginate/express-paginate-tests.ts
@@ -1,4 +1,4 @@
-import * as express from 'express';
+import express from 'express';
 import * as paginate from 'express-paginate';
 
 declare function findAndCountAll(params: object): Promise<{count: number, rows: object[]}>;
diff --git a/types/express-paginate/index.d.ts b/types/express-paginate/index.d.ts
index b816d11b1b..638ae944ad 100644
--- a/types/express-paginate/index.d.ts
+++ b/types/express-paginate/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.7
 
-import * as express from 'express';
+import express = require("express");
 
 declare global {
     namespace Express {
diff --git a/types/express-paginate/tsconfig.json b/types/express-paginate/tsconfig.json
index 9370f2106b..d524beee7a 100644
--- a/types/express-paginate/tsconfig.json
+++ b/types/express-paginate/tsconfig.json
@@ -8,6 +8,7 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
+        "esModuleInterop": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 038389633599b2235e7a510e30829dbcb47e0253 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vincentbiret@hotmail.com>
Date: Wed, 23 May 2018 10:02:07 +0200
Subject: [PATCH 361/575] removing duplicated method

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

diff --git a/types/sharepoint/index.d.ts b/types/sharepoint/index.d.ts
index 7238e6c2b8..b05d498648 100644
--- a/types/sharepoint/index.d.ts
+++ b/types/sharepoint/index.d.ts
@@ -108,7 +108,6 @@ declare namespace SP {
 
     class PageContextInfo {
         constructor();
-        static get_clientServerTimeDelta(): number;
         static get_siteServerRelativeUrl(): string;
         static get_webServerRelativeUrl(): string;
         static get_webAbsoluteUrl(): string;
@@ -129,7 +128,6 @@ declare namespace SP {
         static get_userLoginName(): string;
         static get_webTemplate(): string;
         static get_pagePersonalizationScope(): string;
-        static get_webPermMasks(): SP.ContextPermissions;
     }
     class ContextPermissions {
         has(perm: number): boolean;

From 66150a31df378ded046a6d9c94efbd7b93e521e9 Mon Sep 17 00:00:00 2001
From: Denis Artyuhovich <i@denis.by>
Date: Tue, 22 May 2018 18:17:21 +0300
Subject: [PATCH 362/575] Add defenition for allure-js-commons

---
 .../allure-js-commons-tests.ts                |  24 ++++
 types/allure-js-commons/index.d.ts            | 109 ++++++++++++++++++
 types/allure-js-commons/tsconfig.json         |  23 ++++
 types/allure-js-commons/tslint.json           |   1 +
 4 files changed, 157 insertions(+)
 create mode 100644 types/allure-js-commons/allure-js-commons-tests.ts
 create mode 100644 types/allure-js-commons/index.d.ts
 create mode 100644 types/allure-js-commons/tsconfig.json
 create mode 100644 types/allure-js-commons/tslint.json

diff --git a/types/allure-js-commons/allure-js-commons-tests.ts b/types/allure-js-commons/allure-js-commons-tests.ts
new file mode 100644
index 0000000000..9d4dd653da
--- /dev/null
+++ b/types/allure-js-commons/allure-js-commons-tests.ts
@@ -0,0 +1,24 @@
+import * as Allure from "allure-js-commons";
+
+const shouldMakeError = new Allure("test"); // $ExpectError
+const allure = new Allure();
+
+allure.startSuite("suite");
+allure.startCase("case");
+allure.startCase("case", 123456789);
+
+allure.endCase("passed");
+allure.endCase("pending");
+allure.endCase("skipped");
+allure.endCase("failed");
+allure.endCase("broken", 1232131232);
+allure.endCase("error"); // $ExpectError
+
+allure.startStep("error");
+allure.endStep("error"); // $ExpectError
+
+allure.setDescription("description");
+allure.addAttachment("image", {}, "image/jpeg");
+allure.pendingCase("pending");
+
+allure.endSuite();
diff --git a/types/allure-js-commons/index.d.ts b/types/allure-js-commons/index.d.ts
new file mode 100644
index 0000000000..6331423d1e
--- /dev/null
+++ b/types/allure-js-commons/index.d.ts
@@ -0,0 +1,109 @@
+// Type definitions for allure-js-commons 0.0
+// Project: https://github.com/allure-framework/allure-js-commons
+// Definitions by: Denis Artyuhovich <https://github.com/zaqqaz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+declare class Allure {
+    constructor();
+
+    setOptions(options: Allure.Options): void;
+
+    getCurrentSuite(): Allure.Suite;
+
+    getCurrentTest(): Allure.Test;
+
+    startSuite(suiteName: string, timestamp?: number): void;
+
+    endSuite(timestamp?: number): void;
+
+    startCase(testName: string, timestamp?: number): void;
+
+    endCase(status: Allure.Status, err?: {}, timestamp?: number): void;
+
+    startStep(stepName: string, timestamp?: number): void;
+
+    endStep(status: Allure.Status, timestamp?: number): void;
+
+    setDescription(description: string, timestamp?: number): void;
+
+    addAttachment(attachmentName: string, buffer: any, type: string): void;
+
+    pendingCase(testName: string, timestamp?: number): void;
+}
+
+export = Allure;
+export as namespace Allure;
+declare namespace Allure {
+    interface Options {
+        targetDir: string;
+    }
+
+    type Status = "passed" | "pending" | "skipped" | "failed" | "broken";
+
+    enum TYPE {
+        TEXT = "text",
+        HTML = "html",
+        MARKDOWN = "markdown"
+    }
+
+    class Suite {
+        constructor(name: string, timestamp?: number);
+
+        end(timestamp?: number): void;
+
+        hasTests(): boolean;
+
+        addTest(test: Test): boolean;
+
+        toXML(): string;
+    }
+
+    class Test {
+        constructor(name: string, timestamp?: number);
+
+        setDescription(description: string, type: TYPE): void;
+
+        addLabel(name: string, value: string): void;
+
+        addParameter(kind: any, name: string, value: string): void;
+
+        addStep(step: Step): void;
+
+        addAttachment(attachment: Attachment): void;
+
+        end(status: Status, error: Error, timestamp?: number): void;
+
+        toXML(): string;
+    }
+
+    class Description {
+        constructor(value: string, type: TYPE);
+
+        toXML(): string;
+    }
+
+    class Step {
+        constructor(name: string, timestamp?: number);
+
+        addStep(step: Step): void;
+
+        addAttachment(attachment: Attachment): void;
+
+        end(status: Status, error: Error, timestamp?: number): void;
+
+        toXML(): string;
+    }
+
+    class Attachment {
+        constructor(title: string, source: any, size: number, mime: string);
+
+        addStep(step: Step): void;
+
+        addAttachment(attachment: Attachment): void;
+
+        end(status: Status, error: Error, timestamp?: number): void;
+
+        toXML(): string;
+    }
+}
diff --git a/types/allure-js-commons/tsconfig.json b/types/allure-js-commons/tsconfig.json
new file mode 100644
index 0000000000..9355cb2e42
--- /dev/null
+++ b/types/allure-js-commons/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",
+        "allure-js-commons-tests.ts"
+    ]
+}
diff --git a/types/allure-js-commons/tslint.json b/types/allure-js-commons/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/allure-js-commons/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 88e4b902be876ca37f0c5090ec745659501adcb8 Mon Sep 17 00:00:00 2001
From: liul85 <liul85@gmail.com>
Date: Wed, 23 May 2018 16:14:39 +0800
Subject: [PATCH 363/575] add basic type declaration for solr-client

---
 types/solr-client/index.d.ts           | 165 +++++++++++++++++++++++++
 types/solr-client/solr-client-tests.ts |  21 ++++
 types/solr-client/tsconfig.json        |  23 ++++
 types/solr-client/tslint.json          |   1 +
 4 files changed, 210 insertions(+)
 create mode 100644 types/solr-client/index.d.ts
 create mode 100644 types/solr-client/solr-client-tests.ts
 create mode 100644 types/solr-client/tsconfig.json
 create mode 100644 types/solr-client/tslint.json

diff --git a/types/solr-client/index.d.ts b/types/solr-client/index.d.ts
new file mode 100644
index 0000000000..f2f15f48c2
--- /dev/null
+++ b/types/solr-client/index.d.ts
@@ -0,0 +1,165 @@
+// Type definitions for solr-client 0.7
+// Project: https://github.com/lbdremy/solr-node-client#readme
+// Definitions by: liul85 <https://github.com/liul85>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+import { ClientRequest } from "http";
+
+export function createClient(options?: Options): Client;
+export function createQuery(options?: {solrVersion: string}): Query;
+
+export interface Options {
+    host?: string;
+    port?: number;
+    core?: string;
+    path?: string;
+    agent?: string;
+    secure?: string;
+    bigint?: string;
+    solrVersion?: string;
+}
+
+export interface RangeFilterOption {
+    field: string;
+    start: string | number | Date;
+    end: string | number | Date;
+}
+
+export interface GroupOptions {
+    on?: boolean;
+    field?: string | string[];
+    limit?: number;
+    offset?: number;
+    sort?: string;
+    format?: string;
+    main?: boolean;
+    ngroups?: boolean;
+    truncate?: boolean;
+    cache?: number;
+}
+
+export interface FacetOptions {
+    on: boolean;
+    query?: string;
+    field?: string | string[];
+    prefix: string;
+    sort?: string;
+    limit?: number;
+    offset?: number;
+    mincout?: number;
+    missing?: boolean;
+    method?: string;
+    pivot?: string | string[];
+}
+
+export interface MoreLikeThisOptions {
+    on: boolean;
+    fl?: string | string[];
+    count?: number;
+    mintf?: number;
+    mindf?: number;
+    minwl?: number;
+    maxwl?: number;
+    maxqt?: number;
+    maxntp?: number;
+    boost?: boolean;
+    qf?: string | object;
+}
+
+export interface HighlightOptions {
+    on: boolean;
+    q?: string | string[];
+    qparser?: string;
+    fl?: string | string[];
+    snippets?: number;
+    fragsize?: number;
+    mergeContiguous?: boolean;
+    maxAnalyzedChars?: number;
+    maxMultiValuedToExamine?: number;
+    maxMultiValuedToMatch?: number;
+    alternateField?: string;
+    maxAlternateFieldLength?: number;
+    formatter?: string;
+    simplePre?: string;
+    simplePost?: string;
+    fragmenter?: string;
+    highlightMultiTerm?: boolean;
+    requireFieldMatch?: boolean;
+    usePhraseHighlighter?: boolean;
+    regexSlop?: number;
+    regexPattern?: string;
+    regexMaxAnalyzedChars?: number;
+    preserveMulti?: boolean;
+    payloads?: boolean;
+}
+
+export interface AddRemoteResourceOptions {
+    path: string;
+    format: string;
+    contentType: string;
+    parameters: object;
+}
+
+export interface Query {
+    set(parameters: string): Query;
+    defType(type: string): Query;
+    requestHandler(handler: string): Query;
+    q(q: string | object): Query;
+    qop(op: string): Query;
+    df(df: string): Query;
+    start(start: number): Query;
+    rows(rows: number): Query;
+    cursorMark(mark: string): Query;
+    sort(options: object): Query;
+    rangeFilter(options: RangeFilterOption[]): Query;
+    matchFilter(field: string, value: string | number | Date): Query;
+    fl(fields: string | string[]): Query;
+    timeout(time: string | number): Query;
+    groupBy(field: string): Query;
+    group(options: GroupOptions): Query;
+    facet(options: FacetOptions): Query;
+    mlt(options: MoreLikeThisOptions): Query;
+    dismax(): Query;
+    edismax(): Query;
+    debugQuery(): Query;
+    qf(options: object): Query;
+    mm(minimum: string | number): Query;
+    pf(options: object): Query;
+    ps(slop: number): Query;
+    qs(slop: number): Query;
+    tie(tiebreaker: number): Query;
+    bq(options: object): Query;
+    bf(functions: string): Query;
+    boost(functions: string): Query;
+    build(): string;
+    hl(options: HighlightOptions): Query;
+}
+
+export interface Client {
+    basicAuth(username: string, password: string): Client;
+    unauth(): Client;
+    add(docs: object[], options?: Options, callback?: (err: Error, data: object) => void): ClientRequest;
+    realTimeGet(ids: string | string[], query?: Query, callback?: (err: Error, data: object) => void): ClientRequest;
+    addRemoteResource(options: AddRemoteResourceOptions, callback?: (err: Error, data: object) => void): ClientRequest;
+    commit(options?: Options, callback?: (err: Error, data: object) => void): ClientRequest;
+    prepareCommit(callback?: (err: Error, data: object) => void): ClientRequest;
+    softCommit(callback?: (err: Error, data: object) => void): ClientRequest;
+    delete(field: string, text: string, options?: Options, callback?: (err: Error, data: object) => void): ClientRequest;
+    deleteByRange(field: string, start: string | Date, stop: string | Date, options?: object, callback?: (err: Error, data: object) => void): ClientRequest;
+    deleteById(id: string | number, options?: Options, callback?: (err: Error, data: object) => void): ClientRequest;
+    deleteByQuery(query: string, options?: Options, callback?: (err: Error, data: object) => void): ClientRequest;
+    deleteAll(options?: Options, callback?: (err: Error, data: object) => void): ClientRequest;
+    optimize(options: object, callback?: (err: Error, data: object) => void): ClientRequest;
+    rollback(callback?: (err: Error, data: object) => void): ClientRequest;
+    update(data: object, options?: object, callback?: (err: Error, data: object) => void): ClientRequest;
+    search(query: Query, callback?: (err: Error, data: object) => void): ClientRequest;
+    executeCollection(collection: Query | object | string, callback?: (err: Error, data: object) => void): ClientRequest;
+    searchAll(callback?: (err: Error, data: object) => void): ClientRequest;
+    get(handler: string, query: Query | object | string, callback?: (err: Error, data: object) => void): ClientRequest;
+    post(handler: string, query: Query | object | string, callback?: (err: Error, data: object) => void): ClientRequest;
+    escapeSpecialChars(s: string): string;
+}
+
+export as namespace Solr;
diff --git a/types/solr-client/solr-client-tests.ts b/types/solr-client/solr-client-tests.ts
new file mode 100644
index 0000000000..d9acb225c3
--- /dev/null
+++ b/types/solr-client/solr-client-tests.ts
@@ -0,0 +1,21 @@
+import { createQuery, createClient } from "solr-client";
+
+const query = createQuery();
+const client = createClient();
+
+query; // $ExpectType Query
+client; // $ExpectType Client
+
+query.q({id: "1"}); // $ExpectType Query
+
+client.search(query); // $ExpectType ClientRequest
+
+(() => {
+    client.search(query, (err, data) => {
+        if (err) {
+            console.log(err);
+        } else {
+            console.log(data);
+        }
+    });
+});
diff --git a/types/solr-client/tsconfig.json b/types/solr-client/tsconfig.json
new file mode 100644
index 0000000000..50d5352cd3
--- /dev/null
+++ b/types/solr-client/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "solr-client-tests.ts"
+    ]
+}
diff --git a/types/solr-client/tslint.json b/types/solr-client/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/solr-client/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file

From 605969f059069a091a541d0fcb54fc3bacea7ce1 Mon Sep 17 00:00:00 2001
From: liul85 <liul85@gmail.com>
Date: Wed, 23 May 2018 17:44:34 +0800
Subject: [PATCH 364/575] fix incorrect implementation of creating solr query

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

diff --git a/types/solr-client/index.d.ts b/types/solr-client/index.d.ts
index f2f15f48c2..74e8e2ba94 100644
--- a/types/solr-client/index.d.ts
+++ b/types/solr-client/index.d.ts
@@ -8,7 +8,6 @@
 import { ClientRequest } from "http";
 
 export function createClient(options?: Options): Client;
-export function createQuery(options?: {solrVersion: string}): Query;
 
 export interface Options {
     host?: string;
@@ -160,6 +159,7 @@ export interface Client {
     get(handler: string, query: Query | object | string, callback?: (err: Error, data: object) => void): ClientRequest;
     post(handler: string, query: Query | object | string, callback?: (err: Error, data: object) => void): ClientRequest;
     escapeSpecialChars(s: string): string;
+    query(): Query;
 }
 
 export as namespace Solr;
diff --git a/types/solr-client/solr-client-tests.ts b/types/solr-client/solr-client-tests.ts
index d9acb225c3..99f4700fb5 100644
--- a/types/solr-client/solr-client-tests.ts
+++ b/types/solr-client/solr-client-tests.ts
@@ -1,7 +1,7 @@
-import { createQuery, createClient } from "solr-client";
+import { createClient } from "solr-client";
 
-const query = createQuery();
 const client = createClient();
+const query = client.query();
 
 query; // $ExpectType Query
 client; // $ExpectType Client

From 8157193c263947c9bdb7f012639df511cea289ce Mon Sep 17 00:00:00 2001
From: Holger Jeromin <mailgithub@katur.de>
Date: Wed, 23 May 2018 15:58:57 +0200
Subject: [PATCH 365/575] fixing file.expand typing

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

diff --git a/types/grunt/grunt-tests.ts b/types/grunt/grunt-tests.ts
index 5dd6550582..94eb12a46f 100644
--- a/types/grunt/grunt-tests.ts
+++ b/types/grunt/grunt-tests.ts
@@ -1,6 +1,6 @@
 
 
-// Official code sample from 
+// Official code sample from
 // http://gruntjs.com/getting-started#an-example-gruntfile
 
 interface MyTaskData {
@@ -12,7 +12,7 @@ interface MyOptions {
     repeat: number;
 }
 
-// exports should work same as module.exports 
+// exports should work same as module.exports
 exports = (grunt: IGrunt) => {
 
     // Project configuration.
@@ -126,4 +126,10 @@ exports.exports = function(grunt: IGrunt) {
         });
     });
 
-};
\ No newline at end of file
+};
+
+
+let myTest = function (grunt: IGrunt) {
+    grunt.file.expand(['*.ts']);
+    grunt.file.expand('*.ts');
+}
diff --git a/types/grunt/index.d.ts b/types/grunt/index.d.ts
index 34e5b7e3cb..5187e5e965 100644
--- a/types/grunt/index.d.ts
+++ b/types/grunt/index.d.ts
@@ -445,7 +445,7 @@ declare namespace grunt {
              * File paths are relative to the Gruntfile unless the current working directory is changed with
              * grunt.file.setBase or the --base command-line option.
              */
-            expand(patterns: string[]): string[];
+            expand(patterns: string | string[]): string[];
             expand(options: IFilesConfig, patterns: string[]): string[];
 
             /**

From 64138e36f3c139a879399b14328eefed999a9c30 Mon Sep 17 00:00:00 2001
From: Dave Lee <d.lee.1@elsevier.com>
Date: Wed, 23 May 2018 10:06:21 -0400
Subject: [PATCH 366/575] fix stream support in jszip typings, as the library
 supports this

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

diff --git a/types/jszip/index.d.ts b/types/jszip/index.d.ts
index bca2b6899c..ba3ea392c9 100644
--- a/types/jszip/index.d.ts
+++ b/types/jszip/index.d.ts
@@ -31,6 +31,7 @@ interface InputByType {
     uint8array: Uint8Array;
     arraybuffer: ArrayBuffer;
     blob: Blob;
+    stream: NodeJS.ReadableStream;
 }
 
 interface OutputByType {
@@ -44,7 +45,7 @@ interface OutputByType {
     nodebuffer: Buffer;
 }
 
-type InputFileFormat = InputByType[keyof InputByType] | NodeJS.ReadableStream;
+type InputFileFormat = InputByType[keyof InputByType];
 
 declare namespace JSZip {
     type InputType = keyof InputByType;
diff --git a/types/jszip/jszip-tests.ts b/types/jszip/jszip-tests.ts
index 5d332a8070..d634767d58 100644
--- a/types/jszip/jszip-tests.ts
+++ b/types/jszip/jszip-tests.ts
@@ -1,5 +1,7 @@
 import JSZip = require('jszip');
 
+import { Readable } from "stream";
+
 const SEVERITY = {
 	DEBUG: 0,
 	INFO: 1,
@@ -10,9 +12,12 @@ const SEVERITY = {
 
 function createTestZip(): JSZip {
 	const zip = new JSZip();
+	const stream = new Readable();
+	stream.push("test stream");
 	zip.file("test.txt", "test string");
 	zip.file("test", null, { dir: true });
 	zip.file("test/test.txt", "test string");
+	zip.file("stream.txt", stream);
 	return zip;
 }
 
@@ -105,6 +110,14 @@ function testJSZip() {
 		log(SEVERITY.ERROR, "wrong number of files");
 	}
 		}).catch((e: any) => log(SEVERITY.ERROR, e));
+
+	newJszip.file("stream.txt").async('text').then((text: string) => {
+			if (text === "test string") {
+		log(SEVERITY.INFO, "all ok");
+	} else {
+		log(SEVERITY.ERROR, "no matching file found");
+	}
+		}).catch((e: any) => log(SEVERITY.ERROR, e));
 	}).catch((e: any) => { console.error(e); });
 }
 

From 8c4b85f862cdb722f13caa1de06299244d29e5ac Mon Sep 17 00:00:00 2001
From: Dave <dlee@nvisia.com>
Date: Wed, 23 May 2018 10:28:51 -0400
Subject: [PATCH 367/575] Update jszip-tests.ts

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

diff --git a/types/jszip/jszip-tests.ts b/types/jszip/jszip-tests.ts
index d634767d58..2910b5f729 100644
--- a/types/jszip/jszip-tests.ts
+++ b/types/jszip/jszip-tests.ts
@@ -112,7 +112,7 @@ function testJSZip() {
 		}).catch((e: any) => log(SEVERITY.ERROR, e));
 
 	newJszip.file("stream.txt").async('text').then((text: string) => {
-			if (text === "test string") {
+			if (text === "test stream") {
 		log(SEVERITY.INFO, "all ok");
 	} else {
 		log(SEVERITY.ERROR, "no matching file found");

From 5a88056e4c0c62208a813faaf6aacbe0e6438f66 Mon Sep 17 00:00:00 2001
From: Joshua Goldberg <josh@fullscreenmario.com>
Date: Wed, 23 May 2018 16:31:17 +0200
Subject: [PATCH 368/575] Added .headless() to Firefox options

---
 types/selenium-webdriver/firefox.d.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/types/selenium-webdriver/firefox.d.ts b/types/selenium-webdriver/firefox.d.ts
index 0c2ecdbe92..ce8a14216e 100644
--- a/types/selenium-webdriver/firefox.d.ts
+++ b/types/selenium-webdriver/firefox.d.ts
@@ -149,6 +149,13 @@ export class Profile {
  * Configuration options for the FirefoxDriver.
  */
 export class Options {
+    /**
+     * Sets the browser to be in headless mode.
+     *
+     * @return {!Options} A self reference.
+     */
+    headless(): Options;
+
     /**
      * Sets the profile to use. The profile may be specified as a
      * {@link Profile} object or as the path to an existing Firefox profile to use

From 26fbcf48bfdc702f5b4e3c4018eda5f020b68b76 Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Wed, 23 May 2018 22:44:46 +0800
Subject: [PATCH 369/575] fix(prettier): add missing prop

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

diff --git a/types/prettier/index.d.ts b/types/prettier/index.d.ts
index dbc358bfc9..7789c957a6 100644
--- a/types/prettier/index.d.ts
+++ b/types/prettier/index.d.ts
@@ -107,6 +107,7 @@ export interface RequiredOptions extends doc.printer.Options {
 export interface ParserOptions extends RequiredOptions {
     locStart: (node: any) => number;
     locEnd: (node: any) => number;
+    originalText: string;
 }
 
 export interface Plugin {

From 898bf3a95bbb475137274e37bf3a3309f054bd38 Mon Sep 17 00:00:00 2001
From: Eiji Kitamura <agektmr@google.com>
Date: Wed, 23 May 2018 23:44:06 +0900
Subject: [PATCH 370/575] Adds `BooleanCondition` and `GradientCondition`

---
 .../google-apps-script.spreadsheet.d.ts       | 60 ++++++++++++++++++-
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/types/google-apps-script/google-apps-script.spreadsheet.d.ts b/types/google-apps-script/google-apps-script.spreadsheet.d.ts
index b656032a96..dd2bc1d9f3 100644
--- a/types/google-apps-script/google-apps-script.spreadsheet.d.ts
+++ b/types/google-apps-script/google-apps-script.spreadsheet.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for Google Apps Script 2018-05-03
+// Type definitions for Google Apps Script 2018-05-23
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 //                 linlex <https://github.com/linlex/>
+//                 agektmr <https://github.com/agektmr/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="google-apps-script.types.d.ts" />
@@ -22,6 +23,25 @@ declare namespace GoogleAppsScript {
      */
     export enum BorderStyle { DOTTED, DASHED, SOLID }
 
+    /**
+     * Access boolean conditions in `ConditionalFormatRules`. Each conditional
+     * format rule may contain a single boolean condition. The boolean condition
+     * itself contains a boolean criteria (with values) and formatting settings.
+     * The criteria is evaluated against the content of a cell resulting in
+     * either a `true` or `false` value. If the criteria evaluates to `true`,
+     * the condition's formatting settings are applied to the cell.
+     */
+    export interface BooleanCondition {
+      getBackground(): string;
+      getBold(): boolean;
+      getCriteriaType(): BooleanCriteria;
+      getCriteriaValue(): Object[];
+      getFontColor(): string,
+      getItalic(): boolean;
+      getStrikethrough(): boolean;
+      getUnderline(): boolean;
+    }
+
     /**
      * The chart's position within a sheet.  Can be updated using the EmbeddedChart.modify()
      *  function.
@@ -588,6 +608,42 @@ declare namespace GoogleAppsScript {
       useAlternatingRowStyle(alternate: boolean): EmbeddedTableChartBuilder;
     }
 
+    /**
+     * Access gradient (color) conditions in `ConditionalFormatRuleApis`. Each
+     * conditional format rule may contain a single gradient condition. A
+     * gradient condition is defined by three points along a number scale (min,
+     * mid, and max), each of which has a color, a value, and a
+     * `InterpolationType`. The content of a cell is compared to the values in
+     * the number scale and the color applied to the cell is interpolated based
+     * on the cell content's proximity to the gradient condition min, mid, and
+     * max points.
+     * 
+     * // Logs all the information inside gradient conditional format rules on * a sheet.
+     * var sheet = SpreadsheetApp.getActiveSheet();
+     * var rules = sheet.getConditionalFormatRules();
+     * for (int i = 0; i < rules.length; i++) {
+     *   var gradient = rules[i].getGradientCondition();
+     *   Logger.log("The conditional format gradient information for rule %d:\n
+     *     MinColor %s, MinType %s, MinValue %s, \n
+     *     MidColor %s, MidType %s, MidValue %s, \n
+     *     MaxColor %s, MaxType %s, MaxValue %s \n", i,
+     *     gradient.getMinColor(), gradient.getMinType(), gradient.getMinValue(),
+     *     gradient.getMidColor(), gradient.getMidType(), gradient.getMidValue(),
+     *     gradient.getMaxColor(), gradient.getMaxType(), gradient.getMaxValue());
+     * }
+     **/
+    export interface GradientCondition {
+      getMaxColor(): string;
+      getMaxType(): InterpolationType;
+      getMaxValue(): string;
+      getMidColor(): string;
+      getMidType(): InterpolationType;
+      getMidValue(): string;
+      getMinColor(): string;
+      getMinType(): InterpolationType;
+      getMinValue(): string;
+    }
+
     /**
      * Create, access and modify named ranges in a spreadsheet.
      *  Named ranges are ranges that have associated string aliases.
@@ -1244,7 +1300,7 @@ declare namespace GoogleAppsScript {
       /**
        * Sets the conditional format rule's gradient minpoint fields.
        */
-      setGradientMinpointWithValue(color: string, type: SpreadsheetApp.InterpolationType, value: string): ConditionalFormatRuleBuilder;
+      setGradientMinpointWithValue(color: string, type: InterpolationType, value: string): ConditionalFormatRuleBuilder;
 
       /**
        * Sets text italics for the conditional format rule's format.

From a6cdf1200d91a1f9631662e210dcc7761d5490f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joona=20Heikkil=C3=A4?= <joona.o.heikkila@gmail.com>
Date: Wed, 23 May 2018 18:04:38 +0300
Subject: [PATCH 371/575] Add force close Connection#close variant

Connection#close can take a boolean argument `force`. This change goes back
all the way to v4.11.14 (f9e0525fa2f7c8e254f3f949cab6273469b3df30).
---
 types/mongoose/index.d.ts        | 3 +++
 types/mongoose/mongoose-tests.ts | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index a28bfc6d84..310417089f 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -236,6 +236,9 @@ declare module "mongoose" {
     /** Closes the connection */
     close(callback?: (err: any) => void): Promise<void>;
 
+    /** Closes the connection */
+    close(force?: boolean, callback?: (err: any) => void): Promise<void>;
+
     /**
      * Retrieves a collection, creating it if not cached.
      * Not typically needed by applications. Just talk to your collection through your model.
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index df4762c488..a43c690572 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -135,7 +135,10 @@ conn1.openUri('mongodb://localhost/test', 'myDb', 27017, {
     autoIndex: false
   }
 }, function (err) {}).open('');
-conn1.close().catch(function (err) {});
+conn1.close().then(function () {}).catch(function (err) {});
+conn1.close(true).then(function () {}).catch(function (err) {});
+conn1.close(function (err) {});
+conn1.close(true, function (err) {});
 conn1.collection('name').$format(999);
 conn1.model('myModel', new mongoose.Schema({}), 'myCol').find();
 conn1.models.myModel.findOne().exec();

From 6cca6281c4bc6b482e77ba34a9c11f75baf95f7f Mon Sep 17 00:00:00 2001
From: Olegs Jeremejevs <olegs@jeremejevs.com>
Date: Wed, 23 May 2018 18:36:11 +0300
Subject: [PATCH 372/575] is-svg: Allow Buffer input

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

diff --git a/types/is-svg/index.d.ts b/types/is-svg/index.d.ts
index 21e85cd2e2..568810f94b 100644
--- a/types/is-svg/index.d.ts
+++ b/types/is-svg/index.d.ts
@@ -3,6 +3,8 @@
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference types="node" />
+
 export = isSvg;
 
-declare function isSvg(input: string): boolean;
+declare function isSvg(input: string | Buffer): boolean;
diff --git a/types/is-svg/is-svg-tests.ts b/types/is-svg/is-svg-tests.ts
index d556a944f9..d9ccb6f3db 100644
--- a/types/is-svg/is-svg-tests.ts
+++ b/types/is-svg/is-svg-tests.ts
@@ -1,3 +1,7 @@
 import isSvg = require('is-svg');
 
-const result: boolean = isSvg('<svg xmlns="http://www.w3.org/2000/svg"><path fill="#00CD9F"/></svg>');
+const dataString = '<svg xmlns="http://www.w3.org/2000/svg"><path fill="#00CD9F"/></svg>';
+const dataBuffer = Buffer.from(dataString);
+
+const resultString: boolean = isSvg(dataString);
+const resultBuffer: boolean = isSvg(dataBuffer);

From 512616ac65e48a695af085529a5705b02c5b2f38 Mon Sep 17 00:00:00 2001
From: Olegs Jeremejevs <olegs@jeremejevs.com>
Date: Wed, 23 May 2018 18:47:33 +0300
Subject: [PATCH 373/575] is-svg: Allow falsy input

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

diff --git a/types/is-svg/index.d.ts b/types/is-svg/index.d.ts
index 568810f94b..9e36b57b45 100644
--- a/types/is-svg/index.d.ts
+++ b/types/is-svg/index.d.ts
@@ -7,4 +7,4 @@
 
 export = isSvg;
 
-declare function isSvg(input: string | Buffer): boolean;
+declare function isSvg(input?: string | Buffer | false | null): boolean;
diff --git a/types/is-svg/is-svg-tests.ts b/types/is-svg/is-svg-tests.ts
index d9ccb6f3db..fe68014630 100644
--- a/types/is-svg/is-svg-tests.ts
+++ b/types/is-svg/is-svg-tests.ts
@@ -1,7 +1,11 @@
 import isSvg = require('is-svg');
 
-const dataString = '<svg xmlns="http://www.w3.org/2000/svg"><path fill="#00CD9F"/></svg>';
-const dataBuffer = Buffer.from(dataString);
+const data = '<svg></svg>';
+let result = false;
 
-const resultString: boolean = isSvg(dataString);
-const resultBuffer: boolean = isSvg(dataBuffer);
+result = isSvg(data);
+result = isSvg(Buffer.from(data));
+result = isSvg(false);
+result = isSvg(null);
+result = isSvg(undefined);
+result = isSvg();

From 70b686c494aa6bcc8dc2549abeb6dff896864fda Mon Sep 17 00:00:00 2001
From: Steve Hetzel <shetzel@salesforce.com>
Date: Wed, 23 May 2018 09:49:17 -0600
Subject: [PATCH 374/575] [@types/jsforce] fixes Connection.query signature to
 accept the options arg as ExecuteOptions type from Query.d.ts.  Modifies the
 Connection.queryMore options type to be ExecuteOptions as well.  Fixes the
 scanAll property on ExecuteOptions to be a boolean rather than number and add
 the headers property as optional.  Adds a test to jsforce-tests.ts for the
 changes.

---
 types/jsforce/connection.d.ts  | 6 +++---
 types/jsforce/jsforce-tests.ts | 8 ++++++++
 types/jsforce/query.d.ts       | 3 ++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/types/jsforce/connection.d.ts b/types/jsforce/connection.d.ts
index 27d79fdd5b..32ed4de267 100644
--- a/types/jsforce/connection.d.ts
+++ b/types/jsforce/connection.d.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 import { DescribeSObjectResult, DescribeGlobalResult } from './describe-result';
-import { Query, QueryResult } from './query';
+import { Query, QueryResult, ExecuteOptions } from './query';
 import { Record } from './record';
 import { RecordResult } from './record-result';
 import { SObject } from './salesforce-object';
@@ -93,8 +93,8 @@ export type ConnectionEvent = "refresh";
 export abstract class BaseConnection extends EventEmitter {
     _baseUrl(): string;
     request(info: RequestInfo | string, options?: Object, callback?: (err: Error, Object: object) => void): Promise<Object>;
-    query<T>(soql: string, callback?: (err: Error, result: QueryResult<T>) => void): Query<QueryResult<T>>;
-    queryMore<T>(locator: string, options?: object, callback?: (err: Error, result: QueryResult<T>) => void): Promise<QueryResult<T>>;
+    query<T>(soql: string, options?: ExecuteOptions, callback?: (err: Error, result: QueryResult<T>) => void): Query<QueryResult<T>>;
+    queryMore<T>(locator: string, options?: ExecuteOptions, callback?: (err: Error, result: QueryResult<T>) => void): Promise<QueryResult<T>>;
     create<T>(type: string, records: Record<T> | Array<Record<T>>, options?: Object,
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
     insert<T>(type: string, records: Record<T> | Array<Record<T>>, options?: Object,
diff --git a/types/jsforce/jsforce-tests.ts b/types/jsforce/jsforce-tests.ts
index 0aa98d62d1..c0be86e92c 100644
--- a/types/jsforce/jsforce-tests.ts
+++ b/types/jsforce/jsforce-tests.ts
@@ -30,6 +30,14 @@ const requestInfo: sf.RequestInfo = {
 };
 salesforceConnection.request(requestInfo);
 
+const queryOptions: sf.ExecuteOptions = {
+    autoFetch: true,
+    maxFetch: 5000,
+    headers: {},
+    scanAll: true
+};
+salesforceConnection.query('SELECT Id, Name FROM Account', queryOptions);
+
 // note the following should never compile:
 // salesforceConnection.sobject<DummyRecord>("Dummy").select(["lol"]);
 
diff --git a/types/jsforce/query.d.ts b/types/jsforce/query.d.ts
index b33af41ede..964037123b 100644
--- a/types/jsforce/query.d.ts
+++ b/types/jsforce/query.d.ts
@@ -5,7 +5,8 @@ import { RecordResult } from './record-result';
 export interface ExecuteOptions {
     autoFetch?: boolean;
     maxFetch?: number;
-    scanAll?: number;
+    headers?: object;
+    scanAll?: boolean;
 }
 
 export interface QueryResult<T> {

From 4a7b434868f8ad87e539c54266fb15c9e85f4022 Mon Sep 17 00:00:00 2001
From: Olegs Jeremejevs <olegs@jeremejevs.com>
Date: Wed, 23 May 2018 18:54:24 +0300
Subject: [PATCH 375/575] is-svg: Bump to 3.0

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

diff --git a/types/is-svg/index.d.ts b/types/is-svg/index.d.ts
index 9e36b57b45..1fbdc486ad 100644
--- a/types/is-svg/index.d.ts
+++ b/types/is-svg/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for is-svg 2.1
+// 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

From 5f80843518a77463eb23e6b5e9618e0c375f0729 Mon Sep 17 00:00:00 2001
From: Olegs Jeremejevs <olegs@jeremejevs.com>
Date: Wed, 23 May 2018 19:07:28 +0300
Subject: [PATCH 376/575] is-svg: Export namespace

---
 types/is-svg/index.d.ts      | 7 +++++--
 types/is-svg/is-svg-tests.ts | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/types/is-svg/index.d.ts b/types/is-svg/index.d.ts
index 1fbdc486ad..54ebb84457 100644
--- a/types/is-svg/index.d.ts
+++ b/types/is-svg/index.d.ts
@@ -5,6 +5,9 @@
 
 /// <reference types="node" />
 
-export = isSvg;
-
 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
index fe68014630..73ba29062c 100644
--- a/types/is-svg/is-svg-tests.ts
+++ b/types/is-svg/is-svg-tests.ts
@@ -1,4 +1,4 @@
-import isSvg = require('is-svg');
+import * as isSvg from 'is-svg';
 
 const data = '<svg></svg>';
 let result = false;

From 969d99802b7fef695219d5600de872d57c78e12c Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Wed, 23 May 2018 18:35:57 +0200
Subject: [PATCH 377/575] d3-timer Activate strictNullChecks

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

diff --git a/types/d3-timer/index.d.ts b/types/d3-timer/index.d.ts
index 08fee97696..34bef32aba 100644
--- a/types/d3-timer/index.d.ts
+++ b/types/d3-timer/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// Last module patch version validated against: 1.0.2
+// Last module patch version validated against: 1.0.7
 
 /**
  * Returns the current time as defined by performance.now if available, and Date.now if not.
@@ -44,7 +44,7 @@ export interface Timer {
 export function timer(callback: (elapsed: number) => void, delay?: number, time?: number): Timer;
 
 /**
- * Immediately invoke any eligible timer callbacks
+ * Immediately invoke any eligible timer callbacks.
  */
 export function timerFlush(): void;
 
diff --git a/types/d3-timer/tsconfig.json b/types/d3-timer/tsconfig.json
index f3af0c7d8e..91aaaf2092 100644
--- a/types/d3-timer/tsconfig.json
+++ b/types/d3-timer/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [

From 0dcddbf82ed69b17b12063f886af70e0224ca8f9 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Wed, 23 May 2018 19:06:03 +0200
Subject: [PATCH 378/575] Remove hex inherited from Color in d3-hsv

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

diff --git a/types/d3-hsv/d3-hsv-tests.ts b/types/d3-hsv/d3-hsv-tests.ts
index 780f584c7c..20cdd4f911 100644
--- a/types/d3-hsv/d3-hsv-tests.ts
+++ b/types/d3-hsv/d3-hsv-tests.ts
@@ -48,6 +48,7 @@ cHSV = cHSV.darker();
 cHSV = cHSV.darker(0.2);
 displayable = cHSV.displayable();
 cString = cHSV.toString();
+cString = cHSV.hex();
 console.log('Channels = (h : %d, s: %d, v: %d)', cHSV.h, cHSV.s, cHSV.v);
 console.log('Opacity = %d', cHSV.opacity);
 
diff --git a/types/d3-hsv/index.d.ts b/types/d3-hsv/index.d.ts
index 7452dbcc2b..1728af0874 100644
--- a/types/d3-hsv/index.d.ts
+++ b/types/d3-hsv/index.d.ts
@@ -68,12 +68,6 @@ export interface HSVColor extends Color {
      * Returns the RGB equivalent of this color.
      */
     rgb(): RGBColor;
-
-    /**
-     * Returns a hexadecimal string representing this color.
-     * If this color is not displayable, a suitable displayable color is returned instead. For example, RGB channel values greater than 255 are clamped to 255.
-     */
-    hex(): string;
 }
 
 export const hsv: HSVColorFactory;

From a0e91ea034f573e3007913b78813e3fa1259492a Mon Sep 17 00:00:00 2001
From: Niklas Mollenhauer <nikeee@outlook.com>
Date: Wed, 23 May 2018 19:45:20 +0200
Subject: [PATCH 379/575] Remove react-monaco-editor

---
 notNeededPackages.json                        |   6 +
 types/react-monaco-editor/index.d.ts          |  78 ---------
 types/react-monaco-editor/package.json        |   6 -
 .../react-monaco-editor-tests.tsx             | 149 ------------------
 types/react-monaco-editor/tsconfig.json       |  25 ---
 types/react-monaco-editor/tslint.json         |   1 -
 6 files changed, 6 insertions(+), 259 deletions(-)
 delete mode 100644 types/react-monaco-editor/index.d.ts
 delete mode 100644 types/react-monaco-editor/package.json
 delete mode 100644 types/react-monaco-editor/react-monaco-editor-tests.tsx
 delete mode 100644 types/react-monaco-editor/tsconfig.json
 delete mode 100644 types/react-monaco-editor/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index dd5523d102..4fb2ecedb3 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1158,6 +1158,12 @@
             "sourceRepoURL": "https://github.com/react-ga/react-ga",
             "asOfVersion": "2.3.0"
         },
+        {
+            "libraryName": "react-monaco-editor",
+            "typingsPackageName": "react-monaco-editor",
+            "sourceRepoURL": "https://github.com/superRaytin/react-monaco-editor",
+            "asOfVersion": "0.16.0"
+        },
         {
             "libraryName": "react-native-collapsible",
             "typingsPackageName": "react-native-collapsible",
diff --git a/types/react-monaco-editor/index.d.ts b/types/react-monaco-editor/index.d.ts
deleted file mode 100644
index f6245a82f4..0000000000
--- a/types/react-monaco-editor/index.d.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-// Type definitions for react-monaco-editor 0.10
-// Project: https://github.com/superRaytin/react-monaco-editor
-// Definitions by: Joshua Netterfield <https://github.com/jnetterf>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
-
-/// <reference types="monaco-editor" />
-
-import * as React from "react";
-
-export interface ReactMonacoEditorProps {
-    /**
-     * Width of editor. Defaults to 100%.
-     */
-    width?: string | number;
-
-    /**
-     * Height of editor. Defaults to 500.
-     */
-    height?: string | number;
-
-    /**
-     * Value of the auto created model in the editor.
-     * If you specify value property, the component behaves in controlled mode. Otherwise, it behaves in uncontrolled mode.
-     */
-    value?: string;
-
-    /**
-     * The initial value of the auto created model in the editor.
-     */
-    defaultValue?: string;
-
-    /**
-     * The initial language of the auto created model in the editor. Defaults to 'javascript'.
-     */
-    language?: string;
-
-    /**
-     * Theme to be used for rendering.
-     * The current out-of-the-box available themes are: 'vs' (default), 'vs-dark', 'hc-black'.
-     * You can create custom themes via `monaco.editor.defineTheme`.
-     */
-    theme?: string;
-
-    /**
-     * Refer to Monaco interface IEditorOptions.
-     */
-    options?: monaco.editor.IEditorOptions;
-
-    /**
-     * An event emitted when the editor has been mounted (similar to componentDidMount of React).
-     */
-    editorDidMount?(editor: monaco.editor.ICodeEditor, monacoModule: typeof monaco): void;
-
-    /**
-     * An event emitted before the editor mounted (similar to componentWillMount of React).
-     */
-    editorWillMount?(monacoModule: typeof monaco): void;
-
-    /**
-     * An event emitted when the content of the current model has changed.
-     */
-    onChange?(val: string, ev: monaco.editor.IModelContentChangedEvent): void;
-
-    /**
-     * Optional, allow to config loader url and relative path of module, refer to require.config.
-     */
-    requireConfig?: object;
-
-    /**
-     * Optional, allow to pass a different context then the global window onto which the monaco instance will be loaded. Useful if you want to load the editor in an iframe.
-     */
-    context?: object;
-}
-
-export default class ReactMonacoEditor extends React.Component<ReactMonacoEditorProps> {
-    editor: monaco.editor.ICodeEditor;
-}
diff --git a/types/react-monaco-editor/package.json b/types/react-monaco-editor/package.json
deleted file mode 100644
index c30b05905b..0000000000
--- a/types/react-monaco-editor/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "monaco-editor": "^0.10.0"
-    }
-}
diff --git a/types/react-monaco-editor/react-monaco-editor-tests.tsx b/types/react-monaco-editor/react-monaco-editor-tests.tsx
deleted file mode 100644
index 0c46e4cfd8..0000000000
--- a/types/react-monaco-editor/react-monaco-editor-tests.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-// Adapted from https://github.com/superRaytin/react-monaco-editor/blob/master/examples/index.js
-
-import * as React from 'react';
-import { render } from 'react-dom';
-import MonacoEditor from 'react-monaco-editor';
-
-interface CodeEditorState {
-    code?: string;
-}
-
-// Using with webpack
-class CodeEditor extends React.Component<object, CodeEditorState> {
-    constructor(props: object) {
-        super(props);
-        this.state = {
-            code: '// type your code... \n',
-        };
-    }
-    editor: monaco.editor.ICodeEditor;
-    editorDidMount = (editor: monaco.editor.ICodeEditor) => {
-        console.log('editorDidMount', editor, editor.getValue(), editor.getModel());
-        this.editor = editor;
-    }
-    onChange = (newValue: string, e: monaco.editor.IModelContentChangedEvent) => {
-        console.log('onChange', newValue, e);
-        this.setState({
-            code: newValue,
-        });
-    }
-    changeEditorValue = () => {
-        if (this.editor) {
-            this.editor.setValue('// code changed! \n');
-        }
-    }
-    changeBySetState = () => {
-        this.setState({code: '// code changed by setState! \n'});
-    }
-    render() {
-        const code = this.state.code;
-        const options = {
-            selectOnLineNumbers: true,
-            roundedSelection: false,
-            readOnly: false,
-            theme: 'vs',
-            cursorStyle: 'line',
-            automaticLayout: false,
-        };
-        return (
-            <div>
-            <div>
-            <button onClick={this.changeEditorValue}>Change value</button>
-            <button onClick={this.changeBySetState}>Change by setState</button>
-            </div>
-            <hr />
-            <MonacoEditor
-            height="500"
-            language="javascript"
-            value={code}
-            options={options}
-            onChange={this.onChange}
-            editorDidMount={this.editorDidMount}
-            />
-            </div>
-        );
-    }
-}
-
-// Using with require.config
-class AnotherEditor extends React.Component<object, CodeEditorState> {
-    constructor(props: object) {
-        super(props);
-        const jsonCode = [
-            '{',
-            '    "$schema": "http://myserver/foo-schema.json"',
-            "}"
-        ].join('\n');
-        this.state = {
-            code: jsonCode,
-        };
-    }
-    editorWillMount = (monacoModule: typeof monaco) => {
-        monacoModule.languages.json.jsonDefaults.setDiagnosticsOptions({
-            schemas: [{
-                uri: "http://myserver/foo-schema.json",
-                schema: {
-                    type: "object",
-                    properties: {
-                        p1: {
-                            enum: [ "v1", "v2"]
-                        },
-                        p2: {
-                            $ref: "http://myserver/bar-schema.json"
-                        }
-                    }
-                }
-            }, {
-                uri: "http://myserver/bar-schema.json",
-                schema: {
-                    type: "object",
-                    properties: {
-                        q1: {
-                            enum: [ "x1", "x2"]
-                        }
-                    }
-                }
-            }]
-        });
-    }
-    render() {
-        const code = this.state.code;
-        const requireConfig = {
-            url: 'https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.1/require.min.js',
-            paths: {
-                vs: 'https://as.alipayobjects.com/g/cicada/monaco-editor-mirror/0.6.1/min/vs'
-            }
-        };
-        return (
-            <div>
-            <MonacoEditor
-            width="800"
-            height="600"
-            language="json"
-            defaultValue={code}
-            requireConfig={requireConfig}
-            editorWillMount={this.editorWillMount}
-            />
-            </div>
-        );
-    }
-}
-
-class App extends React.Component {
-    render() {
-        return (
-            <div>
-            <h2>Monaco Editor Sample (controlled mode)</h2>
-            <CodeEditor />
-            <hr />
-            <h2>Another editor (uncontrolled mode)</h2>
-            <AnotherEditor />
-            </div>
-        );
-    }
-}
-
-render(
-    <App />,
-    document.getElementById('root')
-);
diff --git a/types/react-monaco-editor/tsconfig.json b/types/react-monaco-editor/tsconfig.json
deleted file mode 100644
index 8d55416feb..0000000000
--- a/types/react-monaco-editor/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "jsx": "react"
-    },
-    "files": [
-        "index.d.ts",
-        "react-monaco-editor-tests.tsx"
-    ]
-}
\ No newline at end of file
diff --git a/types/react-monaco-editor/tslint.json b/types/react-monaco-editor/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/react-monaco-editor/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }

From 3247e3e62016de225b89089de04eb46420694d98 Mon Sep 17 00:00:00 2001
From: Sooraj <spudiyadath@hedgeserv.com>
Date: Wed, 23 May 2018 13:56:44 -0400
Subject: [PATCH 380/575] Added a new type surface for 3d surface plots
 @soorajpudiyadath

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

diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index ac35dc064b..fbb94d4a5f 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -7,6 +7,7 @@
 // 				Dadstart <https://github.com/Dadstart>
 // 				Jared Szechy <https://github.com/szechyjs>
 // 				Drew Diamantoukos <https://github.com/MercifulCode>
+// 				Sooraj Pudiyadath <https://github.com/soorajpudiyadath>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -356,7 +357,7 @@ export type Color = string | Array<string | undefined | null> | Array<Array<stri
 
 // Bar Scatter
 export interface ScatterData {
-	type: 'bar' | 'pointcloud' | 'scatter' | 'scattergl' | 'scatter3d';
+	type: 'bar' | 'pointcloud' | 'scatter' | 'scattergl' | 'scatter3d' |'surface';
 	x: Datum[] | Datum[][] | TypedArray;
 	y: Datum[] | Datum[][] | TypedArray;
 	z: Datum[] | Datum[][] | Datum[][][] | TypedArray;

From da93d124d281d534300f607ac4fd9375df76728d Mon Sep 17 00:00:00 2001
From: Cameron Knight <cameron.knight@bumped.com>
Date: Mon, 21 May 2018 07:12:36 -0700
Subject: [PATCH 381/575] [@types/react-relay] QueryRendererProps["query"] can
 be null/undefined

---
 types/react-relay/index.d.ts                 |  3 ++-
 types/react-relay/test/react-relay-tests.tsx | 23 +++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/types/react-relay/index.d.ts b/types/react-relay/index.d.ts
index 35a194b0e7..f87ce26356 100644
--- a/types/react-relay/index.d.ts
+++ b/types/react-relay/index.d.ts
@@ -4,6 +4,7 @@
 //                 Matt Martin <https://github.com/voxmatt>
 //                 Eloy Durán <https://github.com/alloy>
 //                 Nicolas Pirotte <https://github.com/npirotte>
+//                 Cameron Knight <https://github.com/ckknight>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -76,7 +77,7 @@ export const graphql: GraphqlInterface;
 export interface QueryRendererProps {
     cacheConfig?: RelayRuntimeTypes.CacheConfig;
     environment: RelayRuntimeTypes.Environment;
-    query: RelayRuntimeTypes.GraphQLTaggedNode;
+    query?: RelayRuntimeTypes.GraphQLTaggedNode | null;
     render(readyState: ReadyState): React.ReactElement<any> | undefined | null;
     variables: RelayRuntimeTypes.Variables;
     rerunParamExperimental?: RelayRuntimeTypes.RerunParam;
diff --git a/types/react-relay/test/react-relay-tests.tsx b/types/react-relay/test/react-relay-tests.tsx
index cc25f5f368..bf3e2d1475 100644
--- a/types/react-relay/test/react-relay-tests.tsx
+++ b/types/react-relay/test/react-relay-tests.tsx
@@ -28,16 +28,16 @@ const modernEnvironment = new Environment({ network, store });
 // ~~~~~~~~~~~~~~~~~~~~~
 // Modern QueryRenderer
 // ~~~~~~~~~~~~~~~~~~~~~
-const MyQueryRenderer = (props: { name: string }) => (
+const MyQueryRenderer = (props: { name: string, show: boolean }) => (
     <QueryRenderer
         environment={modernEnvironment}
-        query={graphql`
+        query={props.show ? graphql`
             query ExampleQuery($pageID: ID!) {
                 page(id: $pageID) {
                     name
                 }
             }
-        `}
+        ` : null}
         variables={{
             pageID: "110798995619330",
         }}
@@ -52,6 +52,23 @@ const MyQueryRenderer = (props: { name: string }) => (
     />
 );
 
+const MyEmptyQueryRenderer = () => (
+    <QueryRenderer
+        environment={modernEnvironment}
+        // NOTE: let's intentionally leave out `query`
+        // query={undefined}
+        variables={{}}
+        render={({ error, props }) => {
+            if (error) {
+                return <div>{error.message}</div>;
+            } else if (props) {
+                throw new Error('This code path should never be hit');
+            }
+            return <div>Loading</div>;
+        }}
+    />
+);
+
 // ~~~~~~~~~~~~~~~~~~~~~
 // Modern RefetchContainer
 // ~~~~~~~~~~~~~~~~~~~~~

From 5d1092441c26ca29f63e279829bd6a34f74cd6aa Mon Sep 17 00:00:00 2001
From: Avi Vahl <avi.vahl@wix.com>
Date: Thu, 24 May 2018 00:14:22 +0300
Subject: [PATCH 382/575] source-map-support: retrieveSourceMap can return null
 to indicate no source map has been found for source, function should return
 null

see README: https://github.com/evanw/node-source-map-support#options
---
 types/source-map-support/index.d.ts                  | 2 +-
 types/source-map-support/source-map-support-tests.ts | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/types/source-map-support/index.d.ts b/types/source-map-support/index.d.ts
index 3898c471a2..f3f289dce6 100644
--- a/types/source-map-support/index.d.ts
+++ b/types/source-map-support/index.d.ts
@@ -24,7 +24,7 @@ export interface Options {
     overrideRetrieveFile?: boolean;
     overrideRetrieveSourceMap?: boolean;
     retrieveFile?(path: string): string;
-    retrieveSourceMap?(source: string): UrlAndMap;
+    retrieveSourceMap?(source: string): UrlAndMap | null;
 }
 
 export interface Position {
diff --git a/types/source-map-support/source-map-support-tests.ts b/types/source-map-support/source-map-support-tests.ts
index 9a30b6a68f..7b07c2970f 100644
--- a/types/source-map-support/source-map-support-tests.ts
+++ b/types/source-map-support/source-map-support-tests.ts
@@ -6,11 +6,11 @@ function retrieveFile(path: string): string {
 	return "foo";
 }
 
-function retrieveSourceMap(source: string): sms.UrlAndMap {
-	return {
+function retrieveSourceMap(source: string): sms.UrlAndMap | null {
+	return source ? {
 		url: "http://foo",
 		map: "foo"
-	};
+	} : null;
 }
 
 const options: sms.Options = {
@@ -39,5 +39,5 @@ let p: sms.Position = {
 };
 p = sms.mapSourcePosition(p);
 
-let u: sms.UrlAndMap;
+let u: sms.UrlAndMap | null;
 u = retrieveSourceMap("foo");

From 99f61a7bb4ce300faece749207449652c2367871 Mon Sep 17 00:00:00 2001
From: stuartlo <stuartlo@microsoft.com>
Date: Wed, 23 May 2018 15:20:33 -0700
Subject: [PATCH 383/575] Add tests

---
 types/ckeditor/ckeditor-tests.ts |  824 ++++-
 types/ckeditor/index.d.ts        | 5526 +++++++++++++++---------------
 2 files changed, 3482 insertions(+), 2868 deletions(-)

diff --git a/types/ckeditor/ckeditor-tests.ts b/types/ckeditor/ckeditor-tests.ts
index 21288c1f93..acc23ae096 100644
--- a/types/ckeditor/ckeditor-tests.ts
+++ b/types/ckeditor/ckeditor-tests.ts
@@ -35,6 +35,13 @@ function test_CKEDITOR() {
     CKEDITOR.replaceAll();
     CKEDITOR.replaceAll('myClassName');
     CKEDITOR.replaceAll((textarea, config) => false);
+
+    var editor: CKEDITOR.editor = CKEDITOR.appendTo('append here', CKEDITOR.config, 'data');
+    var editor: CKEDITOR.editor = CKEDITOR.appendTo(document.createElement('div'));
+    CKEDITOR.error('code');
+    CKEDITOR.error('500', { moreData: true });
+    CKEDITOR.warn('danger');
+    CKEDITOR.warn('303', 12345);
 }
 
 function test_CKEDITOR_events() {
@@ -83,6 +90,8 @@ function test_dom_comment() {
     var nativeNode = document.createComment('Example');
     var comment = new CKEDITOR.dom.comment(nativeNode);
     var comment2 = new CKEDITOR.dom.comment('Example');
+    var comment3 = new CKEDITOR.dom.comment('Example', new CKEDITOR.dom.document(document));
+    var html: string = comment.getOuterHtml();
 }
 
 function test_dom_document() {
@@ -103,10 +112,16 @@ function test_dom_document() {
         '<body>Document contents created by code</body>' +
         '</html>'
         );
+    var styles: CSSStyleSheet = document.appendStyleText('some styles');
+    var element: CKEDITOR.dom.element = document.createElement('div');
+    var element2: CKEDITOR.dom.element = document.createElement('div', { styles: { height: '1234' } });
+    var element3: CKEDITOR.dom.element = document.createElement('div', { attributes: { id: '1234' } });
+    var element4: CKEDITOR.dom.element = document.createElement('div', { attributes: { tabIndex: '1234' }, styles: { width: '1234' } });
 }
 
 function test_dom_documentFragment() {
     var type = CKEDITOR.NODE_DOCUMENT_FRAGMENT;
+    alert(new CKEDITOR.dom.documentFragment(document.body).type === type);
 }
 
 function test_dom_domObject() {
@@ -124,6 +139,8 @@ function test_dom_domObject() {
     var elementB = new CKEDITOR.dom.element(nativeElement).getPrivate().value;
     var element3 = new CKEDITOR.dom.element('span');
     element.setCustomData('hasCustomData', true);
+
+    var domObject = new CKEDITOR.dom.domObject(document.createElement('div'));
 }
 
 function test_dom_element() {
@@ -156,6 +173,7 @@ function test_dom_element() {
     element.appendTo(CKEDITOR.document.getBody());
     alert(element.getEditor().name);
     var first = element.getFirst();
+    var first2 = element.getFirst((node: CKEDITOR.dom.node) => node.equals(document.body));
     alert(element.getHtml());
     alert(element.getId());
     alert(element.getName());
@@ -199,6 +217,26 @@ function test_dom_element() {
     alert(element == CKEDITOR.dom.element.get(element));
     var htmlElement = document.getElementById('myElement');
     alert(CKEDITOR.dom.element.get(htmlElement).getName());
+
+    var dtd: CKEDITOR.dtdDefinition = element.getDtd();
+    var last: CKEDITOR.dom.node = element.getLast();
+    var last2: CKEDITOR.dom.node = element.getLast((node: CKEDITOR.dom.node) => node.equals(document.body));
+    if (element.isBlockBoundary({ 'div': 1, 'span': 1 })) {
+        element.setState(1, 'hex', false);
+    }
+
+    CKEDITOR.dom.element.clearMarkers({}, element, true);
+    var element1: CKEDITOR.dom.element = CKEDITOR.dom.element.get('div');
+    var element2: CKEDITOR.dom.element = CKEDITOR.dom.element.get(document.createElement('div'));
+    var element3: CKEDITOR.dom.element = CKEDITOR.dom.element.get(element2);
+    var markedElement: CKEDITOR.dom.element = CKEDITOR.dom.element.setMarker({}, element, 'key', 0);
+}
+
+function test_dom_elementPath() {
+    var path: CKEDITOR.dom.elementPath = new CKEDITOR.dom.elementPath(CKEDITOR.dom.element.get('div'));
+    var path2: CKEDITOR.dom.elementPath = new CKEDITOR.dom.elementPath(CKEDITOR.dom.element.get('div'), CKEDITOR.dom.element.get(document.body));
+
+    var dir: 'ltr' | 'rtl' = path.direction();
 }
 
 function test_dom_event() {
@@ -226,8 +264,10 @@ function test_dom_event() {
 function test_dom_iterator() {
     var range = new CKEDITOR.dom.range(new CKEDITOR.dom.element('div'));
     var iterator = range.createIterator();
-    iterator.getNextParagraph();
-    iterator.getNextParagraph();
+    var paragrah1: CKEDITOR.dom.element = iterator.getNextParagraph();
+    var paragrah2: CKEDITOR.dom.element = iterator.getNextParagraph('div');
+    alert(iterator.forceBrBreak === false);
+    var itRange: CKEDITOR.dom.range = iterator.range;
 }
 
 function test_dom_node() {
@@ -255,6 +295,7 @@ function test_dom_node() {
 function test_dom_nodeList() {
     var nodeList = CKEDITOR.document.getBody().getChildren();
     alert(nodeList.count());
+    var nodes: CKEDITOR.dom.node[] = nodeList.toArray();
 }
 
 function test_dom_range() {
@@ -277,10 +318,87 @@ function test_dom_range() {
     alert(range.startOffset);
 }
 
+function test_dom_selection() {
+    var element: CKEDITOR.dom.element = CKEDITOR.dom.element.get('div');
+    var selection: CKEDITOR.dom.selection = new CKEDITOR.dom.selection(new CKEDITOR.dom.document(document));
+    selection = new CKEDITOR.dom.selection(element);
+    selection = new CKEDITOR.dom.selection(selection);
+
+    var marks: CKEDITOR.dom.bookmark[] = selection.createBookmarks('serialized');
+    var marks2: CKEDITOR.dom.bookmark2[] = selection.createBookmarks2({ normalized: true });
+    selection.fake(element);
+    selection.fake(element, true);
+    element = selection.getCommonAncestor();
+    var domSel: Selection = selection.getNative();
+    var ranges: CKEDITOR.dom.range[] = selection.getRanges();
+    ranges = selection.getRanges(true);
+    element = selection.getSelectedElement();
+    var text: string = selection.getSelectedText();
+    element = selection.getStartElement();
+    
+    var type: number = selection.getType();
+
+    var isSomething: boolean = selection.isCollapsed();
+    isSomething = selection.isHidden();
+    isSomething = selection.isInTable();
+    isSomething = selection.isInTable(false);
+
+    selection.lock();
+    selection.removeAllRanges();
+    selection.reset();
+    selection.removeAllRanges();
+    selection.reset();
+    selection.scrollIntoView();
+    selection = selection.selectBookmarks(marks);
+    selection = selection.selectBookmarks(marks2);
+    selection.selectElement(element);
+    selection.selectRanges(ranges);
+    selection.unlock(false);
+}
+
+function test_dom_walker() {
+    var element: CKEDITOR.dom.element = CKEDITOR.dom.element.get('div');
+    var range: CKEDITOR.dom.range = new CKEDITOR.dom.range(element);
+
+    var walker: CKEDITOR.dom.walker = new CKEDITOR.dom.walker(range);
+    
+    var isSomething: boolean = walker.checkBackward();
+    isSomething = walker.checkForward();
+    walker.end();
+    
+    var node: CKEDITOR.dom.node = walker.lastBackward();
+    node = walker.lastForward();
+    node = walker.next();
+    node = walker.previous();
+    walker.reset();
+
+    isSomething = CKEDITOR.dom.walker.blockBoundary({ 'div': 1 })(node);
+    isSomething = CKEDITOR.dom.walker.bogus()(node);
+    isSomething = CKEDITOR.dom.walker.bogus(isSomething)(node);
+    isSomething = CKEDITOR.dom.walker.bookmark()(node);
+    isSomething = CKEDITOR.dom.walker.bookmark(true)(node);
+    isSomething = CKEDITOR.dom.walker.bookmark(true, false)(node);
+    isSomething = CKEDITOR.dom.walker.editable()(node);
+    isSomething = CKEDITOR.dom.walker.editable(isSomething)(node);
+    isSomething = CKEDITOR.dom.walker.empty()(node);
+    isSomething = CKEDITOR.dom.walker.empty(true)(node);
+    isSomething = CKEDITOR.dom.walker.ignored()(node);
+    isSomething = CKEDITOR.dom.walker.ignored(true)(node);
+    isSomething = CKEDITOR.dom.walker.listItemBoundary()(node);
+    isSomething = CKEDITOR.dom.walker.nodeType(0)(node);
+    isSomething = CKEDITOR.dom.walker.nodeType(1, true)(node);
+    isSomething = CKEDITOR.dom.walker.temp()(node);
+    isSomething = CKEDITOR.dom.walker.temp(isSomething)(node);
+    isSomething = CKEDITOR.dom.walker.whitespaces()(node);
+    isSomething = CKEDITOR.dom.walker.whitespaces(isSomething)(node);
+}
+
 function test_dom_text() {
     var nativeNode = document.createTextNode('Example');
     var text = new CKEDITOR.dom.text(nativeNode);
     var text2 = new CKEDITOR.dom.text('Example');
+    text.substring(1, 2);
+    text.substring(1);
 }
 
 function test_dom_window() {
@@ -292,6 +410,545 @@ function test_dom_window() {
     var size = win.getViewPaneSize();
     alert(size.width);
     alert(size.height);
+
+    var frame: CKEDITOR.dom.element = win.getFrame();
+    win.focus();
+}
+
+function test_ajax() {
+    var req: string = CKEDITOR.ajax.load('https://ckeditor.com/ckeditor-4/');
+    req = CKEDITOR.ajax.load('https://ckeditor.com/ckeditor-4/', (data: any) => console.log(data));
+
+    var xml: CKEDITOR.xml = CKEDITOR.ajax.loadXml('https://ckeditor.com/ckeditor-4/');
+    xml = CKEDITOR.ajax.loadXml('https://ckeditor.com/ckeditor-4/', (data: any) => console.log(data));
+
+    CKEDITOR.ajax.post('https://ckeditor.com/ckeditor-4/', {});
+    CKEDITOR.ajax.post('https://ckeditor.com/ckeditor-4/', {}, 'html');
+    CKEDITOR.ajax.post('https://ckeditor.com/ckeditor-4/', {}, 'text', (data: any) => console.log(data));
+}
+
+function test_dataProcessor() {
+    var processor: CKEDITOR.dataProcessor;
+    processor.toDataFormat('html', 'fix');
+    processor.toHtml('data');
+    processor.toHtml('data', 'fix');
+}
+
+function test_dialog() {
+    var dialog: CKEDITOR.dialog = new CKEDITOR.dialog(CKEDITOR.instances[0], 'dialog');
+
+    var element: CKEDITOR.dom.element = CKEDITOR.dom.element.get('div');
+    dialog.addFocusable(element);
+    dialog.addFocusable(element, 13);
+    dialog.addPage({ some: true, object: false });
+    var ret = dialog.click('1234');
+    dialog.commitContent();
+    dialog.disableButton('some button');
+    dialog.enableButton('4321');
+    dialog = dialog.foreach(() => console.log('hey'));
+
+    var button: CKEDITOR.ui.dialog.button = dialog.getButton('button1');
+    var uiEl: CKEDITOR.ui.dialog.uiElement = dialog.getContentElement('page1', 'element1');
+    element = dialog.getElement();
+    var str: string = dialog.getName();
+    var numb: number = dialog.getPageCount();
+    var editor: CKEDITOR.editor = dialog.getParentEditor();
+    var obj: { [key: string]: any } = dialog.getPosition();
+    element = dialog.getSelectedElement();
+    obj = dialog.getSize();
+    obj = dialog.getValueOf('page1', 'ele1');
+    dialog.hide();
+    dialog.hidePage('1234');
+    dialog.layout();
+    dialog.move(1, 2, true);
+    dialog = dialog.reset();
+    dialog.resize(numb, numb);
+    dialog.selectPage('1');
+    dialog.setState(4);
+    dialog.setValueOf('page1', 'ele1', false);
+    dialog.setupContent();
+    dialog.show();
+    dialog.showPage('1234');
+    dialog.updateStyle();
+
+    CKEDITOR.dialog.add( 'abbrDialog', this.path + 'dialogs/abbr.js' );
+    CKEDITOR.dialog.add( 'abbrDialog', function ( editor: CKEDITOR.editor ) {
+        return {
+            title: 'Abbreviation Properties',
+            minWidth: 400,
+            minHeight: 200,
+            onLoad: () => {},
+            onOk: () => {},
+            onCancel: () => {},
+            onShow: () => {},
+            onHide: () => {},
+            contents: [
+                {
+                    id: 'tab-basic',
+                    label: 'Basic Settings',
+                    elements: <any[]>[]
+                },
+                {
+                    id: 'tab-adv',
+                    label: 'Advanced Settings',
+                    elements: []
+                }
+            ]
+        };
+    });
+
+    CKEDITOR.dialog.addIframe('frame', 'frame', 1234, 4321);
+    CKEDITOR.dialog.addIframe('frame', 'frame', 1234, 4321, () => console.log('loaded'));
+    CKEDITOR.dialog.addIframe('frame', 'frame', 1234, 4321, () => console.log('loaded'), obj);
+
+    CKEDITOR.dialog.addUIElement('node', () => console.log('build'));
+    CKEDITOR.dialog.cancelButton();
+    CKEDITOR.dialog.exists('dialog1');
+    CKEDITOR.dialog.exists(1234);
+    dialog = CKEDITOR.dialog.getCurrent();
+
+    var isEnabled: boolean = CKEDITOR.dialog.isTabEnabled(editor, 'dialog', 'table');
+
+    CKEDITOR.dialog.okButton();
+}
+
+function test_editable() {
+    var element: CKEDITOR.dom.element;
+    var editor: CKEDITOR.editor;
+
+    var editable: CKEDITOR.editable = new CKEDITOR.editable(editor, element);
+    editable = new CKEDITOR.editable(editor, document.createElement('div'));
+
+    editable.attachClass('class');
+    editable.attachListener(editable, 'event', (evt: CKEDITOR.eventInfo) => console.log('listen')).removeListener();
+    editable.attachListener(new CKEDITOR.event(), 'event', (evt: CKEDITOR.eventInfo) => console.log('listen')).removeListener();
+    editable.attachListener(new CKEDITOR.event(), 'event', (evt: CKEDITOR.eventInfo) => console.log('listen'), { scope: 'object' }).removeListener();
+    editable.attachListener(editable, 'event', (evt: CKEDITOR.eventInfo) => console.log('listen'), { scope: 'object' }, 'data').removeListener();
+    editable.attachListener(editable, 'event', (evt: CKEDITOR.eventInfo) => console.log('listen'), { scope: 'object' }, 'data', 1).removeListener();
+
+    editable.changeAttr('attr', 'val');
+    editable.detach();
+
+    var range: CKEDITOR.dom.range;
+    editable.insertElement(element);
+    editable.insertElement(element, range);
+    editable.insertHtml('data');
+    editable.insertHtml('data', 'mode');
+    editable.insertHtml('data', 'mode', range);
+    editable.insertText(new CKEDITOR.dom.text('text'));
+
+    var inline: boolean = editable.isInline();
+    editable.setReadOnly(inline);
+}
+
+function test_fileTools() {
+    var editor: CKEDITOR.editor;
+    var def: CKEDITOR.fileTools.uploadWidgetDefinition;
+    var loader: CKEDITOR.fileTools.fileLoader;
+    var blob: Blob;
+    var element: CKEDITOR.dom.element;
+
+    CKEDITOR.fileTools.addUploadWidget(editor, 'editor', def);
+    CKEDITOR.fileTools.bindNotification(editor, loader);
+    var url: string = CKEDITOR.fileTools.getUploadUrl({ some: 'object' });
+    url = CKEDITOR.fileTools.getUploadUrl({ some: 'object' }, 'type');
+
+    var supported = CKEDITOR.fileTools.isTypeSupported(blob, /regex/);
+    CKEDITOR.fileTools.markElement(element, 'name', 45);
+}
+
+function test_fileTools_fileLoader() {
+    var editor: CKEDITOR.editor;
+    var def: CKEDITOR.fileTools.uploadWidgetDefinition;
+    var blob: Blob;
+    var element: CKEDITOR.dom.element;
+
+    var loader: CKEDITOR.fileTools.fileLoader = new CKEDITOR.fileTools.fileLoader(editor, 'data');
+    loader = new CKEDITOR.fileTools.fileLoader(editor, blob);
+    loader = new CKEDITOR.fileTools.fileLoader(editor, blob, 'name');
+    
+    loader.abort();
+    var finished: boolean = loader.isFinished();
+    loader.load();
+    loader.loadAndUpload('url');
+    loader.loadAndUpload('url', { someHeader: '1234' });
+
+    loader.update();
+    loader.upload('url');
+    loader.upload('url', { someHeader: '1234' });
+}
+
+function test_fileTools_uploadRepository() {
+    var editor: CKEDITOR.editor;
+    var blob: Blob;
+    var repo: CKEDITOR.fileTools.uploadRepository = new CKEDITOR.fileTools.uploadRepository(editor);
+    
+    var loader: CKEDITOR.fileTools.fileLoader = repo.create('data', 'name');
+    loader = repo.create(blob, 'name', 'type');
+
+    var fin: boolean = loader.isFinished();
+}
+
+function test_filter() {
+    var editor: CKEDITOR.editor;
+    var style: CKEDITOR.style;
+
+    var filter: CKEDITOR.filter = new CKEDITOR.filter(editor);
+    filter = new CKEDITOR.filter('rule');
+    filter = new CKEDITOR.filter(style);
+    filter = new CKEDITOR.filter([ style, 'rule', [ style, 'rule' ] ]);
+    filter = CKEDITOR.filter.instances['1234'];
+
+    filter.addContentForms([ { form: true } ]);
+    filter.addElementCallback((el: CKEDITOR.htmlParser.element) => 4);
+    filter.addFeature({ allowedContent: style });
+    filter.addTransformations([ [ 'transform1', { right: (element: CKEDITOR.htmlParser.element, tools: string | CKEDITOR.filter.transformationTools) => true } ] ]);
+    
+    var allowed: boolean = filter.allow(style);
+    allowed = filter.allow([style], 'name');
+    allowed = filter.allow('rule', 'name', false);
+
+    var apply: boolean = filter.applyTo(CKEDITOR.htmlParser.fragment.fromHtml('string'), true, false, 1);
+    apply = filter.applyTo(new CKEDITOR.htmlParser.element('name', null), true, false, 1);
+
+    var checked: boolean = filter.check(style);
+    checked = filter.check('rule', true);
+    checked = filter.check(style, false, true);
+
+    checked = filter.checkFeature({ allowedContent: style });
+
+    filter = filter.clone();
+    filter.destroy();
+    filter.disable();
+
+    filter.disallow(filter.disallowedContent);
+    var mode: number = filter.getAllowedEnterMode(1);
+    mode = filter.getAllowedEnterMode(1, false);
+}
+
+function test_focusManager() {
+    var textarea = document.createElement('textarea');
+    var instance = CKEDITOR.replace(textarea);
+    var element = CKEDITOR.document.getById('myElement');
+
+    instance.focusManager.focus();
+    instance.focusManager.focus(element);
+    instance.focusManager.lock();
+    instance.focusManager.unlock();
+    instance.focusManager.blur();
+    instance.focusManager.blur(true);
+    instance.focusManager.add(element, true);
+    instance.focusManager.remove(element);
+
+    var focusManager = new CKEDITOR.focusManager(CKEDITOR.instances[0]);
+    var object: CKEDITOR.dom.domObject = focusManager.currentActive;
+    var bool: boolean = focusManager.hasFocus;
+}
+
+
+function test_htmlParser_basicWriter() {
+    var writer = new CKEDITOR.htmlParser.basicWriter();
+    writer.attribute('class', 'MyClass');
+    writer.closeTag('p');
+    writer.comment('hello');
+    alert(writer.getHtml(true)); // '<p class="MyClass">Hello</p>'
+    writer.openTag('p', {});
+    writer.openTagClose('p', false);
+    writer.reset();
+    writer.text('Hello');
+    writer.write('data');
+}
+
+function test_htmlParser_cdata() {
+    var cdata: CKEDITOR.htmlParser.cdata = new CKEDITOR.htmlParser.cdata('hey');
+    cdata.writeHtml(new CKEDITOR.htmlParser.basicWriter());
+}
+
+function test_htmlParser_comment() {
+    var filter: CKEDITOR.htmlParser.filter;
+    var comment: CKEDITOR.htmlParser.comment = new CKEDITOR.htmlParser.comment('hey');
+    var filtered: boolean = comment.filter(filter);
+    comment.writeHtml(new CKEDITOR.htmlParser.basicWriter());
+    comment.writeHtml(new CKEDITOR.htmlParser.basicWriter(), filter);
+}
+
+function test_htmlParser_cssStyle() {
+    var element: CKEDITOR.htmlParser.element;
+
+    var style: CKEDITOR.htmlParser.cssStyle = new CKEDITOR.htmlParser.cssStyle(element);
+    style = new CKEDITOR.htmlParser.cssStyle('styles');
+
+    style.populate(element);
+    style.populate(new CKEDITOR.dom.element('div'));
+    style.populate({ 'width': 1 });
+}
+
+function test_htmlParser_element() {
+    var element: CKEDITOR.htmlParser.element = new CKEDITOR.htmlParser.element('el', { 'id': '1'});
+    
+    var node: CKEDITOR.htmlParser.node;
+    element.add(node);
+    element.add(node, 5);
+    element.addClass('class');
+    element = element.clone();
+
+    var filter: CKEDITOR.htmlParser.filter;
+    var filtered: boolean = element.filter(filter);
+    element.filterChildren(filter);
+
+    var nodes: CKEDITOR.htmlParser.node[] = element.find('*');
+    nodes = element.find((el: CKEDITOR.htmlParser.node) => false, true);
+
+    element.forEach((el: CKEDITOR.htmlParser.node) => console.log('node'));
+    element.forEach((el: CKEDITOR.htmlParser.node) => console.log('node'), 1);
+    element.forEach((el: CKEDITOR.htmlParser.node) => false, 2, true);
+
+    var node: CKEDITOR.htmlParser.node = element.getFirst('*');
+    node = element.getFirst({ 'id': '1' });
+    node = element.getFirst((el: CKEDITOR.htmlParser.node) => true);
+
+    var html: string = element.getHtml();
+    html = element.getOuterHtml();
+
+    var hasClass: boolean = element.hasClass('class');
+    element.removeClass('class');
+    element.replaceWithChildren();
+    element.setHtml('html');
+    var el2: CKEDITOR.htmlParser.element = element.split(1);
+
+    element.writeChildrenHtml(new CKEDITOR.htmlParser.basicWriter());
+    element.writeChildrenHtml(new CKEDITOR.htmlParser.basicWriter(), filter);
+
+    element.writeHtml(new CKEDITOR.htmlParser.basicWriter());
+    element.writeHtml(new CKEDITOR.htmlParser.basicWriter(), filter);
+}
+
+function test_htmlParser_filter() {
+    var filter: CKEDITOR.htmlParser.filter = new CKEDITOR.htmlParser.filter({ elementNames: [ 'div' ] });
+    filter = new CKEDITOR.htmlParser.filter();
+
+    filter.addRules({ text: 'text' });
+    filter.addRules({ attributes: { 'id': '1234' }}, 1);
+    filter.addRules({ comment: 'hey', text: 'text' }, { priority: 1 });
+    filter.addRules({ root: document.body }, { applyToAll: false });
+
+    var node: CKEDITOR.htmlParser.node;
+    filter.applyTo(node);
+}
+
+
+function test_htmlParser_filterRulesGroup() {
+    var rules: CKEDITOR.htmlParser.filterRulesGroup = new CKEDITOR.htmlParser.filterRulesGroup();
+
+    rules.add([ 'some', 'rule' ], 1, { applyToAll: false, excludeNestedEditable: true });
+
+    rules.addMany([ (value: CKEDITOR.htmlParser.node | CKEDITOR.htmlParser.fragment | string) => false, [ 'some', 'rule' ] ], 1, { applyToAll: false });
+
+    var nodeFragOrString: CKEDITOR.htmlParser.node | CKEDITOR.htmlParser.fragment | string;
+    nodeFragOrString = rules.exec(nodeFragOrString);
+
+    var str: string;
+    str = rules.execOnName(str);
+
+    var idx: number = rules.findIndex(1);
+}
+
+function test_htmlParser_fragment() {
+    var frag: CKEDITOR.htmlParser.fragment = new CKEDITOR.htmlParser.fragment();
+
+    var node: CKEDITOR.htmlParser.node;
+    frag.add(node);
+    frag.add(node, 1);
+
+    var filter: CKEDITOR.htmlParser.filter;
+    frag.filter(filter);
+    frag.filterChildren(filter);
+    frag.filterChildren(filter, true);
+    frag.forEach((node: CKEDITOR.htmlParser.node) => console.log('node'));
+    frag.forEach((node: CKEDITOR.htmlParser.node) => false, 1);
+    frag.forEach((node: CKEDITOR.htmlParser.node) => false, 2, true);
+
+    frag.writeChildrenHtml(new CKEDITOR.htmlParser.basicWriter());
+    frag.writeChildrenHtml(new CKEDITOR.htmlParser.basicWriter(), filter);
+
+    frag.writeHtml(new CKEDITOR.htmlParser.basicWriter());
+    frag.writeHtml(new CKEDITOR.htmlParser.basicWriter(), filter);
+
+    frag = CKEDITOR.htmlParser.fragment.fromBBCode('code');
+
+    var fragOrEl: CKEDITOR.htmlParser.fragment | CKEDITOR.htmlParser.element = CKEDITOR.htmlParser.fragment.fromHtml('html');
+    fragOrEl = CKEDITOR.htmlParser.fragment.fromHtml('html', 'parent');
+    fragOrEl = CKEDITOR.htmlParser.fragment.fromHtml('html', 'parent', 'fix');
+    fragOrEl = CKEDITOR.htmlParser.fragment.fromHtml('html', new CKEDITOR.htmlParser.element('name', null), true);
+}
+
+function test_htmlParser_node() {
+    var node: CKEDITOR.htmlParser.node = new CKEDITOR.htmlParser.node();
+
+    var el: CKEDITOR.htmlParser.element = node.getAscendant('condition');
+    el = node.getAscendant({ 'id': '1234' });
+    el = node.getAscendant((node: CKEDITOR.htmlParser.element) => false);
+
+    var idx: number = node.getIndex();
+    node.insertAfter(node);
+    node.insertBefore(node);
+    node.remove();
+    node.replaceWith(node);
+    el = node.wrapWith(el);
+
+}
+
+function test_htmlParser_text() {
+    var text: CKEDITOR.htmlParser.text = new CKEDITOR.htmlParser.text('text');
+    var filtered: boolean = text.filter(new CKEDITOR.htmlParser.filter());
+    text.writeHtml(new CKEDITOR.htmlParser.basicWriter());
+    text.writeHtml(new CKEDITOR.htmlParser.basicWriter(), new CKEDITOR.htmlParser.filter());
+}
+
+function test_htmlWriter() {
+    var writer = new CKEDITOR.htmlWriter();
+    writer.openTag('p', {});
+    writer.attribute('class', 'MyClass');
+    writer.openTagClose('p', false);
+    writer.text('Hello');
+    writer.closeTag('p');
+    alert(writer.getHtml(true)); // '<p class="MyClass">Hello</p>'
+
+    writer.indentationChars = '\t';
+    writer.lineBreakChars = '\r\n';
+    writer.selfClosingEnd = '>';
+    writer.indentation();
+    writer.lineBreak();
+    writer.setRules('img', {breakBeforeOpen: true, breakAfterOpen: true});
+}
+
+function test_htmlParser() {
+    var html = '<div><span>text</span></div>';
+    var fragment = CKEDITOR.htmlParser.fragment.fromHtml(html);
+    fragment.forEach(function(node) {
+        if (node instanceof CKEDITOR.htmlParser.element) {
+            node.forEach(function(node) {
+                console.log(node);
+            });
+        }
+    }, CKEDITOR.NODE_ELEMENT, true);
+}
+
+function test_keystrokeHandler() {
+    var handler: CKEDITOR.keystrokeHandler = new CKEDITOR.keystrokeHandler(CKEDITOR.instances[0]);
+    handler.attach(new CKEDITOR.dom.domObject(document.body)); 
+}
+
+function test_lang() {
+    var lang: string = CKEDITOR.lang.detect('en');
+    lang = CKEDITOR.lang.detect('zh', 'sw');
+    
+    CKEDITOR.lang.load('tk', 'pr', (code: string, entries: any) => console.log('loaded'));
+}
+
+function test_loader() {
+    CKEDITOR.loader.load('script');
+    CKEDITOR.loader.load('script', true);
+
+    CKEDITOR.loader.loadPending();
+}
+
+function test_menu() {
+    var menu: CKEDITOR.menu = new CKEDITOR.menu();
+
+    menu.add({ anything: true });
+    menu.addListener((startElement: CKEDITOR.dom.element, selection: CKEDITOR.dom.selection, path: CKEDITOR.dom.elementPath) => 'return');
+    var { item, element } = menu.findItemByCommandName('command');
+    menu.hide();
+    menu.hide(false);
+    menu.removeAll();
+    menu.show(new CKEDITOR.dom.element('div'));
+    menu.show(new CKEDITOR.dom.element('div'), 1);
+    menu.show(new CKEDITOR.dom.element('div'), 1, 2);
+    menu.show(new CKEDITOR.dom.element('div'), 1, 2, 3);
+}
+
+function test_plugins() {
+    CKEDITOR.plugins.add( 'abbr', {
+        init: function( editor: CKEDITOR.editor ) {
+            // empty logic
+        }
+    });
+
+    console.log(CKEDITOR.plugins.registered['abbr']);
+}
+
+function test_resourceManager() {
+    var manager: CKEDITOR.resourceManager = new CKEDITOR.resourceManager('path', 'name');
+
+    manager.add('name');
+    manager.add('name', { hidpi: true });
+    manager.addExternal('names', 'path');
+    manager.addExternal('names', 'path', 'name');
+
+    var def: CKEDITOR.pluginDefinition = manager.get('name');
+    var path: string = manager.getFilePath('path');
+    path = manager.getPath('path');
+
+    manager.load('name', (loaded: string[]) => console.log('hey'));
+    manager.load([ 'name' ], (loaded: string[]) => console.log('hey'), manager);
+}
+
+function test_scriptLoader() {
+    CKEDITOR.scriptLoader.load('url', (succeededUrls: boolean | string[], failedUrls: string[]) => console.log('loaded'));
+    CKEDITOR.scriptLoader.load([ 'url' ], (succeededUrls: boolean | string[], failedUrls: string[]) => console.log('loaded'), null);
+    CKEDITOR.scriptLoader.load([ 'url' ], (succeededUrls: boolean | string[], failedUrls: string[]) => console.log('loaded'), null, true);
+    CKEDITOR.scriptLoader.queue('url', (succeeded: boolean) => console.log('loaded'));
+}
+
+function test_skin() {
+    CKEDITOR.skin.addIcon('name', 'path');
+    CKEDITOR.skin.addIcon('name', 'path', 1);
+    CKEDITOR.skin.addIcon('name', 'path', 1, 'small');
+
+    CKEDITOR.skin.chameleon('editor', 'part');
+
+    var style: any = CKEDITOR.skin.getIconStyle('name');
+    style = CKEDITOR.skin.getIconStyle('name', true);
+    style = CKEDITOR.skin.getIconStyle('name', true, 1);
+    style = CKEDITOR.skin.getIconStyle('name', true, 1, 'large');
+
+    var path: any = CKEDITOR.skin.getPath('part');
+
+    CKEDITOR.skin.loadPart('part', () => console.log('load'));
+
+    var path2: string = CKEDITOR.skin.path();
+}
+
+function test_style() {
+    var style: CKEDITOR.style = new CKEDITOR.style({ element: 'div' }, { 'key': 'value '});
+    style.apply(CKEDITOR.instances[0]);
+
+    var el: CKEDITOR.dom.element;
+    style.applyToObject(el, CKEDITOR.instances[0]);
+
+    var range: Range;
+    style.applyToRange(range, CKEDITOR.instances[0]);
+
+    var str: string = style.buildPreview();
+    str = style.buildPreview('label');
+
+    var path: CKEDITOR.dom.elementPath;
+    var bool: boolean = style.checkActive(path, CKEDITOR.instances[0]);
+
+    var filter: CKEDITOR.filter;
+    bool = style.checkApplicable(path, CKEDITOR.instances[0], filter);
+
+    bool = style.checkElementMatch(el, true, CKEDITOR.instances[0]);
+    bool = style.checkElementRemovable(el, false, CKEDITOR.instances[0]);
+
+    var def: CKEDITOR.style.definition = style.getDefintion();
+    style.remove(CKEDITOR.instances[0]);
+    style.removeFromRange(range, CKEDITOR.instances[0]);
+    
+    var rules: CKEDITOR.filter.allowedContentRules;
+    rules = style.toAllowedContentRules();
+    rules = style.toAllowedContentRules(CKEDITOR.instances[0]);
 }
 
 function test_adding_command_and_buttons() {
@@ -320,47 +977,6 @@ function test_adding_command_and_buttons() {
     });
 }
 
-function test_adding_dialog_by_path() {
-    CKEDITOR.dialog.add( 'abbrDialog', this.path + 'dialogs/abbr.js' );
-}
-
-function test_adding_dialog_by_definition() {
-    CKEDITOR.dialog.add( 'abbrDialog', function ( editor: CKEDITOR.editor ) {
-        return {
-            title: 'Abbreviation Properties',
-            minWidth: 400,
-            minHeight: 200,
-            onLoad: () => {},
-            onOk: () => {},
-            onCancel: () => {},
-            onShow: () => {},
-            onHide: () => {},
-            contents: [
-                {
-                    id: 'tab-basic',
-                    label: 'Basic Settings',
-                    elements: <any[]>[]
-                },
-                {
-                    id: 'tab-adv',
-                    label: 'Advanced Settings',
-                    elements: []
-                }
-            ]
-        };
-    });
-}
-
-function test_plugins() {
-    CKEDITOR.plugins.add( 'abbr', {
-        init: function( editor: CKEDITOR.editor ) {
-            // empty logic
-        }
-    });
-
-    console.log(CKEDITOR.plugins.registered['abbr']);
-}
-
 function test_adding_widget() {
     function wrapper(editor: CKEDITOR.editor) {
             editor.widgets.add("widgetty", {
@@ -374,52 +990,6 @@ function test_adding_widget() {
     }
 }
 
-function test_focusManager() {
-    var textarea = document.createElement('textarea');
-    var instance = CKEDITOR.replace(textarea);
-    var element = CKEDITOR.document.getById('myElement');
-
-    instance.focusManager.focus();
-    instance.focusManager.focus(element);
-    instance.focusManager.lock();
-    instance.focusManager.unlock();
-    instance.focusManager.blur();
-    instance.focusManager.blur(true);
-    instance.focusManager.add(element, true);
-    instance.focusManager.remove(element);
-
-    var focusManager = new CKEDITOR.focusManager(instance);
-    var object: CKEDITOR.dom.domObject = focusManager.currentActive;
-    var bool: boolean = focusManager.hasFocus;
-}
-
-function test_basicWriter() {
-    var writer = new CKEDITOR.htmlParser.basicWriter();
-    writer.openTag('p', {});
-    writer.attribute('class', 'MyClass');
-    writer.openTagClose('p', false);
-    writer.text('Hello');
-    writer.closeTag('p');
-    alert(writer.getHtml(true)); // '<p class="MyClass">Hello</p>'
-}
-
-function test_htmlWriter() {
-    var writer = new CKEDITOR.htmlWriter();
-    writer.openTag('p', {});
-    writer.attribute('class', 'MyClass');
-    writer.openTagClose('p', false);
-    writer.text('Hello');
-    writer.closeTag('p');
-    alert(writer.getHtml(true)); // '<p class="MyClass">Hello</p>'
-
-    writer.indentationChars = '\t';
-    writer.lineBreakChars = '\r\n';
-    writer.selfClosingEnd = '>';
-    writer.indentation();
-    writer.lineBreak();
-    writer.setRules('img', {breakBeforeOpen: true, breakAfterOpen: true});
-}
-
 function test_sharedSpace() {
     CKEDITOR.inline('content', {
         removePlugins: 'maximize,resize',
@@ -570,31 +1140,75 @@ function test_selection() {
 }
 
 function test_tools() {
-    var obj = { key: 'value' };
+    var obj: { [key: string]: any } = { key: 'value' };
+
+    CKEDITOR.tools.addFunction(console.log);
+    CKEDITOR.tools.addFunction(console.log, obj);
+    var bool = CKEDITOR.tools.arrayCompare([ 1 ], [ 2, 3 ]);
     CKEDITOR.tools.clone(obj);
     CKEDITOR.tools.copy(obj);
-    CKEDITOR.tools.prototypedCopy(obj);
-
+    obj = CKEDITOR.tools.createClass(obj);
+    var str = CKEDITOR.tools.cssStyleToDomStyle('style');
+    var prefixes: { [cssClass: string]: string | number } = CKEDITOR.tools.cssVendorPrefix('prop', 'val');
+    prefixes = CKEDITOR.tools.cssVendorPrefix('prop', 'val', true);
+    var fn: (param: any) => boolean
+    fn = CKEDITOR.tools.defer<(param: any) => boolean>(fn);
+    CKEDITOR.tools.enableHtml5Elements(document);
+    CKEDITOR.tools.enableHtml5Elements(document.createDocumentFragment(), true);
+    str = CKEDITOR.tools.escapeCss('css');
+    var { input, reset } = CKEDITOR.tools.eventsBuffer(1, console.log, obj);
+    obj = CKEDITOR.tools.extend(obj, obj, true, obj);
+    bool = CKEDITOR.tools.fixDomain();
+    str = CKEDITOR.tools.genKey(str);
+    str = CKEDITOR.tools.getCookie(str);
+    str = CKEDITOR.tools.getCsrfToken();
+    var numb: number = CKEDITOR.tools.getIndex<string>(['string', 'array'], (element: string) => false);
+    bool = CKEDITOR.tools.getMouseButton(new CKEDITOR.dom.event(document.createEvent(null)));
+    str = CKEDITOR.tools.getNextId();
+    numb = CKEDITOR.tools.getNextNumber();
+    str = CKEDITOR.tools.getUniqueId();
+    str = CKEDITOR.tools.htmlDecode(str);
+    str = CKEDITOR.tools.htmlDecodeAttr(str);
+    str = CKEDITOR.tools.htmlEncode(str);
+    str = CKEDITOR.tools.htmlEncodeAttr(str);
+    numb = CKEDITOR.tools.indexOf<string>(['string', 'array'], 'string');
+    numb = CKEDITOR.tools.indexOf<boolean>([true, false], (val: boolean) => false);    
     console.log(CKEDITOR.tools.isArray([1])); // true
     console.log(CKEDITOR.tools.isArray(obj)); // false
     console.log(CKEDITOR.tools.isArray(null)); // false
     console.log(CKEDITOR.tools.isArray(undefined)); // false
-
+    bool = CKEDITOR.tools.isEmpty(obj);
+    var ret1: { display: string[], aria: string[] } = CKEDITOR.tools.keystrokeToArray(obj, 1);
+    var ret2: { display: string, aria: string }  = CKEDITOR.tools.keystrokeToString(obj, 1);
+    str = CKEDITOR.tools.ltrim(str);
+    str = CKEDITOR.tools.normalizeCssText(str, bool);
+    str = CKEDITOR.tools.normalizeHex(str);
+    bool = CKEDITOR.tools.objectCompare(obj, obj);
+    bool = CKEDITOR.tools.objectCompare(obj, obj, true);
+    var strArr: string[] = CKEDITOR.tools.objectKeys(obj);
     CKEDITOR.tools.override(parseInt, function(_parseInt) {
         return function(value: any, radix?: number) {
             return _parseInt(value, radix);
         };
     });
-}
-
-function test_htmlParser() {
-    var html = '<div><span>text</span></div>';
-    var fragment = CKEDITOR.htmlParser.fragment.fromHtml(html);
-    fragment.forEach(function(node) {
-        if (node instanceof CKEDITOR.htmlParser.element) {
-            node.forEach(function(node) {
-                console.log(node);
-            });
-        }
-    }, CKEDITOR.NODE_ELEMENT, true);
+    obj = CKEDITOR.tools.parseCssText(str);
+    obj = CKEDITOR.tools.parseCssText(str, bool);
+    obj = CKEDITOR.tools.parseCssText(str, bool, bool);
+    obj = CKEDITOR.tools.prototypedCopy(obj);
+    CKEDITOR.tools.removeFunction(1);
+    str = CKEDITOR.tools.repeat(str, 40);
+    str = CKEDITOR.tools.rtrim(str);
+    str = CKEDITOR.tools.search<string>(strArr, 'string');
+    str = CKEDITOR.tools.search<string>(strArr, (el: string) => true);
+    CKEDITOR.tools.setCookie('name', 'value');
+    numb = CKEDITOR.tools.setTimeout(console.log);
+    numb = CKEDITOR.tools.setTimeout(console.log, 1000);
+    numb = CKEDITOR.tools.setTimeout(console.log, 1000, obj);
+    numb = CKEDITOR.tools.setTimeout(console.log, 1000, obj, 'timeout');
+    numb = CKEDITOR.tools.setTimeout(console.log, 1000, obj, 'timeout', window);
+    str = CKEDITOR.tools.transformPlainTextToHtml(str, 1);
+    str = CKEDITOR.tools.trim(str);
+    CKEDITOR.tools.tryThese([ console.log, console.warn ]);
+    str = CKEDITOR.tools.writeCssText(obj);
+    str = CKEDITOR.tools.writeCssText(obj, true);
 }
diff --git a/types/ckeditor/index.d.ts b/types/ckeditor/index.d.ts
index 44c40f3699..95852e9e04 100644
--- a/types/ckeditor/index.d.ts
+++ b/types/ckeditor/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for CKEditor 4.9.2
+// Type definitions for CKEditor 4.9
 // Project: https://ckeditor.com/ckeditor-4/
 // Definitions by: Thomas Wittwer <https://github.com/wittwert>
 //                 Stuart Long <https://github.com/stuartlong>
@@ -7,2765 +7,2765 @@
 // WORK-IN-PROGRESS: Any contribution support welcomed.
 // See https://github.com/DefinitelyTyped/DefinitelyTyped/issues/1827 for more informations.
 interface Window {
-  CKEDITOR_BASEPATH: string;
-}
-
-declare namespace CKEDITOR {
-
-    // Config options
-    var disableAutoInline: boolean;
-    var replaceClass: string;
-    var skinName: string;
-
-    // Properties
-    const ALT: number;
-    const CTRL: number;
-    const DATA_TRANSFER_CROSS_EDITORS: number;
-    const DATA_TRANSFER_EXTERNAL: number;
-    const DATA_TRANSFER_INTERNAL: number;
-    const DIALOG_RESIZE_BOTH: number;
-    const DIALOG_RESIZE_HEIGHT: number;
-    const DIALOG_RESIZE_NONE: number;
-    const DIALOG_RESIZE_WIDTH: number;
-    const DIALOG_STATE_BUSY: number;
-    const DIALOG_STATE_IDLE: number;
-    const ELEMENT_MODE_APPENDTO: number;
-    const ELEMENT_MODE_INLINE: number;
-    const ELEMENT_MODE_NONE: number;
-    const ELEMENT_MODE_REPLACE: number;
-    const END: number;
-    const ENLARGE_BLOCK_CONTENTS: number;
-    const ENLARGE_ELEMENT: number;
-    const ENLARGE_INLINE: number;
-    const ENLARGE_LIST_ITEM_CONTENTS: number;
-    const ENTER_BR: number;
-    const ENTER_DIV: number;
-    const ENTER_P: number;
-    const EVENT_PHASE_AT_TARGET: number;
-    const EVENT_PHASE_BUBBLING: number;
-    const EVENT_PHASE_CAPTURING: number;
-    const FILTER_SKIP_TREE: number;
-    const LINEUTILS_AFTER: number;
-    const LINEUTILS_BEFORE: number;
-    const LINEUTIS_INSIDE: number;
-    const MOUSE_BUTTON_LEFT: number;
-    const MOUSE_BUTTON_MIDDLE: number;
-    const MOUSE_BUTTON_RIGHT: number;
-    const NODE_COMMENT: number;
-    const NODE_DOCUMENT: number;
-    const NODE_DOCUMENT_FRAGMENT: number;
-    const NODE_ELEMENT: number;
-    const NODE_TEXT: number;
-    const POSITION_AFTER_END: number;
-    const POSITION_AFTER_START: number;
-    const POSITION_BEFORE_END: number;
-    const POSITION_BEFORE_START: number;
-    const POSITION_CONTAINS: number;
-    const POSITION_DISCONNECTED: number;
-    const POSITION_FOLLOWING: number;
-    const POSITION_IDENTICAL: number;
-    const POSITION_IS_CONTAINED: number;
-    const POSITION_PRECEDING: number;
-    const SELECTION_ELEMENT: number;
-    const SELECTION_NONE: number;
-    const SELECTION_TEXT: number;
-    const SHIFT: number;
-    const SHRINK_ELEMENT: number;
-    const SHRINK_TEXT: number;
-    const START: number;
-    const STYLE_BLOCK: string;
-    const STYLE_INLINE: string;
-    const STYLE_OBJECT: string;
-    const TRISTATE_DISABLED: number;
-    const TRISTATE_OFF: number;
-    const TRISTATE_ON: number;
-    const UI_BUTTON: string;
-    const UI_MENUBUTTON: string;
-    const UI_PANEL: string;
-    const UI_PANELBUTTON: string;
-    const UI_RICHCOMBO: string;
-    const UI_SEPARATOR: string;
-    const VERBOSITY_ERROR: number;
-    const VERBOSITY_WARN: number;
-
-    var basePath: string;
-    var currentInstance: editor;
-    var document: dom.document;
-    var instances: { [id: string]: editor };
-    var loadFullCoreTimeout: number;
-    var revision: string;
-    var rnd: number;
-    var status: string;
-    var timestamp: string;
-    var verbosity: number;
-    var version: string;
-    const config: config;
-
-    // Methods
-    function add(editor: editor): void;
-    function addCss(css: string): void;
-    function addTemplate(name: string, source: string): template;
-    function appendTo(element: string | HTMLElement, config?: config, data?: string): editor;
-    function domReady(): void;
-    function editorConfig(config: config): void;
-    function error(errorCode: string, additionalData?: any): void;
-    function getCss(): string;
-    function getTemplate(name: string): template;
-    function getUrl(resource: string): string;
-    function inline(element: string | HTMLElement, instanceConfig?: config): editor;
-    function inlineAll(): void;
-    function loadFullCore(): void;
-    function replace(element: string | HTMLTextAreaElement, config?: config): editor;
-    function replaceAll(className?: string): void;
-    function replaceAll(assertionFunction: (textarea: HTMLTextAreaElement, config: config) => boolean): void;
-    function warn(errorCode: string, additionalData?: any): void;
-
-    // Event interface
-    function capture(): void;
-    function define(name: string, meta: { [key: string]: any }): void;
-    function fire(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
-    function fireOnce(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
-    function hasListeners(eventName: string): boolean;
-    function on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any }, listenerData?: { [key: string]: any }, priority?: number): void;
-    function once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any }, listenerData?: { [key: string]: any }, priority?: number): void;
-    function removeAllListeners(): void;
-    function removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
-
-    type listenerRegistration = {
-        removeListener: () => void;
-    }
-
-    namespace dom {
-
-        interface bookmark {
-            startNode: dom.node | string;
-            endNode: dom.node | string;
-            serializable: boolean;
-            collapsed: boolean;
-        }
-
-        interface bookmark2 {
-            start: number[];
-            end: number[];
-            startOffset: number;
-            endOffset: number;
-            collapsed: boolean;
-            normalized: boolean;
-            is2: boolean;
-        }
-
-        class comment extends node {
-            readonly type: number;
-
-            constructor(comment: string | Node, ownerDocument?: document);
-            getOuterHtml(): string;
-        }
-
-        class document extends domObject {
-            readonly $: Document;
-            readonly type: number;
-
-            constructor(domDocument: { [key: string]: any });
-            appendStyleSheet(cssFileUrl: string): void;
-            appendStyleText(cssStyleText: string): CSSStyleSheet;
-            createElement(name: string, attribsAndStyles?: { attributes: { [key: string]: any }; styles: { [key: string]: any }; }): element;
-            createText(text: string): element;
-            find(selector: string): nodeList;
-            findOne(selector: string): element;
-            focus(): void;
-            getActive(): element;
-            getBody(): element;
-            getByAddress(address: any[], normalized?: boolean): node;
-            getById(elementId: string): element;
-            getDocumentElement(): element;
-            getElementsByTag(tagName: string): nodeList;
-            getHead(): element;
-            getSelection(): selection;
-            getWindow(): window;
-            write(html: string): void;
-        }
-
-        class documentFragment extends node {
-            readonly type: number;
-
-            constructor(nodeOrDoc: { [key: string]: any });
-            insertAfterNode(node: node): void;
-        }
-
-        class domObject extends event {
-            readonly $: any;
-
-            constructor(nativeDomObject: { [key: string]: any });
-            clearCustomData(): void;
-            equals(object: any): boolean;
-            fire(eventName: string, data?: any, editor?: editor): any;
-            getCustomData(key: string): any;
-            getPrivate(): any;
-            getUniqueId(): number;
-            removeAllListeners(): void;
-            removeCustomData(key: string): any;
-            setCustomData(key: string, value: any): domObject;
-        }
-
-        class element extends node {
-            readonly $: HTMLElement;
-            readonly type: number;
-
-            constructor(element: string, ownerDocument?: document);
-            constructor(element: HTMLElement, ownerDocument?: document);
-            addClass(className: string): void;
-            append(node: node | string, toStart?: boolean): node;
-            appendBogus(force: boolean): void;
-            appendHtml(html: string): void;
-            appendText(text: string): node;
-            breakParent(parent: element): void;
-            contains(node: node): boolean;
-            copyAttributes(dest: element, skipAttributes: { [key: string]: string }): void;
-            data(name: string, value?: string | boolean): string;
-            disableContextMenu(): void;
-            find(selector: string): nodeList;
-            findOne(selector: string): element;
-            focus(defer?: boolean): void;
-            focusNext(ignoreChildren?: boolean, indexToUse?: number): void;
-            focusPrevious(ignoreChildren?: boolean, indexToUse?: number): void;
-            forEach(callback: (node: node) => void, type?: number, skipRoot?: boolean): void;
-            getAttribute(name: string): string;
-            getBogus(): node | boolean;
-            getChild(indices: number | number[]): node;
-            getChildCount(): number;
-            getChildren(): nodeList;
-            getClientRect(): ClientRect;
-            getComputedStyle(propertyName: string): string;
-            getDirection(useComputed: boolean): string;
-            getDocumentPosition(refDocument: document): position;
-            getDtd(): dtdDefinition;
-            getEditor(): editor;
-            getElementsByTag(tagName: string): nodeList;
-            getFirst(evaluator?: (node: node) => boolean): node;
-            getFrameDocument(): document;
-            getHtml(): string;
-            getId(): string;
-            getLast(evaluator?: (node: node) => boolean): node;
-            getName(): string;
-            getNameAtt(): string;
-            getOuterHtml(): string;
-            getPositionedAncestor(): element;
-            getSize(type: string, isBorderBox: boolean): void;
-            getStyle(name: string): string;
-            getTabIndex(): number;
-            getText(): string;
-            getValue(): string;
-            getWindow(): window;
-            hasAttributes(): boolean;
-            hasAttribute(name: string): boolean;
-            hasClass(className: string): boolean;
-            hide(): void;
-            is(...name: string[]): boolean;
-            is(name: any): boolean;
-            isBlockBoundary(customNodeNames: { [tagName: string]: 1 }): boolean;
-            isEditable(textCursor?: boolean): boolean;
-            isEmptyInlineRemoveable(): boolean;
-            isIdentical(otherElement: element): boolean;
-            isVisible(): boolean;
-            mergeSiblings(inlineOnly?: boolean): void;
-            moveChildren(target: element, toStart?: boolean): void;
-            removeAttribute(name: string): void;
-            removeAttributes(attributes?: string[]): void;
-            removeClass(className: string): void;
-            removeStyle(name: string): void;
-            renameNode(newTag: string): void;
-            scrollIntoParent(parent: element, alignToTop: boolean, hscroll: boolean): void;
-            scrollIntoParent(parent: window, alignToTop: boolean, hscroll: boolean): void;
-            scrollIntoView(alignToTop?: boolean): void;
-            setAttribute(name: string, value: string): element;
-            setAttributes(attributesPairs: { [key: string]: string }): element;
-            setHtml(html: string): string;
-            setOpacity(opacity: number): void;
-            setSize(type: string, size: number, isBorderBox: boolean): void;
-            setState(state: number, base?: string, useAria?: boolean): void;
-            setStyle(name: string, value: string): element;
-            setStyles(stylesPair: { [key: string]: string }): element;
-            setText(text: string): string;
-            setValue(value: string): element;
-            show(): void;
-            unselectable(): void;
-
-            //static method
-            static clearAllMarkers(database: any): any;
-            static clearMarkers(database: any, element: dom.element, removeFromDatabase: boolean): void;
-            static createFromHtml(html: string): element;
-            static get(element: string | HTMLElement | element): element;
-            static setMarker(database: any, element: dom.element, name: string, value: any): dom.element;
-        }
-
-        class elementPath {
-            readonly block: element;
-            readonly blockLimit: element;
-            readonly elements: element[];
-            readonly lastElement: element;
-            readonly root: element;
-
-            constructor(startNode: element, root?: element);
-            compare(otherPath: elementPath): boolean;
-            contains(query: string | string[] | ((element: element) => boolean) | { [key: string]: any } | element, excludeRoot?: boolean, fromTop?: boolean): element;
-            direction(): 'ltr' | 'rtl';
-            isContextFor(tag: string): boolean;
-        }
-
-        class event {
-            constructor(domEvent: Event);
-            getKey(): number;
-            getKeystroke(): number;
-            preventDefault(stopPropagation?: boolean): void;
-            stopPropagation(): void;
-            getTarget(): node;
-            getPhase(): number;
-            getPhaseOffset(): position;
-            on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: any, listenerData?: any, priority?: number): { removeListener: () => void };
-        }
-
-        class iterator {
-            readonly activeFilter: filter;
-            enforceRealBlocks: boolean;
-            enlargeBr: boolean;
-            readonly filter: filter;
-            forceBrBreak: boolean;
-            readonly range: range;
-            constructor(range: range);
-            getNextParagraph(blockTag?: string): element;
-        }
-
-        class node extends domObject {
-            constructor(domNode: Node);
-            appendTo(element: element): element;
-            clone(includeChildren: boolean, cloneId: boolean): node;
-            hasPrevious(): boolean;
-            hasNext(): boolean;
-            insertAfter(node: node): node;
-            insertBefore(node: node): node;
-            insertBeforeMe(node: node): node;
-            getAddress(normalized?: boolean): number[];
-            getAscendant(reference: string, includeSelf?: boolean): node;
-            getCommonAncestor(node: node): void;
-            getDocument(): document;
-            getIndex(normalized?: boolean): number;
-            getNext(evaluator?: (node: node) => boolean): node;
-            getNextSourceNode(startFromSibling: boolean, nodeType: number, guard: node | ((node: node) => boolean)): void;
-            getParent(allowFragmentParent?: boolean): element;
-            getParents(closerFirst?: boolean): node[];
-            getPosition(otherNode: node): void;
-            getPrevious(evaluator?: (node: node) => boolean): node;
-            getPreviousSourceNode(startFromSibling: boolean, nodeType: number, guard: node | ((node: node) => boolean)): void;
-            hasAscendant(name: string, includeSelf: boolean): boolean;
-            remove(preserveChildren?: boolean): node;
-            replace(nodeToReplace: node): void;
-            trim(): void;
-            ltrim(): void;
-            rtrim(): void;
-            isReadOnly(): boolean;
-        }
-
-        class nodeList {
-            constructor(nativeList: NodeList);
-            count(): number;
-            getItem(index: number): node;
-            toArray(): node[];
-        }
-
-        class range {
-            readonly collapsed: boolean;
-            readonly document: document;
-            readonly endContainer: element | text;
-            readonly endOffset: number;
-            readonly root: element;
-            readonly startContainer: element | text;
-            readonly startOffset: number;
-
-            constructor(root: element | document);
-            checkBoundaryOfElement(element: element, checkType: number): boolean;
-            checkEndOfBlock(): boolean;
-            checkReadOnly(): boolean;
-            checkStartOfBlock(): boolean;
-            clone(cloneId?: boolean): range;
-            cloneContents(): documentFragment;
-            collapse(toStart?: boolean): boolean;
-            createBookmark(serializable?: boolean): bookmark;
-            createBookmark2(normalized?: boolean): bookmark2;
-            createIterator(): iterator;
-            deleteContents(mergeThen?: boolean): void;
-            endPath(): elementPath;
-            enlarge(unit: number, excludeBrs?: boolean): void;
-            extractContents(mergeThen?: boolean, cloneId?: boolean): documentFragment;
-            fixBlock(isStart: boolean, blockTag: string): element;
-            getBoundaryNodes(): { startNode: node; endNode: node; };
-            getCommonAncestor(includeSelf?: boolean, ignoreTextNode?: boolean): element;
-            getEnclosedNode(): node;
-            getNextEditableNode(): element | text;
-            getNextNode(evaluator: (element: dom.element) => boolean, guard?: (element: dom.element) => boolean, boundary?: element): element;
-            getPreviousEditableNode(): element | text;
-            getPreviousNode(evaluator: (element: dom.element) => boolean, guard?: (element: dom.element) => boolean, boundary?: element): element;
-            getTouchedEndNode(): node;
-            getTouchedStartNode(): node;
-            insertNode(node: node): void;
-            moveToBookmark(bookmark: bookmark | bookmark2): void;
-            moveToClosestEditablePosition(element?: element, isMoveForward?: boolean): boolean;
-            moveToElementEditEnd(target: element): boolean;
-            moveToElementEditStart(target: element): boolean;
-            moveToElementEditablePosition(element: element, isMoveToEnd: boolean): boolean;
-            moveToPosition(node: node, position: number): void;
-            moveToRange(range: range): void;
-            optimize(): void;
-            optimizeBookmark(): void;
-            removeEmptyBlocksAtEnd(atEnd: boolean): void;
-            scrollIntoView(): void;
-            select(): selection;
-            selectNodeContents(node: node): void;
-            setEnd(endNode: node, endOffset: number): void;
-            setEndAfter(node: node): void;
-            setEndAt(node: node, position: number): void;
-            setEndBefore(node: node): void;
-            setStart(startNode: node, startOffset: number): void;
-            setStartAfter(node: node): void;
-            setStartAt(node: node, position: number): void;
-            setStartBefore(node: node): void;
-            shrink(mode: number, selectContents?: boolean, options?: boolean | shrinkOptions): void;
-            splitBlock(cloneId?: boolean): void;
-            splitElement(toSplit: element, cloneId?: boolean): element;
-            startPath(): elementPath;
-            trim(ignoreStart?: boolean, ignoreEnd?: boolean): void;
-
-            static mergeRanges(ranges: range[]): range[];
-        }
-
-        interface shrinkOptions {
-            shrinkOnBlockBoundary?: boolean,
-            skipBogus?: boolean
-        }
-
-        class rangeList {
-            constructor(ranges?: range | range[]);
-            createBokmarks(serializable?: boolean): bookmark[];
-            createBookmarks2(normalized?: boolean): bookmark2[];
-            createIterator(): rangeListIterator;
-            moveToBookmarks(bookmarks: bookmark[]): void;
-        }
-
-
-        interface rangeListIterator {
-            getNextRange(mergeConsequent?: boolean): range;
-        }
-
-        // see https://docs.com/ckeditor4/latest/api/CKEDITOR_dom_selection.html
-        class selection {
-            readonly FILLING_CHAR_SEQUENCE: string;
-            readonly document: document;
-            readonly isFake: boolean;
-            readonly isLocked: boolean;
-            readonly rev: number;
-            readonly root: element;
-
-            constructor(target: document | element | selection);
-            createBookmarks(serializable: any): bookmark[];
-            createBookmarks2(normalized: any): bookmark2[];
-            fake(element: element, ariaLabel?: boolean): void;
-            getCommonAncestor(): element;
-            getNative(): Selection;
-            getRanges(onlyEditables?: boolean): range[];
-            getSelectedElement(): element;
-            getSelectedText(): string;
-            getStartElement(): element;
-            getType(): number;
-            isCollapsed(): boolean;
-            isHidden(): boolean;
-            isInTable(allowPartialSelection?: boolean): boolean;
-            lock(): void;
-            removeAllRanges(): void;
-            reset(): void;
-            scrollIntoView(): void;
-            selectBookmarks(bookmarks: (bookmark | bookmark2)[]): selection;
-            selectElement(element: element): void;
-            selectRanges(ranges: range[]): void;
-            unlock(restore: boolean): void;
-        }
-
-        class text extends node {
-            readonly $: Text;
-            readonly type: number;
-
-            constructor(text: Text | string, ownerDocument?: document);
-            getLength(): number;
-            getText(): string;
-            setText(text: string): void;
-            split(offset: number): text;
-            substring(indexA: number, indexB?: number): void;
-        }
-
-        class walker {
-            evaluator: (node: node) => boolean;
-            guard: (node: node) => boolean;
-
-            static validEmptyBlockContainers: { [key: string]: any };
-
-            constructor(range: range);
-            checkBackward(): boolean;
-            checkForward(): boolean;
-            end(): void;
-            lastBackward(): node;
-            lastForward(): node;
-            next(): node;
-            previous(): node;
-            reset(): void;
-
-            static blockBoundary(customNodeNames: any): (node: node) => boolean;
-            static bogus(isReject?: boolean): (node: node) => boolean;
-            static bookmark(contentOnly?: boolean, isReject?: boolean): (node: node) => boolean;
-            static editable(isReject?: boolean): (node: node) => boolean;
-            static empty(isReject?: boolean): (node: node) => boolean;
-            static ignored(isReject?: boolean): (node: node) => boolean;
-            static invisible(isReject?: boolean): (node: node) => boolean;
-            static listItemBoundary(): (node: node) => boolean;
-            static nodeType(type: number, isReject?: boolean): (node: node) => boolean;
-            static temp(isReject?: boolean): (node: node) => boolean;
-            static whitespaces(isReject?: boolean): (node: node) => boolean;
-        }
-
-        interface position {
-            x: number;
-            y: number;
-        }
-
-        interface widthAndHeight {
-            width: number;
-            height: number;
-        }
-
-        class window extends domObject {
-            constructor(domWindow: Window);
-            focus(): void;
-            getViewPaneSize(): widthAndHeight;
-            getScrollPosition(): position;
-            getFrame(): element;
-        }
-    }
-
-
-    namespace ajax {
-        function load(url: string, callback?: (data: any) => void): string;
-        function loadXml(url: string, callback?: (data: any) => void): xml;
-        function post(url: string, data: any, contentType?: string, callback?: (data: any) => void): void;
-    }
-
-
-    class command extends event implements commandDefinition {
-        fakeKeystroke: number;
-        previousState: number;
-        state: number;
-        uiItems: any[];
-
-        // Methods
-        constructor(editor: editor, commandDefinition: commandDefinition);
-        checkAllowed(noCache: boolean): boolean;
-        disable(): void;
-        enable(): void;
-        exec(data?: { [key: string]: any }): boolean;
-        refresh(editor: editor, path: dom.elementPath): void;
-        setState(newState: number): boolean;
-        toggleState(): void;
-
-    }
-
-    interface commandDefinition {
-        async?: boolean;
-        canUndo?: boolean;
-        context?: boolean;
-        contextSensitive?: boolean;
-        editorFocus?: boolean;
-        fakeKeystroke?: number;
-        modes?: { [key: string]: any };
-        startDisabled?: boolean;
-        readOnly?: boolean;
-        exec(editor: editor, data?: any): boolean;
-        refresh?(editor: editor, path: dom.elementPath): void;
-    }
-
-    // https://docs.com/ckeditor4/latest/api/CKEDITOR_config.html
-    interface config {
-        allowedContent?: boolean | filter.allowedContentRules;
-        autoEmbed_widget?: string | ((url: string) => string);
-        autoGrow_bottomSpace?: number;
-        autoGrow_maxHeight?: number;
-        autoGrow_minHeight?: number;
-        autoGrow_onStartup?: boolean;
-        autoUpdateElement?: boolean;
-
-        baseFloatZIndex?: number;
-        baseHref?: string;
-        basicEntities?: boolean;
-        blockedKeystrokes?: number[];
-        bodyClass?: string;
-        bodyId?: string;
-        browserContextMenuOnCtrl?: boolean;
-
-        clipboard_defaultContentType?: 'html' | 'text';
-        clipboard_notificationDuration?: number;
-        cloudServices_tokenUrl?: string;
-        cloudServices_uploadUrl?: string;
-        codeSnippetGeshi_url?: string;
-        codeSnippet_codeClass?: string;
-        codeSnippet_languages?: { [key: string]: any };
-        coceSnippet_theme?: string;
-        colorButton_backStyle?: config.styleObject;
-        colorButton_colors?: string;
-        colorButton_colorsPerRow?: number;
-        colorButton_enableAutomatic?: boolean;
-        colorButton_enableMore?: boolean;
-        colorButton_foreStyle?: config.styleObject;
-        colorButton_normalizeBackground?: boolean;
-        contentsCss?: string | string[];
-        contentsLangDirection?: string;
-        contentsLanguage?: string;
-        copyFormatting_allowRules?: string;
-        copyFormatting_allowedContexts?: boolean | string[];
-        copyFormatting_keystrokeCopy?: number;
-        copyFormatting_keystrokePaste?: number;
-        copyFormatting_outerCursor?: boolean;
-        coreStyles_bold?: config.styleObject;
-        coreStyles_italic?: config.styleObject;
-        coreStyles_strike?: config.styleObject;
-        coreStyles_subscript?: config.styleObject;
-        coreStyles_superscript?: config.styleObject;
-        coreStyles_underline?: config.styleObject;
-        customConfig?: string;
-
-        dataIndentationChars?: string;
-        defaultLanguage?: string;
-        devtools_styles?: string;
-        devtools_textCallback?: (editor: editor, dialog: dialog, element: dom.element, tabName: string) => string;
-        dialog_backgroundCoverColor?: string;
-        dialog_backgroundCoverOpacity?: number;
-        dialog_buttonsOrder?: string;
-        dialog_magnetDistance?: number;
-        dialog_noConfirmCancel?: boolean;
-        dialog_startupFocusTab?: boolean;
-        disableNativeSpellChecker?: boolean;
-        disableNativeTableHandles?: boolean;
-        disableNativeObjectResizing?: boolean;
-        disableNativeReadonlyStyling?: boolean;
-        disallowedContent?: filter.disallowedContentRules;
-        div_wrapTable?: boolean;
-        docType?: string;
-
-        easyimage_class?: string;
-        easyimage_defaultStyle?: string;
-        easyimage_styles?: { [key: string]: any };
-        easyimage_toolbar?: string[] | string;
-        emailProtection?: string;
-        embed_provider?: string;
-        enableTabKeyTools?: boolean;
-        enterMode?: number;
-        entities?: boolean;
-        entities_additional?: string;
-        entities_greek?: boolean;
-        entities_latin?: boolean;
-        entities_processNumerical?: boolean | string;
-        extraAllowedContent?: filter.allowedContentRules;
-        extraPlugins?: string;
-
-        fileTools_defaultFileName?: string;
-        fileTools_requestHeaders?: { [key: string]: any };
-        filebrowserBrowseUrl?: string;
-        filebrowserFlashBrowseUrl?: string;
-        filebrowserFlashUploadUrl?: string;
-        filebrowserImageBrowseLinkUrl?: string;
-        filebrowserImageBrowseUrl?: string;
-        filebrowserImageUploadUrl?: string;
-        filebrowserUploadMethod?: string;
-        filebrowserUploadUrl?: string;
-        filebrowserWindowFeatures?: string;
-        filebrowserWindowHeight?: number | string;
-        filebrowserWindowWidth?: number | string;
-        fillEmptyBlocks?: boolean | ((element: htmlParser.element) => boolean);
-        find_highlight?: config.styleObject;
-        flashAddEmbedTag?: boolean;
-        flashConvertOnEdit?: boolean;
-        flashEmbedTagOnly?: boolean;
-        floatSpaceDockedOffsetX?: number;
-        floatSpaceDockedOffsetY?: number;
-        floatSpacePinnedOffsetX?: number;
-        floatSpacePinnedOffsetY?: number;
-        floatSpacePreferRight?: boolean;
-        fontSize_defaultLabel?: string;
-        fontSize_sizes?: string;
-        fontSize_style?: config.styleObject;
-        font_defaultLabel?: string;
-        font_names?: string;
-        font_style?: config.styleObject;
-        forceEnterMode?: boolean;
-        forcePasteAsPlainText?: boolean;
-        forceSimpleAmpersand?: boolean;
-        format_address?: config.styleObject;
-        format_div?: config.styleObject;
-        format_h1?: config.styleObject;
-        format_h2?: config.styleObject;
-        format_h3?: config.styleObject;
-        format_h4?: config.styleObject;
-        format_h5?: config.styleObject;
-        format_h6?: config.styleObject;
-        format_p?: config.styleObject;
-        format_pre?: config.styleObject;
-        format_tags?: string;
-        fullPage?: boolean;
-
-        grayt_autoStartup?: boolean;
-
-        height?: string | number;
-        htmlEncodeOutput?: boolean;
-
-        ignoreEmptyParagraph?: boolean;
-        image2_alignClasses?: string[];
-        image2_altRequired?: boolean;
-        image2_captionedClass?: string;
-        image2_disableResizer?: boolean;
-        image2_prefillDimensions?: boolean;
-        imageUploadUrl?: string;
-        image_prefillDimensions?: boolean;
-        image_previewText?: string;
-        image_removeLinkByEmptyUrl?: boolean;
-        indentClasses?: string[];
-        indentOffset?: number;
-        indentUnit?: string;
-
-        jqueryOverrideVal?: boolean;
-        justifyClasses?: string[];
-
-        keystrokes?: [number, string][];
-
-        language?: string;
-        language_list?: string[];
-        linkJavaScriptLinksAllowed?: boolean;
-        linkShowAdvancedTab?: boolean;
-        linkShowTargetTab?: boolean;
-
-        magicline_color?: string
-        magicline_everywhere?: boolean;
-        magicline_holdDistance?: number;
-        magicline_keystrokeNext?: number;
-        magicline_keystrokePrevious?: number;
-        magicline_tabuList?: string[];
-        magicline_triggerOffset?: number;
-        mathJaxClass?: string;
-        mathJaxLib?: string;
-        menu_groups?: string;
-        menu_subMenuDelay?: number;
-
-        newpage_html?: string;
-        notification_duration?: number;
-
-        on?: editor.eventObject;
-
-        pasteFilter?: string;
-        pasteFromWordCleanupFile?: string;
-        pasteFromWordNumberedHeadingToList?: boolean;
-        pasteFromWordPromptCleanup?: boolean;
-        pasteFromWordRemoveFontStyles?: boolean;
-        pasteFromWorkRemoveStyles?: boolean;
-        pasteFromWord_heuristicsEdgeList?: boolean;
-        pasteFromWord_inlineImages?: boolean;
-        plugins?: string;
-        protectedSource?: RegExp[];
-
-        readOnly?: boolean;
-        removeButtons?: string;
-        removeDialogTabs?: string;
-        removeFormatAttributes?: string;
-        removeFormatTags?: string;
-        removePlugins?: string;
-        resize_dir?: string;
-        resize_enabled?: boolean;
-        resize_maxHeight?: number;
-        resize_maxWidth?: number;
-        resize_minHeight?: number;
-        resize_minWidth?: number;
-
-        scayt_autoStartup?: boolean;
-        scayt_contextCommands?: string;
-        scayt_contextMenuItemsOrder?: string;
-        scayt_customDictionaryIds?: string;
-        scayt_customerId?: string;
-        scayt_disableOptionsStorage?: string | string[];
-        scayt_elementsToIgnore?: string;
-        scayt_handleCheckDirty?: string;
-        scayt_handleUndoRedo?: string;
-        scayt_ignoreAllCapsWords?: boolean;
-        scayt_ignoreDomainNames?: boolean;
-        scayt_ignoreWordsWithMixedCases?: boolean;
-        scayt_ignoreWordsWithNumbers?: boolean;
-        scayt_inlineModeImmediateMarkup?: boolean;
-        scayt_maxSuggestions?: number;
-        scayt_minWordLength?: number;
-        scayt_moreSuggestions?: string;
-        scayt_multiLanguageMode?: boolean;
-        scayt_multiLanguageStyles?: { [key: string]: any };
-        scayt_sLang?: string;
-        scayt_serviceHost?: string;
-        scayt_servicePath?: string;
-        scayt_servicePort?: string;
-        scayt_serviceProtocol?: string;
-        scayt_srcUrl?: string;
-        scayt_uiTabs?: string;
-        scayt_userDictionaryName?: string;
-
-        sharedSpaces?: sharedSpace;
-        shiftEnterMode?: number;
-        skin?: string;
-        smiley_columns?: number;
-        smiley_descriptions?: string[];
-        smiley_images?: string[];
-        smiley_path?: string;
-        sourceAreaTabSize?: number;
-        specialChars?: (string | [string, string])[];
-        startupFocus?: string | boolean;
-        startupMode?: string;
-        startupOutlineBlocks?: boolean;
-        startupShowBorders?: boolean;
-        stylesSet?: string | boolean | config.styleObject[];
-        stylesheetParser_skipSelectors?: RegExp;
-        stylesheetParser_validSelectors?: RegExp;
-
-        tabIndex?: number;
-        tabSpaces?: number;
-        templates?: string;
-        templates_files?: { [key: string]: any };
-        templates_replaceContent?: boolean;
-        title?: string | boolean;
-        toolbar?: string | (string | string[] | { name: string, items?: string[], groups?: string[] })[] | null;
-        toolbarCanCollapse?: boolean;
-        toolbarGroupCycling?: boolean;
-        toolbarGroups?: (toolbarGroups | string)[];
-        toolbarLocation?: string;
-        toolbarStartupExpanded?: boolean;
-
-        uiColor?: string;
-        undoStackSize?: number;
-        uploadUrl?: string;
-        useComputedState?: boolean;
-
-        width?: string | number;
-        wsc_cmd?: string;
-        wsc_customDictionaryIds?: string;
-        wsc_customLoaderScript?: string;
-        wsc_customerId?: string;
-        wsc_height?: string;
-        wsc_lang?: string;
-        wsc_left?: string;
-        wsc_top?: string;
-        wsc_userDictionaryName?: string;
-        wsc_width?: string;
-    }
-
-    interface dataProcessor {
-        toDataFormat(html: string, fixForBody: string): void;
-        toHtml(data: string, fixForBody?: string): void;
-    }
-
-    class dialog {
-        readonly state: number;
-
-        constructor(editor: editor, dialogName: string);
-
-        addFocusable(element: dom.element, index?: number): void;
-        addPage(contents: { [key: string]: any }): void;
-        click(id: string): any;
-        commitContent(): void;
-        diableButton(id: string): void;
-        enableButton(id: string): void;
-        foreach(fn: () => void): dialog;
-        getButton(id: string): ui.dialog.button;
-        getContentElement(pageId: string, elementId: string): ui.dialog.uiElement;
-        getElement(): dom.element;
-        getName(): string;
-        getPageCount(): number;
-        getParentEditor(): editor;
-        getPosition(): { [key: string]: any };
-        getSelectedElement(): dom.element;
-        getSize(): { [key: string]: any };
-        getValueOf(pageId: string, elementId: string): any;
-        hide(): void;
-        hidePage(id: string): void;
-        layout(): void;
-        move(x: number, y: number, save: boolean): void;
-        reset(): dialog;
-        resize(width: number, height: number): void;
-        selectPage(id: string): void;
-        setState(state: number): void;
-        setValueOf(pageId: string, elementId: string, value: any): void;
-        setupContent(): void;
-        show(): void;
-        showPage(id: string): void;
-        updateStyle(): void;
-
-        static add(name: string, dialogDefinition: string | ((editor: editor) => dialog.IDialogDefinition)): void;
-        static addIframe(name: string, title: string, minWidth: number, minHeight: number, onContentLoad?: () => void, userDefinition?: { [key: string]: any }): void;
-        static addUIElement(typeName: string, builder: () => void): void;
-        static cancelButton(): void;
-        static exists(name: string | number): void; // NOTE: documentation says object, but it's an array accessor, so really a string or number will work
-        static getCurrent(): dialog;
-        static isTabEnabled(editor: editor, dialogName: string, tabName: string): boolean;
-        static okButton(): void;
-    }
-
-    namespace dialog {
-
-        namespace definition {
-
-            interface button extends uiElement {
-                disabled?: boolean;
-            }
-
-            interface checkbox extends uiElement {
-                default?: string;
-                validate?: () => boolean;
-            }
-
-            interface content {
-                accessKey?: string;
-                elements?: dialog.definition.uiElement[];
-                id?: string;
-                label?: string;
-                title?: string;
-            }
-
-            interface file extends labeledElement {
-                action?: string;
-                size?: string;
-                validate?: () => boolean;
-            }
-
-            interface fileButton extends uiElement {
-                filebrowser?: string;
-                for?: string;
-                validate?: () => boolean;
-            }
-
-            interface hbox extends uiElement {
-                children?: ui.dialog.uiElement[];
-                height?: number;
-                padding?: number;
-                validate?: () => boolean;
-                widths?: number[];
-            }
-
-            interface html extends uiElement {
-                html?: string;
-            }
-
-            interface labeledElement extends uiElement {
-                controlStyle?: string;
-                inputStyle?: string;
-                labelLayout?: string;
-                labelStyle?: string;
-                widths?: number[];
-            }
-
-            interface radio extends labeledElement {
-                default?: string;
-                items?: string[] | (string[])[];
-                validate?: () => boolean;
-            }
-
-            interface select extends labeledElement {
-                default?: string;
-                items?: string[] | (string[])[];
-                multiple?: boolean;
-                size?: number;
-                validate?: () => boolean;
-            }
-
-            interface textarea extends labeledElement {
-                bidi?: boolean;
-                cols?: number;
-                default?: string;
-                rows?: number;
-                validate?: () => boolean;
-            }
-
-            interface textInput extends labeledElement {
-                bidi?: boolean;
-                default?: string;
-                maxLength?: number;
-                size?: number;
-                validate?: () => boolean;
-            }
-
-            interface uiElement {
-                align?: string;
-                className?: string;
-                commit?: (widget: plugins.widget) => void;
-                id?: string;
-                label?: string;
-                onHide?: (elem: ui.dialog.uiElement) => void;
-                onLoad?: (elem: ui.dialog.uiElement) => void;
-                onShow?: (elem: ui.dialog.uiElement) => void;
-                requiredContent?: string | { [key: string]: any } | style;
-                setup?: (widget: plugins.widget) => void;
-                style?: string;
-                title?: string;
-                type?: string;
-            }
-
-            interface vbox extends uiElement {
-                children?: ui.dialog.uiElement[];
-                expand?: boolean;
-                heights?: number[];
-                padding?: number;
-                styles?: string;
-                width?: number[];
-            }
-        }
-
-        interface IDialogDefinition {
-            buttons?: dialog.definition.button[];
-            contents?: dialog.definition.content[];
-            height?: number;
-            minHeight?: number;
-            minWidth?: number;
-            onCancel?: () => void;
-            onLoad?: () => void;
-            onOk?: () => void;
-            onShow?: () => void;
-            onHide?: () => void;
-            resizable?: number;
-            title?: string;
-            width?: number;
-        }
-    }
-
-    class dialogCommand {
-        value: any;
-
-        constructor(dialogName: string, ext?: { tabId?: string });
-    }
-
-    interface dtdDefinition {
-        [outerTagName: string]: {[innerTagName: string]: 1};
-        $block:          {[tagName: string]: 1};
-        $blockLimit:     {[tagName: string]: 1};
-        $cdata:          {[tagName: string]: 1};
-        $editable:       {[tagName: string]: 1};
-        $empty:          {[tagName: string]: 1};
-        $inline:         {[tagName: string]: 1};
-        $intermediate:   {[tagName: string]: 1};
-        $list:           {[tagName: string]: 1};
-        $listItem:       {[tagName: string]: 1};
-        $nonBodyContent: {[tagName: string]: 1};
-        $nonEditable:    {[tagName: string]: 1};
-        $object:         {[tagName: string]: 1};
-        $removeEmpty:    {[tagName: string]: 1};
-        $tabIndex:       {[tagName: string]: 1};
-        $tableContent:   {[tagName: string]: 1};
-        $transparent:    {[tagName: string]: 1};
-    }
-
-    var dtd: dtdDefinition;
-    
-    class editable extends dom.element {
-        hasFocus: boolean;
-        readonly status: string;
-
-        constructor(editor: editor, element: HTMLElement | dom.element);
-        attachClass(className: string): void;
-        attachListener(obj: event | editable, eventName: string, listenerFunction: (ei: eventInfo) => void, scopeobj?: {}, listenerData?: any, priority?: number): listenerRegistration;
-        changeAttr(attr: string, val: string): void;
-        detach(): void;
-        insertElement(element: dom.element, range?: dom.range): void;
-        insertHtml(data: string, mode?: string, range?: dom.range): void;
-        insertText(text: dom.text): void;
-        isInline(): boolean;
-        setReadOnly(isReadOnly: boolean): void;
-    }
-
-    class editor extends event {
-        readonly activeEnterMode: number;
-        readonly activeFilter: filter;
-        readonly activeShiftEnterMode: number;
-        readonly blockless: boolean;
-        readonly config: config;
-        readonly container: dom.element;
-        readonly contextMenu: plugins.contextMenu;
-        copyFormatting: plugins.copyformatting.state;
-        dataProcessor: dataProcessor;
-        readonly document: dom.document;
-        readonly element: dom.element;
-        readonly elementMode: number;
-        readonly enterMode: number;
-        readonly filter: filter;
-        readonly focusManager: focusManager;
-        readonly id: string;
-        readonly keystrokeHandler: keystrokeHandler;
-        readonly lang: any;
-        readonly langCode: string;
-        readonly mode: string;
-        readonly name: string;
-        readonly pasteFilter: filter;
-        readonly plugins: any;
-        readonly readOnly: boolean;
-        readonly shiftEnterMode: number;
-        readonly status: string;
-        readonly tabIndex: number;
-        readonly templates: any;
-        readonly title: any;
-        readonly toolbar: any;
-        readonly ui: ui;
-        readonly widgets: plugins.widget.repository;
-        readonly window: dom.window;
-
-        constructor(instanceConfig?: config, element?: dom.element, mode?: number);
-        addCommand(commandName: string, commandDefinition: commandDefinition): void;
-        addContentsCss(cssPath: string): void;
-        addFeature(feature: feature): boolean;
-        addMenuGroup(name: string, order?: number): void;
-        addMenuItem(name: string, definition?: IMenuItemDefinition): void;
-        addMenuItems(definitions: { [id:string]: IMenuItemDefinition }): void;
-        addMode(mode: string, exec: () => void): void;
-        addRemoveFormatFilter(func: (element: dom.element) => boolean): void;
-        applyStyle(style: style): void;
-        attachStyleStateChange(style: style, callback: (state: number) => void): void;
-        checkDirty(): boolean;
-        createFakeElement(realElement: dom.element, className: string, realElementType: string, isResizable: boolean): void;
-        createFakeParserElement(realElement: dom.element, className: string, realElementType: string, isResizable: boolean): void;
-        createRange(): dom.range;
-        destroy(noUpdate?: boolean): void;
-        editable(elementOrEditable?: dom.element | editable): editable;
-        elementPath(startNode?: dom.node): dom.elementPath;
-        execCommand(commandName: string, data?: any): boolean;
-        extractSelectedHtml(toString?: boolean, removeEmptyBlock?: boolean): dom.documentFragment | string | void;
-        focus(): void;
-        forceNextSelectionCheck(): void;
-        getClipboardData(callbackOrOptions: { title: string } | ((data: any) => void), callback: (data: any) => void): void;
-        getColorFromDialog(callback: (color: string) => void, scope?: { [key: string]: any }): void;
-        getCommand(commandName: string): command;
-        getCommandKeystroke(command: command | string): number | null;
-        getData(internal: boolean): string;
-        getMenuItem(name: string): IMenuItemDefinition;
-        getResizable(forContents: boolean): dom.element;
-        getSelectedHtml(toString?: false): dom.documentFragment;
-        getSelectedHtml(toString: true): string;
-        getSelectedHtml(toString?: boolean): dom.documentFragment | string;
-        getSelection(forceRealSelection: boolean): dom.selection;
-        getSnapshot(): string;
-        getStylesSet(callback: (stylesDefinitions: style.definition[]) => void): void;
-        getUiColor(): string;
-        insertElement(element: dom.element): void;
-        insertHtml(html: string, mode?: string, range?: dom.range): void;
-        insertText(text: string): void;
-        loadSnapshot(snapshot: any): void;
-        lockSelection(sel?: dom.selection): boolean;
-        openDialog(dialogName: string, callback: () => void): dialog;
-        popup(url: string, width?: number | string, height?: number | string, options?: string): void;
-        removeMenuItem(name: string): void;
-        removeStyle(style: style): void;
-        resetDirty(): void;
-        resetUndo(): void;
-        resize(width: number | string, height: number | string, isContentHeight?: boolean, resizeInner?: boolean): void;
-        restoreRealElement(fakeElement: dom.element): dom.element;
-        selectionChange(checkNow?: boolean): void;
-        setActiveEnterMode(enterMode: number, shiftEnterMode: number): void;
-        setActiveFilter(filter: filter): void;
-        setData(data: string, options?: { internal?: boolean; callback?: () => void; noSnapshot?: boolean; }): void;
-        setKeystroke(keystroke: number, behavior: string | boolean): void;
-        setKeystroke(keystroke: [number, string | boolean][]): void;
-        setMode(newMode: string, callback: () => void): void;
-        setReadOnly(isReadOnly?: boolean): void;
-        setUiColor(color: string): void;
-        showNotification(message: string, type: plugins.notification.type, progressOrDuration: number): plugins.notification;
-        unlockSelection(restore?: boolean): void;
-        updateElement(): void;
-    }
-
-    namespace editor {
-        interface eventObject {
-            activeEnterModeChange?: (evt: eventInfo) => void;
-            activeFilterChange?: (evt: eventInfo) => void;
-            afterCommandExec?: (evt: eventInfo) => void;
-            afterInsertHtml?: (evt: eventInfo) => void;
-            afterPaste?: (evt: eventInfo) => void;
-            afterPasteFromWord?: (evt: eventInfo) => void;
-            afterSetData?: (evt: eventInfo) => void;
-            afterUndoImage?: (evt: eventInfo) => void;
-            ariaEditorHelpLabel?: (evt: eventInfo) => void;
-            ariaWidget?: (evt: eventInfo) => void;
-            autogrow?: (evt: eventInfo) => void;
-
-            beforeCommandExec?: (evt: eventInfo) => void;
-            beforeDestroy?: (evt: eventInfo) => void;
-            beforeGetData?: (evt: eventInfo) => void;
-            beforeModeUnload?: (evt: eventInfo) => void;
-            beforeSetMode?: (evt: eventInfo) => void;
-            beforeUndoImage?: (evt: eventInfo) => void;
-            blur?: (evt: eventInfo) => void;
-
-            change?: (evt: eventInfo) => void;
-            configLoaded?: (evt: eventInfo) => void;
-            contentDirChanged?: (evt: eventInfo) => void;
-            contentDom?: (evt: eventInfo) => void;
-            contentDomInvalidated?: (evt: eventInfo) => void;
-            contentDomUnload?: (evt: eventInfo) => void;
-            customConfigLoaded?: (evt: eventInfo) => void;
-
-            dataFiltered?: (evt: eventInfo) => void;
-            dataReady?: (evt: eventInfo) => void;
-            destroy?: (evt: eventInfo) => void;
-            dialogHide?: (evt: eventInfo) => void;
-            dialogShow?: (evt: eventInfo) => void;
-            dirChanged?: (evt: eventInfo) => void;
-            doubleclick?: (evt: eventInfo) => void;
-            dragend?: (evt: eventInfo) => void;
-            dragstart?: (evt: eventInfo) => void;
-            drop?: (evt: eventInfo) => void;
-
-            elementsPathUpdate?: (evt: eventInfo) => void;
-
-            fileUploadRequest?: (evt: eventInfo) => void;
-            fileUploadResponse?: (evt: eventInfo) => void;
-            floatingSpaceLayout?: (evt: eventInfo) => void;
-            focus?: (evt: eventInfo) => void;
-
-            getData?: (evt: eventInfo) => void;
-            getSnapshot?: (evt: eventInfo) => void;
-
-            insertElement?: (evt: eventInfo) => void;
-            insertHtml?: (evt: eventInfo) => void;
-            insertText?: (evt: eventInfo) => void;
-            instanceReady?: (evt: eventInfo) => void;
-
-            key?: (evt: eventInfo) => void;
-
-            langLoaded?: (evt: eventInfo) => void;
-            loadSnapshot?: (evt: eventInfo) => void;
-            loaded?: (evt: eventInfo) => void;
-            lockSnapshot?: (evt: eventInfo) => void;
-            maximize?: (evt: eventInfo) => void;
-            menuShow?: (evt: eventInfo) => void;
-            mode?: (evt: eventInfo) => void;
-
-            notificationHide?: (evt: eventInfo) => void;
-            notificationShow?: (evt: eventInfo) => void;
-            notificationUpdate?: (evt: eventInfo) => void;
-
-            paste?: (evt: eventInfo) => void;
-            pasteFromWord?: (evt: eventInfo) => void;
-            pluginsLoaded?: (evt: eventInfo) => void;
-
-            readOnly?: (evt: eventInfo) => void;
-            removeFormatCleanup?: (evt: eventInfo) => void;
-            required?: (evt: eventInfo) => void;
-            resize?: (evt: eventInfo) => void;
-
-            save?: (evt: eventInfo) => void;
-            saveSnapshot?: (evt: eventInfo) => void;
-            selectionChange?: (evt: eventInfo) => void;
-            setData?: (evt: eventInfo) => void;
-            stylesSet?: (evt: eventInfo) => void;
-
-            template?: (evt: eventInfo) => void;
-            toDataFormat?: (evt: eventInfo) => void;
-            toHtml?: (evt: eventInfo) => void;
-
-            unlockSnapshot?: (evt: eventInfo) => void;
-            updateSnapshot?: (evt: eventInfo) => void;
-
-            widgetDefinition?: (evt: eventInfo) => void;
-        }
-    }
-
-    namespace env {
-        var air: boolean;
-        var chrome: boolean;
-        var cssClass: string;
-        var edge: boolean;
-        var gecko: boolean;
-        var hc: boolean;
-        var hidpi: boolean;
-        var iOS: boolean;
-        var ie: boolean;
-        var isCompatible: boolean;
-        var mac: boolean;
-        var needsBrFiller: boolean;
-        var needsNbspFiller: boolean;
-        var quirks: boolean;
-        var safari: boolean;
-        var version: number;
-        var webkit: boolean;
-
-        function secure(): boolean;
-    }
-
-    class event {
-        static useCapture: boolean;
-        
-        constructor();
-        capture(): void;
-        define(name: string, meta: { [key: string]: any }): void;
-        fire(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
-        fireOnce(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
-        hasListeners(eventName: string): boolean;
-        on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any } | null, listenerData?: any, priority?: number): listenerRegistration;
-        once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any } | null, listenerData?: any, priority?: number): listenerRegistration;
-        removeAllListeners(): void;
-        removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
-
-        static implementOn(targetObject: { [key: string]: any }): void;
-    }
-
-    interface eventInfo {
-        data: any;
-        editor: editor;
-        listenerData: any;
-        name: string;
-        sender: { [key: string]: any };
-        
-        cancel(): void;
-        removeListener(): void;
-        stop(): void;
-    }
-
-    interface feature {
-        allowedContent?: filter.allowedContentRules;
-        contentForms?: any;
-        contentTransformations?: any;
-        name?: string;
-        requiredContent?: string | style;
-        toFeature?: () => feature;
-    }
-
-    namespace fileTools {
-        var isFileUploadSupported: boolean;
-
-        function addUploadWidget(editor: editor, name: string, def: uploadWidgetDefinition): void;
-        function bindNotification(editor: editor, fileLoader: fileLoader): void;
-        function getUploadUrl(config: { [key: string]: any }, type?: string): string;
-        function isTypeSupported(file: Blob, supportedTypes: RegExp): boolean;
-        function markElement(element: dom.element, widgetName: string, loaderId: number): void;
-
-        class fileLoader extends event {
-            readonly data: string;
-            readonly file: Blob;
-            readonly fileName: string;
-            readonly id: number;
-            readonly loaded: number;
-            readonly message: string;
-            readonly reader: FileReader;
-            readonly responseData: any;
-            status: string;
-            readonly total: number;
-            readonly uploadTotal: number;
-            readonly uploadUrl: string;
-            readonly uploaded: string;
-            readonly url: string;
-            readonly xhr: XMLHttpRequest;
-
-            constructor(editor: editor, fileOrData: Blob | string, fileName?: string);
-            abort(): void;
-            isFinished(): boolean;
-            load(): void;
-            loadAndUpload(url: string, additionalRequestParameters?: any): void;
-            update(): void;
-            upload(url: string, additionalRequestParameters?: any): void;
-        }
-
-        class uploadRepository extends event {
-            readonly loaders: fileLoader[];
-
-            constructor(editor: editor);
-            create(fileOrData: Blob | string, fileName: string, loaderType?: any): fileLoader;
-            isFinished(): boolean;
-        }
-
-        interface uploadWidgetDefinition extends plugins.widget.definition {
-            additionalRequestParameters: any;
-            fileToElement: (pastedFile: any) => HTMLElement;
-            loadMethod: string;
-            loaderType: any;
-            onAbort: () => boolean;
-            onError: () => boolean;
-            onLoaded: () => boolean;
-            onUploaded: () => boolean;
-            onUploading: () => boolean;
-            replaceWith: () => any;
-            skipNotifications: boolean;
-            supportedTypes: string;
-            uploadUrl: string;
-        }
-    }
-
-    module filter {
-        type allowedContentRule = string | style | { [key: string]: any};
-        type allowedContentRules = allowedContentRule | allowedContentRule[];
-        type contentRule = string | style;
-        type disallowedContentRules = string | { [key: string]: any};
-
-        interface transformation {
-            check?: string;
-            element?: string | style;
-            left?: (element: htmlParser.element | style) => boolean;
-            right: (element: htmlParser.element, tools: string | filter.transformationTools) => boolean;
-        }
-
-        var transformationTools: transformationTools;
-
-        interface transformationTools {
-            alignmentToAttribute(element: htmlParser.element): void;
-            alignmentToStyle(element: htmlParser.element): void;
-            lengthToAttribute(element: htmlParser.element, styleName: string, attrName?: string): void;
-            lengthToStyle(element: htmlParser.element, styleName: string, attrName?: string): void;
-            matchesTyle(element: htmlParser.element, style: style): void;
-            sizeToAttribute(element: htmlParser.element): void;
-            sizeToStyle(element: htmlParser.element): void;
-            splitBorderShorthand(element: htmlParser.element): void;
-            splitMarginShorthand(element: htmlParser.element): void;
-            transform(element: htmlParser.element, form: style | string): void;
-        }
-    }
-
-    class filter {
-        readonly allowedContent: filter.allowedContentRules[];
-        readonly customConfig: boolean;
-        readonly disabled: boolean;
-        readonly disallowedContent: any[];
-        readonly editor: editor;
-        readonly elementCallbacks:((element: htmlParser.element) => number)[];
-        readonly id: number;
-
-        static instances: { [id: string]: filter };
-
-        constructor(editorOrRules: editor | filter.allowedContentRules);
-        addContentForms(forms: any[]): void;
-        addElementCallback(callback: (element: htmlParser.element) => number): void;
-        addFeature(feature: feature): boolean;
-        addTransformations(transformations: (string | filter.transformation)[][]): void;
-        allow(newRules: filter.allowedContentRules, featureName?: string, overrideCustom?: boolean): boolean;
-        applyTo(fragment: htmlParser.fragment | htmlParser.element, toHrml: boolean, transformOnly: boolean, enterMode: number): boolean;
-        check(test: filter.contentRule, applyTransformations?: boolean, strictCheck?: boolean): boolean;
-        checkFeature(feature: feature): boolean;
-        clone(): filter;
-        destroy(): void;
-        disable(): void;
-        disallow(newRules: filter.disallowedContentRules): void;
-        getAllowedEnterMode(defaultMode: number, reverse?: boolean): number;
-    }
-
-    class focusManager {
-        currentActive: dom.domObject;
-        hasFocus: boolean;
-
-        constructor(editor: editor);
-        add(element: dom.element, isCapture: boolean): void;
-        blur(noDelay?: boolean): void;
-        focus(currentActive?: dom.element): void;
-        lock(): void;
-        remove(element: dom.element): void;
-        unlock(): void;
-    }
-
-    class htmlDataProcessor implements dataProcessor {
-        dataFilter: htmlParser.filter;
-        htmlFilter: htmlParser.filter;
-        writer: htmlParser.basicWriter;
-
-        constructor(editor: editor);
-        toDataFormat(html: string, options?: string | { context?: string, filter?: filter, enterMode?: number }): string;
-        toHtml(data: string, options?: string | htmlDataProcessorOptions): string;
-    }
-
-    interface htmlDataProcessorOptions {
-        context?: string;
-        fixForBody?: boolean;
-        filter?: filter;
-        dontFilter?: boolean;
-        enterMode?: number;
-        protectedWhitespaces?: boolean;
-    }
-
-    namespace htmlParser {
-        class basicWriter {
-            constructor();
-            attribute(attName: string, attValue: string): void;
-            closeTag(tagName: string): void;
-            comment(comment: string): void;
-            getHtml(reset: boolean): string;
-            openTag(tagName: string, attributes: { [key: string]: string }): void;
-            openTagClose(tagName: string, isSelfClose: boolean): void;
-            reset(): void;
-            text(text: string): void;
-            write(data: string): void;
-        }
-
-        class cdata extends node {
-            constructor(value: string);
-            type: number;
-            writeHtml(writer: htmlParser.basicWriter): void;
-        }
-
-        class comment extends node {
-            type: number;
-            value: string;
-
-            constructor(value: string);
-            filter(filter: filter): boolean;
-            writeHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
-        }
-
-        class cssStyle {
-            constructor(elementOrStyleText: htmlParser.element | string);
-            populate(obj: htmlParser.element | dom.element | { [key: string]: any}): void;
-        }
-
-        class element extends node {
-            attributes: { [name: string]: string };
-            children: htmlParser.node[];
-            name: string;
-            type: number;
-
-            constructor(name: string, attributes: { [name: string]: string });
-            add(node: node, index?: number): void;
-            addClass(className: string): void;
-            clone(): element;
-            filter(filter: htmlParser.filter): boolean;
-            filterChildren(filter: htmlParser.filter): void;
-            find(criteria: string | ((el: htmlParser.node) => boolean), recursive?: boolean): htmlParser.node[];
-            forEach(callback: (node: htmlParser.node) => void | boolean, type?: number, skipRoot?: boolean): void;
-            getFirst(condition: string | { [key: string]: string } | ((node: htmlParser.node) => boolean)): htmlParser.node;
-            getHtml(): string;
-            getOuterHtml(): string;
-            hasClass(className: string): boolean;
-            removeClass(className: string): void;
-            replaceWithChildren(): void;
-            setHtml(html: string): void;
-            split(index: number): htmlParser.element;
-            writeChildrenHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
-            writeHtml(writer: basicWriter, filter?: htmlParser.filter): void;
-        }
-
-        class filter {
-            attributeNameRules: filterRulesGroup;
-            attributesRules: { [name: string]: filterRulesGroup };
-            commentRules: filterRulesGroup;
-            elementNameRules: filterRulesGroup;
-            elementsRules: { [name: string]: filterRulesGroup };
-            id: number;
-            rootRules: filterRulesGroup;
-            textRules: filterRulesGroup;
-
-            constructor(rules?: filterRulesDefinition);
-            addRules(rules: filterRulesDefinition, options?: number | { priority?: number; applyToAll?: boolean; }): void;
-            applyTo(node: node): void;
-        }
-
-        interface filterRulesDefinition {
-            elementNames: any;
-            attributeNames: any;
-            elements: any;
-            attributes: any;
-            text: any;
-            comment: any;
-            root: any;
-        }
-
-        class filterRulesGroup {
-            rules: { value: rule, priority: number, option: ruleOptions }[];
-
-            add(rule: rule, priority: number, options: ruleOptions): void;
-            addMany(rules: { [key: string]: any }[], priority: number, options: ruleOptions): void;
-            exec(currentValue: htmlParser.node | htmlParser.fragment | string): htmlParser.node | htmlParser.fragment | string;
-            execOnName(currentName: string): string;
-            findIndex(priority: number): number;
-        }
-
-        class fragment {
-            children: htmlParser.node[];
-            parent: htmlParser.fragment;
-            readonly type: number;
-
-            constructor();
-
-            add(node: htmlParser.node, index?: number): void;
-            filter(filter: htmlParser.filter): void;
-            filterChildren(filter: htmlParser.filter, filterRoot?: boolean): void;
-            forEach(callback: (node: htmlParser.node,) => void | boolean, type?: number, skipRoot?: boolean): void;
-            writeChildrenHtml(writer: basicWriter, filter?: htmlParser.filter, filterRoot?: boolean): void;
-            writeHtml(writer: basicWriter, filter?: htmlParser.filter): void;
-
-            static fromBBCode(source: string): htmlParser.fragment;
-            static fromHtml(fragmentHtml: string, parent?: htmlParser.element | string, fixingBlock?: string | boolean): fragment | htmlParser.element;
-        }
-
-        class node {
-            constructor();
-            getAscendant(condition: string | { [name: string]: string | ((node: htmlParser.element) => boolean)}): element;
-            getIndex(): number;
-            insertAfter(node: node): void;
-            insertBefore(node: node): void;
-            remove(): node;
-            replaceWith(node: node): void;
-            wrapWith(wrapper: element): element;
-        }
-
-        type rule = ((value: htmlParser.node | htmlParser.fragment | string) => boolean) | [ string, string ];
-
-        interface ruleOptions {
-            applyToAll?: boolean,
-            excludeNestedEditable?: boolean
-        }
-
-        class text extends node {
-            constructor(value: string);
-            type: number;
-            filter(filter: filter): boolean;
-            writeHtml(writer: basicWriter, filter?: filter): void;
-        }
-    }
-
-    class htmlWriter extends htmlParser.basicWriter {
-        indentationChars: string;
-        lineBreakChars: string;
-        selfClosingEnd: string;
-
-        indentation(): void;
-        lineBreak(): void;
-        setRules(tagName: string, rules: { [key: string]: any }): void;
-    }
-
-    class keystrokeHandler {
-        blockedKeystrokes: { [key: number]: string | boolean };
-        keystrokes: { [key: number]: string | boolean };
-
-        constructor(editor: editor);
-
-        attach(domObject: dom.domObject): void;
-    }
-
-    namespace lang {
-        var languages: { [code: string]: number };
-        var rtl: { [code: string]: number };
-
-        function detect(defaultLanguage: string, probeLanguage?: string): string;
-        function load(languageCode: string, defaultLanguage: string, callback: (code: string, entries: any) => void): void;
-    }
-
-    namespace loader {
-        var loadedScripts: string[];
-        var scripts: string[];
-
-        function load(scriptName: string, defer?: boolean): void;
-        function loadPending(): void;
-    }
-
-    class menu {
-        constructor();
-
-        add(item: any): void;
-        addListener(listenerFn: (startElement: dom.element, selection: dom.selection, path: dom.elementPath) => any): void;
-        findItemByCommandName(commandName: string): { item: any, element: dom.element };
-        hide(returnFocus?: boolean): void;
-        removeAll(): void;
-        show(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
-    }
-
-    interface pluginDefinition {
-        hidpi?: boolean;
-        lang?: string | string[];
-        requires?: string | string[];
-
-        afterInit?(editor: editor): any;
-        beforeInit?(editor: editor): any;
-        init?(editor: editor): void;
-        onLoad?(): any;
-    }
-
-    namespace plugins {
-
-        namespace cloudservices {
-            class cloudServicesLoader extends fileTools.fileLoader {
-                customToken: string;
-
-                constructor(editor: editor, fileOrData: Blob | string, fileName?: string, token?: string);
-                loadAndUpload(url?: string, additionalRequestParameters?: any): void;
-                upload(url?: string, additionalRequestParameters?: any): void;
-            }
-        }
-
-        class autoEmbed {
-            getWidgetDefinition(editor: editor, url: string): widget.definition;
-        }
-
-        namespace balloontoolbar {
-            const PRIORITY: { [pri: string]: number };
-
-            class context {
-                editor: editor;
-                options: contextDefinition;
-                toolbar: ui.balloonToolbar;
-
-                constructor(editor: editor, options: contextDefinition);
-                destroy(): void;
-                hide(): void;
-                refresh(): void;
-                show(pointedElement?: dom.element): void;
-            }
-
-            interface contextDefinition {
-                cssSelector?: string;
-                priority?: number;
-                widgets?: string[] | string;
-
-                refresh?: (editor: editor, path: dom.elementPath, selection: dom.selection) => dom.element;
-            }
-
-            class contextManager {
-                editor: editor;
-
-                constructor(editor: editor);
-                add(context: context): void;
-                check(selection?: dom.selection): void;
-                create(options: contextDefinition): context;
-                destroy(): void;
-                hide(): void;
-            }
-        }
-
-        namespace clipboard {
-            const isCustomCopyCutSupported: boolean;
-            const isCustomDataTypesSupported: boolean;
-            const isFileApiSupported:  boolean;
-            const mainPasteEvent: string;
-
-            function addPasteButton(editor: editor, name: string, definition: { [key: string]: any}): void;
-            function canClipboardApiBeTrusted(dataTransfer: dataTransfer, editor: editor): boolean;
-            function getDropTarget(editor: editor): dom.domObject;
-            function getRangeAtDropPosition(domEvent: Event, editor: editor): dom.range;
-            function initDragDataTransfer(evt?: dom.event, editor?: editor): void;
-            function initPasteDataTransfer(evt?: dom.event, sourceEditor?: editor): void;
-            function preventDefaultDropOnElement(element: dom.element): void;
-            function resetDragDataTransfer(): void;
-
-            class dataTransfer {
-                readonly $: DataTransfer;
-                readonly id: string;
-                readonly sourceEditor: editor;
-
-                constructor(nativeDataTransfer?: DataTransfer, editor?: editor);
-                cacheData(): void;
-                getData(type: string, getNative?: boolean): string;
-                getFile(i: number): File;
-                getFilesCount(): number;
-                getTransferType(targetEditor: editor): number;
-                isEmpty(): boolean;
-                setData(type: string, value: string): void;
-                storeId(): void;
-            }
-
-            class fallbackDataTransfer {
-                constructor(dataTransfer: dataTransfer);
-                getData(type: string, getNative?: boolean): string;
-                isRequired(): boolean;
-                setData(type: string, value: string): string;
-            }
-        }
-
-        namespace condesnippet {
-            function setHighlighter(highlighter: highlighter): void;
-
-            class highlighter {
-                highlighter: (code: string, lang: string, callback: (highlightedCode: string) => void) => void;
-                init: (ready: () => void) => void;
-                languages: { [lang: string]: string };
-                readonly queue: ((code: string, lang: string, callback: (highlightedCode: string) => void) => void)[];
-                readonly ready: boolean;
-
-                highlight(code: string, lang: string, callback: (highlightedCode: string) => void): void;
-            }
-        }
-
-        class contextMenu extends menu {
-            constructor(editor: editor);
-            addTarget(element: dom.element, nativeContextMenuOnCtrl?: boolean): void;
-            open(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
-        }
-
-        namespace copyformatting {
-            var breakOnElements: string[];
-            var elementsForInlineTransform: string[];
-            var excludedAttributes: string[];
-            var excludedAttributesFromInlineTransform: string[];
-            var inlineBoundary: string[];
-            var preservedElements: string[];
-
-            class state extends event {
-                editor: editor;
-                filter: filter;
-                sticky: boolean;
-                styles: style[];
-
-                constructor(editor: editor);
-            }
-        }
-
-        namespace easyimage {
-
-        }
-
-        namespace embedBase {
-            function createWidgetBaseDefinition(editor: editor): baseDefinition;
-
-            interface baseDefinition extends widget.definition {
-                providerUrl: template;
-                urlRegExp: RegExp;
-
-                getErrorMessage(messageTypeOrMessage: string, url?: string, suffix?: string): string;
-                isUrlValid(url: string): boolean;
-                loadContent(url: string, callback?: () => void, errorCallback?: (error: string) => void, noNotifications?: boolean): request;
-            }
-
-            interface request {
-                callback: () => void;
-                errorCallback: (error: string) => void;
-                response: { [key: string]: string };
-                task: notificationAggregator.task;
-                url: string;
-
-                cancel(): void;
-            }
-        }
-
-        namespace image2 {
-            function checkHasNaturalRatio(image: dom.element): boolean;
-            function getLinkAttributesGetter(): (editor: editor, data: { [key: string]: string }) => { set: { [tag: string]: string }, removed: string[] };
-            function getLinkAttributesParser(): (editor: editor, element: dom.element) => { [key: string]: string };
-            function getNatural(image: dom.element): { [key: string]: string };
-        }
-
-        namespace imagebase {
-            var featuresDefinitions: { [key: string]: string };
-
-            function addFeature(editor: editor, name: string, definition: imageWidgetDefinition): imageWidgetDefinition;
-            function addImageWidget(editor: editor, name: string, definition: imageWidgetDefinition): void;
-
-            interface imageWidgetDefinition extends widget.definition {
-                features: string[];
-                upcast: string;
-            }
-
-            class progressBar extends progressReporter {
-                bar: dom.element;
-
-                constructor();
-
-            }
-
-            class progressReporter {
-                wrapper: dom.element;
-
-                constructor(wrapperHtml?: string);
-                aborted(): void;
-                bindLoader(loader: fileTools.fileLoader): void;
-                done(): void;
-                failed(): void;
-                remove(): void;
-                updated(progress: number): void;
-            }
-        }
-
-        namespace indent {
-            function registerCommands(editor: editor, commands: { [key: string]: command} ): void;
-
-            class genericDefinition implements commandDefinition {
-                async: boolean;
-                canUndo: boolean;
-                context: boolean;
-                contextSensitive: boolean;
-                editorFocus: boolean;
-                fakeKeystroke: number;
-                readonly isIndent: boolean;
-                modes: { [key: string]: any };
-                readOnly: boolean;
-                startDisabled: boolean;
-
-                exec(editor: editor, data?: any): boolean;
-                refresh?(editor: editor, path: dom.elementPath): void;
-            }
-
-            class specificDefinition {
-                database: { [key: string]: any };
-                readonly enterBr: boolean;
-                readonly indentKey: { [key: string]: any };
-                readonly isIndent: boolean;
-                readonly jobs: { [priority: string]: { refresh: (editor: editor, path: dom.elementPath) => number, exec: (editor: editor) => boolean } };
-                readonly relatedGlobal: { [key: string]: any };
-
-                execJob(editor: editor, priority: number): boolean;
-                getContext(node: dom.elementPath): dom.element;
-                refreshJob(editor: editor, priority: number): number;
-            }
-        }
-
-        namespace indentList {
-            function firstItemInPath(query: string | string[] | { [tagName: string]: any} | dom.element | ((element: dom.element) => boolean)): boolean;
-        }
-
-        namespace link {
-            // DEPRECATED 4.3.3
-            const emptyAnchorFix: boolean;
-
-            // DEPRECATED 4.3.3
-            const fakeAnchor: boolean;
-
-            // DEPRECATED 4.3.3
-            const synAnchorSelector: boolean;
-
-            function getEditorAnchors(editor: editor): dom.element[];
-            function getLinkAttributes(editor: editor, data: { [key: string]: any}): { set: { [key: string]: string }, removed: string[] }
-            function getSelectedLink(editor: editor, returnMultiple?: boolean): dom.element | dom.element[];
-            function parseLinkAttributes(editor: editor, element: dom.element): { [key: string]: any };
-            function showDisplayTextForElement(element: dom.element, editor: editor): boolean;
-            function tryRestoreFakeAnchor(editor: editor, element: dom.element): dom.element;
-        }
-
-        class list {
-            arrayToList(listArray: any, database: any, paragraphMode: any, dir: any): void;
-            listToArray(listNode: any, database: any, baseArray: any, baseIndentLevel: any, grandparentNode: any): void;
-        }
-
-        class notification {
-            readonly area: notification.area;
-            readonly duration: number;
-            readonly editor: editor;
-            readonly element: dom.element;
-            readonly id: number;
-            readonly message: string;
-            readonly progress: number;
-            readonly type: notification.type;
-
-            constructor(editor: editor, options: notification.options);
-            hide(): void;
-            isVisible(): boolean;
-            show(): void;
-            update(options: notification.updateOptions): void;
-        }
-
-        namespace notification {
-            interface area {
-                readonly editor: editor;
-                readonly element: dom.element;
-                readonly notifications: notification[];
-
-                add(notification: notification): void;
-                remove(notification: notification): void;
-            }
-
-            interface optionsBase {
-                duration?: number;
-                progress?: number;
-                type?: type;
-            }
-
-            interface options extends optionsBase {
-                message: string;
-            }
-
-            interface updateOptions extends optionsBase  {
-                message?: string;
-                important?: boolean;
-            }
-
-            type type = 'info' | 'warning' | 'success' | 'progress';
-        }
-
-        class notificationAggregator extends event {
-            readonly editor: editor;
-            readonly notification: notification;
-
-            constructor(editor: editor, message: string, singularMessage?: string);
-            createTask(options?: { weight?: number }): notificationAggregator.task;
-            getDoneTaskCount(): number;
-            getPercentage(): number;
-            getTaskCount(): number;
-            isFinished(): boolean;
-            update(): void;
-        }
-
-        namespace notificationAggregator {
-            class task extends event {
-                constructor(weight?: number);
-                cancel(): void;
-                done(): void;
-                isCanceled(): boolean;
-                isDone(): boolean;
-                update(weight: number): void;
-            }
-        }
-
-        namespace pastefromword {
-            class lists {
-                numbering: lists.numbering;
-            }
-
-            namespace lists {
-                class numbering {
-                    getStyle(marker: string): string;
-                    toNumber(marker: string, markerType: string): number;
-                }
-            }
-
-            class styles {
-                pushStylesLower(element: htmlParser.element, exceptions: { [style: string]: boolean }, wrapText?: boolean ): boolean;
-            }
-        }
-
-        namespace tableselection {
-            function getCellsBetween(first: dom.element, last: dom.element): dom.element[];
-        }
-
-        namespace widget {
-            var WRAPPER_CLASS_PREFIX: string;
-            
-            function getNestedEditable(guard: dom.element, node: dom.node): dom.element;
-            function isDomDragHandler(node: dom.node): boolean;
-            function isDomDragHandlerContainer(node: dom.node): boolean;
-            function isDomNestedEditable(node: dom.node): boolean;
-            function isDomWidget(node: dom.node): boolean;
-            function isDomWidgetElement(node: dom.node): boolean;
-            function isDomWidgetWrapper(node: dom.node): boolean;
-            function isParserWidgetElement(node: dom.node): boolean;
-            function isParserWidgetWrapper(node: dom.node): boolean;
-
-            namespace nestedEditable {
-                interface definition {
-                    allowedContent?: filter.allowedContentRules;
-                    disallowedContent?: filter.disallowedContentRules;
-                    pathName?: string;
-                    selector?: string;
-                }
-            }
-
-            class nestedEditable extends dom.element {
-                readonly editor: editor;
-                readonly enterMode: number;
-                readonly filter: filter;
-                readonly shiftEnterMode: number;
-
-                constructor(editor: editor, element: dom.element, config: { filter?: filter });
-                getData(): string;
-                setData(data: string): void;
-            }
-
-
-            interface definition extends feature {
-                button?: string;
-                data?: (evt: eventInfo) => void;
-                defaults?: { [key: string]: any };
-                dialog?: string;
-                downcast?: string | ((element: htmlParser.element) => void);
-                downcasts?: { [key: string]: any };
-                draggable?: boolean;
-                edit?: () => void;
-                editables?: { [key: string]: any };
-                getLabel?: () => any;
-                init?: () => void;
-                inline?: boolean;
-                insert?: () => void;
-                mask?: boolean;
-                parts?: { [key: string]: any };
-                pathName?: string;
-                styleToAllowedContentRules?: (style: style) => filter.allowedContentRules;
-                styleableElements?: string;
-                template?: string | template;
-                upcast?: string | ((element: htmlParser.element, data: any) => boolean);
-                upcastPriority?: number;
-                upcasts?: { [key: string]: any };
-            }
-
-            class repository extends event {
-                readonly editor: editor;
-                readonly focused: widget;
-                readonly instances: { [id: string]: widget };
-                readonly registered: { [name: string]: definition };
-                readonly selected: widget[];
-                readonly widgetHoldingFocusedEditable: widget;
-
-                add(name: string, widgetDef: plugins.widget.definition): void;
-                addUpcastCallback(callback: (element: htmlParser.element, data: any) => boolean): void;
-                checkSelection(): void;
-                checkWidgets(options?: { initOnlyNew?: boolean; focusInited?: boolean }): void;
-                del(widget: plugins.widget): void;
-                destroy(widget: plugins.widget, offline?: boolean): void;
-                destroyAll(offline?: boolean): void;
-                finalizeCreation(container: any): void;
-                getByElement(element: any, checkWrapperOnly: boolean): plugins.widget;
-                initOn(element: dom.element, widgetDef?: plugins.widget.definition, startupData?: { [key: string]: any }): plugins.widget;
-                initOn(element: dom.element, widgetDef?: string, startupData?: { [key: string]: any }): plugins.widget;
-                initOnAll(container?: dom.element): plugins.widget[];
-                parseElementClasses(classes: string): any;
-                wrapElement(element: any, widgetName?: string): any;
-            }
-
-            class widgetselection {
-                addFillers(editable: editable): boolean;
-                removeFillers(editable: editable): void;
-            }
-        }
-
-        class widget extends event implements widget.definition {
-            readonly dataReady: boolean;
-            readonly definition: plugins.widget.definition;
-            readonly editor: editor;
-            readonly element: dom.element;
-            readonly focusedEditable: plugins.widget.nestedEditable
-            readonly id: number;
-            readonly inited: boolean;
-            readonly ready: boolean;
-            readonly repository: plugins.widget.repository;
-            readonly wrapper: dom.element;
-
-            constructor(widgetsRepo: plugins.widget.repository, id: number, element: dom.element, widgetDef: plugins.widget.definition, starupData?: any);
-
-            addClass(className: string): void;
-            applyStyle(style: style): void;
-            checkStyleActive(style: style): boolean;
-            destroy(offline?: boolean): void;
-            destroyEditable(editableName: string, offline?: boolean): void;
-            edit(): boolean;
-            focus(): void;
-            getClasses(): any;
-            hasClass(className: string, Whether: boolean): void;
-            initEditable(editableName: string, definition: plugins.widget.nestedEditable.definition): boolean;
-            isInited(): boolean;
-            isReady(): boolean;
-            removeClass(className: string): void;
-            removeStyle(style: style): void;
-            setData(keyOrData: any, value: any): plugins.widget;
-            setFocused(selected: boolean): plugins.widget;
-            setSelected(selected: boolean): plugins.widget;
-            updateDragHandlerPosition(): void;
-        }
-
-        function add(name: string, definition: pluginDefinition): void;
-        function add(name: string): void;
-        function addExternal(name: string, path: string, fileName?: string): void;
-        function get(name: string): any;
-        function getFilePath(name: string): string;
-        function getPath(name: string): string;
-        function load(name: string, callback: (plugins: string[]) => void, scope?: { [key: string]: any }): void;
-        function setLang(pluginName: string, languageCode: string, languageEntries: any): void;
-        var registered: {[key: string]: pluginDefinition};
-    }
-
-    class resourceManager {
-        basePath: string;
-        externals: { [key: string]: any };
-        fileName: string;
-        loaded: { [key: string]: any };
-        registered: { [key: string]: any };
-
-        constructor(basePath: string, fileName: string);
-        add(name: string, definition?: pluginDefinition): void;
-        addExternal(names: string, path: string, fileName?: string): void;
-        get(name: string): pluginDefinition;
-        getFilePath(name: string): string;
-        getPath(name: string): string;
-        load(name: string | string[], callback: (loaded: string[]) => void, scope?: { [key: string]: any }): void; 
-    }
-
-    // see https://docs.com/ckeditor4/latest/api/CKEDITOR_scriptLoader.html
-    namespace scriptLoader {
-        function load(scriptUrls: string | string[], callback: (succeededUrls: boolean | string[], failedUrls?: string[]) => void, scope?: any, showBusy?: boolean): void;
-        function queue(scriptUrl: string, callback?: (succeeded: boolean) => void): void;
-    }
-
-    namespace skin {
-        var icons: { [name: string]: { path: string } };
-        var name: string;
-        var ua: { [name: string]: any };
-
-        function addIcon(name: string, path: string, offset?: number, bgsize?: string): void;
-        function chameleon(editor: string, part: string): void;
-        function getIconStyle(name: string, rtl?: boolean, overridePath?: number, overrideBgsize?: string): any;
-        function getPath(part: string): any;
-        function loadPart(part: string, fn: () => void): void;
-        function path(): string;
-    }
-
-    namespace style {
-        function addCustomHandler(defintion: customHandler): style;
-        function getStyleText(style: definition): string;
-
-        namespace customHandlers {
-            class widget extends style {
-                group: any[];
-                widget: string;
-                checkElement(element: dom.element): boolean;
-                getClassesArray(): string[];
-                getDefintion(): definition;
-                removeStylesFromSameGroup(editor: editor): boolean;
-            }
-        }
-
-        interface definition {
-            attributes?: { [att: string]: string },
-            element: string,
-            name?: string,
-            styles?: { [att: string]: string },
-            type?: string | number
-        }
-
-        interface customHandler {
-            type: string | number;
-            setup?: (style: definition) => void;
-            assignedTo?: number;
-        }
-    }
-
-    class style {
-        alwaysRemoveElement: boolean;
-        includeReadonly: boolean;
-        constructor(styleDefinition: style.definition, variableValues: any);
-        apply(editor: editor): void;
-        applyToObject(element: dom.element, editor: editor): void; 
-        applyToRange(range: Range, editor: editor): void;
-        buildPreview(label?: string): string;
-        checkActive(elementPath: dom.elementPath, editor: editor): boolean;
-        checkApplicable(elementPath: dom.elementPath, editor: editor, filter?: filter): boolean;
-        checkElementMatch(element: dom.element, fullMatch: boolean, editor: editor): boolean;
-        checkElementRemovable(element: dom.element, fullMatch: boolean, editor: editor): boolean;
-        getDefintion(): style.definition;
-        remove(editor: editor): void;
-        removeFromRange(range: Range, editor: editor): void;
-        toAllowedContentRules(editor?: editor): filter.allowedContentRules;
-    }
-
-    class styleCommand {
-        constructor(style: style, ext?: any);
-        exec(editor: editor): void;
-    }
-
-    var stylesSet: resourceManager;
-
-    class template {
-        readonly source: string;
-
-        constructor(source: string);
-        output(data: any, buffer?: any[]): string | number;
-    }
-
-    namespace tools {
-        function addFunction(fn: () => any, scope?: any): number;
-        function arrayCompare(arrayA: any[], arrayB: any[]): boolean;
-        function clone(source: { [key: string]: any }): { [key: string]: any };
-        function copy(source: { [key: string]: any }): { [key: string]: any };
-        function createClass(definition: { [key: string]: any }): any;
-        function cssStyleToDomStyle(cssName: string): string;
-        function cssVendorPrefix(property: string, value: string, asString?: boolean): { [cssClass: string]: string | number };
-        function defer<T extends Function>(fn: T): T;
-        function enableHtml5Elements(doc: Document | DocumentFragment, withAppend?: boolean): void;
-        function escapeCss(selector: string): string;
-        function eventsBuffer(minInterval: number, output: () => void, scopeObj: any): { input: () => void, reset: () => void };
-        function extend(target: { [key: string]: any }, source: { [key: string]: any }, overwrite: boolean, properties: { [key: string]: any }): { [key: string]: any };
-        function fixDomain(): boolean;
-        function genKey(subKey: string): string;
-        function getCookie(name: string): string;
-        function getCsrfToken(): string;
-        function getIndex<T>(array: T[], compareFunction: (element: T) => boolean): number;
-        function getMouseButton(evt: dom.event): boolean;
-        function getNextId(): string;
-        function getNextNumber(): number;
-        function getUniqueId(): string;
-        function htmlDecode(text: string): string;
-        function htmlDecodeAttr(text: string): string;
-        function htmlEncode(text: string): string;
-        function htmlEncodeAttr(text: string): string;
-        function indexOf<T>(array: T[], value: T | ((el: T) => boolean)): number;
-        function isArray<T>(object: any): object is T[];
-        function isEmpty(object: { [key: string]: any }): boolean;
-        function keystrokeToArray(lang: { [key: string]: any }, keystroke: number): { display: string[], aria: string[] };
-        function keystrokeToString(lang: { [key: string]: any }, keystroke: number): { display: string, aria: string };
-        function ltrim(str: string): string;
-        function normalizeCssText(styleText: string, nativeNormalize: boolean): string;
-        function normalizeHex(styleText: string): string;
-        function objectCompare(left: { [key: string]: any }, right: { [key: string]: any }, onlyLef?: boolean): boolean;
-        function objectKeys(obj: { [key: string]: any }): string[];
-        function override<T extends Function>(originalFunction: T, functionBuilder: (originalFunction: T) => T): T;
-        function parseCssText(styleText: string, normalize?: boolean, nativeNormalize?: boolean): { [key: string]: any };
-        function prototypedCopy(source:  { [key: string]: any }):  { [key: string]: any };
-        function removeFunction(ref: number): void;
-        function repeat(str: string, times: number): string;
-        function rtrim(str: string): string;
-        function search<T>(array: T[], value: T | ((element: T) => boolean)): T;
-        function setCookie(name: string, value: string): void;
-        function setTimeout(func: Function, milliseconds?: number, scope?: { [key: string]: any }, args?: any, ownerWindow?: Window): number;
-        function transformPlainTextToHtml(text: string, etnerMode: number): string;
-        function trim(str: string): string;
-        function tryThese(fn: Function[]): any;
-        function writeCssText(styles: { [key: string]: any }, sort?: boolean): string;
-
-        namespace array {
-            function every<T>(array: T[], fn: (value: T, index: number, array: T[]) => boolean, thisArg?: { [key: string]: any }): boolean;
-            function filter<T>(array: T[], fn: (value: T, index: number, array: T[]) => boolean, thisArg?: { [key: string]: any }): T[];
-            function forEach<T>(array: T[], fn: (value: T, index: number, array: T[]) => void, thisArg?: { [key: string]: any }): void;
-            function isArray(object: any): boolean;
-            function map<T, K>(array: T[], fn: (value: T) => K, thisArg?: { [key: string]: any }): K[];
-            function reduce<T, K>(array: T[], fn: (accumulator: K, a: T, index: number, array: T[]) => K, initial: K, thisArg?: { [key: string]: any }): K;
-        }
-
-        namespace object {
-            function findKey(obj: { [key: string]: any }, value: any): string;
-            function merge(obj1: { [key: string]: any }, obj2: { [key: string]: any }): { [key: string]: any };
-        }
-
-        namespace style {
-            namespace parse {
-                function background(value: string): { color: string, unprocessed: string};
-                function border(value: string): { width: string, style: string, color: string };
-                function margin(value: string): { top: number, right: number, bottom: number, left: number };
-            }
-        }
-    }
-
-    class ui extends event {
-        constructor(editor: editor);
-        add(name: string, type: { [key: string]: any }, definition: { [key: string]: any }): void;
-        addButton(name: string, definition: buttonDefinition): void;
-        addHandler(type: { [key: string]: any }, handler: { [key: string]: any }): void;
-        addRichCombo(name: string, definition: { [key: string]: any }): void;
-        addToolbarGroup(name: string, previous: number | string, subgroupOf?: string): void;
-        create(name: string): { [key: string]: any };
-        get(name: string): { [key: string]: any };
-        space(name: string): dom.element;
-        spaceId(name: string): string;
-    }
-
-    namespace ui {
-        namespace dialog {
-            class button extends uiElement {
-                constructor(dialog: dialog, elementDefinition: definitions.button, htmlList: any[]);
-
-                accessKeyDown(): void;
-                accessKeyUp(): void;
-                click(): any;
-            }
-
-            class checkbox extends uiElement {
-                constructor(dialog: dialog, elementDefinition: definitions.checkbox, htmlList: any[]);
-
-                accessKeyUp(): void;
-                getValue(): boolean;
-                setValue(checked: boolean, noChangeEvent: boolean): undefined;
-            }
-
-            namespace definitions {
-                interface button {
-                    label: string;
-                    disabled?: boolean;
-                }
-
-                interface checkbox {
-                    checked?: boolean;
-                    validate?: () => boolean;
-                    label?: string;
-                }
-
-                interface fieldSet {
-                    label?: string;
-                    children: any[];
-                }
-
-                interface file {
-                    validate?: () => boolean;
-                }
-
-                interface fileButton {
-                    for: string;
-                    validate?: () => boolean;
-                }
-
-                interface hbox {
-                    widths?: string[];
-                    height?: string;
-                    padding?: string;
-                    align?: string;
-                }
-
-                interface html {
-                    html: string;
-                }
-
-                interface iframeElement {
-                    src: string;
-                    width: string;
-                    height: string;
-                    onContentLoad?: () => void;
-                }
-
-                interface labeledElement {
-                    label: string;
-                    labelLayout?: 'horizontal' | 'vertical';
-                    widths?: [ string, string ];
-                    role?: string;
-                    includeLabel?: boolean;
-                }
-
-                interface radio {
-                    default: any;
-                    validate?: () => boolean;
-                    items: ([string, string] | [string])[];
-                }
-
-                interface select {
-                    default: any;
-                    validate?: () => boolean;
-                    items: ([string, string] | [string])[];
-                    multiple?: boolean;
-                    size?: number;
-                }
-
-                interface textarea {
-                    rows?: number;
-                    cols?: number;
-                    default?: string;
-                    validate?: () => boolean;
-                }
-
-                interface textInput {
-                    default?: string;
-                    validate?: () => boolean;
-                    maxLength?: number;
-                    size?: string;
-                }
-
-                interface uiElement {
-                    id: string;
-                    type: number;
-                    title?: string;
-                    hidden?: boolean;
-                    className?: string;
-                    style?: string;
-                    accessKey?: string;
-                }
-
-                interface vbox {
-                    width?: string;
-                    heights?: string[];
-                    align?: string;
-                    padding?: string;
-                    expand?: boolean;
-                }
-            }
-
-            class fieldset extends uiElement {
-                constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.fieldSet);
-            }
-
-
-            class file extends ui.dialog.labeledElement {
-                constructor(dialog: dialog, elementDefinition: definitions.file, htmlList: any[]);
-
-                getAction(): string;
-                registerEvents(definition: { [key: string]: any }): file;
-                reset(): void;
-                setInitValue(): void;
-                submit(): file;
-            }
-
-
-            class fileButton extends button {
-                constructor(dialog: dialog, elementDefinition: definitions.fileButton, htmlList: any[]);
-            }
-
-
-            class hbox extends uiElement {
-                constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.hbox);
-
-                getChild(indices: number): ui.dialog.uiElement;
-                getChild(indices: number[]): ui.dialog.uiElement[];
-            }
-
-
-            class html extends uiElement {
-                constructor(dialog: dialog, elementDefinition: definitions.html, htmlList: any[]);
-
-            }
-
-
-            class iframeElement extends uiElement {
-
-            }
-
-
-            class labeledElement extends uiElement {
-                constructor(dialog: dialog, elementDefinition: definitions.labeledElement, htmlList: any[], contentHtml: () => string);
-
-                getLabel(): string;
-                setlabel(label: string): ui.dialog.labeledElement;
-            }
-
-
-            class radio extends ui.dialog.labeledElement {
-                constructor(dialog: dialog, elementDefinition: definitions.radio, htmlList: any[]);
-
-                accessKeyUp(): void;
-                getValue(): string;
-                setValue(value: string, noChangeEvent: boolean): undefined;
-            }
-
-
-            class select extends uiElement {
-                constructor(dialog: dialog, elementDefinition: definitions.select, htmlList: any[]);
-
-                add(label: string, value?: string, indexedDB?: number): select;
-                clear(): select;
-                remove(index: number): select;
-            }
-
-
-            class textarea extends labeledElement {
-                constructor(dialog: dialog, elementDefinition: definitions.textarea, htmlList: any[]);
-            }
-
-
-            class textInput extends ui.dialog.labeledElement {
-                constructor(dialog: dialog, elementDefinition: definitions.textInput, htmlList: any[]);
-
-                accessKeyUp(): void;
-                focus(): undefined;
-                getDirectionMarker(): string;
-                getValue(): string;
-                select(): void;
-                setDirectionMarker(dir: string): void;
-                setValue(value: string, noChangeEvent: boolean): textInput;
-            }
-
-            class uiElement {
-                eventProcessors: any;
-
-                constructor(dialog: dialog, elementDefinition: definitions.uiElement, htmlList: any[], nodeNameArg?: () => string | string, stylesArg?: () => { [key: string]: any } | { [key: string]: any }, attributesArg?: () => { [key: string]: any } | { [key: string]: any }, contentsArg?: () => { [key: string]: any } | string); // Not sure that the htmlList array type is right.
-
-                accessKeyDown(dialog: dialog, key: string): void;
-                accessKeyUp(dialog: dialog, key: string): void;
-                disable(): void;
-                enable(): void;
-                focus(): ui.dialog.uiElement;
-                getDialog(): dialog;
-                getElement(): dom.element;
-                getInputElement(): dom.element;
-                getValue(): any;
-                isChanged(): boolean;
-                isEnabled(): boolean;
-                isFocusable(): boolean;
-                isVisible(): boolean;
-                registerEvents(definition: CKEDITOR.dialog.definition.uiElement): ui.dialog.uiElement;
-                selectParentTab(): ui.dialog.uiElement;
-                setValue(value: any, noChangeEvent: boolean): ui.dialog.uiElement;
-            }
-
-            class vbox extends hbox {
-                constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.vbox);
-            }
-        }
-
-        class balloonPanel {
-            activeShowListeners: { [id: number]: { removeListener: listenerRegistration }};
-            editor: editor;
-            focusables: { [id: number]: dom.element };
-            height: string;
-            parts: balloonPanel.parts;
-            rect: balloonPanel.rect;
-            showListeners: { [id: number]: () => listenerRegistration };
-            templateDefinitions: balloonPanel.templateDefinitions;
-            templates: balloonPanel.templates;
-            triangleHeight: number;
-            triangleMinDistance: number;
-            triangleWidth: number;
-            width: number;
-
-            activeShowListener(id: number): void;
-            activateShowListeners(): void;
-            addShowListener(listener: () => listenerRegistration): listenerRegistration;
-            attach(element: dom.element, options?: dom.element | boolean | { focusElement?: dom.element | boolean, show?: boolean }): void;
-            blur(): void;
-            build(): void;
-            deactivateShowListener(id: number): void;
-            deregisterFocusable(element: dom.element): void;
-            destroy(): void;
-            getHeight(): number;
-            getWidth(): number;
-            hide(): void;
-            move(top: number, left: number): void;
-            registerFocusable(element: dom.element): void;
-            removeShowListener(id: number): void;
-            resize(width: number, height: number): void;
-            setTitle(title: string): void;
-            setTriangle(side: 'left' | 'right' | 'top' | 'bottom'): void;
-            show(): void;
-        }
-
-        namespace balloonPanel {
-            interface definition {
-                content?: string;
-                title?: string;
-            }
-
-            interface templates {
-                close?: template;
-                content?: template;
-                panel?: template;
-                title?: template;
-                triangle?: template;
-                triangleInner?: template;
-                triangleOuter?: template; 
-            }
-    
-            interface templateDefinitions {
-                close?: string;
-                content?: string;
-                panel?: string;
-                title?: string;
-                triangle?: string;
-                triangleInner?: string;
-                triangleOuter?: string;
-            }
-    
-            interface rect {
-                height?: number;
-                left?: number;
-                top?: number;
-                visible?: boolean;
-                width?: number;
-            }
-    
-            interface parts {
-                close?: dom.element;
-                content?: dom.element;
-                panel?: dom.element;
-                title?: dom.element;
-                triangle?: dom.element;
-                triangleInner?: dom.element;
-                triangleOuter?: dom.element;
-            }
-        }
-
-        class balloonToolbar {
-            constructor(editor: editor, definition: { [key: string]: any });
-            addItem(name: string, element: button | richCombo): void;
-            addItems(elements: { [itemName: string]: button | richCombo }): void;
-            deleteItem(name: string): void;
-            destroy(): void;
-            getItem(name: string): button | richCombo;
-            hide(): void;
-            refresh(): void;
-            show(): void;
-        }
-
-        class button {
-            static readonly handler: handlerDefinition<button>;
-
-            constructor(definition: { [key: string]: any });
-            getState(): number;
-            render(editor: editor, output: string[]): void;
-            setState(state: number): void;
-            toFeature(editor: editor): feature;
-        }
-
-        class floatPanel {
-            constructor(editor: editor, parentElement: dom.element, definition: { [key: string]: any }, level: number);
-            addBlock(name: string, block: { [key: string]: any }): void;
-            addListBlock(name: string, multiSelect: boolean): void;
-            allowBlur(allow: boolean): void;
-            blur(): void;
-            focus(): void;
-            getBlock(name: string): panel.block;
-            hide(returnFocus: boolean): void;
-            hideChild(restoreFocus: boolean): void;
-            reposition(): void;
-            showAsChild(panel: floatPanel, blckName: string, offsetParent: dom.element, corner: number, offsetX?: number, offsetY?: number): void;
-            showBlock(name: string, offsetParent: dom.element, corner: number, offsetX?: number, offsetY?: number, callback?: () => void): void;
-        }
-
-        class handlerDefinition<T> {
-            contentsElement: dom.element;
-            create(definition: { [key: string]: any }): T;
-        }
-
-        class menuButton extends button {
-
-        }
-
-        class panel {
-            constructor(document: dom.document, definition: { [key: string]: any });
-            addBlock(name: string, block: { [key: string]: any }): void;
-            getBlock(name: string): panel.block;
-            render(editor: editor, output?: string[]): void;
-            showBlock(name: string): void;
-        }
-
-        namespace panel {
-            class block {
-                getItems(): dom.nodeList;
-                markItem(index: number): void;
-            }
-
-            const handler: handlerDefinition<panel>;
-        }
-
-        class panelButton extends button {
-
-        }
-
-        class richCombo {
-            static readonly handler: handlerDefinition<richCombo>;
-            render(editor: editor, output: string[]): void;
-        }
-    }
-
-    class xml {
-        baseXml: any;
-
-        constructor(xmlObjectOrData: any);
-        getInnerXml(xpath: string, contextNode?: any): string;
-        selectNodes(xpath: string, contextNode?: any): any[];
-        selectSingleNode(xpath: string, contextNode?: any): any;
-    }
-
-    interface toolbarGroups {
-        name?: string;
-        groups?: string[];
-    }
-
-    namespace config {
-        interface styleObject {
-            name?: string;
-            element: string;
-            attributes?: { [key: string]: any };
-            styles?: { [key: string]: any };
-            overrides?: { [key: string]: any };
-        }
-    }
-
-    interface sharedSpace {
-        top?: string | HTMLElement;
-        bottom?: string | HTMLElement;
-    }
-
-    interface IMenuItemDefinition {
-        label:string,
-        command:string,
-        icon: string
-        group:string,
-        order:number
-    }
-
-    interface buttonDefinition {
-        icon?: string;
-        iconOffset?: number;
-        label: string;
-        command: string;
-        toolbar: string;
-    }
-}
+    CKEDITOR_BASEPATH: string;
+  }
+  
+  declare namespace CKEDITOR {
+  
+      // Config options
+      var disableAutoInline: boolean;
+      var replaceClass: string;
+      var skinName: string;
+  
+      // Properties
+      const ALT: number;
+      const CTRL: number;
+      const DATA_TRANSFER_CROSS_EDITORS: number;
+      const DATA_TRANSFER_EXTERNAL: number;
+      const DATA_TRANSFER_INTERNAL: number;
+      const DIALOG_RESIZE_BOTH: number;
+      const DIALOG_RESIZE_HEIGHT: number;
+      const DIALOG_RESIZE_NONE: number;
+      const DIALOG_RESIZE_WIDTH: number;
+      const DIALOG_STATE_BUSY: number;
+      const DIALOG_STATE_IDLE: number;
+      const ELEMENT_MODE_APPENDTO: number;
+      const ELEMENT_MODE_INLINE: number;
+      const ELEMENT_MODE_NONE: number;
+      const ELEMENT_MODE_REPLACE: number;
+      const END: number;
+      const ENLARGE_BLOCK_CONTENTS: number;
+      const ENLARGE_ELEMENT: number;
+      const ENLARGE_INLINE: number;
+      const ENLARGE_LIST_ITEM_CONTENTS: number;
+      const ENTER_BR: number;
+      const ENTER_DIV: number;
+      const ENTER_P: number;
+      const EVENT_PHASE_AT_TARGET: number;
+      const EVENT_PHASE_BUBBLING: number;
+      const EVENT_PHASE_CAPTURING: number;
+      const FILTER_SKIP_TREE: number;
+      const LINEUTILS_AFTER: number;
+      const LINEUTILS_BEFORE: number;
+      const LINEUTIS_INSIDE: number;
+      const MOUSE_BUTTON_LEFT: number;
+      const MOUSE_BUTTON_MIDDLE: number;
+      const MOUSE_BUTTON_RIGHT: number;
+      const NODE_COMMENT: number;
+      const NODE_DOCUMENT: number;
+      const NODE_DOCUMENT_FRAGMENT: number;
+      const NODE_ELEMENT: number;
+      const NODE_TEXT: number;
+      const POSITION_AFTER_END: number;
+      const POSITION_AFTER_START: number;
+      const POSITION_BEFORE_END: number;
+      const POSITION_BEFORE_START: number;
+      const POSITION_CONTAINS: number;
+      const POSITION_DISCONNECTED: number;
+      const POSITION_FOLLOWING: number;
+      const POSITION_IDENTICAL: number;
+      const POSITION_IS_CONTAINED: number;
+      const POSITION_PRECEDING: number;
+      const SELECTION_ELEMENT: number;
+      const SELECTION_NONE: number;
+      const SELECTION_TEXT: number;
+      const SHIFT: number;
+      const SHRINK_ELEMENT: number;
+      const SHRINK_TEXT: number;
+      const START: number;
+      const STYLE_BLOCK: string;
+      const STYLE_INLINE: string;
+      const STYLE_OBJECT: string;
+      const TRISTATE_DISABLED: number;
+      const TRISTATE_OFF: number;
+      const TRISTATE_ON: number;
+      const UI_BUTTON: string;
+      const UI_MENUBUTTON: string;
+      const UI_PANEL: string;
+      const UI_PANELBUTTON: string;
+      const UI_RICHCOMBO: string;
+      const UI_SEPARATOR: string;
+      const VERBOSITY_ERROR: number;
+      const VERBOSITY_WARN: number;
+  
+      var basePath: string;
+      var currentInstance: editor;
+      var document: dom.document;
+      var instances: { [id: string]: editor };
+      var loadFullCoreTimeout: number;
+      var revision: string;
+      var rnd: number;
+      var status: string;
+      var timestamp: string;
+      var verbosity: number;
+      var version: string;
+      const config: config;
+  
+      // Methods
+      function add(editor: editor): void;
+      function addCss(css: string): void;
+      function addTemplate(name: string, source: string): template;
+      function appendTo(element: string | HTMLElement, config?: config, data?: string): editor;
+      function domReady(): void;
+      function editorConfig(config: config): void;
+      function error(errorCode: string, additionalData?: any): void;
+      function getCss(): string;
+      function getTemplate(name: string): template;
+      function getUrl(resource: string): string;
+      function inline(element: string | HTMLElement, instanceConfig?: config): editor;
+      function inlineAll(): void;
+      function loadFullCore(): void;
+      function replace(element: string | HTMLTextAreaElement, config?: config): editor;
+      function replaceAll(className?: string): void;
+      function replaceAll(assertionFunction: (textarea: HTMLTextAreaElement, config: config) => boolean): void;
+      function warn(errorCode: string, additionalData?: any): void;
+  
+      // Event interface
+      function capture(): void;
+      function define(name: string, meta: { [key: string]: any }): void;
+      function fire(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
+      function fireOnce(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
+      function hasListeners(eventName: string): boolean;
+      function on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any }, listenerData?: { [key: string]: any }, priority?: number): void;
+      function once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any }, listenerData?: { [key: string]: any }, priority?: number): void;
+      function removeAllListeners(): void;
+      function removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
+  
+      type listenerRegistration = {
+          removeListener: () => void;
+      }
+  
+      namespace dom {
+  
+          interface bookmark {
+              startNode: dom.node | string;
+              endNode: dom.node | string;
+              serializable: boolean;
+              collapsed: boolean;
+          }
+  
+          interface bookmark2 {
+              start: number[];
+              end: number[];
+              startOffset: number;
+              endOffset: number;
+              collapsed: boolean;
+              normalized: boolean;
+              is2: boolean;
+          }
+  
+          class comment extends node {
+              readonly type: number;
+  
+              constructor(comment: string | Node, ownerDocument?: document);
+              getOuterHtml(): string;
+          }
+  
+          class document extends domObject {
+              readonly $: Document;
+              readonly type: number;
+  
+              constructor(domDocument: { [key: string]: any });
+              appendStyleSheet(cssFileUrl: string): void;
+              appendStyleText(cssStyleText: string): CSSStyleSheet;
+              createElement(name: string, attribsAndStyles?: { attributes?: { [key: string]: string }; styles?: { [key: string]: string }; }): element;
+              createText(text: string): element;
+              find(selector: string): nodeList;
+              findOne(selector: string): element;
+              focus(): void;
+              getActive(): element;
+              getBody(): element;
+              getByAddress(address: any[], normalized?: boolean): node;
+              getById(elementId: string): element;
+              getDocumentElement(): element;
+              getElementsByTag(tagName: string): nodeList;
+              getHead(): element;
+              getSelection(): selection;
+              getWindow(): window;
+              write(html: string): void;
+          }
+  
+          class documentFragment extends node {
+              readonly type: number;
+  
+              constructor(nodeOrDoc: { [key: string]: any });
+              insertAfterNode(node: node): void;
+          }
+  
+          class domObject extends CKEDITOR.event {
+              readonly $: any;
+  
+              constructor(nativeDomObject: { [key: string]: any });
+              clearCustomData(): void;
+              equals(object: any): boolean;
+              getCustomData(key: string): any;
+              getPrivate(): any;
+              getUniqueId(): number;
+              removeAllListeners(): void;
+              removeCustomData(key: string): any;
+              setCustomData(key: string, value: any): domObject;
+          }
+  
+          class element extends node {
+              readonly $: HTMLElement;
+              readonly type: number;
+  
+              constructor(element: string, ownerDocument?: document);
+              constructor(element: HTMLElement, ownerDocument?: document);
+              addClass(className: string): void;
+              append(node: node | string, toStart?: boolean): node;
+              appendBogus(force: boolean): void;
+              appendHtml(html: string): void;
+              appendText(text: string): node;
+              breakParent(parent: element): void;
+              contains(node: node): boolean;
+              copyAttributes(dest: element, skipAttributes: { [key: string]: string }): void;
+              data(name: string, value?: string | false): string;
+              disableContextMenu(): void;
+              find(selector: string): nodeList;
+              findOne(selector: string): element;
+              focus(defer?: boolean): void;
+              focusNext(ignoreChildren?: boolean, indexToUse?: number): void;
+              focusPrevious(ignoreChildren?: boolean, indexToUse?: number): void;
+              forEach(callback: (node: node) => void, type?: number, skipRoot?: boolean): void;
+              getAttribute(name: string): string;
+              getBogus(): node | boolean;
+              getChild(indices: number | number[]): node;
+              getChildCount(): number;
+              getChildren(): nodeList;
+              getClientRect(): ClientRect;
+              getComputedStyle(propertyName: string): string;
+              getDirection(useComputed: boolean): string;
+              getDocumentPosition(refDocument: document): position;
+              getDtd(): dtdDefinition;
+              getEditor(): editor;
+              getElementsByTag(tagName: string): nodeList;
+              getFirst(evaluator?: (node: node) => boolean): node;
+              getFrameDocument(): document;
+              getHtml(): string;
+              getId(): string;
+              getLast(evaluator?: (node: node) => boolean): node;
+              getName(): string;
+              getNameAtt(): string;
+              getOuterHtml(): string;
+              getPositionedAncestor(): element;
+              getSize(type: string, isBorderBox: boolean): void;
+              getStyle(name: string): string;
+              getTabIndex(): number;
+              getText(): string;
+              getValue(): string;
+              getWindow(): window;
+              hasAttributes(): boolean;
+              hasAttribute(name: string): boolean;
+              hasClass(className: string): boolean;
+              hide(): void;
+              is(...name: string[]): boolean;
+              is(name: any): boolean;
+              isBlockBoundary(customNodeNames: { [tagName: string]: 1 }): boolean;
+              isEditable(textCursor?: boolean): boolean;
+              isEmptyInlineRemoveable(): boolean;
+              isIdentical(otherElement: element): boolean;
+              isVisible(): boolean;
+              mergeSiblings(inlineOnly?: boolean): void;
+              moveChildren(target: element, toStart?: boolean): void;
+              removeAttribute(name: string): void;
+              removeAttributes(attributes?: string[]): void;
+              removeClass(className: string): void;
+              removeStyle(name: string): void;
+              renameNode(newTag: string): void;
+              scrollIntoParent(parent: element, alignToTop: boolean, hscroll: boolean): void;
+              scrollIntoParent(parent: window, alignToTop: boolean, hscroll: boolean): void;
+              scrollIntoView(alignToTop?: boolean): void;
+              setAttribute(name: string, value: string): element;
+              setAttributes(attributesPairs: { [key: string]: string }): element;
+              setHtml(html: string): string;
+              setOpacity(opacity: number): void;
+              setSize(type: string, size: number, isBorderBox: boolean): void;
+              setState(state: number, base?: string, useAria?: boolean): void;
+              setStyle(name: string, value: string): element;
+              setStyles(stylesPair: { [key: string]: string }): element;
+              setText(text: string): string;
+              setValue(value: string): element;
+              show(): void;
+              unselectable(): void;
+  
+              //static method
+              static clearAllMarkers(database: any): any;
+              static clearMarkers(database: any, element: dom.element, removeFromDatabase: boolean): void;
+              static createFromHtml(html: string): element;
+              static get(element: string | HTMLElement | element): element;
+              static setMarker(database: any, element: dom.element, name: string, value: any): dom.element;
+          }
+  
+          class elementPath {
+              readonly block: element;
+              readonly blockLimit: element;
+              readonly elements: element[];
+              readonly lastElement: element;
+              readonly root: element;
+  
+              constructor(startNode: element, root?: element);
+              compare(otherPath: elementPath): boolean;
+              contains(query: string | string[] | ((element: element) => boolean) | { [key: string]: any } | element, excludeRoot?: boolean, fromTop?: boolean): element;
+              direction(): 'ltr' | 'rtl';
+              isContextFor(tag: string): boolean;
+          }
+  
+          class event {
+              constructor(domEvent: Event);
+              getKey(): number;
+              getKeystroke(): number;
+              preventDefault(stopPropagation?: boolean): void;
+              stopPropagation(): void;
+              getTarget(): node;
+              getPhase(): number;
+              getPhaseOffset(): position;
+              on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: any, listenerData?: any, priority?: number): { removeListener: () => void };
+          }
+  
+          class iterator {
+              readonly activeFilter: filter;
+              enforceRealBlocks: boolean;
+              enlargeBr: boolean;
+              readonly filter: filter;
+              forceBrBreak: boolean;
+              readonly range: range;
+              constructor(range: range);
+              getNextParagraph(blockTag?: string): element;
+          }
+  
+          class node extends domObject {
+              constructor(domNode: Node);
+              appendTo(element: element): element;
+              clone(includeChildren: boolean, cloneId: boolean): node;
+              hasPrevious(): boolean;
+              hasNext(): boolean;
+              insertAfter(node: node): node;
+              insertBefore(node: node): node;
+              insertBeforeMe(node: node): node;
+              getAddress(normalized?: boolean): number[];
+              getAscendant(reference: string, includeSelf?: boolean): node;
+              getCommonAncestor(node: node): void;
+              getDocument(): document;
+              getIndex(normalized?: boolean): number;
+              getNext(evaluator?: (node: node) => boolean): node;
+              getNextSourceNode(startFromSibling: boolean, nodeType: number, guard: node | ((node: node) => boolean)): void;
+              getParent(allowFragmentParent?: boolean): element;
+              getParents(closerFirst?: boolean): node[];
+              getPosition(otherNode: node): void;
+              getPrevious(evaluator?: (node: node) => boolean): node;
+              getPreviousSourceNode(startFromSibling: boolean, nodeType: number, guard: node | ((node: node) => boolean)): void;
+              hasAscendant(name: string, includeSelf: boolean): boolean;
+              remove(preserveChildren?: boolean): node;
+              replace(nodeToReplace: node): void;
+              trim(): void;
+              ltrim(): void;
+              rtrim(): void;
+              isReadOnly(): boolean;
+          }
+  
+          class nodeList {
+              constructor(nativeList: NodeList);
+              count(): number;
+              getItem(index: number): node;
+              toArray(): node[];
+          }
+  
+          class range {
+              readonly collapsed: boolean;
+              readonly document: document;
+              readonly endContainer: element | text;
+              readonly endOffset: number;
+              readonly root: element;
+              readonly startContainer: element | text;
+              readonly startOffset: number;
+  
+              constructor(root: element | document);
+              checkBoundaryOfElement(element: element, checkType: number): boolean;
+              checkEndOfBlock(): boolean;
+              checkReadOnly(): boolean;
+              checkStartOfBlock(): boolean;
+              clone(cloneId?: boolean): range;
+              cloneContents(): documentFragment;
+              collapse(toStart?: boolean): boolean;
+              createBookmark(serializable?: boolean): bookmark;
+              createBookmark2(normalized?: boolean): bookmark2;
+              createIterator(): iterator;
+              deleteContents(mergeThen?: boolean): void;
+              endPath(): elementPath;
+              enlarge(unit: number, excludeBrs?: boolean): void;
+              extractContents(mergeThen?: boolean, cloneId?: boolean): documentFragment;
+              fixBlock(isStart: boolean, blockTag: string): element;
+              getBoundaryNodes(): { startNode: node; endNode: node; };
+              getCommonAncestor(includeSelf?: boolean, ignoreTextNode?: boolean): element;
+              getEnclosedNode(): node;
+              getNextEditableNode(): element | text;
+              getNextNode(evaluator: (element: dom.element) => boolean, guard?: (element: dom.element) => boolean, boundary?: element): element;
+              getPreviousEditableNode(): element | text;
+              getPreviousNode(evaluator: (element: dom.element) => boolean, guard?: (element: dom.element) => boolean, boundary?: element): element;
+              getTouchedEndNode(): node;
+              getTouchedStartNode(): node;
+              insertNode(node: node): void;
+              moveToBookmark(bookmark: bookmark | bookmark2): void;
+              moveToClosestEditablePosition(element?: element, isMoveForward?: boolean): boolean;
+              moveToElementEditEnd(target: element): boolean;
+              moveToElementEditStart(target: element): boolean;
+              moveToElementEditablePosition(element: element, isMoveToEnd: boolean): boolean;
+              moveToPosition(node: node, position: number): void;
+              moveToRange(range: range): void;
+              optimize(): void;
+              optimizeBookmark(): void;
+              removeEmptyBlocksAtEnd(atEnd: boolean): void;
+              scrollIntoView(): void;
+              select(): selection;
+              selectNodeContents(node: node): void;
+              setEnd(endNode: node, endOffset: number): void;
+              setEndAfter(node: node): void;
+              setEndAt(node: node, position: number): void;
+              setEndBefore(node: node): void;
+              setStart(startNode: node, startOffset: number): void;
+              setStartAfter(node: node): void;
+              setStartAt(node: node, position: number): void;
+              setStartBefore(node: node): void;
+              shrink(mode: number, selectContents?: boolean, options?: boolean | shrinkOptions): void;
+              splitBlock(cloneId?: boolean): void;
+              splitElement(toSplit: element, cloneId?: boolean): element;
+              startPath(): elementPath;
+              trim(ignoreStart?: boolean, ignoreEnd?: boolean): void;
+  
+              static mergeRanges(ranges: range[]): range[];
+          }
+  
+          interface shrinkOptions {
+              shrinkOnBlockBoundary?: boolean,
+              skipBogus?: boolean
+          }
+  
+          class rangeList {
+              constructor(ranges?: range | range[]);
+              createBokmarks(serializable?: boolean): bookmark[];
+              createBookmarks2(normalized?: boolean): bookmark2[];
+              createIterator(): rangeListIterator;
+              moveToBookmarks(bookmarks: bookmark[]): void;
+          }
+  
+  
+          interface rangeListIterator {
+              getNextRange(mergeConsequent?: boolean): range;
+          }
+  
+          // see https://docs.com/ckeditor4/latest/api/CKEDITOR_dom_selection.html
+          class selection {
+              readonly FILLING_CHAR_SEQUENCE: string;
+              readonly document: document;
+              readonly isFake: boolean;
+              readonly isLocked: boolean;
+              readonly rev: number;
+              readonly root: element;
+  
+              constructor(target: document | element | selection);
+              createBookmarks(serializable: any): bookmark[];
+              createBookmarks2(normalized: any): bookmark2[];
+              fake(element: element, ariaLabel?: boolean): void;
+              getCommonAncestor(): element;
+              getNative(): Selection;
+              getRanges(onlyEditables?: boolean): range[];
+              getSelectedElement(): element;
+              getSelectedText(): string;
+              getStartElement(): element;
+              getType(): number;
+              isCollapsed(): boolean;
+              isHidden(): boolean;
+              isInTable(allowPartialSelection?: boolean): boolean;
+              lock(): void;
+              removeAllRanges(): void;
+              reset(): void;
+              scrollIntoView(): void;
+              selectBookmarks(bookmarks: (bookmark | bookmark2)[]): selection;
+              selectElement(element: element): void;
+              selectRanges(ranges: range[]): void;
+              unlock(restore: boolean): void;
+          }
+  
+          class text extends node {
+              readonly $: Text;
+              readonly type: number;
+  
+              constructor(text: Text | string, ownerDocument?: document);
+              getLength(): number;
+              getText(): string;
+              setText(text: string): void;
+              split(offset: number): text;
+              substring(indexA: number, indexB?: number): void;
+          }
+  
+          class walker {
+              evaluator: (node: node) => boolean;
+              guard: (node: node) => boolean;
+  
+              static validEmptyBlockContainers: { [key: string]: any };
+  
+              constructor(range: range);
+              checkBackward(): boolean;
+              checkForward(): boolean;
+              end(): void;
+              lastBackward(): node;
+              lastForward(): node;
+              next(): node;
+              previous(): node;
+              reset(): void;
+  
+              static blockBoundary(customNodeNames: any): (node: node) => boolean;
+              static bogus(isReject?: boolean): (node: node) => boolean;
+              static bookmark(contentOnly?: boolean, isReject?: boolean): (node: node) => boolean;
+              static editable(isReject?: boolean): (node: node) => boolean;
+              static empty(isReject?: boolean): (node: node) => boolean;
+              static ignored(isReject?: boolean): (node: node) => boolean;
+              static invisible(isReject?: boolean): (node: node) => boolean;
+              static listItemBoundary(): (node: node) => boolean;
+              static nodeType(type: number, isReject?: boolean): (node: node) => boolean;
+              static temp(isReject?: boolean): (node: node) => boolean;
+              static whitespaces(isReject?: boolean): (node: node) => boolean;
+          }
+  
+          interface position {
+              x: number;
+              y: number;
+          }
+  
+          interface widthAndHeight {
+              width: number;
+              height: number;
+          }
+  
+          class window extends domObject {
+              constructor(domWindow: Window);
+              focus(): void;
+              getViewPaneSize(): widthAndHeight;
+              getScrollPosition(): position;
+              getFrame(): element;
+          }
+      }
+  
+  
+      namespace ajax {
+          function load(url: string, callback?: (data: any) => void): string;
+          function loadXml(url: string, callback?: (data: any) => void): xml;
+          function post(url: string, data: any, contentType?: string, callback?: (data: any) => void): void;
+      }
+  
+  
+      class command extends event implements commandDefinition {
+          fakeKeystroke: number;
+          previousState: number;
+          state: number;
+          uiItems: any[];
+  
+          // Methods
+          constructor(editor: editor, commandDefinition: commandDefinition);
+          checkAllowed(noCache: boolean): boolean;
+          disable(): void;
+          enable(): void;
+          exec(data?: { [key: string]: any }): boolean;
+          refresh(editor: editor, path: dom.elementPath): void;
+          setState(newState: number): boolean;
+          toggleState(): void;
+  
+      }
+  
+      interface commandDefinition {
+          async?: boolean;
+          canUndo?: boolean;
+          context?: boolean;
+          contextSensitive?: boolean;
+          editorFocus?: boolean;
+          fakeKeystroke?: number;
+          modes?: { [key: string]: any };
+          startDisabled?: boolean;
+          readOnly?: boolean;
+          exec(editor: editor, data?: any): boolean;
+          refresh?(editor: editor, path: dom.elementPath): void;
+      }
+  
+      // https://docs.com/ckeditor4/latest/api/CKEDITOR_config.html
+      interface config {
+          allowedContent?: boolean | filter.allowedContentRules;
+          autoEmbed_widget?: string | ((url: string) => string);
+          autoGrow_bottomSpace?: number;
+          autoGrow_maxHeight?: number;
+          autoGrow_minHeight?: number;
+          autoGrow_onStartup?: boolean;
+          autoUpdateElement?: boolean;
+  
+          baseFloatZIndex?: number;
+          baseHref?: string;
+          basicEntities?: boolean;
+          blockedKeystrokes?: number[];
+          bodyClass?: string;
+          bodyId?: string;
+          browserContextMenuOnCtrl?: boolean;
+  
+          clipboard_defaultContentType?: 'html' | 'text';
+          clipboard_notificationDuration?: number;
+          cloudServices_tokenUrl?: string;
+          cloudServices_uploadUrl?: string;
+          codeSnippetGeshi_url?: string;
+          codeSnippet_codeClass?: string;
+          codeSnippet_languages?: { [key: string]: any };
+          coceSnippet_theme?: string;
+          colorButton_backStyle?: config.styleObject;
+          colorButton_colors?: string;
+          colorButton_colorsPerRow?: number;
+          colorButton_enableAutomatic?: boolean;
+          colorButton_enableMore?: boolean;
+          colorButton_foreStyle?: config.styleObject;
+          colorButton_normalizeBackground?: boolean;
+          contentsCss?: string | string[];
+          contentsLangDirection?: string;
+          contentsLanguage?: string;
+          copyFormatting_allowRules?: string;
+          copyFormatting_allowedContexts?: boolean | string[];
+          copyFormatting_keystrokeCopy?: number;
+          copyFormatting_keystrokePaste?: number;
+          copyFormatting_outerCursor?: boolean;
+          coreStyles_bold?: config.styleObject;
+          coreStyles_italic?: config.styleObject;
+          coreStyles_strike?: config.styleObject;
+          coreStyles_subscript?: config.styleObject;
+          coreStyles_superscript?: config.styleObject;
+          coreStyles_underline?: config.styleObject;
+          customConfig?: string;
+  
+          dataIndentationChars?: string;
+          defaultLanguage?: string;
+          devtools_styles?: string;
+          devtools_textCallback?: (editor: editor, dialog: dialog, element: dom.element, tabName: string) => string;
+          dialog_backgroundCoverColor?: string;
+          dialog_backgroundCoverOpacity?: number;
+          dialog_buttonsOrder?: string;
+          dialog_magnetDistance?: number;
+          dialog_noConfirmCancel?: boolean;
+          dialog_startupFocusTab?: boolean;
+          disableNativeSpellChecker?: boolean;
+          disableNativeTableHandles?: boolean;
+          disableNativeObjectResizing?: boolean;
+          disableNativeReadonlyStyling?: boolean;
+          disallowedContent?: filter.disallowedContentRules;
+          div_wrapTable?: boolean;
+          docType?: string;
+  
+          easyimage_class?: string;
+          easyimage_defaultStyle?: string;
+          easyimage_styles?: { [key: string]: any };
+          easyimage_toolbar?: string[] | string;
+          emailProtection?: string;
+          embed_provider?: string;
+          enableTabKeyTools?: boolean;
+          enterMode?: number;
+          entities?: boolean;
+          entities_additional?: string;
+          entities_greek?: boolean;
+          entities_latin?: boolean;
+          entities_processNumerical?: boolean | string;
+          extraAllowedContent?: filter.allowedContentRules;
+          extraPlugins?: string;
+  
+          fileTools_defaultFileName?: string;
+          fileTools_requestHeaders?: { [key: string]: any };
+          filebrowserBrowseUrl?: string;
+          filebrowserFlashBrowseUrl?: string;
+          filebrowserFlashUploadUrl?: string;
+          filebrowserImageBrowseLinkUrl?: string;
+          filebrowserImageBrowseUrl?: string;
+          filebrowserImageUploadUrl?: string;
+          filebrowserUploadMethod?: string;
+          filebrowserUploadUrl?: string;
+          filebrowserWindowFeatures?: string;
+          filebrowserWindowHeight?: number | string;
+          filebrowserWindowWidth?: number | string;
+          fillEmptyBlocks?: boolean | ((element: htmlParser.element) => boolean);
+          find_highlight?: config.styleObject;
+          flashAddEmbedTag?: boolean;
+          flashConvertOnEdit?: boolean;
+          flashEmbedTagOnly?: boolean;
+          floatSpaceDockedOffsetX?: number;
+          floatSpaceDockedOffsetY?: number;
+          floatSpacePinnedOffsetX?: number;
+          floatSpacePinnedOffsetY?: number;
+          floatSpacePreferRight?: boolean;
+          fontSize_defaultLabel?: string;
+          fontSize_sizes?: string;
+          fontSize_style?: config.styleObject;
+          font_defaultLabel?: string;
+          font_names?: string;
+          font_style?: config.styleObject;
+          forceEnterMode?: boolean;
+          forcePasteAsPlainText?: boolean;
+          forceSimpleAmpersand?: boolean;
+          format_address?: config.styleObject;
+          format_div?: config.styleObject;
+          format_h1?: config.styleObject;
+          format_h2?: config.styleObject;
+          format_h3?: config.styleObject;
+          format_h4?: config.styleObject;
+          format_h5?: config.styleObject;
+          format_h6?: config.styleObject;
+          format_p?: config.styleObject;
+          format_pre?: config.styleObject;
+          format_tags?: string;
+          fullPage?: boolean;
+  
+          grayt_autoStartup?: boolean;
+  
+          height?: string | number;
+          htmlEncodeOutput?: boolean;
+  
+          ignoreEmptyParagraph?: boolean;
+          image2_alignClasses?: string[];
+          image2_altRequired?: boolean;
+          image2_captionedClass?: string;
+          image2_disableResizer?: boolean;
+          image2_prefillDimensions?: boolean;
+          imageUploadUrl?: string;
+          image_prefillDimensions?: boolean;
+          image_previewText?: string;
+          image_removeLinkByEmptyUrl?: boolean;
+          indentClasses?: string[];
+          indentOffset?: number;
+          indentUnit?: string;
+  
+          jqueryOverrideVal?: boolean;
+          justifyClasses?: string[];
+  
+          keystrokes?: [number, string][];
+  
+          language?: string;
+          language_list?: string[];
+          linkJavaScriptLinksAllowed?: boolean;
+          linkShowAdvancedTab?: boolean;
+          linkShowTargetTab?: boolean;
+  
+          magicline_color?: string
+          magicline_everywhere?: boolean;
+          magicline_holdDistance?: number;
+          magicline_keystrokeNext?: number;
+          magicline_keystrokePrevious?: number;
+          magicline_tabuList?: string[];
+          magicline_triggerOffset?: number;
+          mathJaxClass?: string;
+          mathJaxLib?: string;
+          menu_groups?: string;
+          menu_subMenuDelay?: number;
+  
+          newpage_html?: string;
+          notification_duration?: number;
+  
+          on?: editor.eventObject;
+  
+          pasteFilter?: string;
+          pasteFromWordCleanupFile?: string;
+          pasteFromWordNumberedHeadingToList?: boolean;
+          pasteFromWordPromptCleanup?: boolean;
+          pasteFromWordRemoveFontStyles?: boolean;
+          pasteFromWorkRemoveStyles?: boolean;
+          pasteFromWord_heuristicsEdgeList?: boolean;
+          pasteFromWord_inlineImages?: boolean;
+          plugins?: string;
+          protectedSource?: RegExp[];
+  
+          readOnly?: boolean;
+          removeButtons?: string;
+          removeDialogTabs?: string;
+          removeFormatAttributes?: string;
+          removeFormatTags?: string;
+          removePlugins?: string;
+          resize_dir?: string;
+          resize_enabled?: boolean;
+          resize_maxHeight?: number;
+          resize_maxWidth?: number;
+          resize_minHeight?: number;
+          resize_minWidth?: number;
+  
+          scayt_autoStartup?: boolean;
+          scayt_contextCommands?: string;
+          scayt_contextMenuItemsOrder?: string;
+          scayt_customDictionaryIds?: string;
+          scayt_customerId?: string;
+          scayt_disableOptionsStorage?: string | string[];
+          scayt_elementsToIgnore?: string;
+          scayt_handleCheckDirty?: string;
+          scayt_handleUndoRedo?: string;
+          scayt_ignoreAllCapsWords?: boolean;
+          scayt_ignoreDomainNames?: boolean;
+          scayt_ignoreWordsWithMixedCases?: boolean;
+          scayt_ignoreWordsWithNumbers?: boolean;
+          scayt_inlineModeImmediateMarkup?: boolean;
+          scayt_maxSuggestions?: number;
+          scayt_minWordLength?: number;
+          scayt_moreSuggestions?: string;
+          scayt_multiLanguageMode?: boolean;
+          scayt_multiLanguageStyles?: { [key: string]: any };
+          scayt_sLang?: string;
+          scayt_serviceHost?: string;
+          scayt_servicePath?: string;
+          scayt_servicePort?: string;
+          scayt_serviceProtocol?: string;
+          scayt_srcUrl?: string;
+          scayt_uiTabs?: string;
+          scayt_userDictionaryName?: string;
+  
+          sharedSpaces?: sharedSpace;
+          shiftEnterMode?: number;
+          skin?: string;
+          smiley_columns?: number;
+          smiley_descriptions?: string[];
+          smiley_images?: string[];
+          smiley_path?: string;
+          sourceAreaTabSize?: number;
+          specialChars?: (string | [string, string])[];
+          startupFocus?: string | boolean;
+          startupMode?: string;
+          startupOutlineBlocks?: boolean;
+          startupShowBorders?: boolean;
+          stylesSet?: string | boolean | config.styleObject[];
+          stylesheetParser_skipSelectors?: RegExp;
+          stylesheetParser_validSelectors?: RegExp;
+  
+          tabIndex?: number;
+          tabSpaces?: number;
+          templates?: string;
+          templates_files?: { [key: string]: any };
+          templates_replaceContent?: boolean;
+          title?: string | boolean;
+          toolbar?: string | (string | string[] | { name: string, items?: string[], groups?: string[] })[] | null;
+          toolbarCanCollapse?: boolean;
+          toolbarGroupCycling?: boolean;
+          toolbarGroups?: (toolbarGroups | string)[];
+          toolbarLocation?: string;
+          toolbarStartupExpanded?: boolean;
+  
+          uiColor?: string;
+          undoStackSize?: number;
+          uploadUrl?: string;
+          useComputedState?: boolean;
+  
+          width?: string | number;
+          wsc_cmd?: string;
+          wsc_customDictionaryIds?: string;
+          wsc_customLoaderScript?: string;
+          wsc_customerId?: string;
+          wsc_height?: string;
+          wsc_lang?: string;
+          wsc_left?: string;
+          wsc_top?: string;
+          wsc_userDictionaryName?: string;
+          wsc_width?: string;
+      }
+  
+      interface dataProcessor {
+          toDataFormat(html: string, fixForBody: string): void;
+          toHtml(data: string, fixForBody?: string): void;
+      }
+  
+      class dialog {
+          readonly state: number;
+  
+          constructor(editor: editor, dialogName: string);
+  
+          addFocusable(element: dom.element, index?: number): void;
+          addPage(contents: { [key: string]: any }): void;
+          click(id: string): any;
+          commitContent(): void;
+          disableButton(id: string): void;
+          enableButton(id: string): void;
+          foreach(fn: () => void): dialog;
+          getButton(id: string): ui.dialog.button;
+          getContentElement(pageId: string, elementId: string): ui.dialog.uiElement;
+          getElement(): dom.element;
+          getName(): string;
+          getPageCount(): number;
+          getParentEditor(): editor;
+          getPosition(): { [key: string]: any };
+          getSelectedElement(): dom.element;
+          getSize(): { [key: string]: any };
+          getValueOf(pageId: string, elementId: string): any;
+          hide(): void;
+          hidePage(id: string): void;
+          layout(): void;
+          move(x: number, y: number, save: boolean): void;
+          reset(): dialog;
+          resize(width: number, height: number): void;
+          selectPage(id: string): void;
+          setState(state: number): void;
+          setValueOf(pageId: string, elementId: string, value: any): void;
+          setupContent(): void;
+          show(): void;
+          showPage(id: string): void;
+          updateStyle(): void;
+  
+          static add(name: string, dialogDefinition: string | ((editor: editor) => dialog.IDialogDefinition)): void;
+          static addIframe(name: string, title: string, minWidth: number, minHeight: number, onContentLoad?: () => void, userDefinition?: { [key: string]: any }): void;
+          static addUIElement(typeName: string, builder: () => void): void;
+          static cancelButton(): void;
+          static exists(name: string | number): void; // NOTE: documentation says object, but it's an array accessor, so really a string or number will work
+          static getCurrent(): dialog;
+          static isTabEnabled(editor: editor, dialogName: string, tabName: string): boolean;
+          static okButton(): void;
+      }
+  
+      namespace dialog {
+  
+          namespace definition {
+  
+              interface button extends uiElement {
+                  disabled?: boolean;
+              }
+  
+              interface checkbox extends uiElement {
+                  default?: string;
+                  validate?: () => boolean;
+              }
+  
+              interface content {
+                  accessKey?: string;
+                  elements?: dialog.definition.uiElement[];
+                  id?: string;
+                  label?: string;
+                  title?: string;
+              }
+  
+              interface file extends labeledElement {
+                  action?: string;
+                  size?: string;
+                  validate?: () => boolean;
+              }
+  
+              interface fileButton extends uiElement {
+                  filebrowser?: string;
+                  for?: string;
+                  validate?: () => boolean;
+              }
+  
+              interface hbox extends uiElement {
+                  children?: ui.dialog.uiElement[];
+                  height?: number;
+                  padding?: number;
+                  validate?: () => boolean;
+                  widths?: number[];
+              }
+  
+              interface html extends uiElement {
+                  html?: string;
+              }
+  
+              interface labeledElement extends uiElement {
+                  controlStyle?: string;
+                  inputStyle?: string;
+                  labelLayout?: string;
+                  labelStyle?: string;
+                  widths?: number[];
+              }
+  
+              interface radio extends labeledElement {
+                  default?: string;
+                  items?: string[] | (string[])[];
+                  validate?: () => boolean;
+              }
+  
+              interface select extends labeledElement {
+                  default?: string;
+                  items?: string[] | (string[])[];
+                  multiple?: boolean;
+                  size?: number;
+                  validate?: () => boolean;
+              }
+  
+              interface textarea extends labeledElement {
+                  bidi?: boolean;
+                  cols?: number;
+                  default?: string;
+                  rows?: number;
+                  validate?: () => boolean;
+              }
+  
+              interface textInput extends labeledElement {
+                  bidi?: boolean;
+                  default?: string;
+                  maxLength?: number;
+                  size?: number;
+                  validate?: () => boolean;
+              }
+  
+              interface uiElement {
+                  align?: string;
+                  className?: string;
+                  commit?: (widget: plugins.widget) => void;
+                  id?: string;
+                  label?: string;
+                  onHide?: (elem: ui.dialog.uiElement) => void;
+                  onLoad?: (elem: ui.dialog.uiElement) => void;
+                  onShow?: (elem: ui.dialog.uiElement) => void;
+                  requiredContent?: string | { [key: string]: any } | style;
+                  setup?: (widget: plugins.widget) => void;
+                  style?: string;
+                  title?: string;
+                  type?: string;
+              }
+  
+              interface vbox extends uiElement {
+                  children?: ui.dialog.uiElement[];
+                  expand?: boolean;
+                  heights?: number[];
+                  padding?: number;
+                  styles?: string;
+                  width?: number[];
+              }
+          }
+  
+          interface IDialogDefinition {
+              buttons?: dialog.definition.button[];
+              contents?: dialog.definition.content[];
+              height?: number;
+              minHeight?: number;
+              minWidth?: number;
+              onCancel?: () => void;
+              onLoad?: () => void;
+              onOk?: () => void;
+              onShow?: () => void;
+              onHide?: () => void;
+              resizable?: number;
+              title?: string;
+              width?: number;
+          }
+      }
+  
+      class dialogCommand {
+          value: any;
+  
+          constructor(dialogName: string, ext?: { tabId?: string });
+      }
+  
+      interface dtdDefinition {
+          [outerTagName: string]: {[innerTagName: string]: 1};
+          $block:          {[tagName: string]: 1};
+          $blockLimit:     {[tagName: string]: 1};
+          $cdata:          {[tagName: string]: 1};
+          $editable:       {[tagName: string]: 1};
+          $empty:          {[tagName: string]: 1};
+          $inline:         {[tagName: string]: 1};
+          $intermediate:   {[tagName: string]: 1};
+          $list:           {[tagName: string]: 1};
+          $listItem:       {[tagName: string]: 1};
+          $nonBodyContent: {[tagName: string]: 1};
+          $nonEditable:    {[tagName: string]: 1};
+          $object:         {[tagName: string]: 1};
+          $removeEmpty:    {[tagName: string]: 1};
+          $tabIndex:       {[tagName: string]: 1};
+          $tableContent:   {[tagName: string]: 1};
+          $transparent:    {[tagName: string]: 1};
+      }
+  
+      var dtd: dtdDefinition;
+      
+      class editable extends dom.element {
+          hasFocus: boolean;
+          readonly status: string;
+  
+          constructor(editor: editor, element: HTMLElement | dom.element);
+          attachClass(className: string): void;
+          attachListener(obj: event | editable, eventName: string, listenerFunction: (ei: eventInfo) => void, scopeobj?: {}, listenerData?: any, priority?: number): listenerRegistration;
+          changeAttr(attr: string, val: string): void;
+          detach(): void;
+          insertElement(element: dom.element, range?: dom.range): void;
+          insertHtml(data: string, mode?: string, range?: dom.range): void;
+          insertText(text: dom.text): void;
+          isInline(): boolean;
+          setReadOnly(isReadOnly: boolean): void;
+      }
+  
+      class editor extends event {
+          readonly activeEnterMode: number;
+          readonly activeFilter: filter;
+          readonly activeShiftEnterMode: number;
+          readonly blockless: boolean;
+          readonly config: config;
+          readonly container: dom.element;
+          readonly contextMenu: plugins.contextMenu;
+          copyFormatting: plugins.copyformatting.state;
+          dataProcessor: dataProcessor;
+          readonly document: dom.document;
+          readonly element: dom.element;
+          readonly elementMode: number;
+          readonly enterMode: number;
+          readonly filter: filter;
+          readonly focusManager: focusManager;
+          readonly id: string;
+          readonly keystrokeHandler: keystrokeHandler;
+          readonly lang: any;
+          readonly langCode: string;
+          readonly mode: string;
+          readonly name: string;
+          readonly pasteFilter: filter;
+          readonly plugins: any;
+          readonly readOnly: boolean;
+          readonly shiftEnterMode: number;
+          readonly status: string;
+          readonly tabIndex: number;
+          readonly templates: any;
+          readonly title: any;
+          readonly toolbar: any;
+          readonly ui: ui;
+          readonly widgets: plugins.widget.repository;
+          readonly window: dom.window;
+  
+          constructor(instanceConfig?: config, element?: dom.element, mode?: number);
+          addCommand(commandName: string, commandDefinition: commandDefinition): void;
+          addContentsCss(cssPath: string): void;
+          addFeature(feature: feature): boolean;
+          addMenuGroup(name: string, order?: number): void;
+          addMenuItem(name: string, definition?: IMenuItemDefinition): void;
+          addMenuItems(definitions: { [id:string]: IMenuItemDefinition }): void;
+          addMode(mode: string, exec: () => void): void;
+          addRemoveFormatFilter(func: (element: dom.element) => boolean): void;
+          applyStyle(style: style): void;
+          attachStyleStateChange(style: style, callback: (state: number) => void): void;
+          checkDirty(): boolean;
+          createFakeElement(realElement: dom.element, className: string, realElementType: string, isResizable: boolean): void;
+          createFakeParserElement(realElement: dom.element, className: string, realElementType: string, isResizable: boolean): void;
+          createRange(): dom.range;
+          destroy(noUpdate?: boolean): void;
+          editable(elementOrEditable?: dom.element | editable): editable;
+          elementPath(startNode?: dom.node): dom.elementPath;
+          execCommand(commandName: string, data?: any): boolean;
+          extractSelectedHtml(toString?: boolean, removeEmptyBlock?: boolean): dom.documentFragment | string | void;
+          focus(): void;
+          forceNextSelectionCheck(): void;
+          getClipboardData(callbackOrOptions: { title: string } | ((data: any) => void), callback: (data: any) => void): void;
+          getColorFromDialog(callback: (color: string) => void, scope?: { [key: string]: any }): void;
+          getCommand(commandName: string): command;
+          getCommandKeystroke(command: command | string): number | null;
+          getData(internal?: boolean): string;
+          getMenuItem(name: string): IMenuItemDefinition;
+          getResizable(forContents: boolean): dom.element;
+          getSelectedHtml(toString?: false): dom.documentFragment;
+          getSelectedHtml(toString: true): string;
+          getSelectedHtml(toString?: boolean): dom.documentFragment | string;
+          getSelection(forceRealSelection?: boolean): dom.selection;
+          getSnapshot(): string;
+          getStylesSet(callback: (stylesDefinitions: style.definition[]) => void): void;
+          getUiColor(): string;
+          insertElement(element: dom.element): void;
+          insertHtml(html: string, mode?: string, range?: dom.range): void;
+          insertText(text: string): void;
+          loadSnapshot(snapshot: any): void;
+          lockSelection(sel?: dom.selection): boolean;
+          openDialog(dialogName: string, callback: () => void): dialog;
+          popup(url: string, width?: number | string, height?: number | string, options?: string): void;
+          removeMenuItem(name: string): void;
+          removeStyle(style: style): void;
+          resetDirty(): void;
+          resetUndo(): void;
+          resize(width: number | string, height: number | string, isContentHeight?: boolean, resizeInner?: boolean): void;
+          restoreRealElement(fakeElement: dom.element): dom.element;
+          selectionChange(checkNow?: boolean): void;
+          setActiveEnterMode(enterMode: number, shiftEnterMode: number): void;
+          setActiveFilter(filter: filter): void;
+          setData(data: string, options?: { internal?: boolean; callback?: () => void; noSnapshot?: boolean; }): void;
+          setKeystroke(keystroke: number, behavior: string | boolean): void;
+          setKeystroke(keystroke: [number, string | boolean][]): void;
+          setMode(newMode: string, callback: () => void): void;
+          setReadOnly(isReadOnly?: boolean): void;
+          setUiColor(color: string): void;
+          showNotification(message: string, type: plugins.notification.type, progressOrDuration: number): plugins.notification;
+          unlockSelection(restore?: boolean): void;
+          updateElement(): void;
+      }
+  
+      namespace editor {
+          interface eventObject {
+              activeEnterModeChange?: (evt: eventInfo) => void;
+              activeFilterChange?: (evt: eventInfo) => void;
+              afterCommandExec?: (evt: eventInfo) => void;
+              afterInsertHtml?: (evt: eventInfo) => void;
+              afterPaste?: (evt: eventInfo) => void;
+              afterPasteFromWord?: (evt: eventInfo) => void;
+              afterSetData?: (evt: eventInfo) => void;
+              afterUndoImage?: (evt: eventInfo) => void;
+              ariaEditorHelpLabel?: (evt: eventInfo) => void;
+              ariaWidget?: (evt: eventInfo) => void;
+              autogrow?: (evt: eventInfo) => void;
+  
+              beforeCommandExec?: (evt: eventInfo) => void;
+              beforeDestroy?: (evt: eventInfo) => void;
+              beforeGetData?: (evt: eventInfo) => void;
+              beforeModeUnload?: (evt: eventInfo) => void;
+              beforeSetMode?: (evt: eventInfo) => void;
+              beforeUndoImage?: (evt: eventInfo) => void;
+              blur?: (evt: eventInfo) => void;
+  
+              change?: (evt: eventInfo) => void;
+              configLoaded?: (evt: eventInfo) => void;
+              contentDirChanged?: (evt: eventInfo) => void;
+              contentDom?: (evt: eventInfo) => void;
+              contentDomInvalidated?: (evt: eventInfo) => void;
+              contentDomUnload?: (evt: eventInfo) => void;
+              customConfigLoaded?: (evt: eventInfo) => void;
+  
+              dataFiltered?: (evt: eventInfo) => void;
+              dataReady?: (evt: eventInfo) => void;
+              destroy?: (evt: eventInfo) => void;
+              dialogHide?: (evt: eventInfo) => void;
+              dialogShow?: (evt: eventInfo) => void;
+              dirChanged?: (evt: eventInfo) => void;
+              doubleclick?: (evt: eventInfo) => void;
+              dragend?: (evt: eventInfo) => void;
+              dragstart?: (evt: eventInfo) => void;
+              drop?: (evt: eventInfo) => void;
+  
+              elementsPathUpdate?: (evt: eventInfo) => void;
+  
+              fileUploadRequest?: (evt: eventInfo) => void;
+              fileUploadResponse?: (evt: eventInfo) => void;
+              floatingSpaceLayout?: (evt: eventInfo) => void;
+              focus?: (evt: eventInfo) => void;
+  
+              getData?: (evt: eventInfo) => void;
+              getSnapshot?: (evt: eventInfo) => void;
+  
+              insertElement?: (evt: eventInfo) => void;
+              insertHtml?: (evt: eventInfo) => void;
+              insertText?: (evt: eventInfo) => void;
+              instanceReady?: (evt: eventInfo) => void;
+  
+              key?: (evt: eventInfo) => void;
+  
+              langLoaded?: (evt: eventInfo) => void;
+              loadSnapshot?: (evt: eventInfo) => void;
+              loaded?: (evt: eventInfo) => void;
+              lockSnapshot?: (evt: eventInfo) => void;
+              maximize?: (evt: eventInfo) => void;
+              menuShow?: (evt: eventInfo) => void;
+              mode?: (evt: eventInfo) => void;
+  
+              notificationHide?: (evt: eventInfo) => void;
+              notificationShow?: (evt: eventInfo) => void;
+              notificationUpdate?: (evt: eventInfo) => void;
+  
+              paste?: (evt: eventInfo) => void;
+              pasteFromWord?: (evt: eventInfo) => void;
+              pluginsLoaded?: (evt: eventInfo) => void;
+  
+              readOnly?: (evt: eventInfo) => void;
+              removeFormatCleanup?: (evt: eventInfo) => void;
+              required?: (evt: eventInfo) => void;
+              resize?: (evt: eventInfo) => void;
+  
+              save?: (evt: eventInfo) => void;
+              saveSnapshot?: (evt: eventInfo) => void;
+              selectionChange?: (evt: eventInfo) => void;
+              setData?: (evt: eventInfo) => void;
+              stylesSet?: (evt: eventInfo) => void;
+  
+              template?: (evt: eventInfo) => void;
+              toDataFormat?: (evt: eventInfo) => void;
+              toHtml?: (evt: eventInfo) => void;
+  
+              unlockSnapshot?: (evt: eventInfo) => void;
+              updateSnapshot?: (evt: eventInfo) => void;
+  
+              widgetDefinition?: (evt: eventInfo) => void;
+          }
+      }
+  
+      namespace env {
+          var air: boolean;
+          var chrome: boolean;
+          var cssClass: string;
+          var edge: boolean;
+          var gecko: boolean;
+          var hc: boolean;
+          var hidpi: boolean;
+          var iOS: boolean;
+          var ie: boolean;
+          var isCompatible: boolean;
+          var mac: boolean;
+          var needsBrFiller: boolean;
+          var needsNbspFiller: boolean;
+          var quirks: boolean;
+          var safari: boolean;
+          var version: number;
+          var webkit: boolean;
+  
+          function secure(): boolean;
+      }
+  
+      class event {
+          static useCapture: boolean;
+          
+          constructor();
+          capture(): void;
+          define(name: string, meta: { [key: string]: any }): void;
+          fire(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
+          fireOnce(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
+          hasListeners(eventName: string): boolean;
+          on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any } | null, listenerData?: any, priority?: number): listenerRegistration;
+          once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any } | null, listenerData?: any, priority?: number): listenerRegistration;
+          removeAllListeners(): void;
+          removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
+  
+          static implementOn(targetObject: { [key: string]: any }): void;
+      }
+  
+      interface eventInfo {
+          data: any;
+          editor: editor;
+          listenerData: any;
+          name: string;
+          sender: { [key: string]: any };
+          
+          cancel(): void;
+          removeListener(): void;
+          stop(): void;
+      }
+  
+      interface feature {
+          allowedContent?: filter.allowedContentRules;
+          contentForms?: any;
+          contentTransformations?: any;
+          name?: string;
+          requiredContent?: string | style;
+          toFeature?: () => feature;
+      }
+  
+      namespace fileTools {
+          var isFileUploadSupported: boolean;
+  
+          function addUploadWidget(editor: editor, name: string, def: uploadWidgetDefinition): void;
+          function bindNotification(editor: editor, fileLoader: fileLoader): void;
+          function getUploadUrl(config: { [key: string]: any }, type?: string): string;
+          function isTypeSupported(file: Blob, supportedTypes: RegExp): boolean;
+          function markElement(element: dom.element, widgetName: string, loaderId: number): void;
+  
+          class fileLoader extends event {
+              readonly data: string;
+              readonly file: Blob;
+              readonly fileName: string;
+              readonly id: number;
+              readonly loaded: number;
+              readonly message: string;
+              readonly reader: FileReader;
+              readonly responseData: any;
+              status: string;
+              readonly total: number;
+              readonly uploadTotal: number;
+              readonly uploadUrl: string;
+              readonly uploaded: string;
+              readonly url: string;
+              readonly xhr: XMLHttpRequest;
+  
+              constructor(editor: editor, fileOrData: Blob | string, fileName?: string);
+              abort(): void;
+              isFinished(): boolean;
+              load(): void;
+              loadAndUpload(url: string, additionalRequestParameters?: any): void;
+              update(): void;
+              upload(url: string, additionalRequestParameters?: any): void;
+          }
+  
+          class uploadRepository extends event {
+              readonly loaders: fileLoader[];
+  
+              constructor(editor: editor);
+              create(fileOrData: Blob | string, fileName: string, loaderType?: any): fileLoader;
+              isFinished(): boolean;
+          }
+  
+          interface uploadWidgetDefinition extends plugins.widget.definition {
+              additionalRequestParameters: any;
+              fileToElement: (pastedFile: any) => HTMLElement;
+              loadMethod: string;
+              loaderType: any;
+              onAbort: () => boolean;
+              onError: () => boolean;
+              onLoaded: () => boolean;
+              onUploaded: () => boolean;
+              onUploading: () => boolean;
+              replaceWith: () => any;
+              skipNotifications: boolean;
+              supportedTypes: string;
+              uploadUrl: string;
+          }
+      }
+  
+      module filter {
+          type allowedContentRule = string | style | { [key: string]: any};
+          type allowedContentRules = allowedContentRule | allowedContentRule[];
+          type contentRule = string | style;
+          type disallowedContentRules = string | { [key: string]: any};
+  
+          interface transformation {
+              check?: string;
+              element?: string | style;
+              left?: (element: htmlParser.element | style) => boolean;
+              right: (element: htmlParser.element, tools: string | filter.transformationTools) => boolean;
+          }
+  
+          var transformationTools: transformationTools;
+  
+          interface transformationTools {
+              alignmentToAttribute(element: htmlParser.element): void;
+              alignmentToStyle(element: htmlParser.element): void;
+              lengthToAttribute(element: htmlParser.element, styleName: string, attrName?: string): void;
+              lengthToStyle(element: htmlParser.element, styleName: string, attrName?: string): void;
+              matchesTyle(element: htmlParser.element, style: style): void;
+              sizeToAttribute(element: htmlParser.element): void;
+              sizeToStyle(element: htmlParser.element): void;
+              splitBorderShorthand(element: htmlParser.element): void;
+              splitMarginShorthand(element: htmlParser.element): void;
+              transform(element: htmlParser.element, form: style | string): void;
+          }
+      }
+  
+      class filter {
+          readonly allowedContent: filter.allowedContentRules[];
+          readonly customConfig: boolean;
+          readonly disabled: boolean;
+          readonly disallowedContent: any[];
+          readonly editor: editor;
+          readonly elementCallbacks:((element: htmlParser.element) => number)[];
+          readonly id: number;
+  
+          static instances: { [id: string]: filter };
+  
+          constructor(editorOrRules: editor | filter.allowedContentRules);
+          addContentForms(forms: any[]): void;
+          addElementCallback(callback: (element: htmlParser.element) => number): void;
+          addFeature(feature: feature): boolean;
+          addTransformations(transformations: (string | filter.transformation)[][]): void;
+          allow(newRules: filter.allowedContentRules, featureName?: string, overrideCustom?: boolean): boolean;
+          applyTo(fragment: htmlParser.fragment | htmlParser.element, toHrml: boolean, transformOnly: boolean, enterMode: number): boolean;
+          check(test: filter.contentRule, applyTransformations?: boolean, strictCheck?: boolean): boolean;
+          checkFeature(feature: feature): boolean;
+          clone(): filter;
+          destroy(): void;
+          disable(): void;
+          disallow(newRules: filter.disallowedContentRules): void;
+          getAllowedEnterMode(defaultMode: number, reverse?: boolean): number;
+      }
+  
+      class focusManager {
+          currentActive: dom.domObject;
+          hasFocus: boolean;
+  
+          constructor(editor: editor);
+          add(element: dom.element, isCapture: boolean): void;
+          blur(noDelay?: boolean): void;
+          focus(currentActive?: dom.element): void;
+          lock(): void;
+          remove(element: dom.element): void;
+          unlock(): void;
+      }
+  
+      class htmlDataProcessor implements dataProcessor {
+          dataFilter: htmlParser.filter;
+          htmlFilter: htmlParser.filter;
+          writer: htmlParser.basicWriter;
+  
+          constructor(editor: editor);
+          toDataFormat(html: string, options?: string | { context?: string, filter?: filter, enterMode?: number }): string;
+          toHtml(data: string, options?: string | htmlDataProcessorOptions): string;
+      }
+  
+      interface htmlDataProcessorOptions {
+          context?: string;
+          fixForBody?: boolean;
+          filter?: filter;
+          dontFilter?: boolean;
+          enterMode?: number;
+          protectedWhitespaces?: boolean;
+      }
+  
+      namespace htmlParser {
+          class basicWriter {
+              constructor();
+              attribute(attName: string, attValue: string): void;
+              closeTag(tagName: string): void;
+              comment(comment: string): void;
+              getHtml(reset: boolean): string;
+              openTag(tagName: string, attributes: { [key: string]: string }): void;
+              openTagClose(tagName: string, isSelfClose: boolean): void;
+              reset(): void;
+              text(text: string): void;
+              write(data: string): void;
+          }
+  
+          class cdata extends node {
+              constructor(value: string);
+              type: number;
+              writeHtml(writer: htmlParser.basicWriter): void;
+          }
+  
+          class comment extends node {
+              type: number;
+              value: string;
+  
+              constructor(value: string);
+              filter(filter: filter): boolean;
+              writeHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
+          }
+  
+          class cssStyle {
+              constructor(elementOrStyleText: htmlParser.element | string);
+              populate(obj: htmlParser.element | dom.element | { [key: string]: any}): void;
+          }
+  
+          class element extends node {
+              attributes: { [name: string]: string };
+              children: htmlParser.node[];
+              name: string;
+              type: number;
+  
+              constructor(name: string, attributes: { [name: string]: string });
+              add(node: node, index?: number): void;
+              addClass(className: string): void;
+              clone(): element;
+              filter(filter: htmlParser.filter): boolean;
+              filterChildren(filter: htmlParser.filter): void;
+              find(criteria: string | ((el: htmlParser.node) => boolean), recursive?: boolean): htmlParser.node[];
+              forEach(callback: (node: htmlParser.node) => void | false, type?: number, skipRoot?: boolean): void;
+              getFirst(condition: string | { [key: string]: string } | ((node: htmlParser.node) => boolean)): htmlParser.node;
+              getHtml(): string;
+              getOuterHtml(): string;
+              hasClass(className: string): boolean;
+              removeClass(className: string): void;
+              replaceWithChildren(): void;
+              setHtml(html: string): void;
+              split(index: number): htmlParser.element;
+              writeChildrenHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
+              writeHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
+          }
+  
+          class filter {
+              attributeNameRules: filterRulesGroup;
+              attributesRules: { [name: string]: filterRulesGroup };
+              commentRules: filterRulesGroup;
+              elementNameRules: filterRulesGroup;
+              elementsRules: { [name: string]: filterRulesGroup };
+              id: number;
+              rootRules: filterRulesGroup;
+              textRules: filterRulesGroup;
+  
+              constructor(rules?: filterRulesDefinition);
+              addRules(rules: filterRulesDefinition, options?: number | { priority?: number; applyToAll?: boolean; }): void;
+              applyTo(node: node): void;
+          }
+  
+          interface filterRulesDefinition {
+              elementNames?: any;
+              attributeNames?: any;
+              elements?: any;
+              attributes?: any;
+              text?: any;
+              comment?: any;
+              root?: any;
+          }
+  
+          class filterRulesGroup {
+              rules: { value: rule, priority: number, option: ruleOptions }[];
+  
+              add(rule: rule, priority: number, options: ruleOptions): void;
+              addMany(rules: { [key: string]: any }[], priority: number, options: ruleOptions): void;
+              exec(currentValue: htmlParser.node | htmlParser.fragment | string): htmlParser.node | htmlParser.fragment | string;
+              execOnName(currentName: string): string;
+              findIndex(priority: number): number;
+          }
+  
+          class fragment {
+              children: htmlParser.node[];
+              parent: htmlParser.fragment;
+              readonly type: number;
+  
+              constructor();
+  
+              add(node: htmlParser.node, index?: number): void;
+              filter(filter: htmlParser.filter): void;
+              filterChildren(filter: htmlParser.filter, filterRoot?: boolean): void;
+              forEach(callback: (node: htmlParser.node) => void | false, type?: number, skipRoot?: boolean): void;
+              writeChildrenHtml(writer: basicWriter, filter?: htmlParser.filter, filterRoot?: boolean): void;
+              writeHtml(writer: basicWriter, filter?: htmlParser.filter): void;
+  
+              static fromBBCode(source: string): htmlParser.fragment;
+              static fromHtml(fragmentHtml: string, parent?: htmlParser.element | string, fixingBlock?: string | boolean): fragment | htmlParser.element;
+          }
+  
+          class node {
+              constructor();
+              getAscendant(condition: string | { [name: string]: string } | ((node: htmlParser.element) => boolean)): element;
+              getIndex(): number;
+              insertAfter(node: node): void;
+              insertBefore(node: node): void;
+              remove(): node;
+              replaceWith(node: node): void;
+              wrapWith(wrapper: element): element;
+          }
+  
+          type rule = ((value: htmlParser.node | htmlParser.fragment | string) => boolean) | [ string, string ];
+  
+          interface ruleOptions {
+              applyToAll?: boolean,
+              excludeNestedEditable?: boolean
+          }
+  
+          class text extends node {
+              constructor(value: string);
+              type: number;
+              filter(filter: filter): boolean;
+              writeHtml(writer: basicWriter, filter?: filter): void;
+          }
+      }
+  
+      class htmlWriter extends htmlParser.basicWriter {
+          indentationChars: string;
+          lineBreakChars: string;
+          selfClosingEnd: string;
+  
+          indentation(): void;
+          lineBreak(): void;
+          setRules(tagName: string, rules: { [key: string]: any }): void;
+      }
+  
+      class keystrokeHandler {
+          blockedKeystrokes: { [key: number]: string | boolean };
+          keystrokes: { [key: number]: string | boolean };
+  
+          constructor(editor: editor);
+  
+          attach(domObject: dom.domObject): void;
+      }
+  
+      namespace lang {
+          var languages: { [code: string]: number };
+          var rtl: { [code: string]: number };
+  
+          function detect(defaultLanguage: string, probeLanguage?: string): string;
+          function load(languageCode: string, defaultLanguage: string, callback: (code: string, entries: any) => void): void;
+      }
+  
+      namespace loader {
+          var loadedScripts: string[];
+          var scripts: string[];
+  
+          function load(scriptName: string, defer?: boolean): void;
+          function loadPending(): void;
+      }
+  
+      class menu {
+          constructor();
+  
+          add(item: any): void;
+          addListener(listenerFn: (startElement: dom.element, selection: dom.selection, path: dom.elementPath) => any): void;
+          findItemByCommandName(commandName: string): { item: any, element: dom.element };
+          hide(returnFocus?: boolean): void;
+          removeAll(): void;
+          show(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
+      }
+  
+      interface pluginDefinition {
+          hidpi?: boolean;
+          lang?: string | string[];
+          requires?: string | string[];
+  
+          afterInit?(editor: editor): any;
+          beforeInit?(editor: editor): any;
+          init?(editor: editor): void;
+          onLoad?(): any;
+      }
+  
+      namespace plugins {
+  
+          namespace cloudservices {
+              class cloudServicesLoader extends fileTools.fileLoader {
+                  customToken: string;
+  
+                  constructor(editor: editor, fileOrData: Blob | string, fileName?: string, token?: string);
+                  loadAndUpload(url?: string, additionalRequestParameters?: any): void;
+                  upload(url?: string, additionalRequestParameters?: any): void;
+              }
+          }
+  
+          class autoEmbed {
+              getWidgetDefinition(editor: editor, url: string): widget.definition;
+          }
+  
+          namespace balloontoolbar {
+              const PRIORITY: { [pri: string]: number };
+  
+              class context {
+                  editor: editor;
+                  options: contextDefinition;
+                  toolbar: ui.balloonToolbar;
+  
+                  constructor(editor: editor, options: contextDefinition);
+                  destroy(): void;
+                  hide(): void;
+                  refresh(): void;
+                  show(pointedElement?: dom.element): void;
+              }
+  
+              interface contextDefinition {
+                  cssSelector?: string;
+                  priority?: number;
+                  widgets?: string[] | string;
+  
+                  refresh?: (editor: editor, path: dom.elementPath, selection: dom.selection) => dom.element;
+              }
+  
+              class contextManager {
+                  editor: editor;
+  
+                  constructor(editor: editor);
+                  add(context: context): void;
+                  check(selection?: dom.selection): void;
+                  create(options: contextDefinition): context;
+                  destroy(): void;
+                  hide(): void;
+              }
+          }
+  
+          namespace clipboard {
+              const isCustomCopyCutSupported: boolean;
+              const isCustomDataTypesSupported: boolean;
+              const isFileApiSupported:  boolean;
+              const mainPasteEvent: string;
+  
+              function addPasteButton(editor: editor, name: string, definition: { [key: string]: any}): void;
+              function canClipboardApiBeTrusted(dataTransfer: dataTransfer, editor: editor): boolean;
+              function getDropTarget(editor: editor): dom.domObject;
+              function getRangeAtDropPosition(domEvent: Event, editor: editor): dom.range;
+              function initDragDataTransfer(evt?: dom.event, editor?: editor): void;
+              function initPasteDataTransfer(evt?: dom.event, sourceEditor?: editor): void;
+              function preventDefaultDropOnElement(element: dom.element): void;
+              function resetDragDataTransfer(): void;
+  
+              class dataTransfer {
+                  readonly $: DataTransfer;
+                  readonly id: string;
+                  readonly sourceEditor: editor;
+  
+                  constructor(nativeDataTransfer?: DataTransfer, editor?: editor);
+                  cacheData(): void;
+                  getData(type: string, getNative?: boolean): string;
+                  getFile(i: number): File;
+                  getFilesCount(): number;
+                  getTransferType(targetEditor: editor): number;
+                  isEmpty(): boolean;
+                  setData(type: string, value: string): void;
+                  storeId(): void;
+              }
+  
+              class fallbackDataTransfer {
+                  constructor(dataTransfer: dataTransfer);
+                  getData(type: string, getNative?: boolean): string;
+                  isRequired(): boolean;
+                  setData(type: string, value: string): string;
+              }
+          }
+  
+          namespace condesnippet {
+              function setHighlighter(highlighter: highlighter): void;
+  
+              class highlighter {
+                  highlighter: (code: string, lang: string, callback: (highlightedCode: string) => void) => void;
+                  init: (ready: () => void) => void;
+                  languages: { [lang: string]: string };
+                  readonly queue: ((code: string, lang: string, callback: (highlightedCode: string) => void) => void)[];
+                  readonly ready: boolean;
+  
+                  highlight(code: string, lang: string, callback: (highlightedCode: string) => void): void;
+              }
+          }
+  
+          class contextMenu extends menu {
+              constructor(editor: editor);
+              addTarget(element: dom.element, nativeContextMenuOnCtrl?: boolean): void;
+              open(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
+          }
+  
+          namespace copyformatting {
+              var breakOnElements: string[];
+              var elementsForInlineTransform: string[];
+              var excludedAttributes: string[];
+              var excludedAttributesFromInlineTransform: string[];
+              var inlineBoundary: string[];
+              var preservedElements: string[];
+  
+              class state extends event {
+                  editor: editor;
+                  filter: filter;
+                  sticky: boolean;
+                  styles: style[];
+  
+                  constructor(editor: editor);
+              }
+          }
+  
+          namespace easyimage {
+  
+          }
+  
+          namespace embedBase {
+              function createWidgetBaseDefinition(editor: editor): baseDefinition;
+  
+              interface baseDefinition extends widget.definition {
+                  providerUrl: template;
+                  urlRegExp: RegExp;
+  
+                  getErrorMessage(messageTypeOrMessage: string, url?: string, suffix?: string): string;
+                  isUrlValid(url: string): boolean;
+                  loadContent(url: string, callback?: () => void, errorCallback?: (error: string) => void, noNotifications?: boolean): request;
+              }
+  
+              interface request {
+                  callback: () => void;
+                  errorCallback: (error: string) => void;
+                  response: { [key: string]: string };
+                  task: notificationAggregator.task;
+                  url: string;
+  
+                  cancel(): void;
+              }
+          }
+  
+          namespace image2 {
+              function checkHasNaturalRatio(image: dom.element): boolean;
+              function getLinkAttributesGetter(): (editor: editor, data: { [key: string]: string }) => { set: { [tag: string]: string }, removed: string[] };
+              function getLinkAttributesParser(): (editor: editor, element: dom.element) => { [key: string]: string };
+              function getNatural(image: dom.element): { [key: string]: string };
+          }
+  
+          namespace imagebase {
+              var featuresDefinitions: { [key: string]: string };
+  
+              function addFeature(editor: editor, name: string, definition: imageWidgetDefinition): imageWidgetDefinition;
+              function addImageWidget(editor: editor, name: string, definition: imageWidgetDefinition): void;
+  
+              interface imageWidgetDefinition extends widget.definition {
+                  features: string[];
+                  upcast: string;
+              }
+  
+              class progressBar extends progressReporter {
+                  bar: dom.element;
+  
+                  constructor();
+  
+              }
+  
+              class progressReporter {
+                  wrapper: dom.element;
+  
+                  constructor(wrapperHtml?: string);
+                  aborted(): void;
+                  bindLoader(loader: fileTools.fileLoader): void;
+                  done(): void;
+                  failed(): void;
+                  remove(): void;
+                  updated(progress: number): void;
+              }
+          }
+  
+          namespace indent {
+              function registerCommands(editor: editor, commands: { [key: string]: command} ): void;
+  
+              class genericDefinition implements commandDefinition {
+                  async: boolean;
+                  canUndo: boolean;
+                  context: boolean;
+                  contextSensitive: boolean;
+                  editorFocus: boolean;
+                  fakeKeystroke: number;
+                  readonly isIndent: boolean;
+                  modes: { [key: string]: any };
+                  readOnly: boolean;
+                  startDisabled: boolean;
+  
+                  exec(editor: editor, data?: any): boolean;
+                  refresh?(editor: editor, path: dom.elementPath): void;
+              }
+  
+              class specificDefinition {
+                  database: { [key: string]: any };
+                  readonly enterBr: boolean;
+                  readonly indentKey: { [key: string]: any };
+                  readonly isIndent: boolean;
+                  readonly jobs: { [priority: string]: { refresh: (editor: editor, path: dom.elementPath) => number, exec: (editor: editor) => boolean } };
+                  readonly relatedGlobal: { [key: string]: any };
+  
+                  execJob(editor: editor, priority: number): boolean;
+                  getContext(node: dom.elementPath): dom.element;
+                  refreshJob(editor: editor, priority: number): number;
+              }
+          }
+  
+          namespace indentList {
+              function firstItemInPath(query: string | string[] | { [tagName: string]: any} | dom.element | ((element: dom.element) => boolean)): boolean;
+          }
+  
+          namespace link {
+              // DEPRECATED 4.3.3
+              const emptyAnchorFix: boolean;
+  
+              // DEPRECATED 4.3.3
+              const fakeAnchor: boolean;
+  
+              // DEPRECATED 4.3.3
+              const synAnchorSelector: boolean;
+  
+              function getEditorAnchors(editor: editor): dom.element[];
+              function getLinkAttributes(editor: editor, data: { [key: string]: any}): { set: { [key: string]: string }, removed: string[] }
+              function getSelectedLink(editor: editor, returnMultiple?: boolean): dom.element | dom.element[];
+              function parseLinkAttributes(editor: editor, element: dom.element): { [key: string]: any };
+              function showDisplayTextForElement(element: dom.element, editor: editor): boolean;
+              function tryRestoreFakeAnchor(editor: editor, element: dom.element): dom.element;
+          }
+  
+          class list {
+              arrayToList(listArray: any, database: any, paragraphMode: any, dir: any): void;
+              listToArray(listNode: any, database: any, baseArray: any, baseIndentLevel: any, grandparentNode: any): void;
+          }
+  
+          class notification {
+              readonly area: notification.area;
+              readonly duration: number;
+              readonly editor: editor;
+              readonly element: dom.element;
+              readonly id: number;
+              readonly message: string;
+              readonly progress: number;
+              readonly type: notification.type;
+  
+              constructor(editor: editor, options: notification.options);
+              hide(): void;
+              isVisible(): boolean;
+              show(): void;
+              update(options: notification.updateOptions): void;
+          }
+  
+          namespace notification {
+              interface area {
+                  readonly editor: editor;
+                  readonly element: dom.element;
+                  readonly notifications: notification[];
+  
+                  add(notification: notification): void;
+                  remove(notification: notification): void;
+              }
+  
+              interface optionsBase {
+                  duration?: number;
+                  progress?: number;
+                  type?: type;
+              }
+  
+              interface options extends optionsBase {
+                  message: string;
+              }
+  
+              interface updateOptions extends optionsBase  {
+                  message?: string;
+                  important?: boolean;
+              }
+  
+              type type = 'info' | 'warning' | 'success' | 'progress';
+          }
+  
+          class notificationAggregator extends event {
+              readonly editor: editor;
+              readonly notification: notification;
+  
+              constructor(editor: editor, message: string, singularMessage?: string);
+              createTask(options?: { weight?: number }): notificationAggregator.task;
+              getDoneTaskCount(): number;
+              getPercentage(): number;
+              getTaskCount(): number;
+              isFinished(): boolean;
+              update(): void;
+          }
+  
+          namespace notificationAggregator {
+              class task extends event {
+                  constructor(weight?: number);
+                  cancel(): void;
+                  done(): void;
+                  isCanceled(): boolean;
+                  isDone(): boolean;
+                  update(weight: number): void;
+              }
+          }
+  
+          namespace pastefromword {
+              class lists {
+                  numbering: lists.numbering;
+              }
+  
+              namespace lists {
+                  class numbering {
+                      getStyle(marker: string): string;
+                      toNumber(marker: string, markerType: string): number;
+                  }
+              }
+  
+              class styles {
+                  pushStylesLower(element: htmlParser.element, exceptions: { [style: string]: boolean }, wrapText?: boolean ): boolean;
+              }
+          }
+  
+          namespace tableselection {
+              function getCellsBetween(first: dom.element, last: dom.element): dom.element[];
+          }
+  
+          namespace widget {
+              var WRAPPER_CLASS_PREFIX: string;
+              
+              function getNestedEditable(guard: dom.element, node: dom.node): dom.element;
+              function isDomDragHandler(node: dom.node): boolean;
+              function isDomDragHandlerContainer(node: dom.node): boolean;
+              function isDomNestedEditable(node: dom.node): boolean;
+              function isDomWidget(node: dom.node): boolean;
+              function isDomWidgetElement(node: dom.node): boolean;
+              function isDomWidgetWrapper(node: dom.node): boolean;
+              function isParserWidgetElement(node: dom.node): boolean;
+              function isParserWidgetWrapper(node: dom.node): boolean;
+  
+              namespace nestedEditable {
+                  interface definition {
+                      allowedContent?: filter.allowedContentRules;
+                      disallowedContent?: filter.disallowedContentRules;
+                      pathName?: string;
+                      selector?: string;
+                  }
+              }
+  
+              class nestedEditable extends dom.element {
+                  readonly editor: editor;
+                  readonly enterMode: number;
+                  readonly filter: filter;
+                  readonly shiftEnterMode: number;
+  
+                  constructor(editor: editor, element: dom.element, config: { filter?: filter });
+                  getData(): string;
+                  setData(data: string): void;
+              }
+  
+  
+              interface definition extends feature {
+                  button?: string;
+                  data?: (evt: eventInfo) => void;
+                  defaults?: { [key: string]: any };
+                  dialog?: string;
+                  downcast?: string | ((element: htmlParser.element) => void);
+                  downcasts?: { [key: string]: any };
+                  draggable?: boolean;
+                  edit?: () => void;
+                  editables?: { [key: string]: any };
+                  getLabel?: () => any;
+                  init?: () => void;
+                  inline?: boolean;
+                  insert?: () => void;
+                  mask?: boolean;
+                  parts?: { [key: string]: any };
+                  pathName?: string;
+                  styleToAllowedContentRules?: (style: style) => filter.allowedContentRules;
+                  styleableElements?: string;
+                  template?: string | template;
+                  upcast?: string | ((element: htmlParser.element, data: any) => boolean);
+                  upcastPriority?: number;
+                  upcasts?: { [key: string]: any };
+              }
+  
+              class repository extends event {
+                  readonly editor: editor;
+                  readonly focused: widget;
+                  readonly instances: { [id: string]: widget };
+                  readonly registered: { [name: string]: definition };
+                  readonly selected: widget[];
+                  readonly widgetHoldingFocusedEditable: widget;
+  
+                  add(name: string, widgetDef: plugins.widget.definition): void;
+                  addUpcastCallback(callback: (element: htmlParser.element, data: any) => boolean): void;
+                  checkSelection(): void;
+                  checkWidgets(options?: { initOnlyNew?: boolean; focusInited?: boolean }): void;
+                  del(widget: plugins.widget): void;
+                  destroy(widget: plugins.widget, offline?: boolean): void;
+                  destroyAll(offline?: boolean): void;
+                  finalizeCreation(container: any): void;
+                  getByElement(element: any, checkWrapperOnly: boolean): plugins.widget;
+                  initOn(element: dom.element, widgetDef?: plugins.widget.definition, startupData?: { [key: string]: any }): plugins.widget;
+                  initOn(element: dom.element, widgetDef?: string, startupData?: { [key: string]: any }): plugins.widget;
+                  initOnAll(container?: dom.element): plugins.widget[];
+                  parseElementClasses(classes: string): any;
+                  wrapElement(element: any, widgetName?: string): any;
+              }
+  
+              class widgetselection {
+                  addFillers(editable: editable): boolean;
+                  removeFillers(editable: editable): void;
+              }
+          }
+  
+          class widget extends event implements widget.definition {
+              readonly dataReady: boolean;
+              readonly definition: plugins.widget.definition;
+              readonly editor: editor;
+              readonly element: dom.element;
+              readonly focusedEditable: plugins.widget.nestedEditable
+              readonly id: number;
+              readonly inited: boolean;
+              readonly ready: boolean;
+              readonly repository: plugins.widget.repository;
+              readonly wrapper: dom.element;
+  
+              constructor(widgetsRepo: plugins.widget.repository, id: number, element: dom.element, widgetDef: plugins.widget.definition, starupData?: any);
+  
+              addClass(className: string): void;
+              applyStyle(style: style): void;
+              checkStyleActive(style: style): boolean;
+              destroy(offline?: boolean): void;
+              destroyEditable(editableName: string, offline?: boolean): void;
+              edit(): boolean;
+              focus(): void;
+              getClasses(): any;
+              hasClass(className: string, Whether: boolean): void;
+              initEditable(editableName: string, definition: plugins.widget.nestedEditable.definition): boolean;
+              isInited(): boolean;
+              isReady(): boolean;
+              removeClass(className: string): void;
+              removeStyle(style: style): void;
+              setData(keyOrData: any, value: any): plugins.widget;
+              setFocused(selected: boolean): plugins.widget;
+              setSelected(selected: boolean): plugins.widget;
+              updateDragHandlerPosition(): void;
+          }
+  
+          function add(name: string, definition: pluginDefinition): void;
+          function add(name: string): void;
+          function addExternal(name: string, path: string, fileName?: string): void;
+          function get(name: string): any;
+          function getFilePath(name: string): string;
+          function getPath(name: string): string;
+          function load(name: string, callback: (plugins: string[]) => void, scope?: { [key: string]: any }): void;
+          function setLang(pluginName: string, languageCode: string, languageEntries: any): void;
+          var registered: {[key: string]: pluginDefinition};
+      }
+  
+      class resourceManager {
+          basePath: string;
+          externals: { [key: string]: any };
+          fileName: string;
+          loaded: { [key: string]: any };
+          registered: { [key: string]: any };
+  
+          constructor(basePath: string, fileName: string);
+          add(name: string, definition?: pluginDefinition): void;
+          addExternal(names: string, path: string, fileName?: string): void;
+          get(name: string): pluginDefinition;
+          getFilePath(name: string): string;
+          getPath(name: string): string;
+          load(name: string | string[], callback: (loaded: string[]) => void, scope?: { [key: string]: any }): void; 
+      }
+  
+      // see https://docs.com/ckeditor4/latest/api/CKEDITOR_scriptLoader.html
+      namespace scriptLoader {
+          function load(scriptUrls: string | string[], callback: (succeededUrls: boolean | string[], failedUrls: string[]) => void, scope?: any, showBusy?: boolean): void;
+          function queue(scriptUrl: string, callback?: (succeeded: boolean) => void): void;
+      }
+  
+      namespace skin {
+          var icons: { [name: string]: { path: string } };
+          var name: string;
+          var ua: { [name: string]: any };
+  
+          function addIcon(name: string, path: string, offset?: number, bgsize?: string): void;
+          function chameleon(editor: string, part: string): void;
+          function getIconStyle(name: string, rtl?: boolean, overridePath?: number, overrideBgsize?: string): any;
+          function getPath(part: string): any;
+          function loadPart(part: string, fn: () => void): void;
+          function path(): string;
+      }
+  
+      namespace style {
+          function addCustomHandler(defintion: customHandler): style;
+          function getStyleText(style: definition): string;
+  
+          namespace customHandlers {
+              class widget extends style {
+                  group: any[];
+                  widget: string;
+                  checkElement(element: dom.element): boolean;
+                  getClassesArray(): string[];
+                  getDefintion(): definition;
+                  removeStylesFromSameGroup(editor: editor): boolean;
+              }
+          }
+  
+          interface definition {
+              attributes?: { [att: string]: string },
+              element: string,
+              name?: string,
+              styles?: { [att: string]: string },
+              type?: string | number
+          }
+  
+          interface customHandler {
+              type: string | number;
+              setup?: (style: definition) => void;
+              assignedTo?: number;
+          }
+      }
+  
+      class style {
+          alwaysRemoveElement: boolean;
+          includeReadonly: boolean;
+          constructor(styleDefinition: style.definition, variableValues: any);
+          apply(editor: editor): void;
+          applyToObject(element: dom.element, editor: editor): void; 
+          applyToRange(range: Range, editor: editor): void;
+          buildPreview(label?: string): string;
+          checkActive(elementPath: dom.elementPath, editor: editor): boolean;
+          checkApplicable(elementPath: dom.elementPath, editor: editor, filter?: filter): boolean;
+          checkElementMatch(element: dom.element, fullMatch: boolean, editor: editor): boolean;
+          checkElementRemovable(element: dom.element, fullMatch: boolean, editor: editor): boolean;
+          getDefintion(): style.definition;
+          remove(editor: editor): void;
+          removeFromRange(range: Range, editor: editor): void;
+          toAllowedContentRules(editor?: editor): filter.allowedContentRules;
+      }
+  
+      class styleCommand {
+          constructor(style: style, ext?: any);
+          exec(editor: editor): void;
+      }
+  
+      var stylesSet: resourceManager;
+  
+      class template {
+          readonly source: string;
+  
+          constructor(source: string);
+          output(data: any, buffer?: any[]): string | number;
+      }
+  
+      namespace tools {
+          function addFunction(fn: () => any, scope?: any): number;
+          function arrayCompare(arrayA: any[], arrayB: any[]): boolean;
+          function clone(source: { [key: string]: any }): { [key: string]: any };
+          function copy(source: { [key: string]: any }): { [key: string]: any };
+          function createClass(definition: { [key: string]: any }): any;
+          function cssStyleToDomStyle(cssName: string): string;
+          function cssVendorPrefix(property: string, value: string, asString?: boolean): { [cssClass: string]: string | number };
+          function defer<T extends Function>(fn: T): T;
+          function enableHtml5Elements(doc: Document | DocumentFragment, withAppend?: boolean): void;
+          function escapeCss(selector: string): string;
+          function eventsBuffer(minInterval: number, output: () => void, scopeObj: any): { input: () => void, reset: () => void };
+          function extend(target: { [key: string]: any }, source: { [key: string]: any }, overwrite: boolean, properties: { [key: string]: any }): { [key: string]: any };
+          function fixDomain(): boolean;
+          function genKey(subKey: string): string;
+          function getCookie(name: string): string;
+          function getCsrfToken(): string;
+          function getIndex<T>(array: T[], compareFunction: (element: T) => boolean): number;
+          function getMouseButton(evt: dom.event): boolean;
+          function getNextId(): string;
+          function getNextNumber(): number;
+          function getUniqueId(): string;
+          function htmlDecode(text: string): string;
+          function htmlDecodeAttr(text: string): string;
+          function htmlEncode(text: string): string;
+          function htmlEncodeAttr(text: string): string;
+          function indexOf<T>(array: T[], value: T | ((el: T) => boolean)): number;
+          function isArray<T>(object: any): object is T[];
+          function isEmpty(object: { [key: string]: any }): boolean;
+          function keystrokeToArray(lang: { [key: string]: any }, keystroke: number): { display: string[], aria: string[] };
+          function keystrokeToString(lang: { [key: string]: any }, keystroke: number): { display: string, aria: string };
+          function ltrim(str: string): string;
+          function normalizeCssText(styleText: string, nativeNormalize: boolean): string;
+          function normalizeHex(styleText: string): string;
+          function objectCompare(left: { [key: string]: any }, right: { [key: string]: any }, onlyLef?: boolean): boolean;
+          function objectKeys(obj: { [key: string]: any }): string[];
+          function override<T extends Function>(originalFunction: T, functionBuilder: (originalFunction: T) => T): T;
+          function parseCssText(styleText: string, normalize?: boolean, nativeNormalize?: boolean): { [key: string]: any };
+          function prototypedCopy(source:  { [key: string]: any }):  { [key: string]: any };
+          function removeFunction(ref: number): void;
+          function repeat(str: string, times: number): string;
+          function rtrim(str: string): string;
+          function search<T>(array: T[], value: T | ((element: T) => boolean)): T;
+          function setCookie(name: string, value: string): void;
+          function setTimeout(func: Function, milliseconds?: number, scope?: { [key: string]: any }, args?: any, ownerWindow?: Window): number;
+          function transformPlainTextToHtml(text: string, etnerMode: number): string;
+          function trim(str: string): string;
+          function tryThese(fn: Function[]): any;
+          function writeCssText(styles: { [key: string]: any }, sort?: boolean): string;
+  
+          namespace array {
+              function every<T>(array: T[], fn: (value: T, index: number, array: T[]) => boolean, thisArg?: { [key: string]: any }): boolean;
+              function filter<T>(array: T[], fn: (value: T, index: number, array: T[]) => boolean, thisArg?: { [key: string]: any }): T[];
+              function forEach<T>(array: T[], fn: (value: T, index: number, array: T[]) => void, thisArg?: { [key: string]: any }): void;
+              function isArray(object: any): boolean;
+              function map<T, K>(array: T[], fn: (value: T) => K, thisArg?: { [key: string]: any }): K[];
+              function reduce<T, K>(array: T[], fn: (accumulator: K, a: T, index: number, array: T[]) => K, initial: K, thisArg?: { [key: string]: any }): K;
+          }
+  
+          namespace object {
+              function findKey(obj: { [key: string]: any }, value: any): string;
+              function merge(obj1: { [key: string]: any }, obj2: { [key: string]: any }): { [key: string]: any };
+          }
+  
+          namespace style {
+              namespace parse {
+                  function background(value: string): { color: string, unprocessed: string};
+                  function border(value: string): { width: string, style: string, color: string };
+                  function margin(value: string): { top: number, right: number, bottom: number, left: number };
+              }
+          }
+      }
+  
+      class ui extends event {
+          constructor(editor: editor);
+          add(name: string, type: { [key: string]: any }, definition: { [key: string]: any }): void;
+          addButton(name: string, definition: buttonDefinition): void;
+          addHandler(type: { [key: string]: any }, handler: { [key: string]: any }): void;
+          addRichCombo(name: string, definition: { [key: string]: any }): void;
+          addToolbarGroup(name: string, previous: number | string, subgroupOf?: string): void;
+          create(name: string): { [key: string]: any };
+          get(name: string): { [key: string]: any };
+          space(name: string): dom.element;
+          spaceId(name: string): string;
+      }
+  
+      namespace ui {
+          namespace dialog {
+              class button extends uiElement {
+                  constructor(dialog: dialog, elementDefinition: definitions.button, htmlList: any[]);
+  
+                  accessKeyDown(): void;
+                  accessKeyUp(): void;
+                  click(): any;
+              }
+  
+              class checkbox extends uiElement {
+                  constructor(dialog: dialog, elementDefinition: definitions.checkbox, htmlList: any[]);
+  
+                  accessKeyUp(): void;
+                  getValue(): boolean;
+                  setValue(checked: boolean, noChangeEvent: boolean): undefined;
+              }
+  
+              namespace definitions {
+                  interface button {
+                      label: string;
+                      disabled?: boolean;
+                  }
+  
+                  interface checkbox {
+                      checked?: boolean;
+                      validate?: () => boolean;
+                      label?: string;
+                  }
+  
+                  interface fieldSet {
+                      label?: string;
+                      children: any[];
+                  }
+  
+                  interface file {
+                      validate?: () => boolean;
+                  }
+  
+                  interface fileButton {
+                      for: string;
+                      validate?: () => boolean;
+                  }
+  
+                  interface hbox {
+                      widths?: string[];
+                      height?: string;
+                      padding?: string;
+                      align?: string;
+                  }
+  
+                  interface html {
+                      html: string;
+                  }
+  
+                  interface iframeElement {
+                      src: string;
+                      width: string;
+                      height: string;
+                      onContentLoad?: () => void;
+                  }
+  
+                  interface labeledElement {
+                      label: string;
+                      labelLayout?: 'horizontal' | 'vertical';
+                      widths?: [ string, string ];
+                      role?: string;
+                      includeLabel?: boolean;
+                  }
+  
+                  interface radio {
+                      default: any;
+                      validate?: () => boolean;
+                      items: ([string, string] | [string])[];
+                  }
+  
+                  interface select {
+                      default: any;
+                      validate?: () => boolean;
+                      items: ([string, string] | [string])[];
+                      multiple?: boolean;
+                      size?: number;
+                  }
+  
+                  interface textarea {
+                      rows?: number;
+                      cols?: number;
+                      default?: string;
+                      validate?: () => boolean;
+                  }
+  
+                  interface textInput {
+                      default?: string;
+                      validate?: () => boolean;
+                      maxLength?: number;
+                      size?: string;
+                  }
+  
+                  interface uiElement {
+                      id: string;
+                      type: number;
+                      title?: string;
+                      hidden?: boolean;
+                      className?: string;
+                      style?: string;
+                      accessKey?: string;
+                  }
+  
+                  interface vbox {
+                      width?: string;
+                      heights?: string[];
+                      align?: string;
+                      padding?: string;
+                      expand?: boolean;
+                  }
+              }
+  
+              class fieldset extends uiElement {
+                  constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.fieldSet);
+              }
+  
+  
+              class file extends ui.dialog.labeledElement {
+                  constructor(dialog: dialog, elementDefinition: definitions.file, htmlList: any[]);
+  
+                  getAction(): string;
+                  registerEvents(definition: { [key: string]: any }): file;
+                  reset(): void;
+                  setInitValue(): void;
+                  submit(): file;
+              }
+  
+  
+              class fileButton extends button {
+                  constructor(dialog: dialog, elementDefinition: definitions.fileButton, htmlList: any[]);
+              }
+  
+  
+              class hbox extends uiElement {
+                  constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.hbox);
+  
+                  getChild(indices: number): ui.dialog.uiElement;
+                  getChild(indices: number[]): ui.dialog.uiElement[];
+              }
+  
+  
+              class html extends uiElement {
+                  constructor(dialog: dialog, elementDefinition: definitions.html, htmlList: any[]);
+  
+              }
+  
+  
+              class iframeElement extends uiElement {
+  
+              }
+  
+  
+              class labeledElement extends uiElement {
+                  constructor(dialog: dialog, elementDefinition: definitions.labeledElement, htmlList: any[], contentHtml: () => string);
+  
+                  getLabel(): string;
+                  setlabel(label: string): ui.dialog.labeledElement;
+              }
+  
+  
+              class radio extends ui.dialog.labeledElement {
+                  constructor(dialog: dialog, elementDefinition: definitions.radio, htmlList: any[]);
+  
+                  accessKeyUp(): void;
+                  getValue(): string;
+                  setValue(value: string, noChangeEvent: boolean): undefined;
+              }
+  
+  
+              class select extends uiElement {
+                  constructor(dialog: dialog, elementDefinition: definitions.select, htmlList: any[]);
+  
+                  add(label: string, value?: string, indexedDB?: number): select;
+                  clear(): select;
+                  remove(index: number): select;
+              }
+  
+  
+              class textarea extends labeledElement {
+                  constructor(dialog: dialog, elementDefinition: definitions.textarea, htmlList: any[]);
+              }
+  
+  
+              class textInput extends ui.dialog.labeledElement {
+                  constructor(dialog: dialog, elementDefinition: definitions.textInput, htmlList: any[]);
+  
+                  accessKeyUp(): void;
+                  focus(): undefined;
+                  getDirectionMarker(): string;
+                  getValue(): string;
+                  select(): void;
+                  setDirectionMarker(dir: string): void;
+                  setValue(value: string, noChangeEvent: boolean): textInput;
+              }
+  
+              class uiElement {
+                  eventProcessors: any;
+  
+                  constructor(dialog: dialog, elementDefinition: definitions.uiElement, htmlList: any[], nodeNameArg?: () => string | string, stylesArg?: () => { [key: string]: any } | { [key: string]: any }, attributesArg?: () => { [key: string]: any } | { [key: string]: any }, contentsArg?: () => { [key: string]: any } | string); // Not sure that the htmlList array type is right.
+  
+                  accessKeyDown(dialog: dialog, key: string): void;
+                  accessKeyUp(dialog: dialog, key: string): void;
+                  disable(): void;
+                  enable(): void;
+                  focus(): ui.dialog.uiElement;
+                  getDialog(): dialog;
+                  getElement(): dom.element;
+                  getInputElement(): dom.element;
+                  getValue(): any;
+                  isChanged(): boolean;
+                  isEnabled(): boolean;
+                  isFocusable(): boolean;
+                  isVisible(): boolean;
+                  registerEvents(definition: CKEDITOR.dialog.definition.uiElement): ui.dialog.uiElement;
+                  selectParentTab(): ui.dialog.uiElement;
+                  setValue(value: any, noChangeEvent: boolean): ui.dialog.uiElement;
+              }
+  
+              class vbox extends hbox {
+                  constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.vbox);
+              }
+          }
+  
+          class balloonPanel {
+              activeShowListeners: { [id: number]: { removeListener: listenerRegistration }};
+              editor: editor;
+              focusables: { [id: number]: dom.element };
+              height: string;
+              parts: balloonPanel.parts;
+              rect: balloonPanel.rect;
+              showListeners: { [id: number]: () => listenerRegistration };
+              templateDefinitions: balloonPanel.templateDefinitions;
+              templates: balloonPanel.templates;
+              triangleHeight: number;
+              triangleMinDistance: number;
+              triangleWidth: number;
+              width: number;
+  
+              activeShowListener(id: number): void;
+              activateShowListeners(): void;
+              addShowListener(listener: () => listenerRegistration): listenerRegistration;
+              attach(element: dom.element, options?: dom.element | boolean | { focusElement?: dom.element | boolean, show?: boolean }): void;
+              blur(): void;
+              build(): void;
+              deactivateShowListener(id: number): void;
+              deregisterFocusable(element: dom.element): void;
+              destroy(): void;
+              getHeight(): number;
+              getWidth(): number;
+              hide(): void;
+              move(top: number, left: number): void;
+              registerFocusable(element: dom.element): void;
+              removeShowListener(id: number): void;
+              resize(width: number, height: number): void;
+              setTitle(title: string): void;
+              setTriangle(side: 'left' | 'right' | 'top' | 'bottom'): void;
+              show(): void;
+          }
+  
+          namespace balloonPanel {
+              interface definition {
+                  content?: string;
+                  title?: string;
+              }
+  
+              interface templates {
+                  close?: template;
+                  content?: template;
+                  panel?: template;
+                  title?: template;
+                  triangle?: template;
+                  triangleInner?: template;
+                  triangleOuter?: template; 
+              }
+      
+              interface templateDefinitions {
+                  close?: string;
+                  content?: string;
+                  panel?: string;
+                  title?: string;
+                  triangle?: string;
+                  triangleInner?: string;
+                  triangleOuter?: string;
+              }
+      
+              interface rect {
+                  height?: number;
+                  left?: number;
+                  top?: number;
+                  visible?: boolean;
+                  width?: number;
+              }
+      
+              interface parts {
+                  close?: dom.element;
+                  content?: dom.element;
+                  panel?: dom.element;
+                  title?: dom.element;
+                  triangle?: dom.element;
+                  triangleInner?: dom.element;
+                  triangleOuter?: dom.element;
+              }
+          }
+  
+          class balloonToolbar {
+              constructor(editor: editor, definition: { [key: string]: any });
+              addItem(name: string, element: button | richCombo): void;
+              addItems(elements: { [itemName: string]: button | richCombo }): void;
+              deleteItem(name: string): void;
+              destroy(): void;
+              getItem(name: string): button | richCombo;
+              hide(): void;
+              refresh(): void;
+              show(): void;
+          }
+  
+          class button {
+              static readonly handler: handlerDefinition<button>;
+  
+              constructor(definition: { [key: string]: any });
+              getState(): number;
+              render(editor: editor, output: string[]): void;
+              setState(state: number): void;
+              toFeature(editor: editor): feature;
+          }
+  
+          class floatPanel {
+              constructor(editor: editor, parentElement: dom.element, definition: { [key: string]: any }, level: number);
+              addBlock(name: string, block: { [key: string]: any }): void;
+              addListBlock(name: string, multiSelect: boolean): void;
+              allowBlur(allow: boolean): void;
+              blur(): void;
+              focus(): void;
+              getBlock(name: string): panel.block;
+              hide(returnFocus: boolean): void;
+              hideChild(restoreFocus: boolean): void;
+              reposition(): void;
+              showAsChild(panel: floatPanel, blckName: string, offsetParent: dom.element, corner: number, offsetX?: number, offsetY?: number): void;
+              showBlock(name: string, offsetParent: dom.element, corner: number, offsetX?: number, offsetY?: number, callback?: () => void): void;
+          }
+  
+          class handlerDefinition<T> {
+              contentsElement: dom.element;
+              create(definition: { [key: string]: any }): T;
+          }
+  
+          class menuButton extends button {
+  
+          }
+  
+          class panel {
+              constructor(document: dom.document, definition: { [key: string]: any });
+              addBlock(name: string, block: { [key: string]: any }): void;
+              getBlock(name: string): panel.block;
+              render(editor: editor, output?: string[]): void;
+              showBlock(name: string): void;
+          }
+  
+          namespace panel {
+              class block {
+                  getItems(): dom.nodeList;
+                  markItem(index: number): void;
+              }
+  
+              const handler: handlerDefinition<panel>;
+          }
+  
+          class panelButton extends button {
+  
+          }
+  
+          class richCombo {
+              static readonly handler: handlerDefinition<richCombo>;
+              render(editor: editor, output: string[]): void;
+          }
+      }
+  
+      class xml {
+          baseXml: any;
+  
+          constructor(xmlObjectOrData: any);
+          getInnerXml(xpath: string, contextNode?: any): string;
+          selectNodes(xpath: string, contextNode?: any): any[];
+          selectSingleNode(xpath: string, contextNode?: any): any;
+      }
+  
+      interface toolbarGroups {
+          name?: string;
+          groups?: string[];
+      }
+  
+      namespace config {
+          interface styleObject {
+              name?: string;
+              element: string;
+              attributes?: { [key: string]: any };
+              styles?: { [key: string]: any };
+              overrides?: { [key: string]: any };
+          }
+      }
+  
+      interface sharedSpace {
+          top?: string | HTMLElement;
+          bottom?: string | HTMLElement;
+      }
+  
+      interface IMenuItemDefinition {
+          label:string,
+          command:string,
+          icon: string
+          group:string,
+          order:number
+      }
+  
+      interface buttonDefinition {
+          icon?: string;
+          iconOffset?: number;
+          label: string;
+          command: string;
+          toolbar: string;
+      }
+  }
+  
\ No newline at end of file

From dd8fc566999bd6774c200a6dff6ca7dd05940f7e Mon Sep 17 00:00:00 2001
From: stuartlo <stuartlo@microsoft.com>
Date: Wed, 23 May 2018 16:25:44 -0700
Subject: [PATCH 384/575] Fix whitespace issues

---
 types/ckeditor/index.d.ts | 5521 ++++++++++++++++++-------------------
 1 file changed, 2760 insertions(+), 2761 deletions(-)

diff --git a/types/ckeditor/index.d.ts b/types/ckeditor/index.d.ts
index 95852e9e04..e95429cd29 100644
--- a/types/ckeditor/index.d.ts
+++ b/types/ckeditor/index.d.ts
@@ -8,2764 +8,2763 @@
 // See https://github.com/DefinitelyTyped/DefinitelyTyped/issues/1827 for more informations.
 interface Window {
     CKEDITOR_BASEPATH: string;
-  }
-  
-  declare namespace CKEDITOR {
-  
-      // Config options
-      var disableAutoInline: boolean;
-      var replaceClass: string;
-      var skinName: string;
-  
-      // Properties
-      const ALT: number;
-      const CTRL: number;
-      const DATA_TRANSFER_CROSS_EDITORS: number;
-      const DATA_TRANSFER_EXTERNAL: number;
-      const DATA_TRANSFER_INTERNAL: number;
-      const DIALOG_RESIZE_BOTH: number;
-      const DIALOG_RESIZE_HEIGHT: number;
-      const DIALOG_RESIZE_NONE: number;
-      const DIALOG_RESIZE_WIDTH: number;
-      const DIALOG_STATE_BUSY: number;
-      const DIALOG_STATE_IDLE: number;
-      const ELEMENT_MODE_APPENDTO: number;
-      const ELEMENT_MODE_INLINE: number;
-      const ELEMENT_MODE_NONE: number;
-      const ELEMENT_MODE_REPLACE: number;
-      const END: number;
-      const ENLARGE_BLOCK_CONTENTS: number;
-      const ENLARGE_ELEMENT: number;
-      const ENLARGE_INLINE: number;
-      const ENLARGE_LIST_ITEM_CONTENTS: number;
-      const ENTER_BR: number;
-      const ENTER_DIV: number;
-      const ENTER_P: number;
-      const EVENT_PHASE_AT_TARGET: number;
-      const EVENT_PHASE_BUBBLING: number;
-      const EVENT_PHASE_CAPTURING: number;
-      const FILTER_SKIP_TREE: number;
-      const LINEUTILS_AFTER: number;
-      const LINEUTILS_BEFORE: number;
-      const LINEUTIS_INSIDE: number;
-      const MOUSE_BUTTON_LEFT: number;
-      const MOUSE_BUTTON_MIDDLE: number;
-      const MOUSE_BUTTON_RIGHT: number;
-      const NODE_COMMENT: number;
-      const NODE_DOCUMENT: number;
-      const NODE_DOCUMENT_FRAGMENT: number;
-      const NODE_ELEMENT: number;
-      const NODE_TEXT: number;
-      const POSITION_AFTER_END: number;
-      const POSITION_AFTER_START: number;
-      const POSITION_BEFORE_END: number;
-      const POSITION_BEFORE_START: number;
-      const POSITION_CONTAINS: number;
-      const POSITION_DISCONNECTED: number;
-      const POSITION_FOLLOWING: number;
-      const POSITION_IDENTICAL: number;
-      const POSITION_IS_CONTAINED: number;
-      const POSITION_PRECEDING: number;
-      const SELECTION_ELEMENT: number;
-      const SELECTION_NONE: number;
-      const SELECTION_TEXT: number;
-      const SHIFT: number;
-      const SHRINK_ELEMENT: number;
-      const SHRINK_TEXT: number;
-      const START: number;
-      const STYLE_BLOCK: string;
-      const STYLE_INLINE: string;
-      const STYLE_OBJECT: string;
-      const TRISTATE_DISABLED: number;
-      const TRISTATE_OFF: number;
-      const TRISTATE_ON: number;
-      const UI_BUTTON: string;
-      const UI_MENUBUTTON: string;
-      const UI_PANEL: string;
-      const UI_PANELBUTTON: string;
-      const UI_RICHCOMBO: string;
-      const UI_SEPARATOR: string;
-      const VERBOSITY_ERROR: number;
-      const VERBOSITY_WARN: number;
-  
-      var basePath: string;
-      var currentInstance: editor;
-      var document: dom.document;
-      var instances: { [id: string]: editor };
-      var loadFullCoreTimeout: number;
-      var revision: string;
-      var rnd: number;
-      var status: string;
-      var timestamp: string;
-      var verbosity: number;
-      var version: string;
-      const config: config;
-  
-      // Methods
-      function add(editor: editor): void;
-      function addCss(css: string): void;
-      function addTemplate(name: string, source: string): template;
-      function appendTo(element: string | HTMLElement, config?: config, data?: string): editor;
-      function domReady(): void;
-      function editorConfig(config: config): void;
-      function error(errorCode: string, additionalData?: any): void;
-      function getCss(): string;
-      function getTemplate(name: string): template;
-      function getUrl(resource: string): string;
-      function inline(element: string | HTMLElement, instanceConfig?: config): editor;
-      function inlineAll(): void;
-      function loadFullCore(): void;
-      function replace(element: string | HTMLTextAreaElement, config?: config): editor;
-      function replaceAll(className?: string): void;
-      function replaceAll(assertionFunction: (textarea: HTMLTextAreaElement, config: config) => boolean): void;
-      function warn(errorCode: string, additionalData?: any): void;
-  
-      // Event interface
-      function capture(): void;
-      function define(name: string, meta: { [key: string]: any }): void;
-      function fire(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
-      function fireOnce(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
-      function hasListeners(eventName: string): boolean;
-      function on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any }, listenerData?: { [key: string]: any }, priority?: number): void;
-      function once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any }, listenerData?: { [key: string]: any }, priority?: number): void;
-      function removeAllListeners(): void;
-      function removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
-  
-      type listenerRegistration = {
-          removeListener: () => void;
-      }
-  
-      namespace dom {
-  
-          interface bookmark {
-              startNode: dom.node | string;
-              endNode: dom.node | string;
-              serializable: boolean;
-              collapsed: boolean;
-          }
-  
-          interface bookmark2 {
-              start: number[];
-              end: number[];
-              startOffset: number;
-              endOffset: number;
-              collapsed: boolean;
-              normalized: boolean;
-              is2: boolean;
-          }
-  
-          class comment extends node {
-              readonly type: number;
-  
-              constructor(comment: string | Node, ownerDocument?: document);
-              getOuterHtml(): string;
-          }
-  
-          class document extends domObject {
-              readonly $: Document;
-              readonly type: number;
-  
-              constructor(domDocument: { [key: string]: any });
-              appendStyleSheet(cssFileUrl: string): void;
-              appendStyleText(cssStyleText: string): CSSStyleSheet;
-              createElement(name: string, attribsAndStyles?: { attributes?: { [key: string]: string }; styles?: { [key: string]: string }; }): element;
-              createText(text: string): element;
-              find(selector: string): nodeList;
-              findOne(selector: string): element;
-              focus(): void;
-              getActive(): element;
-              getBody(): element;
-              getByAddress(address: any[], normalized?: boolean): node;
-              getById(elementId: string): element;
-              getDocumentElement(): element;
-              getElementsByTag(tagName: string): nodeList;
-              getHead(): element;
-              getSelection(): selection;
-              getWindow(): window;
-              write(html: string): void;
-          }
-  
-          class documentFragment extends node {
-              readonly type: number;
-  
-              constructor(nodeOrDoc: { [key: string]: any });
-              insertAfterNode(node: node): void;
-          }
-  
-          class domObject extends CKEDITOR.event {
-              readonly $: any;
-  
-              constructor(nativeDomObject: { [key: string]: any });
-              clearCustomData(): void;
-              equals(object: any): boolean;
-              getCustomData(key: string): any;
-              getPrivate(): any;
-              getUniqueId(): number;
-              removeAllListeners(): void;
-              removeCustomData(key: string): any;
-              setCustomData(key: string, value: any): domObject;
-          }
-  
-          class element extends node {
-              readonly $: HTMLElement;
-              readonly type: number;
-  
-              constructor(element: string, ownerDocument?: document);
-              constructor(element: HTMLElement, ownerDocument?: document);
-              addClass(className: string): void;
-              append(node: node | string, toStart?: boolean): node;
-              appendBogus(force: boolean): void;
-              appendHtml(html: string): void;
-              appendText(text: string): node;
-              breakParent(parent: element): void;
-              contains(node: node): boolean;
-              copyAttributes(dest: element, skipAttributes: { [key: string]: string }): void;
-              data(name: string, value?: string | false): string;
-              disableContextMenu(): void;
-              find(selector: string): nodeList;
-              findOne(selector: string): element;
-              focus(defer?: boolean): void;
-              focusNext(ignoreChildren?: boolean, indexToUse?: number): void;
-              focusPrevious(ignoreChildren?: boolean, indexToUse?: number): void;
-              forEach(callback: (node: node) => void, type?: number, skipRoot?: boolean): void;
-              getAttribute(name: string): string;
-              getBogus(): node | boolean;
-              getChild(indices: number | number[]): node;
-              getChildCount(): number;
-              getChildren(): nodeList;
-              getClientRect(): ClientRect;
-              getComputedStyle(propertyName: string): string;
-              getDirection(useComputed: boolean): string;
-              getDocumentPosition(refDocument: document): position;
-              getDtd(): dtdDefinition;
-              getEditor(): editor;
-              getElementsByTag(tagName: string): nodeList;
-              getFirst(evaluator?: (node: node) => boolean): node;
-              getFrameDocument(): document;
-              getHtml(): string;
-              getId(): string;
-              getLast(evaluator?: (node: node) => boolean): node;
-              getName(): string;
-              getNameAtt(): string;
-              getOuterHtml(): string;
-              getPositionedAncestor(): element;
-              getSize(type: string, isBorderBox: boolean): void;
-              getStyle(name: string): string;
-              getTabIndex(): number;
-              getText(): string;
-              getValue(): string;
-              getWindow(): window;
-              hasAttributes(): boolean;
-              hasAttribute(name: string): boolean;
-              hasClass(className: string): boolean;
-              hide(): void;
-              is(...name: string[]): boolean;
-              is(name: any): boolean;
-              isBlockBoundary(customNodeNames: { [tagName: string]: 1 }): boolean;
-              isEditable(textCursor?: boolean): boolean;
-              isEmptyInlineRemoveable(): boolean;
-              isIdentical(otherElement: element): boolean;
-              isVisible(): boolean;
-              mergeSiblings(inlineOnly?: boolean): void;
-              moveChildren(target: element, toStart?: boolean): void;
-              removeAttribute(name: string): void;
-              removeAttributes(attributes?: string[]): void;
-              removeClass(className: string): void;
-              removeStyle(name: string): void;
-              renameNode(newTag: string): void;
-              scrollIntoParent(parent: element, alignToTop: boolean, hscroll: boolean): void;
-              scrollIntoParent(parent: window, alignToTop: boolean, hscroll: boolean): void;
-              scrollIntoView(alignToTop?: boolean): void;
-              setAttribute(name: string, value: string): element;
-              setAttributes(attributesPairs: { [key: string]: string }): element;
-              setHtml(html: string): string;
-              setOpacity(opacity: number): void;
-              setSize(type: string, size: number, isBorderBox: boolean): void;
-              setState(state: number, base?: string, useAria?: boolean): void;
-              setStyle(name: string, value: string): element;
-              setStyles(stylesPair: { [key: string]: string }): element;
-              setText(text: string): string;
-              setValue(value: string): element;
-              show(): void;
-              unselectable(): void;
-  
-              //static method
-              static clearAllMarkers(database: any): any;
-              static clearMarkers(database: any, element: dom.element, removeFromDatabase: boolean): void;
-              static createFromHtml(html: string): element;
-              static get(element: string | HTMLElement | element): element;
-              static setMarker(database: any, element: dom.element, name: string, value: any): dom.element;
-          }
-  
-          class elementPath {
-              readonly block: element;
-              readonly blockLimit: element;
-              readonly elements: element[];
-              readonly lastElement: element;
-              readonly root: element;
-  
-              constructor(startNode: element, root?: element);
-              compare(otherPath: elementPath): boolean;
-              contains(query: string | string[] | ((element: element) => boolean) | { [key: string]: any } | element, excludeRoot?: boolean, fromTop?: boolean): element;
-              direction(): 'ltr' | 'rtl';
-              isContextFor(tag: string): boolean;
-          }
-  
-          class event {
-              constructor(domEvent: Event);
-              getKey(): number;
-              getKeystroke(): number;
-              preventDefault(stopPropagation?: boolean): void;
-              stopPropagation(): void;
-              getTarget(): node;
-              getPhase(): number;
-              getPhaseOffset(): position;
-              on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: any, listenerData?: any, priority?: number): { removeListener: () => void };
-          }
-  
-          class iterator {
-              readonly activeFilter: filter;
-              enforceRealBlocks: boolean;
-              enlargeBr: boolean;
-              readonly filter: filter;
-              forceBrBreak: boolean;
-              readonly range: range;
-              constructor(range: range);
-              getNextParagraph(blockTag?: string): element;
-          }
-  
-          class node extends domObject {
-              constructor(domNode: Node);
-              appendTo(element: element): element;
-              clone(includeChildren: boolean, cloneId: boolean): node;
-              hasPrevious(): boolean;
-              hasNext(): boolean;
-              insertAfter(node: node): node;
-              insertBefore(node: node): node;
-              insertBeforeMe(node: node): node;
-              getAddress(normalized?: boolean): number[];
-              getAscendant(reference: string, includeSelf?: boolean): node;
-              getCommonAncestor(node: node): void;
-              getDocument(): document;
-              getIndex(normalized?: boolean): number;
-              getNext(evaluator?: (node: node) => boolean): node;
-              getNextSourceNode(startFromSibling: boolean, nodeType: number, guard: node | ((node: node) => boolean)): void;
-              getParent(allowFragmentParent?: boolean): element;
-              getParents(closerFirst?: boolean): node[];
-              getPosition(otherNode: node): void;
-              getPrevious(evaluator?: (node: node) => boolean): node;
-              getPreviousSourceNode(startFromSibling: boolean, nodeType: number, guard: node | ((node: node) => boolean)): void;
-              hasAscendant(name: string, includeSelf: boolean): boolean;
-              remove(preserveChildren?: boolean): node;
-              replace(nodeToReplace: node): void;
-              trim(): void;
-              ltrim(): void;
-              rtrim(): void;
-              isReadOnly(): boolean;
-          }
-  
-          class nodeList {
-              constructor(nativeList: NodeList);
-              count(): number;
-              getItem(index: number): node;
-              toArray(): node[];
-          }
-  
-          class range {
-              readonly collapsed: boolean;
-              readonly document: document;
-              readonly endContainer: element | text;
-              readonly endOffset: number;
-              readonly root: element;
-              readonly startContainer: element | text;
-              readonly startOffset: number;
-  
-              constructor(root: element | document);
-              checkBoundaryOfElement(element: element, checkType: number): boolean;
-              checkEndOfBlock(): boolean;
-              checkReadOnly(): boolean;
-              checkStartOfBlock(): boolean;
-              clone(cloneId?: boolean): range;
-              cloneContents(): documentFragment;
-              collapse(toStart?: boolean): boolean;
-              createBookmark(serializable?: boolean): bookmark;
-              createBookmark2(normalized?: boolean): bookmark2;
-              createIterator(): iterator;
-              deleteContents(mergeThen?: boolean): void;
-              endPath(): elementPath;
-              enlarge(unit: number, excludeBrs?: boolean): void;
-              extractContents(mergeThen?: boolean, cloneId?: boolean): documentFragment;
-              fixBlock(isStart: boolean, blockTag: string): element;
-              getBoundaryNodes(): { startNode: node; endNode: node; };
-              getCommonAncestor(includeSelf?: boolean, ignoreTextNode?: boolean): element;
-              getEnclosedNode(): node;
-              getNextEditableNode(): element | text;
-              getNextNode(evaluator: (element: dom.element) => boolean, guard?: (element: dom.element) => boolean, boundary?: element): element;
-              getPreviousEditableNode(): element | text;
-              getPreviousNode(evaluator: (element: dom.element) => boolean, guard?: (element: dom.element) => boolean, boundary?: element): element;
-              getTouchedEndNode(): node;
-              getTouchedStartNode(): node;
-              insertNode(node: node): void;
-              moveToBookmark(bookmark: bookmark | bookmark2): void;
-              moveToClosestEditablePosition(element?: element, isMoveForward?: boolean): boolean;
-              moveToElementEditEnd(target: element): boolean;
-              moveToElementEditStart(target: element): boolean;
-              moveToElementEditablePosition(element: element, isMoveToEnd: boolean): boolean;
-              moveToPosition(node: node, position: number): void;
-              moveToRange(range: range): void;
-              optimize(): void;
-              optimizeBookmark(): void;
-              removeEmptyBlocksAtEnd(atEnd: boolean): void;
-              scrollIntoView(): void;
-              select(): selection;
-              selectNodeContents(node: node): void;
-              setEnd(endNode: node, endOffset: number): void;
-              setEndAfter(node: node): void;
-              setEndAt(node: node, position: number): void;
-              setEndBefore(node: node): void;
-              setStart(startNode: node, startOffset: number): void;
-              setStartAfter(node: node): void;
-              setStartAt(node: node, position: number): void;
-              setStartBefore(node: node): void;
-              shrink(mode: number, selectContents?: boolean, options?: boolean | shrinkOptions): void;
-              splitBlock(cloneId?: boolean): void;
-              splitElement(toSplit: element, cloneId?: boolean): element;
-              startPath(): elementPath;
-              trim(ignoreStart?: boolean, ignoreEnd?: boolean): void;
-  
-              static mergeRanges(ranges: range[]): range[];
-          }
-  
-          interface shrinkOptions {
-              shrinkOnBlockBoundary?: boolean,
-              skipBogus?: boolean
-          }
-  
-          class rangeList {
-              constructor(ranges?: range | range[]);
-              createBokmarks(serializable?: boolean): bookmark[];
-              createBookmarks2(normalized?: boolean): bookmark2[];
-              createIterator(): rangeListIterator;
-              moveToBookmarks(bookmarks: bookmark[]): void;
-          }
-  
-  
-          interface rangeListIterator {
-              getNextRange(mergeConsequent?: boolean): range;
-          }
-  
-          // see https://docs.com/ckeditor4/latest/api/CKEDITOR_dom_selection.html
-          class selection {
-              readonly FILLING_CHAR_SEQUENCE: string;
-              readonly document: document;
-              readonly isFake: boolean;
-              readonly isLocked: boolean;
-              readonly rev: number;
-              readonly root: element;
-  
-              constructor(target: document | element | selection);
-              createBookmarks(serializable: any): bookmark[];
-              createBookmarks2(normalized: any): bookmark2[];
-              fake(element: element, ariaLabel?: boolean): void;
-              getCommonAncestor(): element;
-              getNative(): Selection;
-              getRanges(onlyEditables?: boolean): range[];
-              getSelectedElement(): element;
-              getSelectedText(): string;
-              getStartElement(): element;
-              getType(): number;
-              isCollapsed(): boolean;
-              isHidden(): boolean;
-              isInTable(allowPartialSelection?: boolean): boolean;
-              lock(): void;
-              removeAllRanges(): void;
-              reset(): void;
-              scrollIntoView(): void;
-              selectBookmarks(bookmarks: (bookmark | bookmark2)[]): selection;
-              selectElement(element: element): void;
-              selectRanges(ranges: range[]): void;
-              unlock(restore: boolean): void;
-          }
-  
-          class text extends node {
-              readonly $: Text;
-              readonly type: number;
-  
-              constructor(text: Text | string, ownerDocument?: document);
-              getLength(): number;
-              getText(): string;
-              setText(text: string): void;
-              split(offset: number): text;
-              substring(indexA: number, indexB?: number): void;
-          }
-  
-          class walker {
-              evaluator: (node: node) => boolean;
-              guard: (node: node) => boolean;
-  
-              static validEmptyBlockContainers: { [key: string]: any };
-  
-              constructor(range: range);
-              checkBackward(): boolean;
-              checkForward(): boolean;
-              end(): void;
-              lastBackward(): node;
-              lastForward(): node;
-              next(): node;
-              previous(): node;
-              reset(): void;
-  
-              static blockBoundary(customNodeNames: any): (node: node) => boolean;
-              static bogus(isReject?: boolean): (node: node) => boolean;
-              static bookmark(contentOnly?: boolean, isReject?: boolean): (node: node) => boolean;
-              static editable(isReject?: boolean): (node: node) => boolean;
-              static empty(isReject?: boolean): (node: node) => boolean;
-              static ignored(isReject?: boolean): (node: node) => boolean;
-              static invisible(isReject?: boolean): (node: node) => boolean;
-              static listItemBoundary(): (node: node) => boolean;
-              static nodeType(type: number, isReject?: boolean): (node: node) => boolean;
-              static temp(isReject?: boolean): (node: node) => boolean;
-              static whitespaces(isReject?: boolean): (node: node) => boolean;
-          }
-  
-          interface position {
-              x: number;
-              y: number;
-          }
-  
-          interface widthAndHeight {
-              width: number;
-              height: number;
-          }
-  
-          class window extends domObject {
-              constructor(domWindow: Window);
-              focus(): void;
-              getViewPaneSize(): widthAndHeight;
-              getScrollPosition(): position;
-              getFrame(): element;
-          }
-      }
-  
-  
-      namespace ajax {
-          function load(url: string, callback?: (data: any) => void): string;
-          function loadXml(url: string, callback?: (data: any) => void): xml;
-          function post(url: string, data: any, contentType?: string, callback?: (data: any) => void): void;
-      }
-  
-  
-      class command extends event implements commandDefinition {
-          fakeKeystroke: number;
-          previousState: number;
-          state: number;
-          uiItems: any[];
-  
-          // Methods
-          constructor(editor: editor, commandDefinition: commandDefinition);
-          checkAllowed(noCache: boolean): boolean;
-          disable(): void;
-          enable(): void;
-          exec(data?: { [key: string]: any }): boolean;
-          refresh(editor: editor, path: dom.elementPath): void;
-          setState(newState: number): boolean;
-          toggleState(): void;
-  
-      }
-  
-      interface commandDefinition {
-          async?: boolean;
-          canUndo?: boolean;
-          context?: boolean;
-          contextSensitive?: boolean;
-          editorFocus?: boolean;
-          fakeKeystroke?: number;
-          modes?: { [key: string]: any };
-          startDisabled?: boolean;
-          readOnly?: boolean;
-          exec(editor: editor, data?: any): boolean;
-          refresh?(editor: editor, path: dom.elementPath): void;
-      }
-  
-      // https://docs.com/ckeditor4/latest/api/CKEDITOR_config.html
-      interface config {
-          allowedContent?: boolean | filter.allowedContentRules;
-          autoEmbed_widget?: string | ((url: string) => string);
-          autoGrow_bottomSpace?: number;
-          autoGrow_maxHeight?: number;
-          autoGrow_minHeight?: number;
-          autoGrow_onStartup?: boolean;
-          autoUpdateElement?: boolean;
-  
-          baseFloatZIndex?: number;
-          baseHref?: string;
-          basicEntities?: boolean;
-          blockedKeystrokes?: number[];
-          bodyClass?: string;
-          bodyId?: string;
-          browserContextMenuOnCtrl?: boolean;
-  
-          clipboard_defaultContentType?: 'html' | 'text';
-          clipboard_notificationDuration?: number;
-          cloudServices_tokenUrl?: string;
-          cloudServices_uploadUrl?: string;
-          codeSnippetGeshi_url?: string;
-          codeSnippet_codeClass?: string;
-          codeSnippet_languages?: { [key: string]: any };
-          coceSnippet_theme?: string;
-          colorButton_backStyle?: config.styleObject;
-          colorButton_colors?: string;
-          colorButton_colorsPerRow?: number;
-          colorButton_enableAutomatic?: boolean;
-          colorButton_enableMore?: boolean;
-          colorButton_foreStyle?: config.styleObject;
-          colorButton_normalizeBackground?: boolean;
-          contentsCss?: string | string[];
-          contentsLangDirection?: string;
-          contentsLanguage?: string;
-          copyFormatting_allowRules?: string;
-          copyFormatting_allowedContexts?: boolean | string[];
-          copyFormatting_keystrokeCopy?: number;
-          copyFormatting_keystrokePaste?: number;
-          copyFormatting_outerCursor?: boolean;
-          coreStyles_bold?: config.styleObject;
-          coreStyles_italic?: config.styleObject;
-          coreStyles_strike?: config.styleObject;
-          coreStyles_subscript?: config.styleObject;
-          coreStyles_superscript?: config.styleObject;
-          coreStyles_underline?: config.styleObject;
-          customConfig?: string;
-  
-          dataIndentationChars?: string;
-          defaultLanguage?: string;
-          devtools_styles?: string;
-          devtools_textCallback?: (editor: editor, dialog: dialog, element: dom.element, tabName: string) => string;
-          dialog_backgroundCoverColor?: string;
-          dialog_backgroundCoverOpacity?: number;
-          dialog_buttonsOrder?: string;
-          dialog_magnetDistance?: number;
-          dialog_noConfirmCancel?: boolean;
-          dialog_startupFocusTab?: boolean;
-          disableNativeSpellChecker?: boolean;
-          disableNativeTableHandles?: boolean;
-          disableNativeObjectResizing?: boolean;
-          disableNativeReadonlyStyling?: boolean;
-          disallowedContent?: filter.disallowedContentRules;
-          div_wrapTable?: boolean;
-          docType?: string;
-  
-          easyimage_class?: string;
-          easyimage_defaultStyle?: string;
-          easyimage_styles?: { [key: string]: any };
-          easyimage_toolbar?: string[] | string;
-          emailProtection?: string;
-          embed_provider?: string;
-          enableTabKeyTools?: boolean;
-          enterMode?: number;
-          entities?: boolean;
-          entities_additional?: string;
-          entities_greek?: boolean;
-          entities_latin?: boolean;
-          entities_processNumerical?: boolean | string;
-          extraAllowedContent?: filter.allowedContentRules;
-          extraPlugins?: string;
-  
-          fileTools_defaultFileName?: string;
-          fileTools_requestHeaders?: { [key: string]: any };
-          filebrowserBrowseUrl?: string;
-          filebrowserFlashBrowseUrl?: string;
-          filebrowserFlashUploadUrl?: string;
-          filebrowserImageBrowseLinkUrl?: string;
-          filebrowserImageBrowseUrl?: string;
-          filebrowserImageUploadUrl?: string;
-          filebrowserUploadMethod?: string;
-          filebrowserUploadUrl?: string;
-          filebrowserWindowFeatures?: string;
-          filebrowserWindowHeight?: number | string;
-          filebrowserWindowWidth?: number | string;
-          fillEmptyBlocks?: boolean | ((element: htmlParser.element) => boolean);
-          find_highlight?: config.styleObject;
-          flashAddEmbedTag?: boolean;
-          flashConvertOnEdit?: boolean;
-          flashEmbedTagOnly?: boolean;
-          floatSpaceDockedOffsetX?: number;
-          floatSpaceDockedOffsetY?: number;
-          floatSpacePinnedOffsetX?: number;
-          floatSpacePinnedOffsetY?: number;
-          floatSpacePreferRight?: boolean;
-          fontSize_defaultLabel?: string;
-          fontSize_sizes?: string;
-          fontSize_style?: config.styleObject;
-          font_defaultLabel?: string;
-          font_names?: string;
-          font_style?: config.styleObject;
-          forceEnterMode?: boolean;
-          forcePasteAsPlainText?: boolean;
-          forceSimpleAmpersand?: boolean;
-          format_address?: config.styleObject;
-          format_div?: config.styleObject;
-          format_h1?: config.styleObject;
-          format_h2?: config.styleObject;
-          format_h3?: config.styleObject;
-          format_h4?: config.styleObject;
-          format_h5?: config.styleObject;
-          format_h6?: config.styleObject;
-          format_p?: config.styleObject;
-          format_pre?: config.styleObject;
-          format_tags?: string;
-          fullPage?: boolean;
-  
-          grayt_autoStartup?: boolean;
-  
-          height?: string | number;
-          htmlEncodeOutput?: boolean;
-  
-          ignoreEmptyParagraph?: boolean;
-          image2_alignClasses?: string[];
-          image2_altRequired?: boolean;
-          image2_captionedClass?: string;
-          image2_disableResizer?: boolean;
-          image2_prefillDimensions?: boolean;
-          imageUploadUrl?: string;
-          image_prefillDimensions?: boolean;
-          image_previewText?: string;
-          image_removeLinkByEmptyUrl?: boolean;
-          indentClasses?: string[];
-          indentOffset?: number;
-          indentUnit?: string;
-  
-          jqueryOverrideVal?: boolean;
-          justifyClasses?: string[];
-  
-          keystrokes?: [number, string][];
-  
-          language?: string;
-          language_list?: string[];
-          linkJavaScriptLinksAllowed?: boolean;
-          linkShowAdvancedTab?: boolean;
-          linkShowTargetTab?: boolean;
-  
-          magicline_color?: string
-          magicline_everywhere?: boolean;
-          magicline_holdDistance?: number;
-          magicline_keystrokeNext?: number;
-          magicline_keystrokePrevious?: number;
-          magicline_tabuList?: string[];
-          magicline_triggerOffset?: number;
-          mathJaxClass?: string;
-          mathJaxLib?: string;
-          menu_groups?: string;
-          menu_subMenuDelay?: number;
-  
-          newpage_html?: string;
-          notification_duration?: number;
-  
-          on?: editor.eventObject;
-  
-          pasteFilter?: string;
-          pasteFromWordCleanupFile?: string;
-          pasteFromWordNumberedHeadingToList?: boolean;
-          pasteFromWordPromptCleanup?: boolean;
-          pasteFromWordRemoveFontStyles?: boolean;
-          pasteFromWorkRemoveStyles?: boolean;
-          pasteFromWord_heuristicsEdgeList?: boolean;
-          pasteFromWord_inlineImages?: boolean;
-          plugins?: string;
-          protectedSource?: RegExp[];
-  
-          readOnly?: boolean;
-          removeButtons?: string;
-          removeDialogTabs?: string;
-          removeFormatAttributes?: string;
-          removeFormatTags?: string;
-          removePlugins?: string;
-          resize_dir?: string;
-          resize_enabled?: boolean;
-          resize_maxHeight?: number;
-          resize_maxWidth?: number;
-          resize_minHeight?: number;
-          resize_minWidth?: number;
-  
-          scayt_autoStartup?: boolean;
-          scayt_contextCommands?: string;
-          scayt_contextMenuItemsOrder?: string;
-          scayt_customDictionaryIds?: string;
-          scayt_customerId?: string;
-          scayt_disableOptionsStorage?: string | string[];
-          scayt_elementsToIgnore?: string;
-          scayt_handleCheckDirty?: string;
-          scayt_handleUndoRedo?: string;
-          scayt_ignoreAllCapsWords?: boolean;
-          scayt_ignoreDomainNames?: boolean;
-          scayt_ignoreWordsWithMixedCases?: boolean;
-          scayt_ignoreWordsWithNumbers?: boolean;
-          scayt_inlineModeImmediateMarkup?: boolean;
-          scayt_maxSuggestions?: number;
-          scayt_minWordLength?: number;
-          scayt_moreSuggestions?: string;
-          scayt_multiLanguageMode?: boolean;
-          scayt_multiLanguageStyles?: { [key: string]: any };
-          scayt_sLang?: string;
-          scayt_serviceHost?: string;
-          scayt_servicePath?: string;
-          scayt_servicePort?: string;
-          scayt_serviceProtocol?: string;
-          scayt_srcUrl?: string;
-          scayt_uiTabs?: string;
-          scayt_userDictionaryName?: string;
-  
-          sharedSpaces?: sharedSpace;
-          shiftEnterMode?: number;
-          skin?: string;
-          smiley_columns?: number;
-          smiley_descriptions?: string[];
-          smiley_images?: string[];
-          smiley_path?: string;
-          sourceAreaTabSize?: number;
-          specialChars?: (string | [string, string])[];
-          startupFocus?: string | boolean;
-          startupMode?: string;
-          startupOutlineBlocks?: boolean;
-          startupShowBorders?: boolean;
-          stylesSet?: string | boolean | config.styleObject[];
-          stylesheetParser_skipSelectors?: RegExp;
-          stylesheetParser_validSelectors?: RegExp;
-  
-          tabIndex?: number;
-          tabSpaces?: number;
-          templates?: string;
-          templates_files?: { [key: string]: any };
-          templates_replaceContent?: boolean;
-          title?: string | boolean;
-          toolbar?: string | (string | string[] | { name: string, items?: string[], groups?: string[] })[] | null;
-          toolbarCanCollapse?: boolean;
-          toolbarGroupCycling?: boolean;
-          toolbarGroups?: (toolbarGroups | string)[];
-          toolbarLocation?: string;
-          toolbarStartupExpanded?: boolean;
-  
-          uiColor?: string;
-          undoStackSize?: number;
-          uploadUrl?: string;
-          useComputedState?: boolean;
-  
-          width?: string | number;
-          wsc_cmd?: string;
-          wsc_customDictionaryIds?: string;
-          wsc_customLoaderScript?: string;
-          wsc_customerId?: string;
-          wsc_height?: string;
-          wsc_lang?: string;
-          wsc_left?: string;
-          wsc_top?: string;
-          wsc_userDictionaryName?: string;
-          wsc_width?: string;
-      }
-  
-      interface dataProcessor {
-          toDataFormat(html: string, fixForBody: string): void;
-          toHtml(data: string, fixForBody?: string): void;
-      }
-  
-      class dialog {
-          readonly state: number;
-  
-          constructor(editor: editor, dialogName: string);
-  
-          addFocusable(element: dom.element, index?: number): void;
-          addPage(contents: { [key: string]: any }): void;
-          click(id: string): any;
-          commitContent(): void;
-          disableButton(id: string): void;
-          enableButton(id: string): void;
-          foreach(fn: () => void): dialog;
-          getButton(id: string): ui.dialog.button;
-          getContentElement(pageId: string, elementId: string): ui.dialog.uiElement;
-          getElement(): dom.element;
-          getName(): string;
-          getPageCount(): number;
-          getParentEditor(): editor;
-          getPosition(): { [key: string]: any };
-          getSelectedElement(): dom.element;
-          getSize(): { [key: string]: any };
-          getValueOf(pageId: string, elementId: string): any;
-          hide(): void;
-          hidePage(id: string): void;
-          layout(): void;
-          move(x: number, y: number, save: boolean): void;
-          reset(): dialog;
-          resize(width: number, height: number): void;
-          selectPage(id: string): void;
-          setState(state: number): void;
-          setValueOf(pageId: string, elementId: string, value: any): void;
-          setupContent(): void;
-          show(): void;
-          showPage(id: string): void;
-          updateStyle(): void;
-  
-          static add(name: string, dialogDefinition: string | ((editor: editor) => dialog.IDialogDefinition)): void;
-          static addIframe(name: string, title: string, minWidth: number, minHeight: number, onContentLoad?: () => void, userDefinition?: { [key: string]: any }): void;
-          static addUIElement(typeName: string, builder: () => void): void;
-          static cancelButton(): void;
-          static exists(name: string | number): void; // NOTE: documentation says object, but it's an array accessor, so really a string or number will work
-          static getCurrent(): dialog;
-          static isTabEnabled(editor: editor, dialogName: string, tabName: string): boolean;
-          static okButton(): void;
-      }
-  
-      namespace dialog {
-  
-          namespace definition {
-  
-              interface button extends uiElement {
-                  disabled?: boolean;
-              }
-  
-              interface checkbox extends uiElement {
-                  default?: string;
-                  validate?: () => boolean;
-              }
-  
-              interface content {
-                  accessKey?: string;
-                  elements?: dialog.definition.uiElement[];
-                  id?: string;
-                  label?: string;
-                  title?: string;
-              }
-  
-              interface file extends labeledElement {
-                  action?: string;
-                  size?: string;
-                  validate?: () => boolean;
-              }
-  
-              interface fileButton extends uiElement {
-                  filebrowser?: string;
-                  for?: string;
-                  validate?: () => boolean;
-              }
-  
-              interface hbox extends uiElement {
-                  children?: ui.dialog.uiElement[];
-                  height?: number;
-                  padding?: number;
-                  validate?: () => boolean;
-                  widths?: number[];
-              }
-  
-              interface html extends uiElement {
-                  html?: string;
-              }
-  
-              interface labeledElement extends uiElement {
-                  controlStyle?: string;
-                  inputStyle?: string;
-                  labelLayout?: string;
-                  labelStyle?: string;
-                  widths?: number[];
-              }
-  
-              interface radio extends labeledElement {
-                  default?: string;
-                  items?: string[] | (string[])[];
-                  validate?: () => boolean;
-              }
-  
-              interface select extends labeledElement {
-                  default?: string;
-                  items?: string[] | (string[])[];
-                  multiple?: boolean;
-                  size?: number;
-                  validate?: () => boolean;
-              }
-  
-              interface textarea extends labeledElement {
-                  bidi?: boolean;
-                  cols?: number;
-                  default?: string;
-                  rows?: number;
-                  validate?: () => boolean;
-              }
-  
-              interface textInput extends labeledElement {
-                  bidi?: boolean;
-                  default?: string;
-                  maxLength?: number;
-                  size?: number;
-                  validate?: () => boolean;
-              }
-  
-              interface uiElement {
-                  align?: string;
-                  className?: string;
-                  commit?: (widget: plugins.widget) => void;
-                  id?: string;
-                  label?: string;
-                  onHide?: (elem: ui.dialog.uiElement) => void;
-                  onLoad?: (elem: ui.dialog.uiElement) => void;
-                  onShow?: (elem: ui.dialog.uiElement) => void;
-                  requiredContent?: string | { [key: string]: any } | style;
-                  setup?: (widget: plugins.widget) => void;
-                  style?: string;
-                  title?: string;
-                  type?: string;
-              }
-  
-              interface vbox extends uiElement {
-                  children?: ui.dialog.uiElement[];
-                  expand?: boolean;
-                  heights?: number[];
-                  padding?: number;
-                  styles?: string;
-                  width?: number[];
-              }
-          }
-  
-          interface IDialogDefinition {
-              buttons?: dialog.definition.button[];
-              contents?: dialog.definition.content[];
-              height?: number;
-              minHeight?: number;
-              minWidth?: number;
-              onCancel?: () => void;
-              onLoad?: () => void;
-              onOk?: () => void;
-              onShow?: () => void;
-              onHide?: () => void;
-              resizable?: number;
-              title?: string;
-              width?: number;
-          }
-      }
-  
-      class dialogCommand {
-          value: any;
-  
-          constructor(dialogName: string, ext?: { tabId?: string });
-      }
-  
-      interface dtdDefinition {
-          [outerTagName: string]: {[innerTagName: string]: 1};
-          $block:          {[tagName: string]: 1};
-          $blockLimit:     {[tagName: string]: 1};
-          $cdata:          {[tagName: string]: 1};
-          $editable:       {[tagName: string]: 1};
-          $empty:          {[tagName: string]: 1};
-          $inline:         {[tagName: string]: 1};
-          $intermediate:   {[tagName: string]: 1};
-          $list:           {[tagName: string]: 1};
-          $listItem:       {[tagName: string]: 1};
-          $nonBodyContent: {[tagName: string]: 1};
-          $nonEditable:    {[tagName: string]: 1};
-          $object:         {[tagName: string]: 1};
-          $removeEmpty:    {[tagName: string]: 1};
-          $tabIndex:       {[tagName: string]: 1};
-          $tableContent:   {[tagName: string]: 1};
-          $transparent:    {[tagName: string]: 1};
-      }
-  
-      var dtd: dtdDefinition;
-      
-      class editable extends dom.element {
-          hasFocus: boolean;
-          readonly status: string;
-  
-          constructor(editor: editor, element: HTMLElement | dom.element);
-          attachClass(className: string): void;
-          attachListener(obj: event | editable, eventName: string, listenerFunction: (ei: eventInfo) => void, scopeobj?: {}, listenerData?: any, priority?: number): listenerRegistration;
-          changeAttr(attr: string, val: string): void;
-          detach(): void;
-          insertElement(element: dom.element, range?: dom.range): void;
-          insertHtml(data: string, mode?: string, range?: dom.range): void;
-          insertText(text: dom.text): void;
-          isInline(): boolean;
-          setReadOnly(isReadOnly: boolean): void;
-      }
-  
-      class editor extends event {
-          readonly activeEnterMode: number;
-          readonly activeFilter: filter;
-          readonly activeShiftEnterMode: number;
-          readonly blockless: boolean;
-          readonly config: config;
-          readonly container: dom.element;
-          readonly contextMenu: plugins.contextMenu;
-          copyFormatting: plugins.copyformatting.state;
-          dataProcessor: dataProcessor;
-          readonly document: dom.document;
-          readonly element: dom.element;
-          readonly elementMode: number;
-          readonly enterMode: number;
-          readonly filter: filter;
-          readonly focusManager: focusManager;
-          readonly id: string;
-          readonly keystrokeHandler: keystrokeHandler;
-          readonly lang: any;
-          readonly langCode: string;
-          readonly mode: string;
-          readonly name: string;
-          readonly pasteFilter: filter;
-          readonly plugins: any;
-          readonly readOnly: boolean;
-          readonly shiftEnterMode: number;
-          readonly status: string;
-          readonly tabIndex: number;
-          readonly templates: any;
-          readonly title: any;
-          readonly toolbar: any;
-          readonly ui: ui;
-          readonly widgets: plugins.widget.repository;
-          readonly window: dom.window;
-  
-          constructor(instanceConfig?: config, element?: dom.element, mode?: number);
-          addCommand(commandName: string, commandDefinition: commandDefinition): void;
-          addContentsCss(cssPath: string): void;
-          addFeature(feature: feature): boolean;
-          addMenuGroup(name: string, order?: number): void;
-          addMenuItem(name: string, definition?: IMenuItemDefinition): void;
-          addMenuItems(definitions: { [id:string]: IMenuItemDefinition }): void;
-          addMode(mode: string, exec: () => void): void;
-          addRemoveFormatFilter(func: (element: dom.element) => boolean): void;
-          applyStyle(style: style): void;
-          attachStyleStateChange(style: style, callback: (state: number) => void): void;
-          checkDirty(): boolean;
-          createFakeElement(realElement: dom.element, className: string, realElementType: string, isResizable: boolean): void;
-          createFakeParserElement(realElement: dom.element, className: string, realElementType: string, isResizable: boolean): void;
-          createRange(): dom.range;
-          destroy(noUpdate?: boolean): void;
-          editable(elementOrEditable?: dom.element | editable): editable;
-          elementPath(startNode?: dom.node): dom.elementPath;
-          execCommand(commandName: string, data?: any): boolean;
-          extractSelectedHtml(toString?: boolean, removeEmptyBlock?: boolean): dom.documentFragment | string | void;
-          focus(): void;
-          forceNextSelectionCheck(): void;
-          getClipboardData(callbackOrOptions: { title: string } | ((data: any) => void), callback: (data: any) => void): void;
-          getColorFromDialog(callback: (color: string) => void, scope?: { [key: string]: any }): void;
-          getCommand(commandName: string): command;
-          getCommandKeystroke(command: command | string): number | null;
-          getData(internal?: boolean): string;
-          getMenuItem(name: string): IMenuItemDefinition;
-          getResizable(forContents: boolean): dom.element;
-          getSelectedHtml(toString?: false): dom.documentFragment;
-          getSelectedHtml(toString: true): string;
-          getSelectedHtml(toString?: boolean): dom.documentFragment | string;
-          getSelection(forceRealSelection?: boolean): dom.selection;
-          getSnapshot(): string;
-          getStylesSet(callback: (stylesDefinitions: style.definition[]) => void): void;
-          getUiColor(): string;
-          insertElement(element: dom.element): void;
-          insertHtml(html: string, mode?: string, range?: dom.range): void;
-          insertText(text: string): void;
-          loadSnapshot(snapshot: any): void;
-          lockSelection(sel?: dom.selection): boolean;
-          openDialog(dialogName: string, callback: () => void): dialog;
-          popup(url: string, width?: number | string, height?: number | string, options?: string): void;
-          removeMenuItem(name: string): void;
-          removeStyle(style: style): void;
-          resetDirty(): void;
-          resetUndo(): void;
-          resize(width: number | string, height: number | string, isContentHeight?: boolean, resizeInner?: boolean): void;
-          restoreRealElement(fakeElement: dom.element): dom.element;
-          selectionChange(checkNow?: boolean): void;
-          setActiveEnterMode(enterMode: number, shiftEnterMode: number): void;
-          setActiveFilter(filter: filter): void;
-          setData(data: string, options?: { internal?: boolean; callback?: () => void; noSnapshot?: boolean; }): void;
-          setKeystroke(keystroke: number, behavior: string | boolean): void;
-          setKeystroke(keystroke: [number, string | boolean][]): void;
-          setMode(newMode: string, callback: () => void): void;
-          setReadOnly(isReadOnly?: boolean): void;
-          setUiColor(color: string): void;
-          showNotification(message: string, type: plugins.notification.type, progressOrDuration: number): plugins.notification;
-          unlockSelection(restore?: boolean): void;
-          updateElement(): void;
-      }
-  
-      namespace editor {
-          interface eventObject {
-              activeEnterModeChange?: (evt: eventInfo) => void;
-              activeFilterChange?: (evt: eventInfo) => void;
-              afterCommandExec?: (evt: eventInfo) => void;
-              afterInsertHtml?: (evt: eventInfo) => void;
-              afterPaste?: (evt: eventInfo) => void;
-              afterPasteFromWord?: (evt: eventInfo) => void;
-              afterSetData?: (evt: eventInfo) => void;
-              afterUndoImage?: (evt: eventInfo) => void;
-              ariaEditorHelpLabel?: (evt: eventInfo) => void;
-              ariaWidget?: (evt: eventInfo) => void;
-              autogrow?: (evt: eventInfo) => void;
-  
-              beforeCommandExec?: (evt: eventInfo) => void;
-              beforeDestroy?: (evt: eventInfo) => void;
-              beforeGetData?: (evt: eventInfo) => void;
-              beforeModeUnload?: (evt: eventInfo) => void;
-              beforeSetMode?: (evt: eventInfo) => void;
-              beforeUndoImage?: (evt: eventInfo) => void;
-              blur?: (evt: eventInfo) => void;
-  
-              change?: (evt: eventInfo) => void;
-              configLoaded?: (evt: eventInfo) => void;
-              contentDirChanged?: (evt: eventInfo) => void;
-              contentDom?: (evt: eventInfo) => void;
-              contentDomInvalidated?: (evt: eventInfo) => void;
-              contentDomUnload?: (evt: eventInfo) => void;
-              customConfigLoaded?: (evt: eventInfo) => void;
-  
-              dataFiltered?: (evt: eventInfo) => void;
-              dataReady?: (evt: eventInfo) => void;
-              destroy?: (evt: eventInfo) => void;
-              dialogHide?: (evt: eventInfo) => void;
-              dialogShow?: (evt: eventInfo) => void;
-              dirChanged?: (evt: eventInfo) => void;
-              doubleclick?: (evt: eventInfo) => void;
-              dragend?: (evt: eventInfo) => void;
-              dragstart?: (evt: eventInfo) => void;
-              drop?: (evt: eventInfo) => void;
-  
-              elementsPathUpdate?: (evt: eventInfo) => void;
-  
-              fileUploadRequest?: (evt: eventInfo) => void;
-              fileUploadResponse?: (evt: eventInfo) => void;
-              floatingSpaceLayout?: (evt: eventInfo) => void;
-              focus?: (evt: eventInfo) => void;
-  
-              getData?: (evt: eventInfo) => void;
-              getSnapshot?: (evt: eventInfo) => void;
-  
-              insertElement?: (evt: eventInfo) => void;
-              insertHtml?: (evt: eventInfo) => void;
-              insertText?: (evt: eventInfo) => void;
-              instanceReady?: (evt: eventInfo) => void;
-  
-              key?: (evt: eventInfo) => void;
-  
-              langLoaded?: (evt: eventInfo) => void;
-              loadSnapshot?: (evt: eventInfo) => void;
-              loaded?: (evt: eventInfo) => void;
-              lockSnapshot?: (evt: eventInfo) => void;
-              maximize?: (evt: eventInfo) => void;
-              menuShow?: (evt: eventInfo) => void;
-              mode?: (evt: eventInfo) => void;
-  
-              notificationHide?: (evt: eventInfo) => void;
-              notificationShow?: (evt: eventInfo) => void;
-              notificationUpdate?: (evt: eventInfo) => void;
-  
-              paste?: (evt: eventInfo) => void;
-              pasteFromWord?: (evt: eventInfo) => void;
-              pluginsLoaded?: (evt: eventInfo) => void;
-  
-              readOnly?: (evt: eventInfo) => void;
-              removeFormatCleanup?: (evt: eventInfo) => void;
-              required?: (evt: eventInfo) => void;
-              resize?: (evt: eventInfo) => void;
-  
-              save?: (evt: eventInfo) => void;
-              saveSnapshot?: (evt: eventInfo) => void;
-              selectionChange?: (evt: eventInfo) => void;
-              setData?: (evt: eventInfo) => void;
-              stylesSet?: (evt: eventInfo) => void;
-  
-              template?: (evt: eventInfo) => void;
-              toDataFormat?: (evt: eventInfo) => void;
-              toHtml?: (evt: eventInfo) => void;
-  
-              unlockSnapshot?: (evt: eventInfo) => void;
-              updateSnapshot?: (evt: eventInfo) => void;
-  
-              widgetDefinition?: (evt: eventInfo) => void;
-          }
-      }
-  
-      namespace env {
-          var air: boolean;
-          var chrome: boolean;
-          var cssClass: string;
-          var edge: boolean;
-          var gecko: boolean;
-          var hc: boolean;
-          var hidpi: boolean;
-          var iOS: boolean;
-          var ie: boolean;
-          var isCompatible: boolean;
-          var mac: boolean;
-          var needsBrFiller: boolean;
-          var needsNbspFiller: boolean;
-          var quirks: boolean;
-          var safari: boolean;
-          var version: number;
-          var webkit: boolean;
-  
-          function secure(): boolean;
-      }
-  
-      class event {
-          static useCapture: boolean;
-          
-          constructor();
-          capture(): void;
-          define(name: string, meta: { [key: string]: any }): void;
-          fire(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
-          fireOnce(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
-          hasListeners(eventName: string): boolean;
-          on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any } | null, listenerData?: any, priority?: number): listenerRegistration;
-          once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any } | null, listenerData?: any, priority?: number): listenerRegistration;
-          removeAllListeners(): void;
-          removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
-  
-          static implementOn(targetObject: { [key: string]: any }): void;
-      }
-  
-      interface eventInfo {
-          data: any;
-          editor: editor;
-          listenerData: any;
-          name: string;
-          sender: { [key: string]: any };
-          
-          cancel(): void;
-          removeListener(): void;
-          stop(): void;
-      }
-  
-      interface feature {
-          allowedContent?: filter.allowedContentRules;
-          contentForms?: any;
-          contentTransformations?: any;
-          name?: string;
-          requiredContent?: string | style;
-          toFeature?: () => feature;
-      }
-  
-      namespace fileTools {
-          var isFileUploadSupported: boolean;
-  
-          function addUploadWidget(editor: editor, name: string, def: uploadWidgetDefinition): void;
-          function bindNotification(editor: editor, fileLoader: fileLoader): void;
-          function getUploadUrl(config: { [key: string]: any }, type?: string): string;
-          function isTypeSupported(file: Blob, supportedTypes: RegExp): boolean;
-          function markElement(element: dom.element, widgetName: string, loaderId: number): void;
-  
-          class fileLoader extends event {
-              readonly data: string;
-              readonly file: Blob;
-              readonly fileName: string;
-              readonly id: number;
-              readonly loaded: number;
-              readonly message: string;
-              readonly reader: FileReader;
-              readonly responseData: any;
-              status: string;
-              readonly total: number;
-              readonly uploadTotal: number;
-              readonly uploadUrl: string;
-              readonly uploaded: string;
-              readonly url: string;
-              readonly xhr: XMLHttpRequest;
-  
-              constructor(editor: editor, fileOrData: Blob | string, fileName?: string);
-              abort(): void;
-              isFinished(): boolean;
-              load(): void;
-              loadAndUpload(url: string, additionalRequestParameters?: any): void;
-              update(): void;
-              upload(url: string, additionalRequestParameters?: any): void;
-          }
-  
-          class uploadRepository extends event {
-              readonly loaders: fileLoader[];
-  
-              constructor(editor: editor);
-              create(fileOrData: Blob | string, fileName: string, loaderType?: any): fileLoader;
-              isFinished(): boolean;
-          }
-  
-          interface uploadWidgetDefinition extends plugins.widget.definition {
-              additionalRequestParameters: any;
-              fileToElement: (pastedFile: any) => HTMLElement;
-              loadMethod: string;
-              loaderType: any;
-              onAbort: () => boolean;
-              onError: () => boolean;
-              onLoaded: () => boolean;
-              onUploaded: () => boolean;
-              onUploading: () => boolean;
-              replaceWith: () => any;
-              skipNotifications: boolean;
-              supportedTypes: string;
-              uploadUrl: string;
-          }
-      }
-  
-      module filter {
-          type allowedContentRule = string | style | { [key: string]: any};
-          type allowedContentRules = allowedContentRule | allowedContentRule[];
-          type contentRule = string | style;
-          type disallowedContentRules = string | { [key: string]: any};
-  
-          interface transformation {
-              check?: string;
-              element?: string | style;
-              left?: (element: htmlParser.element | style) => boolean;
-              right: (element: htmlParser.element, tools: string | filter.transformationTools) => boolean;
-          }
-  
-          var transformationTools: transformationTools;
-  
-          interface transformationTools {
-              alignmentToAttribute(element: htmlParser.element): void;
-              alignmentToStyle(element: htmlParser.element): void;
-              lengthToAttribute(element: htmlParser.element, styleName: string, attrName?: string): void;
-              lengthToStyle(element: htmlParser.element, styleName: string, attrName?: string): void;
-              matchesTyle(element: htmlParser.element, style: style): void;
-              sizeToAttribute(element: htmlParser.element): void;
-              sizeToStyle(element: htmlParser.element): void;
-              splitBorderShorthand(element: htmlParser.element): void;
-              splitMarginShorthand(element: htmlParser.element): void;
-              transform(element: htmlParser.element, form: style | string): void;
-          }
-      }
-  
-      class filter {
-          readonly allowedContent: filter.allowedContentRules[];
-          readonly customConfig: boolean;
-          readonly disabled: boolean;
-          readonly disallowedContent: any[];
-          readonly editor: editor;
-          readonly elementCallbacks:((element: htmlParser.element) => number)[];
-          readonly id: number;
-  
-          static instances: { [id: string]: filter };
-  
-          constructor(editorOrRules: editor | filter.allowedContentRules);
-          addContentForms(forms: any[]): void;
-          addElementCallback(callback: (element: htmlParser.element) => number): void;
-          addFeature(feature: feature): boolean;
-          addTransformations(transformations: (string | filter.transformation)[][]): void;
-          allow(newRules: filter.allowedContentRules, featureName?: string, overrideCustom?: boolean): boolean;
-          applyTo(fragment: htmlParser.fragment | htmlParser.element, toHrml: boolean, transformOnly: boolean, enterMode: number): boolean;
-          check(test: filter.contentRule, applyTransformations?: boolean, strictCheck?: boolean): boolean;
-          checkFeature(feature: feature): boolean;
-          clone(): filter;
-          destroy(): void;
-          disable(): void;
-          disallow(newRules: filter.disallowedContentRules): void;
-          getAllowedEnterMode(defaultMode: number, reverse?: boolean): number;
-      }
-  
-      class focusManager {
-          currentActive: dom.domObject;
-          hasFocus: boolean;
-  
-          constructor(editor: editor);
-          add(element: dom.element, isCapture: boolean): void;
-          blur(noDelay?: boolean): void;
-          focus(currentActive?: dom.element): void;
-          lock(): void;
-          remove(element: dom.element): void;
-          unlock(): void;
-      }
-  
-      class htmlDataProcessor implements dataProcessor {
-          dataFilter: htmlParser.filter;
-          htmlFilter: htmlParser.filter;
-          writer: htmlParser.basicWriter;
-  
-          constructor(editor: editor);
-          toDataFormat(html: string, options?: string | { context?: string, filter?: filter, enterMode?: number }): string;
-          toHtml(data: string, options?: string | htmlDataProcessorOptions): string;
-      }
-  
-      interface htmlDataProcessorOptions {
-          context?: string;
-          fixForBody?: boolean;
-          filter?: filter;
-          dontFilter?: boolean;
-          enterMode?: number;
-          protectedWhitespaces?: boolean;
-      }
-  
-      namespace htmlParser {
-          class basicWriter {
-              constructor();
-              attribute(attName: string, attValue: string): void;
-              closeTag(tagName: string): void;
-              comment(comment: string): void;
-              getHtml(reset: boolean): string;
-              openTag(tagName: string, attributes: { [key: string]: string }): void;
-              openTagClose(tagName: string, isSelfClose: boolean): void;
-              reset(): void;
-              text(text: string): void;
-              write(data: string): void;
-          }
-  
-          class cdata extends node {
-              constructor(value: string);
-              type: number;
-              writeHtml(writer: htmlParser.basicWriter): void;
-          }
-  
-          class comment extends node {
-              type: number;
-              value: string;
-  
-              constructor(value: string);
-              filter(filter: filter): boolean;
-              writeHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
-          }
-  
-          class cssStyle {
-              constructor(elementOrStyleText: htmlParser.element | string);
-              populate(obj: htmlParser.element | dom.element | { [key: string]: any}): void;
-          }
-  
-          class element extends node {
-              attributes: { [name: string]: string };
-              children: htmlParser.node[];
-              name: string;
-              type: number;
-  
-              constructor(name: string, attributes: { [name: string]: string });
-              add(node: node, index?: number): void;
-              addClass(className: string): void;
-              clone(): element;
-              filter(filter: htmlParser.filter): boolean;
-              filterChildren(filter: htmlParser.filter): void;
-              find(criteria: string | ((el: htmlParser.node) => boolean), recursive?: boolean): htmlParser.node[];
-              forEach(callback: (node: htmlParser.node) => void | false, type?: number, skipRoot?: boolean): void;
-              getFirst(condition: string | { [key: string]: string } | ((node: htmlParser.node) => boolean)): htmlParser.node;
-              getHtml(): string;
-              getOuterHtml(): string;
-              hasClass(className: string): boolean;
-              removeClass(className: string): void;
-              replaceWithChildren(): void;
-              setHtml(html: string): void;
-              split(index: number): htmlParser.element;
-              writeChildrenHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
-              writeHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
-          }
-  
-          class filter {
-              attributeNameRules: filterRulesGroup;
-              attributesRules: { [name: string]: filterRulesGroup };
-              commentRules: filterRulesGroup;
-              elementNameRules: filterRulesGroup;
-              elementsRules: { [name: string]: filterRulesGroup };
-              id: number;
-              rootRules: filterRulesGroup;
-              textRules: filterRulesGroup;
-  
-              constructor(rules?: filterRulesDefinition);
-              addRules(rules: filterRulesDefinition, options?: number | { priority?: number; applyToAll?: boolean; }): void;
-              applyTo(node: node): void;
-          }
-  
-          interface filterRulesDefinition {
-              elementNames?: any;
-              attributeNames?: any;
-              elements?: any;
-              attributes?: any;
-              text?: any;
-              comment?: any;
-              root?: any;
-          }
-  
-          class filterRulesGroup {
-              rules: { value: rule, priority: number, option: ruleOptions }[];
-  
-              add(rule: rule, priority: number, options: ruleOptions): void;
-              addMany(rules: { [key: string]: any }[], priority: number, options: ruleOptions): void;
-              exec(currentValue: htmlParser.node | htmlParser.fragment | string): htmlParser.node | htmlParser.fragment | string;
-              execOnName(currentName: string): string;
-              findIndex(priority: number): number;
-          }
-  
-          class fragment {
-              children: htmlParser.node[];
-              parent: htmlParser.fragment;
-              readonly type: number;
-  
-              constructor();
-  
-              add(node: htmlParser.node, index?: number): void;
-              filter(filter: htmlParser.filter): void;
-              filterChildren(filter: htmlParser.filter, filterRoot?: boolean): void;
-              forEach(callback: (node: htmlParser.node) => void | false, type?: number, skipRoot?: boolean): void;
-              writeChildrenHtml(writer: basicWriter, filter?: htmlParser.filter, filterRoot?: boolean): void;
-              writeHtml(writer: basicWriter, filter?: htmlParser.filter): void;
-  
-              static fromBBCode(source: string): htmlParser.fragment;
-              static fromHtml(fragmentHtml: string, parent?: htmlParser.element | string, fixingBlock?: string | boolean): fragment | htmlParser.element;
-          }
-  
-          class node {
-              constructor();
-              getAscendant(condition: string | { [name: string]: string } | ((node: htmlParser.element) => boolean)): element;
-              getIndex(): number;
-              insertAfter(node: node): void;
-              insertBefore(node: node): void;
-              remove(): node;
-              replaceWith(node: node): void;
-              wrapWith(wrapper: element): element;
-          }
-  
-          type rule = ((value: htmlParser.node | htmlParser.fragment | string) => boolean) | [ string, string ];
-  
-          interface ruleOptions {
-              applyToAll?: boolean,
-              excludeNestedEditable?: boolean
-          }
-  
-          class text extends node {
-              constructor(value: string);
-              type: number;
-              filter(filter: filter): boolean;
-              writeHtml(writer: basicWriter, filter?: filter): void;
-          }
-      }
-  
-      class htmlWriter extends htmlParser.basicWriter {
-          indentationChars: string;
-          lineBreakChars: string;
-          selfClosingEnd: string;
-  
-          indentation(): void;
-          lineBreak(): void;
-          setRules(tagName: string, rules: { [key: string]: any }): void;
-      }
-  
-      class keystrokeHandler {
-          blockedKeystrokes: { [key: number]: string | boolean };
-          keystrokes: { [key: number]: string | boolean };
-  
-          constructor(editor: editor);
-  
-          attach(domObject: dom.domObject): void;
-      }
-  
-      namespace lang {
-          var languages: { [code: string]: number };
-          var rtl: { [code: string]: number };
-  
-          function detect(defaultLanguage: string, probeLanguage?: string): string;
-          function load(languageCode: string, defaultLanguage: string, callback: (code: string, entries: any) => void): void;
-      }
-  
-      namespace loader {
-          var loadedScripts: string[];
-          var scripts: string[];
-  
-          function load(scriptName: string, defer?: boolean): void;
-          function loadPending(): void;
-      }
-  
-      class menu {
-          constructor();
-  
-          add(item: any): void;
-          addListener(listenerFn: (startElement: dom.element, selection: dom.selection, path: dom.elementPath) => any): void;
-          findItemByCommandName(commandName: string): { item: any, element: dom.element };
-          hide(returnFocus?: boolean): void;
-          removeAll(): void;
-          show(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
-      }
-  
-      interface pluginDefinition {
-          hidpi?: boolean;
-          lang?: string | string[];
-          requires?: string | string[];
-  
-          afterInit?(editor: editor): any;
-          beforeInit?(editor: editor): any;
-          init?(editor: editor): void;
-          onLoad?(): any;
-      }
-  
-      namespace plugins {
-  
-          namespace cloudservices {
-              class cloudServicesLoader extends fileTools.fileLoader {
-                  customToken: string;
-  
-                  constructor(editor: editor, fileOrData: Blob | string, fileName?: string, token?: string);
-                  loadAndUpload(url?: string, additionalRequestParameters?: any): void;
-                  upload(url?: string, additionalRequestParameters?: any): void;
-              }
-          }
-  
-          class autoEmbed {
-              getWidgetDefinition(editor: editor, url: string): widget.definition;
-          }
-  
-          namespace balloontoolbar {
-              const PRIORITY: { [pri: string]: number };
-  
-              class context {
-                  editor: editor;
-                  options: contextDefinition;
-                  toolbar: ui.balloonToolbar;
-  
-                  constructor(editor: editor, options: contextDefinition);
-                  destroy(): void;
-                  hide(): void;
-                  refresh(): void;
-                  show(pointedElement?: dom.element): void;
-              }
-  
-              interface contextDefinition {
-                  cssSelector?: string;
-                  priority?: number;
-                  widgets?: string[] | string;
-  
-                  refresh?: (editor: editor, path: dom.elementPath, selection: dom.selection) => dom.element;
-              }
-  
-              class contextManager {
-                  editor: editor;
-  
-                  constructor(editor: editor);
-                  add(context: context): void;
-                  check(selection?: dom.selection): void;
-                  create(options: contextDefinition): context;
-                  destroy(): void;
-                  hide(): void;
-              }
-          }
-  
-          namespace clipboard {
-              const isCustomCopyCutSupported: boolean;
-              const isCustomDataTypesSupported: boolean;
-              const isFileApiSupported:  boolean;
-              const mainPasteEvent: string;
-  
-              function addPasteButton(editor: editor, name: string, definition: { [key: string]: any}): void;
-              function canClipboardApiBeTrusted(dataTransfer: dataTransfer, editor: editor): boolean;
-              function getDropTarget(editor: editor): dom.domObject;
-              function getRangeAtDropPosition(domEvent: Event, editor: editor): dom.range;
-              function initDragDataTransfer(evt?: dom.event, editor?: editor): void;
-              function initPasteDataTransfer(evt?: dom.event, sourceEditor?: editor): void;
-              function preventDefaultDropOnElement(element: dom.element): void;
-              function resetDragDataTransfer(): void;
-  
-              class dataTransfer {
-                  readonly $: DataTransfer;
-                  readonly id: string;
-                  readonly sourceEditor: editor;
-  
-                  constructor(nativeDataTransfer?: DataTransfer, editor?: editor);
-                  cacheData(): void;
-                  getData(type: string, getNative?: boolean): string;
-                  getFile(i: number): File;
-                  getFilesCount(): number;
-                  getTransferType(targetEditor: editor): number;
-                  isEmpty(): boolean;
-                  setData(type: string, value: string): void;
-                  storeId(): void;
-              }
-  
-              class fallbackDataTransfer {
-                  constructor(dataTransfer: dataTransfer);
-                  getData(type: string, getNative?: boolean): string;
-                  isRequired(): boolean;
-                  setData(type: string, value: string): string;
-              }
-          }
-  
-          namespace condesnippet {
-              function setHighlighter(highlighter: highlighter): void;
-  
-              class highlighter {
-                  highlighter: (code: string, lang: string, callback: (highlightedCode: string) => void) => void;
-                  init: (ready: () => void) => void;
-                  languages: { [lang: string]: string };
-                  readonly queue: ((code: string, lang: string, callback: (highlightedCode: string) => void) => void)[];
-                  readonly ready: boolean;
-  
-                  highlight(code: string, lang: string, callback: (highlightedCode: string) => void): void;
-              }
-          }
-  
-          class contextMenu extends menu {
-              constructor(editor: editor);
-              addTarget(element: dom.element, nativeContextMenuOnCtrl?: boolean): void;
-              open(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
-          }
-  
-          namespace copyformatting {
-              var breakOnElements: string[];
-              var elementsForInlineTransform: string[];
-              var excludedAttributes: string[];
-              var excludedAttributesFromInlineTransform: string[];
-              var inlineBoundary: string[];
-              var preservedElements: string[];
-  
-              class state extends event {
-                  editor: editor;
-                  filter: filter;
-                  sticky: boolean;
-                  styles: style[];
-  
-                  constructor(editor: editor);
-              }
-          }
-  
-          namespace easyimage {
-  
-          }
-  
-          namespace embedBase {
-              function createWidgetBaseDefinition(editor: editor): baseDefinition;
-  
-              interface baseDefinition extends widget.definition {
-                  providerUrl: template;
-                  urlRegExp: RegExp;
-  
-                  getErrorMessage(messageTypeOrMessage: string, url?: string, suffix?: string): string;
-                  isUrlValid(url: string): boolean;
-                  loadContent(url: string, callback?: () => void, errorCallback?: (error: string) => void, noNotifications?: boolean): request;
-              }
-  
-              interface request {
-                  callback: () => void;
-                  errorCallback: (error: string) => void;
-                  response: { [key: string]: string };
-                  task: notificationAggregator.task;
-                  url: string;
-  
-                  cancel(): void;
-              }
-          }
-  
-          namespace image2 {
-              function checkHasNaturalRatio(image: dom.element): boolean;
-              function getLinkAttributesGetter(): (editor: editor, data: { [key: string]: string }) => { set: { [tag: string]: string }, removed: string[] };
-              function getLinkAttributesParser(): (editor: editor, element: dom.element) => { [key: string]: string };
-              function getNatural(image: dom.element): { [key: string]: string };
-          }
-  
-          namespace imagebase {
-              var featuresDefinitions: { [key: string]: string };
-  
-              function addFeature(editor: editor, name: string, definition: imageWidgetDefinition): imageWidgetDefinition;
-              function addImageWidget(editor: editor, name: string, definition: imageWidgetDefinition): void;
-  
-              interface imageWidgetDefinition extends widget.definition {
-                  features: string[];
-                  upcast: string;
-              }
-  
-              class progressBar extends progressReporter {
-                  bar: dom.element;
-  
-                  constructor();
-  
-              }
-  
-              class progressReporter {
-                  wrapper: dom.element;
-  
-                  constructor(wrapperHtml?: string);
-                  aborted(): void;
-                  bindLoader(loader: fileTools.fileLoader): void;
-                  done(): void;
-                  failed(): void;
-                  remove(): void;
-                  updated(progress: number): void;
-              }
-          }
-  
-          namespace indent {
-              function registerCommands(editor: editor, commands: { [key: string]: command} ): void;
-  
-              class genericDefinition implements commandDefinition {
-                  async: boolean;
-                  canUndo: boolean;
-                  context: boolean;
-                  contextSensitive: boolean;
-                  editorFocus: boolean;
-                  fakeKeystroke: number;
-                  readonly isIndent: boolean;
-                  modes: { [key: string]: any };
-                  readOnly: boolean;
-                  startDisabled: boolean;
-  
-                  exec(editor: editor, data?: any): boolean;
-                  refresh?(editor: editor, path: dom.elementPath): void;
-              }
-  
-              class specificDefinition {
-                  database: { [key: string]: any };
-                  readonly enterBr: boolean;
-                  readonly indentKey: { [key: string]: any };
-                  readonly isIndent: boolean;
-                  readonly jobs: { [priority: string]: { refresh: (editor: editor, path: dom.elementPath) => number, exec: (editor: editor) => boolean } };
-                  readonly relatedGlobal: { [key: string]: any };
-  
-                  execJob(editor: editor, priority: number): boolean;
-                  getContext(node: dom.elementPath): dom.element;
-                  refreshJob(editor: editor, priority: number): number;
-              }
-          }
-  
-          namespace indentList {
-              function firstItemInPath(query: string | string[] | { [tagName: string]: any} | dom.element | ((element: dom.element) => boolean)): boolean;
-          }
-  
-          namespace link {
-              // DEPRECATED 4.3.3
-              const emptyAnchorFix: boolean;
-  
-              // DEPRECATED 4.3.3
-              const fakeAnchor: boolean;
-  
-              // DEPRECATED 4.3.3
-              const synAnchorSelector: boolean;
-  
-              function getEditorAnchors(editor: editor): dom.element[];
-              function getLinkAttributes(editor: editor, data: { [key: string]: any}): { set: { [key: string]: string }, removed: string[] }
-              function getSelectedLink(editor: editor, returnMultiple?: boolean): dom.element | dom.element[];
-              function parseLinkAttributes(editor: editor, element: dom.element): { [key: string]: any };
-              function showDisplayTextForElement(element: dom.element, editor: editor): boolean;
-              function tryRestoreFakeAnchor(editor: editor, element: dom.element): dom.element;
-          }
-  
-          class list {
-              arrayToList(listArray: any, database: any, paragraphMode: any, dir: any): void;
-              listToArray(listNode: any, database: any, baseArray: any, baseIndentLevel: any, grandparentNode: any): void;
-          }
-  
-          class notification {
-              readonly area: notification.area;
-              readonly duration: number;
-              readonly editor: editor;
-              readonly element: dom.element;
-              readonly id: number;
-              readonly message: string;
-              readonly progress: number;
-              readonly type: notification.type;
-  
-              constructor(editor: editor, options: notification.options);
-              hide(): void;
-              isVisible(): boolean;
-              show(): void;
-              update(options: notification.updateOptions): void;
-          }
-  
-          namespace notification {
-              interface area {
-                  readonly editor: editor;
-                  readonly element: dom.element;
-                  readonly notifications: notification[];
-  
-                  add(notification: notification): void;
-                  remove(notification: notification): void;
-              }
-  
-              interface optionsBase {
-                  duration?: number;
-                  progress?: number;
-                  type?: type;
-              }
-  
-              interface options extends optionsBase {
-                  message: string;
-              }
-  
-              interface updateOptions extends optionsBase  {
-                  message?: string;
-                  important?: boolean;
-              }
-  
-              type type = 'info' | 'warning' | 'success' | 'progress';
-          }
-  
-          class notificationAggregator extends event {
-              readonly editor: editor;
-              readonly notification: notification;
-  
-              constructor(editor: editor, message: string, singularMessage?: string);
-              createTask(options?: { weight?: number }): notificationAggregator.task;
-              getDoneTaskCount(): number;
-              getPercentage(): number;
-              getTaskCount(): number;
-              isFinished(): boolean;
-              update(): void;
-          }
-  
-          namespace notificationAggregator {
-              class task extends event {
-                  constructor(weight?: number);
-                  cancel(): void;
-                  done(): void;
-                  isCanceled(): boolean;
-                  isDone(): boolean;
-                  update(weight: number): void;
-              }
-          }
-  
-          namespace pastefromword {
-              class lists {
-                  numbering: lists.numbering;
-              }
-  
-              namespace lists {
-                  class numbering {
-                      getStyle(marker: string): string;
-                      toNumber(marker: string, markerType: string): number;
-                  }
-              }
-  
-              class styles {
-                  pushStylesLower(element: htmlParser.element, exceptions: { [style: string]: boolean }, wrapText?: boolean ): boolean;
-              }
-          }
-  
-          namespace tableselection {
-              function getCellsBetween(first: dom.element, last: dom.element): dom.element[];
-          }
-  
-          namespace widget {
-              var WRAPPER_CLASS_PREFIX: string;
-              
-              function getNestedEditable(guard: dom.element, node: dom.node): dom.element;
-              function isDomDragHandler(node: dom.node): boolean;
-              function isDomDragHandlerContainer(node: dom.node): boolean;
-              function isDomNestedEditable(node: dom.node): boolean;
-              function isDomWidget(node: dom.node): boolean;
-              function isDomWidgetElement(node: dom.node): boolean;
-              function isDomWidgetWrapper(node: dom.node): boolean;
-              function isParserWidgetElement(node: dom.node): boolean;
-              function isParserWidgetWrapper(node: dom.node): boolean;
-  
-              namespace nestedEditable {
-                  interface definition {
-                      allowedContent?: filter.allowedContentRules;
-                      disallowedContent?: filter.disallowedContentRules;
-                      pathName?: string;
-                      selector?: string;
-                  }
-              }
-  
-              class nestedEditable extends dom.element {
-                  readonly editor: editor;
-                  readonly enterMode: number;
-                  readonly filter: filter;
-                  readonly shiftEnterMode: number;
-  
-                  constructor(editor: editor, element: dom.element, config: { filter?: filter });
-                  getData(): string;
-                  setData(data: string): void;
-              }
-  
-  
-              interface definition extends feature {
-                  button?: string;
-                  data?: (evt: eventInfo) => void;
-                  defaults?: { [key: string]: any };
-                  dialog?: string;
-                  downcast?: string | ((element: htmlParser.element) => void);
-                  downcasts?: { [key: string]: any };
-                  draggable?: boolean;
-                  edit?: () => void;
-                  editables?: { [key: string]: any };
-                  getLabel?: () => any;
-                  init?: () => void;
-                  inline?: boolean;
-                  insert?: () => void;
-                  mask?: boolean;
-                  parts?: { [key: string]: any };
-                  pathName?: string;
-                  styleToAllowedContentRules?: (style: style) => filter.allowedContentRules;
-                  styleableElements?: string;
-                  template?: string | template;
-                  upcast?: string | ((element: htmlParser.element, data: any) => boolean);
-                  upcastPriority?: number;
-                  upcasts?: { [key: string]: any };
-              }
-  
-              class repository extends event {
-                  readonly editor: editor;
-                  readonly focused: widget;
-                  readonly instances: { [id: string]: widget };
-                  readonly registered: { [name: string]: definition };
-                  readonly selected: widget[];
-                  readonly widgetHoldingFocusedEditable: widget;
-  
-                  add(name: string, widgetDef: plugins.widget.definition): void;
-                  addUpcastCallback(callback: (element: htmlParser.element, data: any) => boolean): void;
-                  checkSelection(): void;
-                  checkWidgets(options?: { initOnlyNew?: boolean; focusInited?: boolean }): void;
-                  del(widget: plugins.widget): void;
-                  destroy(widget: plugins.widget, offline?: boolean): void;
-                  destroyAll(offline?: boolean): void;
-                  finalizeCreation(container: any): void;
-                  getByElement(element: any, checkWrapperOnly: boolean): plugins.widget;
-                  initOn(element: dom.element, widgetDef?: plugins.widget.definition, startupData?: { [key: string]: any }): plugins.widget;
-                  initOn(element: dom.element, widgetDef?: string, startupData?: { [key: string]: any }): plugins.widget;
-                  initOnAll(container?: dom.element): plugins.widget[];
-                  parseElementClasses(classes: string): any;
-                  wrapElement(element: any, widgetName?: string): any;
-              }
-  
-              class widgetselection {
-                  addFillers(editable: editable): boolean;
-                  removeFillers(editable: editable): void;
-              }
-          }
-  
-          class widget extends event implements widget.definition {
-              readonly dataReady: boolean;
-              readonly definition: plugins.widget.definition;
-              readonly editor: editor;
-              readonly element: dom.element;
-              readonly focusedEditable: plugins.widget.nestedEditable
-              readonly id: number;
-              readonly inited: boolean;
-              readonly ready: boolean;
-              readonly repository: plugins.widget.repository;
-              readonly wrapper: dom.element;
-  
-              constructor(widgetsRepo: plugins.widget.repository, id: number, element: dom.element, widgetDef: plugins.widget.definition, starupData?: any);
-  
-              addClass(className: string): void;
-              applyStyle(style: style): void;
-              checkStyleActive(style: style): boolean;
-              destroy(offline?: boolean): void;
-              destroyEditable(editableName: string, offline?: boolean): void;
-              edit(): boolean;
-              focus(): void;
-              getClasses(): any;
-              hasClass(className: string, Whether: boolean): void;
-              initEditable(editableName: string, definition: plugins.widget.nestedEditable.definition): boolean;
-              isInited(): boolean;
-              isReady(): boolean;
-              removeClass(className: string): void;
-              removeStyle(style: style): void;
-              setData(keyOrData: any, value: any): plugins.widget;
-              setFocused(selected: boolean): plugins.widget;
-              setSelected(selected: boolean): plugins.widget;
-              updateDragHandlerPosition(): void;
-          }
-  
-          function add(name: string, definition: pluginDefinition): void;
-          function add(name: string): void;
-          function addExternal(name: string, path: string, fileName?: string): void;
-          function get(name: string): any;
-          function getFilePath(name: string): string;
-          function getPath(name: string): string;
-          function load(name: string, callback: (plugins: string[]) => void, scope?: { [key: string]: any }): void;
-          function setLang(pluginName: string, languageCode: string, languageEntries: any): void;
-          var registered: {[key: string]: pluginDefinition};
-      }
-  
-      class resourceManager {
-          basePath: string;
-          externals: { [key: string]: any };
-          fileName: string;
-          loaded: { [key: string]: any };
-          registered: { [key: string]: any };
-  
-          constructor(basePath: string, fileName: string);
-          add(name: string, definition?: pluginDefinition): void;
-          addExternal(names: string, path: string, fileName?: string): void;
-          get(name: string): pluginDefinition;
-          getFilePath(name: string): string;
-          getPath(name: string): string;
-          load(name: string | string[], callback: (loaded: string[]) => void, scope?: { [key: string]: any }): void; 
-      }
-  
-      // see https://docs.com/ckeditor4/latest/api/CKEDITOR_scriptLoader.html
-      namespace scriptLoader {
-          function load(scriptUrls: string | string[], callback: (succeededUrls: boolean | string[], failedUrls: string[]) => void, scope?: any, showBusy?: boolean): void;
-          function queue(scriptUrl: string, callback?: (succeeded: boolean) => void): void;
-      }
-  
-      namespace skin {
-          var icons: { [name: string]: { path: string } };
-          var name: string;
-          var ua: { [name: string]: any };
-  
-          function addIcon(name: string, path: string, offset?: number, bgsize?: string): void;
-          function chameleon(editor: string, part: string): void;
-          function getIconStyle(name: string, rtl?: boolean, overridePath?: number, overrideBgsize?: string): any;
-          function getPath(part: string): any;
-          function loadPart(part: string, fn: () => void): void;
-          function path(): string;
-      }
-  
-      namespace style {
-          function addCustomHandler(defintion: customHandler): style;
-          function getStyleText(style: definition): string;
-  
-          namespace customHandlers {
-              class widget extends style {
-                  group: any[];
-                  widget: string;
-                  checkElement(element: dom.element): boolean;
-                  getClassesArray(): string[];
-                  getDefintion(): definition;
-                  removeStylesFromSameGroup(editor: editor): boolean;
-              }
-          }
-  
-          interface definition {
-              attributes?: { [att: string]: string },
-              element: string,
-              name?: string,
-              styles?: { [att: string]: string },
-              type?: string | number
-          }
-  
-          interface customHandler {
-              type: string | number;
-              setup?: (style: definition) => void;
-              assignedTo?: number;
-          }
-      }
-  
-      class style {
-          alwaysRemoveElement: boolean;
-          includeReadonly: boolean;
-          constructor(styleDefinition: style.definition, variableValues: any);
-          apply(editor: editor): void;
-          applyToObject(element: dom.element, editor: editor): void; 
-          applyToRange(range: Range, editor: editor): void;
-          buildPreview(label?: string): string;
-          checkActive(elementPath: dom.elementPath, editor: editor): boolean;
-          checkApplicable(elementPath: dom.elementPath, editor: editor, filter?: filter): boolean;
-          checkElementMatch(element: dom.element, fullMatch: boolean, editor: editor): boolean;
-          checkElementRemovable(element: dom.element, fullMatch: boolean, editor: editor): boolean;
-          getDefintion(): style.definition;
-          remove(editor: editor): void;
-          removeFromRange(range: Range, editor: editor): void;
-          toAllowedContentRules(editor?: editor): filter.allowedContentRules;
-      }
-  
-      class styleCommand {
-          constructor(style: style, ext?: any);
-          exec(editor: editor): void;
-      }
-  
-      var stylesSet: resourceManager;
-  
-      class template {
-          readonly source: string;
-  
-          constructor(source: string);
-          output(data: any, buffer?: any[]): string | number;
-      }
-  
-      namespace tools {
-          function addFunction(fn: () => any, scope?: any): number;
-          function arrayCompare(arrayA: any[], arrayB: any[]): boolean;
-          function clone(source: { [key: string]: any }): { [key: string]: any };
-          function copy(source: { [key: string]: any }): { [key: string]: any };
-          function createClass(definition: { [key: string]: any }): any;
-          function cssStyleToDomStyle(cssName: string): string;
-          function cssVendorPrefix(property: string, value: string, asString?: boolean): { [cssClass: string]: string | number };
-          function defer<T extends Function>(fn: T): T;
-          function enableHtml5Elements(doc: Document | DocumentFragment, withAppend?: boolean): void;
-          function escapeCss(selector: string): string;
-          function eventsBuffer(minInterval: number, output: () => void, scopeObj: any): { input: () => void, reset: () => void };
-          function extend(target: { [key: string]: any }, source: { [key: string]: any }, overwrite: boolean, properties: { [key: string]: any }): { [key: string]: any };
-          function fixDomain(): boolean;
-          function genKey(subKey: string): string;
-          function getCookie(name: string): string;
-          function getCsrfToken(): string;
-          function getIndex<T>(array: T[], compareFunction: (element: T) => boolean): number;
-          function getMouseButton(evt: dom.event): boolean;
-          function getNextId(): string;
-          function getNextNumber(): number;
-          function getUniqueId(): string;
-          function htmlDecode(text: string): string;
-          function htmlDecodeAttr(text: string): string;
-          function htmlEncode(text: string): string;
-          function htmlEncodeAttr(text: string): string;
-          function indexOf<T>(array: T[], value: T | ((el: T) => boolean)): number;
-          function isArray<T>(object: any): object is T[];
-          function isEmpty(object: { [key: string]: any }): boolean;
-          function keystrokeToArray(lang: { [key: string]: any }, keystroke: number): { display: string[], aria: string[] };
-          function keystrokeToString(lang: { [key: string]: any }, keystroke: number): { display: string, aria: string };
-          function ltrim(str: string): string;
-          function normalizeCssText(styleText: string, nativeNormalize: boolean): string;
-          function normalizeHex(styleText: string): string;
-          function objectCompare(left: { [key: string]: any }, right: { [key: string]: any }, onlyLef?: boolean): boolean;
-          function objectKeys(obj: { [key: string]: any }): string[];
-          function override<T extends Function>(originalFunction: T, functionBuilder: (originalFunction: T) => T): T;
-          function parseCssText(styleText: string, normalize?: boolean, nativeNormalize?: boolean): { [key: string]: any };
-          function prototypedCopy(source:  { [key: string]: any }):  { [key: string]: any };
-          function removeFunction(ref: number): void;
-          function repeat(str: string, times: number): string;
-          function rtrim(str: string): string;
-          function search<T>(array: T[], value: T | ((element: T) => boolean)): T;
-          function setCookie(name: string, value: string): void;
-          function setTimeout(func: Function, milliseconds?: number, scope?: { [key: string]: any }, args?: any, ownerWindow?: Window): number;
-          function transformPlainTextToHtml(text: string, etnerMode: number): string;
-          function trim(str: string): string;
-          function tryThese(fn: Function[]): any;
-          function writeCssText(styles: { [key: string]: any }, sort?: boolean): string;
-  
-          namespace array {
-              function every<T>(array: T[], fn: (value: T, index: number, array: T[]) => boolean, thisArg?: { [key: string]: any }): boolean;
-              function filter<T>(array: T[], fn: (value: T, index: number, array: T[]) => boolean, thisArg?: { [key: string]: any }): T[];
-              function forEach<T>(array: T[], fn: (value: T, index: number, array: T[]) => void, thisArg?: { [key: string]: any }): void;
-              function isArray(object: any): boolean;
-              function map<T, K>(array: T[], fn: (value: T) => K, thisArg?: { [key: string]: any }): K[];
-              function reduce<T, K>(array: T[], fn: (accumulator: K, a: T, index: number, array: T[]) => K, initial: K, thisArg?: { [key: string]: any }): K;
-          }
-  
-          namespace object {
-              function findKey(obj: { [key: string]: any }, value: any): string;
-              function merge(obj1: { [key: string]: any }, obj2: { [key: string]: any }): { [key: string]: any };
-          }
-  
-          namespace style {
-              namespace parse {
-                  function background(value: string): { color: string, unprocessed: string};
-                  function border(value: string): { width: string, style: string, color: string };
-                  function margin(value: string): { top: number, right: number, bottom: number, left: number };
-              }
-          }
-      }
-  
-      class ui extends event {
-          constructor(editor: editor);
-          add(name: string, type: { [key: string]: any }, definition: { [key: string]: any }): void;
-          addButton(name: string, definition: buttonDefinition): void;
-          addHandler(type: { [key: string]: any }, handler: { [key: string]: any }): void;
-          addRichCombo(name: string, definition: { [key: string]: any }): void;
-          addToolbarGroup(name: string, previous: number | string, subgroupOf?: string): void;
-          create(name: string): { [key: string]: any };
-          get(name: string): { [key: string]: any };
-          space(name: string): dom.element;
-          spaceId(name: string): string;
-      }
-  
-      namespace ui {
-          namespace dialog {
-              class button extends uiElement {
-                  constructor(dialog: dialog, elementDefinition: definitions.button, htmlList: any[]);
-  
-                  accessKeyDown(): void;
-                  accessKeyUp(): void;
-                  click(): any;
-              }
-  
-              class checkbox extends uiElement {
-                  constructor(dialog: dialog, elementDefinition: definitions.checkbox, htmlList: any[]);
-  
-                  accessKeyUp(): void;
-                  getValue(): boolean;
-                  setValue(checked: boolean, noChangeEvent: boolean): undefined;
-              }
-  
-              namespace definitions {
-                  interface button {
-                      label: string;
-                      disabled?: boolean;
-                  }
-  
-                  interface checkbox {
-                      checked?: boolean;
-                      validate?: () => boolean;
-                      label?: string;
-                  }
-  
-                  interface fieldSet {
-                      label?: string;
-                      children: any[];
-                  }
-  
-                  interface file {
-                      validate?: () => boolean;
-                  }
-  
-                  interface fileButton {
-                      for: string;
-                      validate?: () => boolean;
-                  }
-  
-                  interface hbox {
-                      widths?: string[];
-                      height?: string;
-                      padding?: string;
-                      align?: string;
-                  }
-  
-                  interface html {
-                      html: string;
-                  }
-  
-                  interface iframeElement {
-                      src: string;
-                      width: string;
-                      height: string;
-                      onContentLoad?: () => void;
-                  }
-  
-                  interface labeledElement {
-                      label: string;
-                      labelLayout?: 'horizontal' | 'vertical';
-                      widths?: [ string, string ];
-                      role?: string;
-                      includeLabel?: boolean;
-                  }
-  
-                  interface radio {
-                      default: any;
-                      validate?: () => boolean;
-                      items: ([string, string] | [string])[];
-                  }
-  
-                  interface select {
-                      default: any;
-                      validate?: () => boolean;
-                      items: ([string, string] | [string])[];
-                      multiple?: boolean;
-                      size?: number;
-                  }
-  
-                  interface textarea {
-                      rows?: number;
-                      cols?: number;
-                      default?: string;
-                      validate?: () => boolean;
-                  }
-  
-                  interface textInput {
-                      default?: string;
-                      validate?: () => boolean;
-                      maxLength?: number;
-                      size?: string;
-                  }
-  
-                  interface uiElement {
-                      id: string;
-                      type: number;
-                      title?: string;
-                      hidden?: boolean;
-                      className?: string;
-                      style?: string;
-                      accessKey?: string;
-                  }
-  
-                  interface vbox {
-                      width?: string;
-                      heights?: string[];
-                      align?: string;
-                      padding?: string;
-                      expand?: boolean;
-                  }
-              }
-  
-              class fieldset extends uiElement {
-                  constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.fieldSet);
-              }
-  
-  
-              class file extends ui.dialog.labeledElement {
-                  constructor(dialog: dialog, elementDefinition: definitions.file, htmlList: any[]);
-  
-                  getAction(): string;
-                  registerEvents(definition: { [key: string]: any }): file;
-                  reset(): void;
-                  setInitValue(): void;
-                  submit(): file;
-              }
-  
-  
-              class fileButton extends button {
-                  constructor(dialog: dialog, elementDefinition: definitions.fileButton, htmlList: any[]);
-              }
-  
-  
-              class hbox extends uiElement {
-                  constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.hbox);
-  
-                  getChild(indices: number): ui.dialog.uiElement;
-                  getChild(indices: number[]): ui.dialog.uiElement[];
-              }
-  
-  
-              class html extends uiElement {
-                  constructor(dialog: dialog, elementDefinition: definitions.html, htmlList: any[]);
-  
-              }
-  
-  
-              class iframeElement extends uiElement {
-  
-              }
-  
-  
-              class labeledElement extends uiElement {
-                  constructor(dialog: dialog, elementDefinition: definitions.labeledElement, htmlList: any[], contentHtml: () => string);
-  
-                  getLabel(): string;
-                  setlabel(label: string): ui.dialog.labeledElement;
-              }
-  
-  
-              class radio extends ui.dialog.labeledElement {
-                  constructor(dialog: dialog, elementDefinition: definitions.radio, htmlList: any[]);
-  
-                  accessKeyUp(): void;
-                  getValue(): string;
-                  setValue(value: string, noChangeEvent: boolean): undefined;
-              }
-  
-  
-              class select extends uiElement {
-                  constructor(dialog: dialog, elementDefinition: definitions.select, htmlList: any[]);
-  
-                  add(label: string, value?: string, indexedDB?: number): select;
-                  clear(): select;
-                  remove(index: number): select;
-              }
-  
-  
-              class textarea extends labeledElement {
-                  constructor(dialog: dialog, elementDefinition: definitions.textarea, htmlList: any[]);
-              }
-  
-  
-              class textInput extends ui.dialog.labeledElement {
-                  constructor(dialog: dialog, elementDefinition: definitions.textInput, htmlList: any[]);
-  
-                  accessKeyUp(): void;
-                  focus(): undefined;
-                  getDirectionMarker(): string;
-                  getValue(): string;
-                  select(): void;
-                  setDirectionMarker(dir: string): void;
-                  setValue(value: string, noChangeEvent: boolean): textInput;
-              }
-  
-              class uiElement {
-                  eventProcessors: any;
-  
-                  constructor(dialog: dialog, elementDefinition: definitions.uiElement, htmlList: any[], nodeNameArg?: () => string | string, stylesArg?: () => { [key: string]: any } | { [key: string]: any }, attributesArg?: () => { [key: string]: any } | { [key: string]: any }, contentsArg?: () => { [key: string]: any } | string); // Not sure that the htmlList array type is right.
-  
-                  accessKeyDown(dialog: dialog, key: string): void;
-                  accessKeyUp(dialog: dialog, key: string): void;
-                  disable(): void;
-                  enable(): void;
-                  focus(): ui.dialog.uiElement;
-                  getDialog(): dialog;
-                  getElement(): dom.element;
-                  getInputElement(): dom.element;
-                  getValue(): any;
-                  isChanged(): boolean;
-                  isEnabled(): boolean;
-                  isFocusable(): boolean;
-                  isVisible(): boolean;
-                  registerEvents(definition: CKEDITOR.dialog.definition.uiElement): ui.dialog.uiElement;
-                  selectParentTab(): ui.dialog.uiElement;
-                  setValue(value: any, noChangeEvent: boolean): ui.dialog.uiElement;
-              }
-  
-              class vbox extends hbox {
-                  constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.vbox);
-              }
-          }
-  
-          class balloonPanel {
-              activeShowListeners: { [id: number]: { removeListener: listenerRegistration }};
-              editor: editor;
-              focusables: { [id: number]: dom.element };
-              height: string;
-              parts: balloonPanel.parts;
-              rect: balloonPanel.rect;
-              showListeners: { [id: number]: () => listenerRegistration };
-              templateDefinitions: balloonPanel.templateDefinitions;
-              templates: balloonPanel.templates;
-              triangleHeight: number;
-              triangleMinDistance: number;
-              triangleWidth: number;
-              width: number;
-  
-              activeShowListener(id: number): void;
-              activateShowListeners(): void;
-              addShowListener(listener: () => listenerRegistration): listenerRegistration;
-              attach(element: dom.element, options?: dom.element | boolean | { focusElement?: dom.element | boolean, show?: boolean }): void;
-              blur(): void;
-              build(): void;
-              deactivateShowListener(id: number): void;
-              deregisterFocusable(element: dom.element): void;
-              destroy(): void;
-              getHeight(): number;
-              getWidth(): number;
-              hide(): void;
-              move(top: number, left: number): void;
-              registerFocusable(element: dom.element): void;
-              removeShowListener(id: number): void;
-              resize(width: number, height: number): void;
-              setTitle(title: string): void;
-              setTriangle(side: 'left' | 'right' | 'top' | 'bottom'): void;
-              show(): void;
-          }
-  
-          namespace balloonPanel {
-              interface definition {
-                  content?: string;
-                  title?: string;
-              }
-  
-              interface templates {
-                  close?: template;
-                  content?: template;
-                  panel?: template;
-                  title?: template;
-                  triangle?: template;
-                  triangleInner?: template;
-                  triangleOuter?: template; 
-              }
-      
-              interface templateDefinitions {
-                  close?: string;
-                  content?: string;
-                  panel?: string;
-                  title?: string;
-                  triangle?: string;
-                  triangleInner?: string;
-                  triangleOuter?: string;
-              }
-      
-              interface rect {
-                  height?: number;
-                  left?: number;
-                  top?: number;
-                  visible?: boolean;
-                  width?: number;
-              }
-      
-              interface parts {
-                  close?: dom.element;
-                  content?: dom.element;
-                  panel?: dom.element;
-                  title?: dom.element;
-                  triangle?: dom.element;
-                  triangleInner?: dom.element;
-                  triangleOuter?: dom.element;
-              }
-          }
-  
-          class balloonToolbar {
-              constructor(editor: editor, definition: { [key: string]: any });
-              addItem(name: string, element: button | richCombo): void;
-              addItems(elements: { [itemName: string]: button | richCombo }): void;
-              deleteItem(name: string): void;
-              destroy(): void;
-              getItem(name: string): button | richCombo;
-              hide(): void;
-              refresh(): void;
-              show(): void;
-          }
-  
-          class button {
-              static readonly handler: handlerDefinition<button>;
-  
-              constructor(definition: { [key: string]: any });
-              getState(): number;
-              render(editor: editor, output: string[]): void;
-              setState(state: number): void;
-              toFeature(editor: editor): feature;
-          }
-  
-          class floatPanel {
-              constructor(editor: editor, parentElement: dom.element, definition: { [key: string]: any }, level: number);
-              addBlock(name: string, block: { [key: string]: any }): void;
-              addListBlock(name: string, multiSelect: boolean): void;
-              allowBlur(allow: boolean): void;
-              blur(): void;
-              focus(): void;
-              getBlock(name: string): panel.block;
-              hide(returnFocus: boolean): void;
-              hideChild(restoreFocus: boolean): void;
-              reposition(): void;
-              showAsChild(panel: floatPanel, blckName: string, offsetParent: dom.element, corner: number, offsetX?: number, offsetY?: number): void;
-              showBlock(name: string, offsetParent: dom.element, corner: number, offsetX?: number, offsetY?: number, callback?: () => void): void;
-          }
-  
-          class handlerDefinition<T> {
-              contentsElement: dom.element;
-              create(definition: { [key: string]: any }): T;
-          }
-  
-          class menuButton extends button {
-  
-          }
-  
-          class panel {
-              constructor(document: dom.document, definition: { [key: string]: any });
-              addBlock(name: string, block: { [key: string]: any }): void;
-              getBlock(name: string): panel.block;
-              render(editor: editor, output?: string[]): void;
-              showBlock(name: string): void;
-          }
-  
-          namespace panel {
-              class block {
-                  getItems(): dom.nodeList;
-                  markItem(index: number): void;
-              }
-  
-              const handler: handlerDefinition<panel>;
-          }
-  
-          class panelButton extends button {
-  
-          }
-  
-          class richCombo {
-              static readonly handler: handlerDefinition<richCombo>;
-              render(editor: editor, output: string[]): void;
-          }
-      }
-  
-      class xml {
-          baseXml: any;
-  
-          constructor(xmlObjectOrData: any);
-          getInnerXml(xpath: string, contextNode?: any): string;
-          selectNodes(xpath: string, contextNode?: any): any[];
-          selectSingleNode(xpath: string, contextNode?: any): any;
-      }
-  
-      interface toolbarGroups {
-          name?: string;
-          groups?: string[];
-      }
-  
-      namespace config {
-          interface styleObject {
-              name?: string;
-              element: string;
-              attributes?: { [key: string]: any };
-              styles?: { [key: string]: any };
-              overrides?: { [key: string]: any };
-          }
-      }
-  
-      interface sharedSpace {
-          top?: string | HTMLElement;
-          bottom?: string | HTMLElement;
-      }
-  
-      interface IMenuItemDefinition {
-          label:string,
-          command:string,
-          icon: string
-          group:string,
-          order:number
-      }
-  
-      interface buttonDefinition {
-          icon?: string;
-          iconOffset?: number;
-          label: string;
-          command: string;
-          toolbar: string;
-      }
-  }
-  
\ No newline at end of file
+}
+
+declare namespace CKEDITOR {
+
+    // Config options
+    var disableAutoInline: boolean;
+    var replaceClass: string;
+    var skinName: string;
+
+    // Properties
+    const ALT: number;
+    const CTRL: number;
+    const DATA_TRANSFER_CROSS_EDITORS: number;
+    const DATA_TRANSFER_EXTERNAL: number;
+    const DATA_TRANSFER_INTERNAL: number;
+    const DIALOG_RESIZE_BOTH: number;
+    const DIALOG_RESIZE_HEIGHT: number;
+    const DIALOG_RESIZE_NONE: number;
+    const DIALOG_RESIZE_WIDTH: number;
+    const DIALOG_STATE_BUSY: number;
+    const DIALOG_STATE_IDLE: number;
+    const ELEMENT_MODE_APPENDTO: number;
+    const ELEMENT_MODE_INLINE: number;
+    const ELEMENT_MODE_NONE: number;
+    const ELEMENT_MODE_REPLACE: number;
+    const END: number;
+    const ENLARGE_BLOCK_CONTENTS: number;
+    const ENLARGE_ELEMENT: number;
+    const ENLARGE_INLINE: number;
+    const ENLARGE_LIST_ITEM_CONTENTS: number;
+    const ENTER_BR: number;
+    const ENTER_DIV: number;
+    const ENTER_P: number;
+    const EVENT_PHASE_AT_TARGET: number;
+    const EVENT_PHASE_BUBBLING: number;
+    const EVENT_PHASE_CAPTURING: number;
+    const FILTER_SKIP_TREE: number;
+    const LINEUTILS_AFTER: number;
+    const LINEUTILS_BEFORE: number;
+    const LINEUTIS_INSIDE: number;
+    const MOUSE_BUTTON_LEFT: number;
+    const MOUSE_BUTTON_MIDDLE: number;
+    const MOUSE_BUTTON_RIGHT: number;
+    const NODE_COMMENT: number;
+    const NODE_DOCUMENT: number;
+    const NODE_DOCUMENT_FRAGMENT: number;
+    const NODE_ELEMENT: number;
+    const NODE_TEXT: number;
+    const POSITION_AFTER_END: number;
+    const POSITION_AFTER_START: number;
+    const POSITION_BEFORE_END: number;
+    const POSITION_BEFORE_START: number;
+    const POSITION_CONTAINS: number;
+    const POSITION_DISCONNECTED: number;
+    const POSITION_FOLLOWING: number;
+    const POSITION_IDENTICAL: number;
+    const POSITION_IS_CONTAINED: number;
+    const POSITION_PRECEDING: number;
+    const SELECTION_ELEMENT: number;
+    const SELECTION_NONE: number;
+    const SELECTION_TEXT: number;
+    const SHIFT: number;
+    const SHRINK_ELEMENT: number;
+    const SHRINK_TEXT: number;
+    const START: number;
+    const STYLE_BLOCK: string;
+    const STYLE_INLINE: string;
+    const STYLE_OBJECT: string;
+    const TRISTATE_DISABLED: number;
+    const TRISTATE_OFF: number;
+    const TRISTATE_ON: number;
+    const UI_BUTTON: string;
+    const UI_MENUBUTTON: string;
+    const UI_PANEL: string;
+    const UI_PANELBUTTON: string;
+    const UI_RICHCOMBO: string;
+    const UI_SEPARATOR: string;
+    const VERBOSITY_ERROR: number;
+    const VERBOSITY_WARN: number;
+
+    var basePath: string;
+    var currentInstance: editor;
+    var document: dom.document;
+    var instances: { [id: string]: editor };
+    var loadFullCoreTimeout: number;
+    var revision: string;
+    var rnd: number;
+    var status: string;
+    var timestamp: string;
+    var verbosity: number;
+    var version: string;
+    const config: config;
+
+    // Methods
+    function add(editor: editor): void;
+    function addCss(css: string): void;
+    function addTemplate(name: string, source: string): template;
+    function appendTo(element: string | HTMLElement, config?: config, data?: string): editor;
+    function domReady(): void;
+    function editorConfig(config: config): void;
+    function error(errorCode: string, additionalData?: any): void;
+    function getCss(): string;
+    function getTemplate(name: string): template;
+    function getUrl(resource: string): string;
+    function inline(element: string | HTMLElement, instanceConfig?: config): editor;
+    function inlineAll(): void;
+    function loadFullCore(): void;
+    function replace(element: string | HTMLTextAreaElement, config?: config): editor;
+    function replaceAll(className?: string): void;
+    function replaceAll(assertionFunction: (textarea: HTMLTextAreaElement, config: config) => boolean): void;
+    function warn(errorCode: string, additionalData?: any): void;
+
+    // Event interface
+    function capture(): void;
+    function define(name: string, meta: { [key: string]: any }): void;
+    function fire(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
+    function fireOnce(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
+    function hasListeners(eventName: string): boolean;
+    function on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any }, listenerData?: { [key: string]: any }, priority?: number): void;
+    function once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any }, listenerData?: { [key: string]: any }, priority?: number): void;
+    function removeAllListeners(): void;
+    function removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
+
+    type listenerRegistration = {
+        removeListener: () => void;
+    }
+
+    namespace dom {
+
+        interface bookmark {
+            startNode: dom.node | string;
+            endNode: dom.node | string;
+            serializable: boolean;
+            collapsed: boolean;
+        }
+
+        interface bookmark2 {
+            start: number[];
+            end: number[];
+            startOffset: number;
+            endOffset: number;
+            collapsed: boolean;
+            normalized: boolean;
+            is2: boolean;
+        }
+
+        class comment extends node {
+            readonly type: number;
+
+            constructor(comment: string | Node, ownerDocument?: document);
+            getOuterHtml(): string;
+        }
+
+        class document extends domObject {
+            readonly $: Document;
+            readonly type: number;
+
+            constructor(domDocument: { [key: string]: any });
+            appendStyleSheet(cssFileUrl: string): void;
+            appendStyleText(cssStyleText: string): CSSStyleSheet;
+            createElement(name: string, attribsAndStyles?: { attributes?: { [key: string]: string }; styles?: { [key: string]: string }; }): element;
+            createText(text: string): element;
+            find(selector: string): nodeList;
+            findOne(selector: string): element;
+            focus(): void;
+            getActive(): element;
+            getBody(): element;
+            getByAddress(address: any[], normalized?: boolean): node;
+            getById(elementId: string): element;
+            getDocumentElement(): element;
+            getElementsByTag(tagName: string): nodeList;
+            getHead(): element;
+            getSelection(): selection;
+            getWindow(): window;
+            write(html: string): void;
+        }
+
+        class documentFragment extends node {
+            readonly type: number;
+
+            constructor(nodeOrDoc: { [key: string]: any });
+            insertAfterNode(node: node): void;
+        }
+
+        class domObject extends CKEDITOR.event {
+            readonly $: any;
+
+            constructor(nativeDomObject: { [key: string]: any });
+            clearCustomData(): void;
+            equals(object: any): boolean;
+            getCustomData(key: string): any;
+            getPrivate(): any;
+            getUniqueId(): number;
+            removeAllListeners(): void;
+            removeCustomData(key: string): any;
+            setCustomData(key: string, value: any): domObject;
+        }
+
+        class element extends node {
+            readonly $: HTMLElement;
+            readonly type: number;
+
+            constructor(element: string, ownerDocument?: document);
+            constructor(element: HTMLElement, ownerDocument?: document);
+            addClass(className: string): void;
+            append(node: node | string, toStart?: boolean): node;
+            appendBogus(force: boolean): void;
+            appendHtml(html: string): void;
+            appendText(text: string): node;
+            breakParent(parent: element): void;
+            contains(node: node): boolean;
+            copyAttributes(dest: element, skipAttributes: { [key: string]: string }): void;
+            data(name: string, value?: string | false): string;
+            disableContextMenu(): void;
+            find(selector: string): nodeList;
+            findOne(selector: string): element;
+            focus(defer?: boolean): void;
+            focusNext(ignoreChildren?: boolean, indexToUse?: number): void;
+            focusPrevious(ignoreChildren?: boolean, indexToUse?: number): void;
+            forEach(callback: (node: node) => void, type?: number, skipRoot?: boolean): void;
+            getAttribute(name: string): string;
+            getBogus(): node | boolean;
+            getChild(indices: number | number[]): node;
+            getChildCount(): number;
+            getChildren(): nodeList;
+            getClientRect(): ClientRect;
+            getComputedStyle(propertyName: string): string;
+            getDirection(useComputed: boolean): string;
+            getDocumentPosition(refDocument: document): position;
+            getDtd(): dtdDefinition;
+            getEditor(): editor;
+            getElementsByTag(tagName: string): nodeList;
+            getFirst(evaluator?: (node: node) => boolean): node;
+            getFrameDocument(): document;
+            getHtml(): string;
+            getId(): string;
+            getLast(evaluator?: (node: node) => boolean): node;
+            getName(): string;
+            getNameAtt(): string;
+            getOuterHtml(): string;
+            getPositionedAncestor(): element;
+            getSize(type: string, isBorderBox: boolean): void;
+            getStyle(name: string): string;
+            getTabIndex(): number;
+            getText(): string;
+            getValue(): string;
+            getWindow(): window;
+            hasAttributes(): boolean;
+            hasAttribute(name: string): boolean;
+            hasClass(className: string): boolean;
+            hide(): void;
+            is(...name: string[]): boolean;
+            is(name: any): boolean;
+            isBlockBoundary(customNodeNames: { [tagName: string]: 1 }): boolean;
+            isEditable(textCursor?: boolean): boolean;
+            isEmptyInlineRemoveable(): boolean;
+            isIdentical(otherElement: element): boolean;
+            isVisible(): boolean;
+            mergeSiblings(inlineOnly?: boolean): void;
+            moveChildren(target: element, toStart?: boolean): void;
+            removeAttribute(name: string): void;
+            removeAttributes(attributes?: string[]): void;
+            removeClass(className: string): void;
+            removeStyle(name: string): void;
+            renameNode(newTag: string): void;
+            scrollIntoParent(parent: element, alignToTop: boolean, hscroll: boolean): void;
+            scrollIntoParent(parent: window, alignToTop: boolean, hscroll: boolean): void;
+            scrollIntoView(alignToTop?: boolean): void;
+            setAttribute(name: string, value: string): element;
+            setAttributes(attributesPairs: { [key: string]: string }): element;
+            setHtml(html: string): string;
+            setOpacity(opacity: number): void;
+            setSize(type: string, size: number, isBorderBox: boolean): void;
+            setState(state: number, base?: string, useAria?: boolean): void;
+            setStyle(name: string, value: string): element;
+            setStyles(stylesPair: { [key: string]: string }): element;
+            setText(text: string): string;
+            setValue(value: string): element;
+            show(): void;
+            unselectable(): void;
+
+            //static method
+            static clearAllMarkers(database: any): any;
+            static clearMarkers(database: any, element: dom.element, removeFromDatabase: boolean): void;
+            static createFromHtml(html: string): element;
+            static get(element: string | HTMLElement | element): element;
+            static setMarker(database: any, element: dom.element, name: string, value: any): dom.element;
+        }
+
+        class elementPath {
+            readonly block: element;
+            readonly blockLimit: element;
+            readonly elements: element[];
+            readonly lastElement: element;
+            readonly root: element;
+
+            constructor(startNode: element, root?: element);
+            compare(otherPath: elementPath): boolean;
+            contains(query: string | string[] | ((element: element) => boolean) | { [key: string]: any } | element, excludeRoot?: boolean, fromTop?: boolean): element;
+            direction(): 'ltr' | 'rtl';
+            isContextFor(tag: string): boolean;
+        }
+
+        class event {
+            constructor(domEvent: Event);
+            getKey(): number;
+            getKeystroke(): number;
+            preventDefault(stopPropagation?: boolean): void;
+            stopPropagation(): void;
+            getTarget(): node;
+            getPhase(): number;
+            getPhaseOffset(): position;
+            on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: any, listenerData?: any, priority?: number): { removeListener: () => void };
+        }
+
+        class iterator {
+            readonly activeFilter: filter;
+            enforceRealBlocks: boolean;
+            enlargeBr: boolean;
+            readonly filter: filter;
+            forceBrBreak: boolean;
+            readonly range: range;
+            constructor(range: range);
+            getNextParagraph(blockTag?: string): element;
+        }
+
+        class node extends domObject {
+            constructor(domNode: Node);
+            appendTo(element: element): element;
+            clone(includeChildren: boolean, cloneId: boolean): node;
+            hasPrevious(): boolean;
+            hasNext(): boolean;
+            insertAfter(node: node): node;
+            insertBefore(node: node): node;
+            insertBeforeMe(node: node): node;
+            getAddress(normalized?: boolean): number[];
+            getAscendant(reference: string, includeSelf?: boolean): node;
+            getCommonAncestor(node: node): void;
+            getDocument(): document;
+            getIndex(normalized?: boolean): number;
+            getNext(evaluator?: (node: node) => boolean): node;
+            getNextSourceNode(startFromSibling: boolean, nodeType: number, guard: node | ((node: node) => boolean)): void;
+            getParent(allowFragmentParent?: boolean): element;
+            getParents(closerFirst?: boolean): node[];
+            getPosition(otherNode: node): void;
+            getPrevious(evaluator?: (node: node) => boolean): node;
+            getPreviousSourceNode(startFromSibling: boolean, nodeType: number, guard: node | ((node: node) => boolean)): void;
+            hasAscendant(name: string, includeSelf: boolean): boolean;
+            remove(preserveChildren?: boolean): node;
+            replace(nodeToReplace: node): void;
+            trim(): void;
+            ltrim(): void;
+            rtrim(): void;
+            isReadOnly(): boolean;
+        }
+
+        class nodeList {
+            constructor(nativeList: NodeList);
+            count(): number;
+            getItem(index: number): node;
+            toArray(): node[];
+        }
+
+        class range {
+            readonly collapsed: boolean;
+            readonly document: document;
+            readonly endContainer: element | text;
+            readonly endOffset: number;
+            readonly root: element;
+            readonly startContainer: element | text;
+            readonly startOffset: number;
+
+            constructor(root: element | document);
+            checkBoundaryOfElement(element: element, checkType: number): boolean;
+            checkEndOfBlock(): boolean;
+            checkReadOnly(): boolean;
+            checkStartOfBlock(): boolean;
+            clone(cloneId?: boolean): range;
+            cloneContents(): documentFragment;
+            collapse(toStart?: boolean): boolean;
+            createBookmark(serializable?: boolean): bookmark;
+            createBookmark2(normalized?: boolean): bookmark2;
+            createIterator(): iterator;
+            deleteContents(mergeThen?: boolean): void;
+            endPath(): elementPath;
+            enlarge(unit: number, excludeBrs?: boolean): void;
+            extractContents(mergeThen?: boolean, cloneId?: boolean): documentFragment;
+            fixBlock(isStart: boolean, blockTag: string): element;
+            getBoundaryNodes(): { startNode: node; endNode: node; };
+            getCommonAncestor(includeSelf?: boolean, ignoreTextNode?: boolean): element;
+            getEnclosedNode(): node;
+            getNextEditableNode(): element | text;
+            getNextNode(evaluator?: (element: dom.element) => boolean, guard?: (element: dom.element) => boolean, boundary?: element): element;
+            getPreviousEditableNode(): element | text;
+            getPreviousNode(evaluator?: (element: dom.element) => boolean, guard?: (element: dom.element) => boolean, boundary?: element): element;
+            getTouchedEndNode(): node;
+            getTouchedStartNode(): node;
+            insertNode(node: node): void;
+            moveToBookmark(bookmark: bookmark | bookmark2): void;
+            moveToClosestEditablePosition(element?: element, isMoveForward?: boolean): boolean;
+            moveToElementEditEnd(target: element): boolean;
+            moveToElementEditStart(target: element): boolean;
+            moveToElementEditablePosition(element: element, isMoveToEnd: boolean): boolean;
+            moveToPosition(node: node, position: number): void;
+            moveToRange(range: range): void;
+            optimize(): void;
+            optimizeBookmark(): void;
+            removeEmptyBlocksAtEnd(atEnd: boolean): void;
+            scrollIntoView(): void;
+            select(): selection;
+            selectNodeContents(node: node): void;
+            setEnd(endNode: node, endOffset: number): void;
+            setEndAfter(node: node): void;
+            setEndAt(node: node, position: number): void;
+            setEndBefore(node: node): void;
+            setStart(startNode: node, startOffset: number): void;
+            setStartAfter(node: node): void;
+            setStartAt(node: node, position: number): void;
+            setStartBefore(node: node): void;
+            shrink(mode: number, selectContents?: boolean, options?: boolean | shrinkOptions): void;
+            splitBlock(cloneId?: boolean): void;
+            splitElement(toSplit: element, cloneId?: boolean): element;
+            startPath(): elementPath;
+            trim(ignoreStart?: boolean, ignoreEnd?: boolean): void;
+
+            static mergeRanges(ranges: range[]): range[];
+        }
+
+        interface shrinkOptions {
+            shrinkOnBlockBoundary?: boolean,
+            skipBogus?: boolean
+        }
+
+        class rangeList {
+            constructor(ranges?: range | range[]);
+            createBokmarks(serializable?: boolean): bookmark[];
+            createBookmarks2(normalized?: boolean): bookmark2[];
+            createIterator(): rangeListIterator;
+            moveToBookmarks(bookmarks: bookmark[]): void;
+        }
+
+
+        interface rangeListIterator {
+            getNextRange(mergeConsequent?: boolean): range;
+        }
+
+        // see https://docs.com/ckeditor4/latest/api/CKEDITOR_dom_selection.html
+        class selection {
+            readonly FILLING_CHAR_SEQUENCE: string;
+            readonly document: document;
+            readonly isFake: boolean;
+            readonly isLocked: boolean;
+            readonly rev: number;
+            readonly root: element;
+
+            constructor(target: document | element | selection);
+            createBookmarks(serializable: any): bookmark[];
+            createBookmarks2(normalized: any): bookmark2[];
+            fake(element: element, ariaLabel?: boolean): void;
+            getCommonAncestor(): element;
+            getNative(): Selection;
+            getRanges(onlyEditables?: boolean): range[];
+            getSelectedElement(): element;
+            getSelectedText(): string;
+            getStartElement(): element;
+            getType(): number;
+            isCollapsed(): boolean;
+            isHidden(): boolean;
+            isInTable(allowPartialSelection?: boolean): boolean;
+            lock(): void;
+            removeAllRanges(): void;
+            reset(): void;
+            scrollIntoView(): void;
+            selectBookmarks(bookmarks: (bookmark | bookmark2)[]): selection;
+            selectElement(element: element): void;
+            selectRanges(ranges: range[]): void;
+            unlock(restore: boolean): void;
+        }
+
+        class text extends node {
+            readonly $: Text;
+            readonly type: number;
+
+            constructor(text: Text | string, ownerDocument?: document);
+            getLength(): number;
+            getText(): string;
+            setText(text: string): void;
+            split(offset: number): text;
+            substring(indexA: number, indexB?: number): void;
+        }
+
+        class walker {
+            evaluator: (node: node) => boolean;
+            guard: (node: node) => boolean;
+
+            static validEmptyBlockContainers: { [key: string]: any };
+
+            constructor(range: range);
+            checkBackward(): boolean;
+            checkForward(): boolean;
+            end(): void;
+            lastBackward(): node;
+            lastForward(): node;
+            next(): node;
+            previous(): node;
+            reset(): void;
+
+            static blockBoundary(customNodeNames: any): (node: node) => boolean;
+            static bogus(isReject?: boolean): (node: node) => boolean;
+            static bookmark(contentOnly?: boolean, isReject?: boolean): (node: node) => boolean;
+            static editable(isReject?: boolean): (node: node) => boolean;
+            static empty(isReject?: boolean): (node: node) => boolean;
+            static ignored(isReject?: boolean): (node: node) => boolean;
+            static invisible(isReject?: boolean): (node: node) => boolean;
+            static listItemBoundary(): (node: node) => boolean;
+            static nodeType(type: number, isReject?: boolean): (node: node) => boolean;
+            static temp(isReject?: boolean): (node: node) => boolean;
+            static whitespaces(isReject?: boolean): (node: node) => boolean;
+        }
+
+        interface position {
+            x: number;
+            y: number;
+        }
+
+        interface widthAndHeight {
+            width: number;
+            height: number;
+        }
+
+        class window extends domObject {
+            constructor(domWindow: Window);
+            focus(): void;
+            getViewPaneSize(): widthAndHeight;
+            getScrollPosition(): position;
+            getFrame(): element;
+        }
+    }
+
+
+    namespace ajax {
+        function load(url: string, callback?: (data: any) => void): string;
+        function loadXml(url: string, callback?: (data: any) => void): xml;
+        function post(url: string, data: any, contentType?: string, callback?: (data: any) => void): void;
+    }
+
+
+    class command extends event implements commandDefinition {
+        fakeKeystroke: number;
+        previousState: number;
+        state: number;
+        uiItems: any[];
+
+        // Methods
+        constructor(editor: editor, commandDefinition: commandDefinition);
+        checkAllowed(noCache: boolean): boolean;
+        disable(): void;
+        enable(): void;
+        exec(data?: { [key: string]: any }): boolean;
+        refresh(editor: editor, path: dom.elementPath): void;
+        setState(newState: number): boolean;
+        toggleState(): void;
+
+    }
+
+    interface commandDefinition {
+        async?: boolean;
+        canUndo?: boolean;
+        context?: boolean;
+        contextSensitive?: boolean;
+        editorFocus?: boolean;
+        fakeKeystroke?: number;
+        modes?: { [key: string]: any };
+        startDisabled?: boolean;
+        readOnly?: boolean;
+        exec(editor: editor, data?: any): boolean;
+        refresh?(editor: editor, path: dom.elementPath): void;
+    }
+
+    // https://docs.com/ckeditor4/latest/api/CKEDITOR_config.html
+    interface config {
+        allowedContent?: boolean | filter.allowedContentRules;
+        autoEmbed_widget?: string | ((url: string) => string);
+        autoGrow_bottomSpace?: number;
+        autoGrow_maxHeight?: number;
+        autoGrow_minHeight?: number;
+        autoGrow_onStartup?: boolean;
+        autoUpdateElement?: boolean;
+
+        baseFloatZIndex?: number;
+        baseHref?: string;
+        basicEntities?: boolean;
+        blockedKeystrokes?: number[];
+        bodyClass?: string;
+        bodyId?: string;
+        browserContextMenuOnCtrl?: boolean;
+
+        clipboard_defaultContentType?: 'html' | 'text';
+        clipboard_notificationDuration?: number;
+        cloudServices_tokenUrl?: string;
+        cloudServices_uploadUrl?: string;
+        codeSnippetGeshi_url?: string;
+        codeSnippet_codeClass?: string;
+        codeSnippet_languages?: { [key: string]: any };
+        coceSnippet_theme?: string;
+        colorButton_backStyle?: config.styleObject;
+        colorButton_colors?: string;
+        colorButton_colorsPerRow?: number;
+        colorButton_enableAutomatic?: boolean;
+        colorButton_enableMore?: boolean;
+        colorButton_foreStyle?: config.styleObject;
+        colorButton_normalizeBackground?: boolean;
+        contentsCss?: string | string[];
+        contentsLangDirection?: string;
+        contentsLanguage?: string;
+        copyFormatting_allowRules?: string;
+        copyFormatting_allowedContexts?: boolean | string[];
+        copyFormatting_keystrokeCopy?: number;
+        copyFormatting_keystrokePaste?: number;
+        copyFormatting_outerCursor?: boolean;
+        coreStyles_bold?: config.styleObject;
+        coreStyles_italic?: config.styleObject;
+        coreStyles_strike?: config.styleObject;
+        coreStyles_subscript?: config.styleObject;
+        coreStyles_superscript?: config.styleObject;
+        coreStyles_underline?: config.styleObject;
+        customConfig?: string;
+
+        dataIndentationChars?: string;
+        defaultLanguage?: string;
+        devtools_styles?: string;
+        devtools_textCallback?: (editor: editor, dialog: dialog, element: dom.element, tabName: string) => string;
+        dialog_backgroundCoverColor?: string;
+        dialog_backgroundCoverOpacity?: number;
+        dialog_buttonsOrder?: string;
+        dialog_magnetDistance?: number;
+        dialog_noConfirmCancel?: boolean;
+        dialog_startupFocusTab?: boolean;
+        disableNativeSpellChecker?: boolean;
+        disableNativeTableHandles?: boolean;
+        disableNativeObjectResizing?: boolean;
+        disableNativeReadonlyStyling?: boolean;
+        disallowedContent?: filter.disallowedContentRules;
+        div_wrapTable?: boolean;
+        docType?: string;
+
+        easyimage_class?: string;
+        easyimage_defaultStyle?: string;
+        easyimage_styles?: { [key: string]: any };
+        easyimage_toolbar?: string[] | string;
+        emailProtection?: string;
+        embed_provider?: string;
+        enableTabKeyTools?: boolean;
+        enterMode?: number;
+        entities?: boolean;
+        entities_additional?: string;
+        entities_greek?: boolean;
+        entities_latin?: boolean;
+        entities_processNumerical?: boolean | string;
+        extraAllowedContent?: filter.allowedContentRules;
+        extraPlugins?: string;
+
+        fileTools_defaultFileName?: string;
+        fileTools_requestHeaders?: { [key: string]: any };
+        filebrowserBrowseUrl?: string;
+        filebrowserFlashBrowseUrl?: string;
+        filebrowserFlashUploadUrl?: string;
+        filebrowserImageBrowseLinkUrl?: string;
+        filebrowserImageBrowseUrl?: string;
+        filebrowserImageUploadUrl?: string;
+        filebrowserUploadMethod?: string;
+        filebrowserUploadUrl?: string;
+        filebrowserWindowFeatures?: string;
+        filebrowserWindowHeight?: number | string;
+        filebrowserWindowWidth?: number | string;
+        fillEmptyBlocks?: boolean | ((element: htmlParser.element) => boolean);
+        find_highlight?: config.styleObject;
+        flashAddEmbedTag?: boolean;
+        flashConvertOnEdit?: boolean;
+        flashEmbedTagOnly?: boolean;
+        floatSpaceDockedOffsetX?: number;
+        floatSpaceDockedOffsetY?: number;
+        floatSpacePinnedOffsetX?: number;
+        floatSpacePinnedOffsetY?: number;
+        floatSpacePreferRight?: boolean;
+        fontSize_defaultLabel?: string;
+        fontSize_sizes?: string;
+        fontSize_style?: config.styleObject;
+        font_defaultLabel?: string;
+        font_names?: string;
+        font_style?: config.styleObject;
+        forceEnterMode?: boolean;
+        forcePasteAsPlainText?: boolean;
+        forceSimpleAmpersand?: boolean;
+        format_address?: config.styleObject;
+        format_div?: config.styleObject;
+        format_h1?: config.styleObject;
+        format_h2?: config.styleObject;
+        format_h3?: config.styleObject;
+        format_h4?: config.styleObject;
+        format_h5?: config.styleObject;
+        format_h6?: config.styleObject;
+        format_p?: config.styleObject;
+        format_pre?: config.styleObject;
+        format_tags?: string;
+        fullPage?: boolean;
+
+        grayt_autoStartup?: boolean;
+
+        height?: string | number;
+        htmlEncodeOutput?: boolean;
+
+        ignoreEmptyParagraph?: boolean;
+        image2_alignClasses?: string[];
+        image2_altRequired?: boolean;
+        image2_captionedClass?: string;
+        image2_disableResizer?: boolean;
+        image2_prefillDimensions?: boolean;
+        imageUploadUrl?: string;
+        image_prefillDimensions?: boolean;
+        image_previewText?: string;
+        image_removeLinkByEmptyUrl?: boolean;
+        indentClasses?: string[];
+        indentOffset?: number;
+        indentUnit?: string;
+
+        jqueryOverrideVal?: boolean;
+        justifyClasses?: string[];
+
+        keystrokes?: [number, string][];
+
+        language?: string;
+        language_list?: string[];
+        linkJavaScriptLinksAllowed?: boolean;
+        linkShowAdvancedTab?: boolean;
+        linkShowTargetTab?: boolean;
+
+        magicline_color?: string
+        magicline_everywhere?: boolean;
+        magicline_holdDistance?: number;
+        magicline_keystrokeNext?: number;
+        magicline_keystrokePrevious?: number;
+        magicline_tabuList?: string[];
+        magicline_triggerOffset?: number;
+        mathJaxClass?: string;
+        mathJaxLib?: string;
+        menu_groups?: string;
+        menu_subMenuDelay?: number;
+
+        newpage_html?: string;
+        notification_duration?: number;
+
+        on?: editor.eventObject;
+
+        pasteFilter?: string;
+        pasteFromWordCleanupFile?: string;
+        pasteFromWordNumberedHeadingToList?: boolean;
+        pasteFromWordPromptCleanup?: boolean;
+        pasteFromWordRemoveFontStyles?: boolean;
+        pasteFromWorkRemoveStyles?: boolean;
+        pasteFromWord_heuristicsEdgeList?: boolean;
+        pasteFromWord_inlineImages?: boolean;
+        plugins?: string;
+        protectedSource?: RegExp[];
+
+        readOnly?: boolean;
+        removeButtons?: string;
+        removeDialogTabs?: string;
+        removeFormatAttributes?: string;
+        removeFormatTags?: string;
+        removePlugins?: string;
+        resize_dir?: string;
+        resize_enabled?: boolean;
+        resize_maxHeight?: number;
+        resize_maxWidth?: number;
+        resize_minHeight?: number;
+        resize_minWidth?: number;
+
+        scayt_autoStartup?: boolean;
+        scayt_contextCommands?: string;
+        scayt_contextMenuItemsOrder?: string;
+        scayt_customDictionaryIds?: string;
+        scayt_customerId?: string;
+        scayt_disableOptionsStorage?: string | string[];
+        scayt_elementsToIgnore?: string;
+        scayt_handleCheckDirty?: string;
+        scayt_handleUndoRedo?: string;
+        scayt_ignoreAllCapsWords?: boolean;
+        scayt_ignoreDomainNames?: boolean;
+        scayt_ignoreWordsWithMixedCases?: boolean;
+        scayt_ignoreWordsWithNumbers?: boolean;
+        scayt_inlineModeImmediateMarkup?: boolean;
+        scayt_maxSuggestions?: number;
+        scayt_minWordLength?: number;
+        scayt_moreSuggestions?: string;
+        scayt_multiLanguageMode?: boolean;
+        scayt_multiLanguageStyles?: { [key: string]: any };
+        scayt_sLang?: string;
+        scayt_serviceHost?: string;
+        scayt_servicePath?: string;
+        scayt_servicePort?: string;
+        scayt_serviceProtocol?: string;
+        scayt_srcUrl?: string;
+        scayt_uiTabs?: string;
+        scayt_userDictionaryName?: string;
+
+        sharedSpaces?: sharedSpace;
+        shiftEnterMode?: number;
+        skin?: string;
+        smiley_columns?: number;
+        smiley_descriptions?: string[];
+        smiley_images?: string[];
+        smiley_path?: string;
+        sourceAreaTabSize?: number;
+        specialChars?: (string | [string, string])[];
+        startupFocus?: string | boolean;
+        startupMode?: string;
+        startupOutlineBlocks?: boolean;
+        startupShowBorders?: boolean;
+        stylesSet?: string | boolean | config.styleObject[];
+        stylesheetParser_skipSelectors?: RegExp;
+        stylesheetParser_validSelectors?: RegExp;
+
+        tabIndex?: number;
+        tabSpaces?: number;
+        templates?: string;
+        templates_files?: { [key: string]: any };
+        templates_replaceContent?: boolean;
+        title?: string | boolean;
+        toolbar?: string | (string | string[] | { name: string, items?: string[], groups?: string[] })[] | null;
+        toolbarCanCollapse?: boolean;
+        toolbarGroupCycling?: boolean;
+        toolbarGroups?: (toolbarGroups | string)[];
+        toolbarLocation?: string;
+        toolbarStartupExpanded?: boolean;
+
+        uiColor?: string;
+        undoStackSize?: number;
+        uploadUrl?: string;
+        useComputedState?: boolean;
+
+        width?: string | number;
+        wsc_cmd?: string;
+        wsc_customDictionaryIds?: string;
+        wsc_customLoaderScript?: string;
+        wsc_customerId?: string;
+        wsc_height?: string;
+        wsc_lang?: string;
+        wsc_left?: string;
+        wsc_top?: string;
+        wsc_userDictionaryName?: string;
+        wsc_width?: string;
+    }
+
+    interface dataProcessor {
+        toDataFormat(html: string, fixForBody: string): void;
+        toHtml(data: string, fixForBody?: string): void;
+    }
+
+    class dialog {
+        readonly state: number;
+
+        constructor(editor: editor, dialogName: string);
+
+        addFocusable(element: dom.element, index?: number): void;
+        addPage(contents: { [key: string]: any }): void;
+        click(id: string): any;
+        commitContent(): void;
+        disableButton(id: string): void;
+        enableButton(id: string): void;
+        foreach(fn: () => void): dialog;
+        getButton(id: string): ui.dialog.button;
+        getContentElement(pageId: string, elementId: string): ui.dialog.uiElement;
+        getElement(): dom.element;
+        getName(): string;
+        getPageCount(): number;
+        getParentEditor(): editor;
+        getPosition(): { [key: string]: any };
+        getSelectedElement(): dom.element;
+        getSize(): { [key: string]: any };
+        getValueOf(pageId: string, elementId: string): any;
+        hide(): void;
+        hidePage(id: string): void;
+        layout(): void;
+        move(x: number, y: number, save: boolean): void;
+        reset(): dialog;
+        resize(width: number, height: number): void;
+        selectPage(id: string): void;
+        setState(state: number): void;
+        setValueOf(pageId: string, elementId: string, value: any): void;
+        setupContent(): void;
+        show(): void;
+        showPage(id: string): void;
+        updateStyle(): void;
+
+        static add(name: string, dialogDefinition: string | ((editor: editor) => dialog.IDialogDefinition)): void;
+        static addIframe(name: string, title: string, minWidth: number, minHeight: number, onContentLoad?: () => void, userDefinition?: { [key: string]: any }): void;
+        static addUIElement(typeName: string, builder: () => void): void;
+        static cancelButton(): void;
+        static exists(name: string | number): void; // NOTE: documentation says object, but it's an array accessor, so really a string or number will work
+        static getCurrent(): dialog;
+        static isTabEnabled(editor: editor, dialogName: string, tabName: string): boolean;
+        static okButton(): void;
+    }
+
+    namespace dialog {
+
+        namespace definition {
+
+            interface button extends uiElement {
+                disabled?: boolean;
+            }
+
+            interface checkbox extends uiElement {
+                default?: string;
+                validate?: () => boolean;
+            }
+
+            interface content {
+                accessKey?: string;
+                elements?: dialog.definition.uiElement[];
+                id?: string;
+                label?: string;
+                title?: string;
+            }
+
+            interface file extends labeledElement {
+                action?: string;
+                size?: string;
+                validate?: () => boolean;
+            }
+
+            interface fileButton extends uiElement {
+                filebrowser?: string;
+                for?: string;
+                validate?: () => boolean;
+            }
+
+            interface hbox extends uiElement {
+                children?: ui.dialog.uiElement[];
+                height?: number;
+                padding?: number;
+                validate?: () => boolean;
+                widths?: number[];
+            }
+
+            interface html extends uiElement {
+                html?: string;
+            }
+
+            interface labeledElement extends uiElement {
+                controlStyle?: string;
+                inputStyle?: string;
+                labelLayout?: string;
+                labelStyle?: string;
+                widths?: number[];
+            }
+
+            interface radio extends labeledElement {
+                default?: string;
+                items?: string[] | (string[])[];
+                validate?: () => boolean;
+            }
+
+            interface select extends labeledElement {
+                default?: string;
+                items?: string[] | (string[])[];
+                multiple?: boolean;
+                size?: number;
+                validate?: () => boolean;
+            }
+
+            interface textarea extends labeledElement {
+                bidi?: boolean;
+                cols?: number;
+                default?: string;
+                rows?: number;
+                validate?: () => boolean;
+            }
+
+            interface textInput extends labeledElement {
+                bidi?: boolean;
+                default?: string;
+                maxLength?: number;
+                size?: number;
+                validate?: () => boolean;
+            }
+
+            interface uiElement {
+                align?: string;
+                className?: string;
+                commit?: (widget: plugins.widget) => void;
+                id?: string;
+                label?: string;
+                onHide?: (elem: ui.dialog.uiElement) => void;
+                onLoad?: (elem: ui.dialog.uiElement) => void;
+                onShow?: (elem: ui.dialog.uiElement) => void;
+                requiredContent?: string | { [key: string]: any } | style;
+                setup?: (widget: plugins.widget) => void;
+                style?: string;
+                title?: string;
+                type?: string;
+            }
+
+            interface vbox extends uiElement {
+                children?: ui.dialog.uiElement[];
+                expand?: boolean;
+                heights?: number[];
+                padding?: number;
+                styles?: string;
+                width?: number[];
+            }
+        }
+
+        interface IDialogDefinition {
+            buttons?: dialog.definition.button[];
+            contents?: dialog.definition.content[];
+            height?: number;
+            minHeight?: number;
+            minWidth?: number;
+            onCancel?: () => void;
+            onLoad?: () => void;
+            onOk?: () => void;
+            onShow?: () => void;
+            onHide?: () => void;
+            resizable?: number;
+            title?: string;
+            width?: number;
+        }
+    }
+
+    class dialogCommand {
+        value: any;
+
+        constructor(dialogName: string, ext?: { tabId?: string });
+    }
+
+    interface dtdDefinition {
+        [outerTagName: string]: { [innerTagName: string]: 1 };
+        $block: { [tagName: string]: 1 };
+        $blockLimit: { [tagName: string]: 1 };
+        $cdata: { [tagName: string]: 1 };
+        $editable: { [tagName: string]: 1 };
+        $empty: { [tagName: string]: 1 };
+        $inline: { [tagName: string]: 1 };
+        $intermediate: { [tagName: string]: 1 };
+        $list: { [tagName: string]: 1 };
+        $listItem: { [tagName: string]: 1 };
+        $nonBodyContent: { [tagName: string]: 1 };
+        $nonEditable: { [tagName: string]: 1 };
+        $object: { [tagName: string]: 1 };
+        $removeEmpty: { [tagName: string]: 1 };
+        $tabIndex: { [tagName: string]: 1 };
+        $tableContent: { [tagName: string]: 1 };
+        $transparent: { [tagName: string]: 1 };
+    }
+
+    var dtd: dtdDefinition;
+
+    class editable extends dom.element {
+        hasFocus: boolean;
+        readonly status: string;
+
+        constructor(editor: editor, element: HTMLElement | dom.element);
+        attachClass(className: string): void;
+        attachListener(obj: event | editable, eventName: string, listenerFunction: (ei: eventInfo) => void, scopeobj?: {}, listenerData?: any, priority?: number): listenerRegistration;
+        changeAttr(attr: string, val: string): void;
+        detach(): void;
+        insertElement(element: dom.element, range?: dom.range): void;
+        insertHtml(data: string, mode?: string, range?: dom.range): void;
+        insertText(text: dom.text): void;
+        isInline(): boolean;
+        setReadOnly(isReadOnly: boolean): void;
+    }
+
+    class editor extends event {
+        readonly activeEnterMode: number;
+        readonly activeFilter: filter;
+        readonly activeShiftEnterMode: number;
+        readonly blockless: boolean;
+        readonly config: config;
+        readonly container: dom.element;
+        readonly contextMenu: plugins.contextMenu;
+        copyFormatting: plugins.copyformatting.state;
+        dataProcessor: dataProcessor;
+        readonly document: dom.document;
+        readonly element: dom.element;
+        readonly elementMode: number;
+        readonly enterMode: number;
+        readonly filter: filter;
+        readonly focusManager: focusManager;
+        readonly id: string;
+        readonly keystrokeHandler: keystrokeHandler;
+        readonly lang: any;
+        readonly langCode: string;
+        readonly mode: string;
+        readonly name: string;
+        readonly pasteFilter: filter;
+        readonly plugins: any;
+        readonly readOnly: boolean;
+        readonly shiftEnterMode: number;
+        readonly status: string;
+        readonly tabIndex: number;
+        readonly templates: any;
+        readonly title: any;
+        readonly toolbar: any;
+        readonly ui: ui;
+        readonly widgets: plugins.widget.repository;
+        readonly window: dom.window;
+
+        constructor(instanceConfig?: config, element?: dom.element, mode?: number);
+        addCommand(commandName: string, commandDefinition: commandDefinition): void;
+        addContentsCss(cssPath: string): void;
+        addFeature(feature: feature): boolean;
+        addMenuGroup(name: string, order?: number): void;
+        addMenuItem(name: string, definition?: IMenuItemDefinition): void;
+        addMenuItems(definitions: { [id: string]: IMenuItemDefinition }): void;
+        addMode(mode: string, exec: () => void): void;
+        addRemoveFormatFilter(func: (element: dom.element) => boolean): void;
+        applyStyle(style: style): void;
+        attachStyleStateChange(style: style, callback: (state: number) => void): void;
+        checkDirty(): boolean;
+        createFakeElement(realElement: dom.element, className: string, realElementType: string, isResizable: boolean): void;
+        createFakeParserElement(realElement: dom.element, className: string, realElementType: string, isResizable: boolean): void;
+        createRange(): dom.range;
+        destroy(noUpdate?: boolean): void;
+        editable(elementOrEditable?: dom.element | editable): editable;
+        elementPath(startNode?: dom.node): dom.elementPath;
+        execCommand(commandName: string, data?: any): boolean;
+        extractSelectedHtml(toString?: boolean, removeEmptyBlock?: boolean): dom.documentFragment | string | void;
+        focus(): void;
+        forceNextSelectionCheck(): void;
+        getClipboardData(callbackOrOptions: { title: string } | ((data: any) => void), callback: (data: any) => void): void;
+        getColorFromDialog(callback: (color: string) => void, scope?: { [key: string]: any }): void;
+        getCommand(commandName: string): command;
+        getCommandKeystroke(command: command | string): number | null;
+        getData(internal?: boolean): string;
+        getMenuItem(name: string): IMenuItemDefinition;
+        getResizable(forContents: boolean): dom.element;
+        getSelectedHtml(toString?: false): dom.documentFragment;
+        getSelectedHtml(toString: true): string;
+        getSelectedHtml(toString?: boolean): dom.documentFragment | string;
+        getSelection(forceRealSelection?: boolean): dom.selection;
+        getSnapshot(): string;
+        getStylesSet(callback: (stylesDefinitions: style.definition[]) => void): void;
+        getUiColor(): string;
+        insertElement(element: dom.element): void;
+        insertHtml(html: string, mode?: string, range?: dom.range): void;
+        insertText(text: string): void;
+        loadSnapshot(snapshot: any): void;
+        lockSelection(sel?: dom.selection): boolean;
+        openDialog(dialogName: string, callback: () => void): dialog;
+        popup(url: string, width?: number | string, height?: number | string, options?: string): void;
+        removeMenuItem(name: string): void;
+        removeStyle(style: style): void;
+        resetDirty(): void;
+        resetUndo(): void;
+        resize(width: number | string, height: number | string, isContentHeight?: boolean, resizeInner?: boolean): void;
+        restoreRealElement(fakeElement: dom.element): dom.element;
+        selectionChange(checkNow?: boolean): void;
+        setActiveEnterMode(enterMode: number, shiftEnterMode: number): void;
+        setActiveFilter(filter: filter): void;
+        setData(data: string, options?: { internal?: boolean; callback?: () => void; noSnapshot?: boolean; }): void;
+        setKeystroke(keystroke: number, behavior: string | boolean): void;
+        setKeystroke(keystroke: [number, string | boolean][]): void;
+        setMode(newMode: string, callback: () => void): void;
+        setReadOnly(isReadOnly?: boolean): void;
+        setUiColor(color: string): void;
+        showNotification(message: string, type: plugins.notification.type, progressOrDuration: number): plugins.notification;
+        unlockSelection(restore?: boolean): void;
+        updateElement(): void;
+    }
+
+    namespace editor {
+        interface eventObject {
+            activeEnterModeChange?: (evt: eventInfo) => void;
+            activeFilterChange?: (evt: eventInfo) => void;
+            afterCommandExec?: (evt: eventInfo) => void;
+            afterInsertHtml?: (evt: eventInfo) => void;
+            afterPaste?: (evt: eventInfo) => void;
+            afterPasteFromWord?: (evt: eventInfo) => void;
+            afterSetData?: (evt: eventInfo) => void;
+            afterUndoImage?: (evt: eventInfo) => void;
+            ariaEditorHelpLabel?: (evt: eventInfo) => void;
+            ariaWidget?: (evt: eventInfo) => void;
+            autogrow?: (evt: eventInfo) => void;
+
+            beforeCommandExec?: (evt: eventInfo) => void;
+            beforeDestroy?: (evt: eventInfo) => void;
+            beforeGetData?: (evt: eventInfo) => void;
+            beforeModeUnload?: (evt: eventInfo) => void;
+            beforeSetMode?: (evt: eventInfo) => void;
+            beforeUndoImage?: (evt: eventInfo) => void;
+            blur?: (evt: eventInfo) => void;
+
+            change?: (evt: eventInfo) => void;
+            configLoaded?: (evt: eventInfo) => void;
+            contentDirChanged?: (evt: eventInfo) => void;
+            contentDom?: (evt: eventInfo) => void;
+            contentDomInvalidated?: (evt: eventInfo) => void;
+            contentDomUnload?: (evt: eventInfo) => void;
+            customConfigLoaded?: (evt: eventInfo) => void;
+
+            dataFiltered?: (evt: eventInfo) => void;
+            dataReady?: (evt: eventInfo) => void;
+            destroy?: (evt: eventInfo) => void;
+            dialogHide?: (evt: eventInfo) => void;
+            dialogShow?: (evt: eventInfo) => void;
+            dirChanged?: (evt: eventInfo) => void;
+            doubleclick?: (evt: eventInfo) => void;
+            dragend?: (evt: eventInfo) => void;
+            dragstart?: (evt: eventInfo) => void;
+            drop?: (evt: eventInfo) => void;
+
+            elementsPathUpdate?: (evt: eventInfo) => void;
+
+            fileUploadRequest?: (evt: eventInfo) => void;
+            fileUploadResponse?: (evt: eventInfo) => void;
+            floatingSpaceLayout?: (evt: eventInfo) => void;
+            focus?: (evt: eventInfo) => void;
+
+            getData?: (evt: eventInfo) => void;
+            getSnapshot?: (evt: eventInfo) => void;
+
+            insertElement?: (evt: eventInfo) => void;
+            insertHtml?: (evt: eventInfo) => void;
+            insertText?: (evt: eventInfo) => void;
+            instanceReady?: (evt: eventInfo) => void;
+
+            key?: (evt: eventInfo) => void;
+
+            langLoaded?: (evt: eventInfo) => void;
+            loadSnapshot?: (evt: eventInfo) => void;
+            loaded?: (evt: eventInfo) => void;
+            lockSnapshot?: (evt: eventInfo) => void;
+            maximize?: (evt: eventInfo) => void;
+            menuShow?: (evt: eventInfo) => void;
+            mode?: (evt: eventInfo) => void;
+
+            notificationHide?: (evt: eventInfo) => void;
+            notificationShow?: (evt: eventInfo) => void;
+            notificationUpdate?: (evt: eventInfo) => void;
+
+            paste?: (evt: eventInfo) => void;
+            pasteFromWord?: (evt: eventInfo) => void;
+            pluginsLoaded?: (evt: eventInfo) => void;
+
+            readOnly?: (evt: eventInfo) => void;
+            removeFormatCleanup?: (evt: eventInfo) => void;
+            required?: (evt: eventInfo) => void;
+            resize?: (evt: eventInfo) => void;
+
+            save?: (evt: eventInfo) => void;
+            saveSnapshot?: (evt: eventInfo) => void;
+            selectionChange?: (evt: eventInfo) => void;
+            setData?: (evt: eventInfo) => void;
+            stylesSet?: (evt: eventInfo) => void;
+
+            template?: (evt: eventInfo) => void;
+            toDataFormat?: (evt: eventInfo) => void;
+            toHtml?: (evt: eventInfo) => void;
+
+            unlockSnapshot?: (evt: eventInfo) => void;
+            updateSnapshot?: (evt: eventInfo) => void;
+
+            widgetDefinition?: (evt: eventInfo) => void;
+        }
+    }
+
+    namespace env {
+        var air: boolean;
+        var chrome: boolean;
+        var cssClass: string;
+        var edge: boolean;
+        var gecko: boolean;
+        var hc: boolean;
+        var hidpi: boolean;
+        var iOS: boolean;
+        var ie: boolean;
+        var isCompatible: boolean;
+        var mac: boolean;
+        var needsBrFiller: boolean;
+        var needsNbspFiller: boolean;
+        var quirks: boolean;
+        var safari: boolean;
+        var version: number;
+        var webkit: boolean;
+
+        function secure(): boolean;
+    }
+
+    class event {
+        static useCapture: boolean;
+
+        constructor();
+        capture(): void;
+        define(name: string, meta: { [key: string]: any }): void;
+        fire(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
+        fireOnce(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
+        hasListeners(eventName: string): boolean;
+        on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any } | null, listenerData?: any, priority?: number): listenerRegistration;
+        once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any } | null, listenerData?: any, priority?: number): listenerRegistration;
+        removeAllListeners(): void;
+        removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
+
+        static implementOn(targetObject: { [key: string]: any }): void;
+    }
+
+    interface eventInfo {
+        data: any;
+        editor: editor;
+        listenerData: any;
+        name: string;
+        sender: { [key: string]: any };
+
+        cancel(): void;
+        removeListener(): void;
+        stop(): void;
+    }
+
+    interface feature {
+        allowedContent?: filter.allowedContentRules;
+        contentForms?: any;
+        contentTransformations?: any;
+        name?: string;
+        requiredContent?: string | style;
+        toFeature?: () => feature;
+    }
+
+    namespace fileTools {
+        var isFileUploadSupported: boolean;
+
+        function addUploadWidget(editor: editor, name: string, def: uploadWidgetDefinition): void;
+        function bindNotification(editor: editor, fileLoader: fileLoader): void;
+        function getUploadUrl(config: { [key: string]: any }, type?: string): string;
+        function isTypeSupported(file: Blob, supportedTypes: RegExp): boolean;
+        function markElement(element: dom.element, widgetName: string, loaderId: number): void;
+
+        class fileLoader extends event {
+            readonly data: string;
+            readonly file: Blob;
+            readonly fileName: string;
+            readonly id: number;
+            readonly loaded: number;
+            readonly message: string;
+            readonly reader: FileReader;
+            readonly responseData: any;
+            status: string;
+            readonly total: number;
+            readonly uploadTotal: number;
+            readonly uploadUrl: string;
+            readonly uploaded: string;
+            readonly url: string;
+            readonly xhr: XMLHttpRequest;
+
+            constructor(editor: editor, fileOrData: Blob | string, fileName?: string);
+            abort(): void;
+            isFinished(): boolean;
+            load(): void;
+            loadAndUpload(url: string, additionalRequestParameters?: any): void;
+            update(): void;
+            upload(url: string, additionalRequestParameters?: any): void;
+        }
+
+        class uploadRepository extends event {
+            readonly loaders: fileLoader[];
+
+            constructor(editor: editor);
+            create(fileOrData: Blob | string, fileName: string, loaderType?: any): fileLoader;
+            isFinished(): boolean;
+        }
+
+        interface uploadWidgetDefinition extends plugins.widget.definition {
+            additionalRequestParameters: any;
+            fileToElement: (pastedFile: any) => HTMLElement;
+            loadMethod: string;
+            loaderType: any;
+            onAbort: () => boolean;
+            onError: () => boolean;
+            onLoaded: () => boolean;
+            onUploaded: () => boolean;
+            onUploading: () => boolean;
+            replaceWith: () => any;
+            skipNotifications: boolean;
+            supportedTypes: string;
+            uploadUrl: string;
+        }
+    }
+
+    module filter {
+        type allowedContentRule = string | style | { [key: string]: any };
+        type allowedContentRules = allowedContentRule | allowedContentRule[];
+        type contentRule = string | style;
+        type disallowedContentRules = string | { [key: string]: any };
+
+        interface transformation {
+            check?: string;
+            element?: string | style;
+            left?: (element: htmlParser.element | style) => boolean;
+            right: (element: htmlParser.element, tools: string | filter.transformationTools) => boolean;
+        }
+
+        var transformationTools: transformationTools;
+
+        interface transformationTools {
+            alignmentToAttribute(element: htmlParser.element): void;
+            alignmentToStyle(element: htmlParser.element): void;
+            lengthToAttribute(element: htmlParser.element, styleName: string, attrName?: string): void;
+            lengthToStyle(element: htmlParser.element, styleName: string, attrName?: string): void;
+            matchesTyle(element: htmlParser.element, style: style): void;
+            sizeToAttribute(element: htmlParser.element): void;
+            sizeToStyle(element: htmlParser.element): void;
+            splitBorderShorthand(element: htmlParser.element): void;
+            splitMarginShorthand(element: htmlParser.element): void;
+            transform(element: htmlParser.element, form: style | string): void;
+        }
+    }
+
+    class filter {
+        readonly allowedContent: filter.allowedContentRules[];
+        readonly customConfig: boolean;
+        readonly disabled: boolean;
+        readonly disallowedContent: any[];
+        readonly editor: editor;
+        readonly elementCallbacks: ((element: htmlParser.element) => number)[];
+        readonly id: number;
+
+        static instances: { [id: string]: filter };
+
+        constructor(editorOrRules: editor | filter.allowedContentRules);
+        addContentForms(forms: any[]): void;
+        addElementCallback(callback: (element: htmlParser.element) => number): void;
+        addFeature(feature: feature): boolean;
+        addTransformations(transformations: (string | filter.transformation)[][]): void;
+        allow(newRules: filter.allowedContentRules, featureName?: string, overrideCustom?: boolean): boolean;
+        applyTo(fragment: htmlParser.fragment | htmlParser.element, toHrml: boolean, transformOnly: boolean, enterMode: number): boolean;
+        check(test: filter.contentRule, applyTransformations?: boolean, strictCheck?: boolean): boolean;
+        checkFeature(feature: feature): boolean;
+        clone(): filter;
+        destroy(): void;
+        disable(): void;
+        disallow(newRules: filter.disallowedContentRules): void;
+        getAllowedEnterMode(defaultMode: number, reverse?: boolean): number;
+    }
+
+    class focusManager {
+        currentActive: dom.domObject;
+        hasFocus: boolean;
+
+        constructor(editor: editor);
+        add(element: dom.element, isCapture: boolean): void;
+        blur(noDelay?: boolean): void;
+        focus(currentActive?: dom.element): void;
+        lock(): void;
+        remove(element: dom.element): void;
+        unlock(): void;
+    }
+
+    class htmlDataProcessor implements dataProcessor {
+        dataFilter: htmlParser.filter;
+        htmlFilter: htmlParser.filter;
+        writer: htmlParser.basicWriter;
+
+        constructor(editor: editor);
+        toDataFormat(html: string, options?: string | { context?: string, filter?: filter, enterMode?: number }): string;
+        toHtml(data: string, options?: string | htmlDataProcessorOptions): string;
+    }
+
+    interface htmlDataProcessorOptions {
+        context?: string;
+        fixForBody?: boolean;
+        filter?: filter;
+        dontFilter?: boolean;
+        enterMode?: number;
+        protectedWhitespaces?: boolean;
+    }
+
+    namespace htmlParser {
+        class basicWriter {
+            constructor();
+            attribute(attName: string, attValue: string): void;
+            closeTag(tagName: string): void;
+            comment(comment: string): void;
+            getHtml(reset: boolean): string;
+            openTag(tagName: string, attributes: { [key: string]: string }): void;
+            openTagClose(tagName: string, isSelfClose: boolean): void;
+            reset(): void;
+            text(text: string): void;
+            write(data: string): void;
+        }
+
+        class cdata extends node {
+            constructor(value: string);
+            type: number;
+            writeHtml(writer: htmlParser.basicWriter): void;
+        }
+
+        class comment extends node {
+            type: number;
+            value: string;
+
+            constructor(value: string);
+            filter(filter: filter): boolean;
+            writeHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
+        }
+
+        class cssStyle {
+            constructor(elementOrStyleText: htmlParser.element | string);
+            populate(obj: htmlParser.element | dom.element | { [key: string]: any }): void;
+        }
+
+        class element extends node {
+            attributes: { [name: string]: string };
+            children: htmlParser.node[];
+            name: string;
+            type: number;
+
+            constructor(name: string, attributes: { [name: string]: string });
+            add(node: node, index?: number): void;
+            addClass(className: string): void;
+            clone(): element;
+            filter(filter: htmlParser.filter): boolean;
+            filterChildren(filter: htmlParser.filter): void;
+            find(criteria: string | ((el: htmlParser.node) => boolean), recursive?: boolean): htmlParser.node[];
+            forEach(callback: (node: htmlParser.node) => void | false, type?: number, skipRoot?: boolean): void;
+            getFirst(condition: string | { [key: string]: string } | ((node: htmlParser.node) => boolean)): htmlParser.node;
+            getHtml(): string;
+            getOuterHtml(): string;
+            hasClass(className: string): boolean;
+            removeClass(className: string): void;
+            replaceWithChildren(): void;
+            setHtml(html: string): void;
+            split(index: number): htmlParser.element;
+            writeChildrenHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
+            writeHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
+        }
+
+        class filter {
+            attributeNameRules: filterRulesGroup;
+            attributesRules: { [name: string]: filterRulesGroup };
+            commentRules: filterRulesGroup;
+            elementNameRules: filterRulesGroup;
+            elementsRules: { [name: string]: filterRulesGroup };
+            id: number;
+            rootRules: filterRulesGroup;
+            textRules: filterRulesGroup;
+
+            constructor(rules?: filterRulesDefinition);
+            addRules(rules: filterRulesDefinition, options?: number | { priority?: number; applyToAll?: boolean; }): void;
+            applyTo(node: node): void;
+        }
+
+        interface filterRulesDefinition {
+            elementNames?: any;
+            attributeNames?: any;
+            elements?: any;
+            attributes?: any;
+            text?: any;
+            comment?: any;
+            root?: any;
+        }
+
+        class filterRulesGroup {
+            rules: { value: rule, priority: number, option: ruleOptions }[];
+
+            add(rule: rule, priority: number, options: ruleOptions): void;
+            addMany(rules: { [key: string]: any }[], priority: number, options: ruleOptions): void;
+            exec(currentValue: htmlParser.node | htmlParser.fragment | string): htmlParser.node | htmlParser.fragment | string;
+            execOnName(currentName: string): string;
+            findIndex(priority: number): number;
+        }
+
+        class fragment {
+            children: htmlParser.node[];
+            parent: htmlParser.fragment;
+            readonly type: number;
+
+            constructor();
+
+            add(node: htmlParser.node, index?: number): void;
+            filter(filter: htmlParser.filter): void;
+            filterChildren(filter: htmlParser.filter, filterRoot?: boolean): void;
+            forEach(callback: (node: htmlParser.node) => void | false, type?: number, skipRoot?: boolean): void;
+            writeChildrenHtml(writer: basicWriter, filter?: htmlParser.filter, filterRoot?: boolean): void;
+            writeHtml(writer: basicWriter, filter?: htmlParser.filter): void;
+
+            static fromBBCode(source: string): htmlParser.fragment;
+            static fromHtml(fragmentHtml: string, parent?: htmlParser.element | string, fixingBlock?: string | boolean): fragment | htmlParser.element;
+        }
+
+        class node {
+            constructor();
+            getAscendant(condition: string | { [name: string]: string } | ((node: htmlParser.element) => boolean)): element;
+            getIndex(): number;
+            insertAfter(node: node): void;
+            insertBefore(node: node): void;
+            remove(): node;
+            replaceWith(node: node): void;
+            wrapWith(wrapper: element): element;
+        }
+
+        type rule = ((value: htmlParser.node | htmlParser.fragment | string) => boolean) | [string, string];
+
+        interface ruleOptions {
+            applyToAll?: boolean,
+            excludeNestedEditable?: boolean
+        }
+
+        class text extends node {
+            constructor(value: string);
+            type: number;
+            filter(filter: filter): boolean;
+            writeHtml(writer: basicWriter, filter?: filter): void;
+        }
+    }
+
+    class htmlWriter extends htmlParser.basicWriter {
+        indentationChars: string;
+        lineBreakChars: string;
+        selfClosingEnd: string;
+
+        indentation(): void;
+        lineBreak(): void;
+        setRules(tagName: string, rules: { [key: string]: any }): void;
+    }
+
+    class keystrokeHandler {
+        blockedKeystrokes: { [key: number]: string | boolean };
+        keystrokes: { [key: number]: string | boolean };
+
+        constructor(editor: editor);
+
+        attach(domObject: dom.domObject): void;
+    }
+
+    namespace lang {
+        var languages: { [code: string]: number };
+        var rtl: { [code: string]: number };
+
+        function detect(defaultLanguage: string, probeLanguage?: string): string;
+        function load(languageCode: string, defaultLanguage: string, callback: (code: string, entries: any) => void): void;
+    }
+
+    namespace loader {
+        var loadedScripts: string[];
+        var scripts: string[];
+
+        function load(scriptName: string, defer?: boolean): void;
+        function loadPending(): void;
+    }
+
+    class menu {
+        constructor();
+
+        add(item: any): void;
+        addListener(listenerFn: (startElement: dom.element, selection: dom.selection, path: dom.elementPath) => any): void;
+        findItemByCommandName(commandName: string): { item: any, element: dom.element };
+        hide(returnFocus?: boolean): void;
+        removeAll(): void;
+        show(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
+    }
+
+    interface pluginDefinition {
+        hidpi?: boolean;
+        lang?: string | string[];
+        requires?: string | string[];
+
+        afterInit?(editor: editor): any;
+        beforeInit?(editor: editor): any;
+        init?(editor: editor): void;
+        onLoad?(): any;
+    }
+
+    namespace plugins {
+
+        namespace cloudservices {
+            class cloudServicesLoader extends fileTools.fileLoader {
+                customToken: string;
+
+                constructor(editor: editor, fileOrData: Blob | string, fileName?: string, token?: string);
+                loadAndUpload(url?: string, additionalRequestParameters?: any): void;
+                upload(url?: string, additionalRequestParameters?: any): void;
+            }
+        }
+
+        class autoEmbed {
+            getWidgetDefinition(editor: editor, url: string): widget.definition;
+        }
+
+        namespace balloontoolbar {
+            const PRIORITY: { [pri: string]: number };
+
+            class context {
+                editor: editor;
+                options: contextDefinition;
+                toolbar: ui.balloonToolbar;
+
+                constructor(editor: editor, options: contextDefinition);
+                destroy(): void;
+                hide(): void;
+                refresh(): void;
+                show(pointedElement?: dom.element): void;
+            }
+
+            interface contextDefinition {
+                cssSelector?: string;
+                priority?: number;
+                widgets?: string[] | string;
+
+                refresh?: (editor: editor, path: dom.elementPath, selection: dom.selection) => dom.element;
+            }
+
+            class contextManager {
+                editor: editor;
+
+                constructor(editor: editor);
+                add(context: context): void;
+                check(selection?: dom.selection): void;
+                create(options: contextDefinition): context;
+                destroy(): void;
+                hide(): void;
+            }
+        }
+
+        namespace clipboard {
+            const isCustomCopyCutSupported: boolean;
+            const isCustomDataTypesSupported: boolean;
+            const isFileApiSupported: boolean;
+            const mainPasteEvent: string;
+
+            function addPasteButton(editor: editor, name: string, definition: { [key: string]: any }): void;
+            function canClipboardApiBeTrusted(dataTransfer: dataTransfer, editor: editor): boolean;
+            function getDropTarget(editor: editor): dom.domObject;
+            function getRangeAtDropPosition(domEvent: Event, editor: editor): dom.range;
+            function initDragDataTransfer(evt?: dom.event, editor?: editor): void;
+            function initPasteDataTransfer(evt?: dom.event, sourceEditor?: editor): void;
+            function preventDefaultDropOnElement(element: dom.element): void;
+            function resetDragDataTransfer(): void;
+
+            class dataTransfer {
+                readonly $: DataTransfer;
+                readonly id: string;
+                readonly sourceEditor: editor;
+
+                constructor(nativeDataTransfer?: DataTransfer, editor?: editor);
+                cacheData(): void;
+                getData(type: string, getNative?: boolean): string;
+                getFile(i: number): File;
+                getFilesCount(): number;
+                getTransferType(targetEditor: editor): number;
+                isEmpty(): boolean;
+                setData(type: string, value: string): void;
+                storeId(): void;
+            }
+
+            class fallbackDataTransfer {
+                constructor(dataTransfer: dataTransfer);
+                getData(type: string, getNative?: boolean): string;
+                isRequired(): boolean;
+                setData(type: string, value: string): string;
+            }
+        }
+
+        namespace condesnippet {
+            function setHighlighter(highlighter: highlighter): void;
+
+            class highlighter {
+                highlighter: (code: string, lang: string, callback: (highlightedCode: string) => void) => void;
+                init: (ready: () => void) => void;
+                languages: { [lang: string]: string };
+                readonly queue: ((code: string, lang: string, callback: (highlightedCode: string) => void) => void)[];
+                readonly ready: boolean;
+
+                highlight(code: string, lang: string, callback: (highlightedCode: string) => void): void;
+            }
+        }
+
+        class contextMenu extends menu {
+            constructor(editor: editor);
+            addTarget(element: dom.element, nativeContextMenuOnCtrl?: boolean): void;
+            open(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
+        }
+
+        namespace copyformatting {
+            var breakOnElements: string[];
+            var elementsForInlineTransform: string[];
+            var excludedAttributes: string[];
+            var excludedAttributesFromInlineTransform: string[];
+            var inlineBoundary: string[];
+            var preservedElements: string[];
+
+            class state extends event {
+                editor: editor;
+                filter: filter;
+                sticky: boolean;
+                styles: style[];
+
+                constructor(editor: editor);
+            }
+        }
+
+        namespace easyimage {
+
+        }
+
+        namespace embedBase {
+            function createWidgetBaseDefinition(editor: editor): baseDefinition;
+
+            interface baseDefinition extends widget.definition {
+                providerUrl: template;
+                urlRegExp: RegExp;
+
+                getErrorMessage(messageTypeOrMessage: string, url?: string, suffix?: string): string;
+                isUrlValid(url: string): boolean;
+                loadContent(url: string, callback?: () => void, errorCallback?: (error: string) => void, noNotifications?: boolean): request;
+            }
+
+            interface request {
+                callback: () => void;
+                errorCallback: (error: string) => void;
+                response: { [key: string]: string };
+                task: notificationAggregator.task;
+                url: string;
+
+                cancel(): void;
+            }
+        }
+
+        namespace image2 {
+            function checkHasNaturalRatio(image: dom.element): boolean;
+            function getLinkAttributesGetter(): (editor: editor, data: { [key: string]: string }) => { set: { [tag: string]: string }, removed: string[] };
+            function getLinkAttributesParser(): (editor: editor, element: dom.element) => { [key: string]: string };
+            function getNatural(image: dom.element): { [key: string]: string };
+        }
+
+        namespace imagebase {
+            var featuresDefinitions: { [key: string]: string };
+
+            function addFeature(editor: editor, name: string, definition: imageWidgetDefinition): imageWidgetDefinition;
+            function addImageWidget(editor: editor, name: string, definition: imageWidgetDefinition): void;
+
+            interface imageWidgetDefinition extends widget.definition {
+                features: string[];
+                upcast: string;
+            }
+
+            class progressBar extends progressReporter {
+                bar: dom.element;
+
+                constructor();
+
+            }
+
+            class progressReporter {
+                wrapper: dom.element;
+
+                constructor(wrapperHtml?: string);
+                aborted(): void;
+                bindLoader(loader: fileTools.fileLoader): void;
+                done(): void;
+                failed(): void;
+                remove(): void;
+                updated(progress: number): void;
+            }
+        }
+
+        namespace indent {
+            function registerCommands(editor: editor, commands: { [key: string]: command }): void;
+
+            class genericDefinition implements commandDefinition {
+                async: boolean;
+                canUndo: boolean;
+                context: boolean;
+                contextSensitive: boolean;
+                editorFocus: boolean;
+                fakeKeystroke: number;
+                readonly isIndent: boolean;
+                modes: { [key: string]: any };
+                readOnly: boolean;
+                startDisabled: boolean;
+
+                exec(editor: editor, data?: any): boolean;
+                refresh?(editor: editor, path: dom.elementPath): void;
+            }
+
+            class specificDefinition {
+                database: { [key: string]: any };
+                readonly enterBr: boolean;
+                readonly indentKey: { [key: string]: any };
+                readonly isIndent: boolean;
+                readonly jobs: { [priority: string]: { refresh: (editor: editor, path: dom.elementPath) => number, exec: (editor: editor) => boolean } };
+                readonly relatedGlobal: { [key: string]: any };
+
+                execJob(editor: editor, priority: number): boolean;
+                getContext(node: dom.elementPath): dom.element;
+                refreshJob(editor: editor, priority: number): number;
+            }
+        }
+
+        namespace indentList {
+            function firstItemInPath(query: string | string[] | { [tagName: string]: any } | dom.element | ((element: dom.element) => boolean)): boolean;
+        }
+
+        namespace link {
+            // DEPRECATED 4.3.3
+            const emptyAnchorFix: boolean;
+
+            // DEPRECATED 4.3.3
+            const fakeAnchor: boolean;
+
+            // DEPRECATED 4.3.3
+            const synAnchorSelector: boolean;
+
+            function getEditorAnchors(editor: editor): dom.element[];
+            function getLinkAttributes(editor: editor, data: { [key: string]: any }): { set: { [key: string]: string }, removed: string[] }
+            function getSelectedLink(editor: editor, returnMultiple?: boolean): dom.element | dom.element[];
+            function parseLinkAttributes(editor: editor, element: dom.element): { [key: string]: any };
+            function showDisplayTextForElement(element: dom.element, editor: editor): boolean;
+            function tryRestoreFakeAnchor(editor: editor, element: dom.element): dom.element;
+        }
+
+        class list {
+            arrayToList(listArray: any, database: any, paragraphMode: any, dir: any): void;
+            listToArray(listNode: any, database: any, baseArray: any, baseIndentLevel: any, grandparentNode: any): void;
+        }
+
+        class notification {
+            readonly area: notification.area;
+            readonly duration: number;
+            readonly editor: editor;
+            readonly element: dom.element;
+            readonly id: number;
+            readonly message: string;
+            readonly progress: number;
+            readonly type: notification.type;
+
+            constructor(editor: editor, options: notification.options);
+            hide(): void;
+            isVisible(): boolean;
+            show(): void;
+            update(options: notification.updateOptions): void;
+        }
+
+        namespace notification {
+            interface area {
+                readonly editor: editor;
+                readonly element: dom.element;
+                readonly notifications: notification[];
+
+                add(notification: notification): void;
+                remove(notification: notification): void;
+            }
+
+            interface optionsBase {
+                duration?: number;
+                progress?: number;
+                type?: type;
+            }
+
+            interface options extends optionsBase {
+                message: string;
+            }
+
+            interface updateOptions extends optionsBase {
+                message?: string;
+                important?: boolean;
+            }
+
+            type type = 'info' | 'warning' | 'success' | 'progress';
+        }
+
+        class notificationAggregator extends event {
+            readonly editor: editor;
+            readonly notification: notification;
+
+            constructor(editor: editor, message: string, singularMessage?: string);
+            createTask(options?: { weight?: number }): notificationAggregator.task;
+            getDoneTaskCount(): number;
+            getPercentage(): number;
+            getTaskCount(): number;
+            isFinished(): boolean;
+            update(): void;
+        }
+
+        namespace notificationAggregator {
+            class task extends event {
+                constructor(weight?: number);
+                cancel(): void;
+                done(): void;
+                isCanceled(): boolean;
+                isDone(): boolean;
+                update(weight: number): void;
+            }
+        }
+
+        namespace pastefromword {
+            class lists {
+                numbering: lists.numbering;
+            }
+
+            namespace lists {
+                class numbering {
+                    getStyle(marker: string): string;
+                    toNumber(marker: string, markerType: string): number;
+                }
+            }
+
+            class styles {
+                pushStylesLower(element: htmlParser.element, exceptions: { [style: string]: boolean }, wrapText?: boolean): boolean;
+            }
+        }
+
+        namespace tableselection {
+            function getCellsBetween(first: dom.element, last: dom.element): dom.element[];
+        }
+
+        namespace widget {
+            var WRAPPER_CLASS_PREFIX: string;
+
+            function getNestedEditable(guard: dom.element, node: dom.node): dom.element;
+            function isDomDragHandler(node: dom.node): boolean;
+            function isDomDragHandlerContainer(node: dom.node): boolean;
+            function isDomNestedEditable(node: dom.node): boolean;
+            function isDomWidget(node: dom.node): boolean;
+            function isDomWidgetElement(node: dom.node): boolean;
+            function isDomWidgetWrapper(node: dom.node): boolean;
+            function isParserWidgetElement(node: dom.node): boolean;
+            function isParserWidgetWrapper(node: dom.node): boolean;
+
+            namespace nestedEditable {
+                interface definition {
+                    allowedContent?: filter.allowedContentRules;
+                    disallowedContent?: filter.disallowedContentRules;
+                    pathName?: string;
+                    selector?: string;
+                }
+            }
+
+            class nestedEditable extends dom.element {
+                readonly editor: editor;
+                readonly enterMode: number;
+                readonly filter: filter;
+                readonly shiftEnterMode: number;
+
+                constructor(editor: editor, element: dom.element, config: { filter?: filter });
+                getData(): string;
+                setData(data: string): void;
+            }
+
+
+            interface definition extends feature {
+                button?: string;
+                data?: (evt: eventInfo) => void;
+                defaults?: { [key: string]: any };
+                dialog?: string;
+                downcast?: string | ((element: htmlParser.element) => void);
+                downcasts?: { [key: string]: any };
+                draggable?: boolean;
+                edit?: () => void;
+                editables?: { [key: string]: any };
+                getLabel?: () => any;
+                init?: () => void;
+                inline?: boolean;
+                insert?: () => void;
+                mask?: boolean;
+                parts?: { [key: string]: any };
+                pathName?: string;
+                styleToAllowedContentRules?: (style: style) => filter.allowedContentRules;
+                styleableElements?: string;
+                template?: string | template;
+                upcast?: string | ((element: htmlParser.element, data: any) => boolean);
+                upcastPriority?: number;
+                upcasts?: { [key: string]: any };
+            }
+
+            class repository extends event {
+                readonly editor: editor;
+                readonly focused: widget;
+                readonly instances: { [id: string]: widget };
+                readonly registered: { [name: string]: definition };
+                readonly selected: widget[];
+                readonly widgetHoldingFocusedEditable: widget;
+
+                add(name: string, widgetDef: plugins.widget.definition): void;
+                addUpcastCallback(callback: (element: htmlParser.element, data: any) => boolean): void;
+                checkSelection(): void;
+                checkWidgets(options?: { initOnlyNew?: boolean; focusInited?: boolean }): void;
+                del(widget: plugins.widget): void;
+                destroy(widget: plugins.widget, offline?: boolean): void;
+                destroyAll(offline?: boolean): void;
+                finalizeCreation(container: any): void;
+                getByElement(element: any, checkWrapperOnly: boolean): plugins.widget;
+                initOn(element: dom.element, widgetDef?: plugins.widget.definition, startupData?: { [key: string]: any }): plugins.widget;
+                initOn(element: dom.element, widgetDef?: string, startupData?: { [key: string]: any }): plugins.widget;
+                initOnAll(container?: dom.element): plugins.widget[];
+                parseElementClasses(classes: string): any;
+                wrapElement(element: any, widgetName?: string): any;
+            }
+
+            class widgetselection {
+                addFillers(editable: editable): boolean;
+                removeFillers(editable: editable): void;
+            }
+        }
+
+        class widget extends event implements widget.definition {
+            readonly dataReady: boolean;
+            readonly definition: plugins.widget.definition;
+            readonly editor: editor;
+            readonly element: dom.element;
+            readonly focusedEditable: plugins.widget.nestedEditable
+            readonly id: number;
+            readonly inited: boolean;
+            readonly ready: boolean;
+            readonly repository: plugins.widget.repository;
+            readonly wrapper: dom.element;
+
+            constructor(widgetsRepo: plugins.widget.repository, id: number, element: dom.element, widgetDef: plugins.widget.definition, starupData?: any);
+
+            addClass(className: string): void;
+            applyStyle(style: style): void;
+            checkStyleActive(style: style): boolean;
+            destroy(offline?: boolean): void;
+            destroyEditable(editableName: string, offline?: boolean): void;
+            edit(): boolean;
+            focus(): void;
+            getClasses(): any;
+            hasClass(className: string, Whether: boolean): void;
+            initEditable(editableName: string, definition: plugins.widget.nestedEditable.definition): boolean;
+            isInited(): boolean;
+            isReady(): boolean;
+            removeClass(className: string): void;
+            removeStyle(style: style): void;
+            setData(keyOrData: any, value: any): plugins.widget;
+            setFocused(selected: boolean): plugins.widget;
+            setSelected(selected: boolean): plugins.widget;
+            updateDragHandlerPosition(): void;
+        }
+
+        function add(name: string, definition: pluginDefinition): void;
+        function add(name: string): void;
+        function addExternal(name: string, path: string, fileName?: string): void;
+        function get(name: string): any;
+        function getFilePath(name: string): string;
+        function getPath(name: string): string;
+        function load(name: string, callback: (plugins: string[]) => void, scope?: { [key: string]: any }): void;
+        function setLang(pluginName: string, languageCode: string, languageEntries: any): void;
+        var registered: { [key: string]: pluginDefinition };
+    }
+
+    class resourceManager {
+        basePath: string;
+        externals: { [key: string]: any };
+        fileName: string;
+        loaded: { [key: string]: any };
+        registered: { [key: string]: any };
+
+        constructor(basePath: string, fileName: string);
+        add(name: string, definition?: pluginDefinition): void;
+        addExternal(names: string, path: string, fileName?: string): void;
+        get(name: string): pluginDefinition;
+        getFilePath(name: string): string;
+        getPath(name: string): string;
+        load(name: string | string[], callback: (loaded: string[]) => void, scope?: { [key: string]: any }): void;
+    }
+
+    // see https://docs.com/ckeditor4/latest/api/CKEDITOR_scriptLoader.html
+    namespace scriptLoader {
+        function load(scriptUrls: string | string[], callback: (succeededUrls: boolean | string[], failedUrls: string[]) => void, scope?: any, showBusy?: boolean): void;
+        function queue(scriptUrl: string, callback?: (succeeded: boolean) => void): void;
+    }
+
+    namespace skin {
+        var icons: { [name: string]: { path: string } };
+        var name: string;
+        var ua: { [name: string]: any };
+
+        function addIcon(name: string, path: string, offset?: number, bgsize?: string): void;
+        function chameleon(editor: string, part: string): void;
+        function getIconStyle(name: string, rtl?: boolean, overridePath?: number, overrideBgsize?: string): any;
+        function getPath(part: string): any;
+        function loadPart(part: string, fn: () => void): void;
+        function path(): string;
+    }
+
+    namespace style {
+        function addCustomHandler(defintion: customHandler): style;
+        function getStyleText(style: definition): string;
+
+        namespace customHandlers {
+            class widget extends style {
+                group: any[];
+                widget: string;
+                checkElement(element: dom.element): boolean;
+                getClassesArray(): string[];
+                getDefintion(): definition;
+                removeStylesFromSameGroup(editor: editor): boolean;
+            }
+        }
+
+        interface definition {
+            attributes?: { [att: string]: string },
+            element: string,
+            name?: string,
+            styles?: { [att: string]: string },
+            type?: string | number
+        }
+
+        interface customHandler {
+            type: string | number;
+            setup?: (style: definition) => void;
+            assignedTo?: number;
+        }
+    }
+
+    class style {
+        alwaysRemoveElement: boolean;
+        includeReadonly: boolean;
+        constructor(styleDefinition: style.definition, variableValues: any);
+        apply(editor: editor): void;
+        applyToObject(element: dom.element, editor: editor): void;
+        applyToRange(range: Range, editor: editor): void;
+        buildPreview(label?: string): string;
+        checkActive(elementPath: dom.elementPath, editor: editor): boolean;
+        checkApplicable(elementPath: dom.elementPath, editor: editor, filter?: filter): boolean;
+        checkElementMatch(element: dom.element, fullMatch: boolean, editor: editor): boolean;
+        checkElementRemovable(element: dom.element, fullMatch: boolean, editor: editor): boolean;
+        getDefintion(): style.definition;
+        remove(editor: editor): void;
+        removeFromRange(range: dom.range, editor: editor): void;
+        toAllowedContentRules(editor?: editor): filter.allowedContentRules;
+    }
+
+    class styleCommand {
+        constructor(style: style, ext?: any);
+        exec(editor: editor): void;
+    }
+
+    var stylesSet: resourceManager;
+
+    class template {
+        readonly source: string;
+
+        constructor(source: string);
+        output(data: any, buffer?: any[]): string | number;
+    }
+
+    namespace tools {
+        function addFunction(fn: () => any, scope?: any): number;
+        function arrayCompare(arrayA: any[], arrayB: any[]): boolean;
+        function clone(source: { [key: string]: any }): { [key: string]: any };
+        function copy(source: { [key: string]: any }): { [key: string]: any };
+        function createClass(definition: { [key: string]: any }): any;
+        function cssStyleToDomStyle(cssName: string): string;
+        function cssVendorPrefix(property: string, value: string, asString?: boolean): { [cssClass: string]: string | number };
+        function defer<T extends Function>(fn: T): T;
+        function enableHtml5Elements(doc: Document | DocumentFragment, withAppend?: boolean): void;
+        function escapeCss(selector: string): string;
+        function eventsBuffer(minInterval: number, output: () => void, scopeObj: any): { input: () => void, reset: () => void };
+        function extend(target: { [key: string]: any }, source: { [key: string]: any }, overwrite: boolean, properties: { [key: string]: any }): { [key: string]: any };
+        function fixDomain(): boolean;
+        function genKey(subKey: string): string;
+        function getCookie(name: string): string;
+        function getCsrfToken(): string;
+        function getIndex<T>(array: T[], compareFunction: (element: T) => boolean): number;
+        function getMouseButton(evt: dom.event): boolean;
+        function getNextId(): string;
+        function getNextNumber(): number;
+        function getUniqueId(): string;
+        function htmlDecode(text: string): string;
+        function htmlDecodeAttr(text: string): string;
+        function htmlEncode(text: string): string;
+        function htmlEncodeAttr(text: string): string;
+        function indexOf<T>(array: T[], value: T | ((el: T) => boolean)): number;
+        function isArray<T>(object: any): object is T[];
+        function isEmpty(object: { [key: string]: any }): boolean;
+        function keystrokeToArray(lang: { [key: string]: any }, keystroke: number): { display: string[], aria: string[] };
+        function keystrokeToString(lang: { [key: string]: any }, keystroke: number): { display: string, aria: string };
+        function ltrim(str: string): string;
+        function normalizeCssText(styleText: string, nativeNormalize: boolean): string;
+        function normalizeHex(styleText: string): string;
+        function objectCompare(left: { [key: string]: any }, right: { [key: string]: any }, onlyLef?: boolean): boolean;
+        function objectKeys(obj: { [key: string]: any }): string[];
+        function override<T extends Function>(originalFunction: T, functionBuilder: (originalFunction: T) => T): T;
+        function parseCssText(styleText: string, normalize?: boolean, nativeNormalize?: boolean): { [key: string]: any };
+        function prototypedCopy(source: { [key: string]: any }): { [key: string]: any };
+        function removeFunction(ref: number): void;
+        function repeat(str: string, times: number): string;
+        function rtrim(str: string): string;
+        function search<T>(array: T[], value: T | ((element: T) => boolean)): T;
+        function setCookie(name: string, value: string): void;
+        function setTimeout(func: Function, milliseconds?: number, scope?: { [key: string]: any }, args?: any, ownerWindow?: Window): number;
+        function transformPlainTextToHtml(text: string, etnerMode: number): string;
+        function trim(str: string): string;
+        function tryThese(fn: Function[]): any;
+        function writeCssText(styles: { [key: string]: any }, sort?: boolean): string;
+
+        namespace array {
+            function every<T>(array: T[], fn: (value: T, index: number, array: T[]) => boolean, thisArg?: { [key: string]: any }): boolean;
+            function filter<T>(array: T[], fn: (value: T, index: number, array: T[]) => boolean, thisArg?: { [key: string]: any }): T[];
+            function forEach<T>(array: T[], fn: (value: T, index: number, array: T[]) => void, thisArg?: { [key: string]: any }): void;
+            function isArray(object: any): boolean;
+            function map<T, K>(array: T[], fn: (value: T) => K, thisArg?: { [key: string]: any }): K[];
+            function reduce<T, K>(array: T[], fn: (accumulator: K, a: T, index: number, array: T[]) => K, initial: K, thisArg?: { [key: string]: any }): K;
+        }
+
+        namespace object {
+            function findKey(obj: { [key: string]: any }, value: any): string;
+            function merge(obj1: { [key: string]: any }, obj2: { [key: string]: any }): { [key: string]: any };
+        }
+
+        namespace style {
+            namespace parse {
+                function background(value: string): { color: string, unprocessed: string };
+                function border(value: string): { width: string, style: string, color: string };
+                function margin(value: string): { top: number, right: number, bottom: number, left: number };
+            }
+        }
+    }
+
+    class ui extends event {
+        constructor(editor: editor);
+        add(name: string, type: { [key: string]: any }, definition: { [key: string]: any }): void;
+        addButton(name: string, definition: buttonDefinition): void;
+        addHandler(type: { [key: string]: any }, handler: { [key: string]: any }): void;
+        addRichCombo(name: string, definition: { [key: string]: any }): void;
+        addToolbarGroup(name: string, previous: number | string, subgroupOf?: string): void;
+        create(name: string): { [key: string]: any };
+        get(name: string): { [key: string]: any };
+        space(name: string): dom.element;
+        spaceId(name: string): string;
+    }
+
+    namespace ui {
+        namespace dialog {
+            class button extends uiElement {
+                constructor(dialog: dialog, elementDefinition: definitions.button, htmlList: any[]);
+
+                accessKeyDown(): void;
+                accessKeyUp(): void;
+                click(): any;
+            }
+
+            class checkbox extends uiElement {
+                constructor(dialog: dialog, elementDefinition: definitions.checkbox, htmlList: any[]);
+
+                accessKeyUp(): void;
+                getValue(): boolean;
+                setValue(checked: boolean, noChangeEvent: boolean): undefined;
+            }
+
+            namespace definitions {
+                interface button {
+                    label: string;
+                    disabled?: boolean;
+                }
+
+                interface checkbox {
+                    checked?: boolean;
+                    validate?: () => boolean;
+                    label?: string;
+                }
+
+                interface fieldSet {
+                    label?: string;
+                    children: any[];
+                }
+
+                interface file {
+                    validate?: () => boolean;
+                }
+
+                interface fileButton {
+                    for: string;
+                    validate?: () => boolean;
+                }
+
+                interface hbox {
+                    widths?: string[];
+                    height?: string;
+                    padding?: string;
+                    align?: string;
+                }
+
+                interface html {
+                    html: string;
+                }
+
+                interface iframeElement {
+                    src: string;
+                    width: string;
+                    height: string;
+                    onContentLoad?: () => void;
+                }
+
+                interface labeledElement {
+                    label: string;
+                    labelLayout?: 'horizontal' | 'vertical';
+                    widths?: [string, string];
+                    role?: string;
+                    includeLabel?: boolean;
+                }
+
+                interface radio {
+                    default: any;
+                    validate?: () => boolean;
+                    items: ([string, string] | [string])[];
+                }
+
+                interface select {
+                    default: any;
+                    validate?: () => boolean;
+                    items: ([string, string] | [string])[];
+                    multiple?: boolean;
+                    size?: number;
+                }
+
+                interface textarea {
+                    rows?: number;
+                    cols?: number;
+                    default?: string;
+                    validate?: () => boolean;
+                }
+
+                interface textInput {
+                    default?: string;
+                    validate?: () => boolean;
+                    maxLength?: number;
+                    size?: string;
+                }
+
+                interface uiElement {
+                    id: string;
+                    type: number;
+                    title?: string;
+                    hidden?: boolean;
+                    className?: string;
+                    style?: string;
+                    accessKey?: string;
+                }
+
+                interface vbox {
+                    width?: string;
+                    heights?: string[];
+                    align?: string;
+                    padding?: string;
+                    expand?: boolean;
+                }
+            }
+
+            class fieldset extends uiElement {
+                constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.fieldSet);
+            }
+
+
+            class file extends ui.dialog.labeledElement {
+                constructor(dialog: dialog, elementDefinition: definitions.file, htmlList: any[]);
+
+                getAction(): string;
+                registerEvents(definition: { [key: string]: any }): file;
+                reset(): void;
+                setInitValue(): void;
+                submit(): file;
+            }
+
+
+            class fileButton extends button {
+                constructor(dialog: dialog, elementDefinition: definitions.fileButton, htmlList: any[]);
+            }
+
+
+            class hbox extends uiElement {
+                constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.hbox);
+
+                getChild(indices: number): ui.dialog.uiElement;
+                getChild(indices: number[]): ui.dialog.uiElement[];
+            }
+
+
+            class html extends uiElement {
+                constructor(dialog: dialog, elementDefinition: definitions.html, htmlList: any[]);
+
+            }
+
+
+            class iframeElement extends uiElement {
+
+            }
+
+
+            class labeledElement extends uiElement {
+                constructor(dialog: dialog, elementDefinition: definitions.labeledElement, htmlList: any[], contentHtml: () => string);
+
+                getLabel(): string;
+                setlabel(label: string): ui.dialog.labeledElement;
+            }
+
+
+            class radio extends ui.dialog.labeledElement {
+                constructor(dialog: dialog, elementDefinition: definitions.radio, htmlList: any[]);
+
+                accessKeyUp(): void;
+                getValue(): string;
+                setValue(value: string, noChangeEvent: boolean): undefined;
+            }
+
+
+            class select extends uiElement {
+                constructor(dialog: dialog, elementDefinition: definitions.select, htmlList: any[]);
+
+                add(label: string, value?: string, indexedDB?: number): select;
+                clear(): select;
+                remove(index: number): select;
+            }
+
+
+            class textarea extends labeledElement {
+                constructor(dialog: dialog, elementDefinition: definitions.textarea, htmlList: any[]);
+            }
+
+
+            class textInput extends ui.dialog.labeledElement {
+                constructor(dialog: dialog, elementDefinition: definitions.textInput, htmlList: any[]);
+
+                accessKeyUp(): void;
+                focus(): undefined;
+                getDirectionMarker(): string;
+                getValue(): string;
+                select(): void;
+                setDirectionMarker(dir: string): void;
+                setValue(value: string, noChangeEvent: boolean): textInput;
+            }
+
+            class uiElement {
+                eventProcessors: any;
+
+                constructor(dialog: dialog, elementDefinition: definitions.uiElement, htmlList: any[], nodeNameArg?: () => string | string, stylesArg?: () => { [key: string]: any } | { [key: string]: any }, attributesArg?: () => { [key: string]: any } | { [key: string]: any }, contentsArg?: () => { [key: string]: any } | string); // Not sure that the htmlList array type is right.
+
+                accessKeyDown(dialog: dialog, key: string): void;
+                accessKeyUp(dialog: dialog, key: string): void;
+                disable(): void;
+                enable(): void;
+                focus(): ui.dialog.uiElement;
+                getDialog(): dialog;
+                getElement(): dom.element;
+                getInputElement(): dom.element;
+                getValue(): any;
+                isChanged(): boolean;
+                isEnabled(): boolean;
+                isFocusable(): boolean;
+                isVisible(): boolean;
+                registerEvents(definition: CKEDITOR.dialog.definition.uiElement): ui.dialog.uiElement;
+                selectParentTab(): ui.dialog.uiElement;
+                setValue(value: any, noChangeEvent: boolean): ui.dialog.uiElement;
+            }
+
+            class vbox extends hbox {
+                constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.vbox);
+            }
+        }
+
+        class balloonPanel {
+            activeShowListeners: { [id: number]: { removeListener: listenerRegistration } };
+            editor: editor;
+            focusables: { [id: number]: dom.element };
+            height: string;
+            parts: balloonPanel.parts;
+            rect: balloonPanel.rect;
+            showListeners: { [id: number]: () => listenerRegistration };
+            templateDefinitions: balloonPanel.templateDefinitions;
+            templates: balloonPanel.templates;
+            triangleHeight: number;
+            triangleMinDistance: number;
+            triangleWidth: number;
+            width: number;
+
+            activeShowListener(id: number): void;
+            activateShowListeners(): void;
+            addShowListener(listener: () => listenerRegistration): listenerRegistration;
+            attach(element: dom.element, options?: dom.element | boolean | { focusElement?: dom.element | boolean, show?: boolean }): void;
+            blur(): void;
+            build(): void;
+            deactivateShowListener(id: number): void;
+            deregisterFocusable(element: dom.element): void;
+            destroy(): void;
+            getHeight(): number;
+            getWidth(): number;
+            hide(): void;
+            move(top: number, left: number): void;
+            registerFocusable(element: dom.element): void;
+            removeShowListener(id: number): void;
+            resize(width: number, height: number): void;
+            setTitle(title: string): void;
+            setTriangle(side: 'left' | 'right' | 'top' | 'bottom'): void;
+            show(): void;
+        }
+
+        namespace balloonPanel {
+            interface definition {
+                content?: string;
+                title?: string;
+            }
+
+            interface templates {
+                close?: template;
+                content?: template;
+                panel?: template;
+                title?: template;
+                triangle?: template;
+                triangleInner?: template;
+                triangleOuter?: template;
+            }
+
+            interface templateDefinitions {
+                close?: string;
+                content?: string;
+                panel?: string;
+                title?: string;
+                triangle?: string;
+                triangleInner?: string;
+                triangleOuter?: string;
+            }
+
+            interface rect {
+                height?: number;
+                left?: number;
+                top?: number;
+                visible?: boolean;
+                width?: number;
+            }
+
+            interface parts {
+                close?: dom.element;
+                content?: dom.element;
+                panel?: dom.element;
+                title?: dom.element;
+                triangle?: dom.element;
+                triangleInner?: dom.element;
+                triangleOuter?: dom.element;
+            }
+        }
+
+        class balloonToolbar {
+            constructor(editor: editor, definition: { [key: string]: any });
+            addItem(name: string, element: button | richCombo): void;
+            addItems(elements: { [itemName: string]: button | richCombo }): void;
+            deleteItem(name: string): void;
+            destroy(): void;
+            getItem(name: string): button | richCombo;
+            hide(): void;
+            refresh(): void;
+            show(): void;
+        }
+
+        class button {
+            static readonly handler: handlerDefinition<button>;
+
+            constructor(definition: { [key: string]: any });
+            getState(): number;
+            render(editor: editor, output: string[]): void;
+            setState(state: number): void;
+            toFeature(editor: editor): feature;
+        }
+
+        class floatPanel {
+            constructor(editor: editor, parentElement: dom.element, definition: { [key: string]: any }, level: number);
+            addBlock(name: string, block: { [key: string]: any }): void;
+            addListBlock(name: string, multiSelect: boolean): void;
+            allowBlur(allow: boolean): void;
+            blur(): void;
+            focus(): void;
+            getBlock(name: string): panel.block;
+            hide(returnFocus: boolean): void;
+            hideChild(restoreFocus: boolean): void;
+            reposition(): void;
+            showAsChild(panel: floatPanel, blckName: string, offsetParent: dom.element, corner: number, offsetX?: number, offsetY?: number): void;
+            showBlock(name: string, offsetParent: dom.element, corner: number, offsetX?: number, offsetY?: number, callback?: () => void): void;
+        }
+
+        class handlerDefinition<T> {
+            contentsElement: dom.element;
+            create(definition: { [key: string]: any }): T;
+        }
+
+        class menuButton extends button {
+
+        }
+
+        class panel {
+            constructor(document: dom.document, definition: { [key: string]: any });
+            addBlock(name: string, block: { [key: string]: any }): void;
+            getBlock(name: string): panel.block;
+            render(editor: editor, output?: string[]): void;
+            showBlock(name: string): void;
+        }
+
+        namespace panel {
+            class block {
+                getItems(): dom.nodeList;
+                markItem(index: number): void;
+            }
+
+            const handler: handlerDefinition<panel>;
+        }
+
+        class panelButton extends button {
+
+        }
+
+        class richCombo {
+            static readonly handler: handlerDefinition<richCombo>;
+            render(editor: editor, output: string[]): void;
+        }
+    }
+
+    class xml {
+        baseXml: any;
+
+        constructor(xmlObjectOrData: any);
+        getInnerXml(xpath: string, contextNode?: any): string;
+        selectNodes(xpath: string, contextNode?: any): any[];
+        selectSingleNode(xpath: string, contextNode?: any): any;
+    }
+
+    interface toolbarGroups {
+        name?: string;
+        groups?: string[];
+    }
+
+    namespace config {
+        interface styleObject {
+            name?: string;
+            element: string;
+            attributes?: { [key: string]: any };
+            styles?: { [key: string]: any };
+            overrides?: { [key: string]: any };
+        }
+    }
+
+    interface sharedSpace {
+        top?: string | HTMLElement;
+        bottom?: string | HTMLElement;
+    }
+
+    interface IMenuItemDefinition {
+        label: string,
+        command: string,
+        icon: string
+        group: string,
+        order: number
+    }
+
+    interface buttonDefinition {
+        icon?: string;
+        iconOffset?: number;
+        label: string;
+        command: string;
+        toolbar: string;
+    }
+}

From e0a4324ff151b716c8ada2acae79b1baf9543432 Mon Sep 17 00:00:00 2001
From: stuartlo <stuartlo@microsoft.com>
Date: Wed, 23 May 2018 16:51:41 -0700
Subject: [PATCH 385/575] Moved old types to v2

---
 types/ckeditor/ckeditor-tests.ts    | 1214 ------------
 types/ckeditor/index.d.ts           | 2770 ---------------------------
 types/ckeditor/v2/ckeditor-tests.ts |  600 ++++++
 types/ckeditor/v2/index.d.ts        | 1949 +++++++++++++++++++
 types/ckeditor/v2/tsconfig.json     |   24 +
 types/ckeditor/v2/tslint.json       |   79 +
 6 files changed, 2652 insertions(+), 3984 deletions(-)
 delete mode 100644 types/ckeditor/ckeditor-tests.ts
 delete mode 100644 types/ckeditor/index.d.ts
 create mode 100644 types/ckeditor/v2/ckeditor-tests.ts
 create mode 100644 types/ckeditor/v2/index.d.ts
 create mode 100644 types/ckeditor/v2/tsconfig.json
 create mode 100644 types/ckeditor/v2/tslint.json

diff --git a/types/ckeditor/ckeditor-tests.ts b/types/ckeditor/ckeditor-tests.ts
deleted file mode 100644
index acc23ae096..0000000000
--- a/types/ckeditor/ckeditor-tests.ts
+++ /dev/null
@@ -1,1214 +0,0 @@
-
-
-function test_CKEDITOR() {
-    CKEDITOR.basePath = 'test';
-    CKEDITOR.replaceClass = 'rich_editor';
-    CKEDITOR.skinName = 'moono';
-    CKEDITOR.skinName = 'myskin,/customstuff/myskin/';
-    var editor = new CKEDITOR.editor();
-    if (editor.getSelection(true).getType() == CKEDITOR.SELECTION_ELEMENT)
-        if (editor.getSelection(false).getType() == CKEDITOR.SELECTION_NONE)
-            if (editor.getSelection(true).getType() == CKEDITOR.SELECTION_TEXT)
-                alert(CKEDITOR.basePath);
-    if (CKEDITOR.currentInstance)
-        alert(CKEDITOR.currentInstance.name);
-    alert(CKEDITOR.document.getBody().getName());
-    alert(CKEDITOR.instances[0].name);
-    CKEDITOR.loadFullCoreTimeout = 5;
-    alert(CKEDITOR.revision);
-    alert(CKEDITOR.rnd);
-    if (CKEDITOR.status == 'loaded') {
-        CKEDITOR.loadFullCore();
-    }
-    alert(CKEDITOR.timestamp);
-    CKEDITOR.addCss('.cke_editable h1,.cke_editable h2,.cke_editable h3 { border-bottom: 1px dotted red }');
-    CKEDITOR.appendTo('editorSpace');
-    alert(CKEDITOR.getUrl('skins/default/editor.css'));
-    alert(CKEDITOR.getUrl('/skins/default/editor.css'));
-    alert(CKEDITOR.getUrl('http://www.somesite.com/skins/default/editor.css'));
-    CKEDITOR.inline('content');
-    if (CKEDITOR.loadFullCore)
-        CKEDITOR.loadFullCore();
-    CKEDITOR.replace('myfield');
-    var textarea = document.createElement('textarea');
-    CKEDITOR.replace(textarea);
-    CKEDITOR.replaceAll();
-    CKEDITOR.replaceAll('myClassName');
-    CKEDITOR.replaceAll((textarea, config) => false);
-
-    var editor: CKEDITOR.editor = CKEDITOR.appendTo('append here', CKEDITOR.config, 'data');
-    var editor: CKEDITOR.editor = CKEDITOR.appendTo(document.createElement('div'));
-    CKEDITOR.error('code');
-    CKEDITOR.error('500', { moreData: true });
-    CKEDITOR.warn('danger');
-    CKEDITOR.warn('303', 12345);
-}
-
-function test_CKEDITOR_events() {
-    CKEDITOR.on('instanceCreated', function(event) {
-        // $ExpectType editor
-        event.editor;
-    });
-}
-
-function test_config() {
-    var config1: CKEDITOR.config = {
-        toolbar: 'basic',
-    };
-    var config2: CKEDITOR.config = {
-        toolbar: [
-            [ 'mode', 'document', 'doctools' ],
-            [ 'clipboard', 'undo' ],
-            '/',
-            [ 'find', 'selection', 'spellchecker' ],
-            [ 'basicstyles', 'cleanup' ],
-            '/',
-            [ 'list', 'indent', 'blocks', 'align', 'bidi' ],
-        ],
-    };
-    var config3: CKEDITOR.config = {
-        toolbarGroups: [
-            { name: 'clipboard', groups: [ 'clipboard', 'undo' ] },
-            { name: 'editing', groups: [ 'find', 'selection', 'spellchecker', 'editing' ] },
-            { name: 'links', groups: [ 'links' ] },
-            { name: 'insert', groups: [ 'insert' ] },
-            { name: 'tools', groups: [ 'tools' ] },
-            { name: 'document', groups: [ 'mode' ] },
-            { name: 'about', groups: [ 'about' ] },
-            '/',
-            { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
-            { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'paragraph' ] },
-            '/',
-            { name: 'styles', groups: [ 'styles' ] },
-            { name: 'colors', groups: [ 'colors' ] },
-        ],
-    }
-}
-
-function test_dom_comment() {
-    var type = CKEDITOR.NODE_COMMENT;
-    var nativeNode = document.createComment('Example');
-    var comment = new CKEDITOR.dom.comment(nativeNode);
-    var comment2 = new CKEDITOR.dom.comment('Example');
-    var comment3 = new CKEDITOR.dom.comment('Example', new CKEDITOR.dom.document(document));
-    var html: string = comment.getOuterHtml();
-}
-
-function test_dom_document() {
-    var document = new CKEDITOR.dom.document(window.document);
-    var type = CKEDITOR.NODE_DOCUMENT;
-    CKEDITOR.document.appendStyleSheet('/mystyles.css');
-    var element = CKEDITOR.document.getBody();
-    alert(element.getName());
-    var element2 = CKEDITOR.document.getById('myElement');
-    alert(element.getId());
-    var element3 = CKEDITOR.document.getHead();
-    alert(element.getName());
-    var selection = CKEDITOR.instances[0].document.getSelection();
-    alert(selection.getType());
-    document.write(
-        '<html>' +
-        '<head><title>Sample Doc</title></head>' +
-        '<body>Document contents created by code</body>' +
-        '</html>'
-        );
-    var styles: CSSStyleSheet = document.appendStyleText('some styles');
-    var element: CKEDITOR.dom.element = document.createElement('div');
-    var element2: CKEDITOR.dom.element = document.createElement('div', { styles: { height: '1234' } });
-    var element3: CKEDITOR.dom.element = document.createElement('div', { attributes: { id: '1234' } });
-    var element4: CKEDITOR.dom.element = document.createElement('div', { attributes: { tabIndex: '1234' }, styles: { width: '1234' } });
-}
-
-function test_dom_documentFragment() {
-    var type = CKEDITOR.NODE_DOCUMENT_FRAGMENT;
-    alert(new CKEDITOR.dom.documentFragment(document.body).type === type);
-}
-
-function test_dom_domObject() {
-    var element = new CKEDITOR.dom.element('span');
-    alert(element.$.nodeType);
-    var nativeElement = element.$;
-    var doc = new CKEDITOR.dom.document(document);
-    alert(doc.equals(CKEDITOR.document));
-    alert(doc == CKEDITOR.document);
-    var element2 = new CKEDITOR.dom.element('span');
-    alert(element.getCustomData('hasCustomData'));
-    alert(element.getCustomData('nonExistingKey'));
-    var elementA = new CKEDITOR.dom.element(nativeElement);
-    elementA.getPrivate().value = 1;
-    var elementB = new CKEDITOR.dom.element(nativeElement).getPrivate().value;
-    var element3 = new CKEDITOR.dom.element('span');
-    element.setCustomData('hasCustomData', true);
-
-    var domObject = new CKEDITOR.dom.domObject(document.createElement('div'));
-}
-
-function test_dom_element() {
-    var element = new CKEDITOR.dom.element('span');
-    alert(element.$.nodeType);
-    element.addClass('classA');
-    element.addClass('classB');
-    element.addClass('classA');
-    var p = new CKEDITOR.dom.element('p');
-    var strong = new CKEDITOR.dom.element('strong');
-    p.append(strong);
-    var em = p.append('em');
-    var p = new CKEDITOR.dom.element('p');
-    p.appendText('This is');
-    p.appendText(' some text');
-    element.breakParent(strong);
-    element.data('extra-info', 'test');
-    alert(element.data('extra-info'));
-    element.data('extra-info', false);
-    var element5 = CKEDITOR.document.getById('myTextarea');
-    element.focus();
-    element.focusNext();
-    element.focusPrevious();
-    element.forEach(node=> {
-        console.log(node);
-    });
-    var element2 = CKEDITOR.dom.element.createFromHtml('<input type="text" />');
-    alert(element.getAttribute('type'));
-    alert(element.getComputedStyle('display'));
-    element.appendTo(CKEDITOR.document.getBody());
-    alert(element.getEditor().name);
-    var first = element.getFirst();
-    var first2 = element.getFirst((node: CKEDITOR.dom.node) => node.equals(document.body));
-    alert(element.getHtml());
-    alert(element.getId());
-    alert(element.getName());
-    alert('<b>' + element.getNameAtt() + '</b>');
-    alert(element.getOuterHtml());
-    alert(element.getTabIndex());
-    alert(element.getText());
-    alert(element.hasAttributes());
-    alert(element.hasAttributes());
-    element.hide();
-    alert(element.is('span'));
-    alert(element.is('p', 'span'));
-    alert(element.is('p'));
-    alert(element.is('p', 'div'));
-    alert(element.is({ p: 1, span: 1 }));
-    element.removeAttribute('class');
-    element.addClass('classA');
-    element.addClass('classB');
-    element.removeClass('classA');
-    element.removeClass('classB');
-    element.removeStyle('display');
-    element.setAttribute('class', 'myClass');
-    element.setAttribute('title', 'This is an example');
-    element.setAttributes({
-        'class': 'myClass',
-        title: 'This is an example'
-    });
-    p.setHtml('<b>Inner</b> HTML');
-    element.setOpacity(0.75);
-    element.setStyle('background-color', '#ff0000');
-    element.setStyle('margin-top', '10px');
-    element.setStyle('float', 'right');
-    element.setStyles({
-        position: 'absolute',
-        float: 'right'
-    });
-    element.setText('A > B & C < D');
-    element.show();
-    element.unselectable();
-    alert(element.getName());
-    alert(element == CKEDITOR.dom.element.get(element));
-    var htmlElement = document.getElementById('myElement');
-    alert(CKEDITOR.dom.element.get(htmlElement).getName());
-
-    var dtd: CKEDITOR.dtdDefinition = element.getDtd();
-    var last: CKEDITOR.dom.node = element.getLast();
-    var last2: CKEDITOR.dom.node = element.getLast((node: CKEDITOR.dom.node) => node.equals(document.body));
-    if (element.isBlockBoundary({ 'div': 1, 'span': 1 })) {
-        element.setState(1, 'hex', false);
-    }
-
-    CKEDITOR.dom.element.clearMarkers({}, element, true);
-    var element1: CKEDITOR.dom.element = CKEDITOR.dom.element.get('div');
-    var element2: CKEDITOR.dom.element = CKEDITOR.dom.element.get(document.createElement('div'));
-    var element3: CKEDITOR.dom.element = CKEDITOR.dom.element.get(element2);
-    var markedElement: CKEDITOR.dom.element = CKEDITOR.dom.element.setMarker({}, element, 'key', 0);
-}
-
-function test_dom_elementPath() {
-    var path: CKEDITOR.dom.elementPath = new CKEDITOR.dom.elementPath(CKEDITOR.dom.element.get('div'));
-    var path2: CKEDITOR.dom.elementPath = new CKEDITOR.dom.elementPath(CKEDITOR.dom.element.get('div'), CKEDITOR.dom.element.get(document.body));
-
-    var dir: 'ltr' | 'rtl' = path.direction();
-}
-
-function test_dom_event() {
-    var event = new CKEDITOR.dom.event(new Event(""));
-    alert(event.getKey());
-    alert(event.getKeystroke() == 65);
-    alert(event.getKeystroke() == CKEDITOR.CTRL + 65);
-    alert(event.getKeystroke() == CKEDITOR.CTRL + CKEDITOR.SHIFT + 65);
-    var element = new CKEDITOR.dom.element('div');
-    element.on('mousemouse', ev=> {
-        var pageOffset = ev.data.getPageOffset();
-        alert(pageOffset.x);
-        alert(pageOffset.y);
-    });
-    element.on('click', ev=> {
-        var domEvent = ev.data;
-        domEvent.getTarget().addClass('clicked');
-    });
-    element.on('click', ev=> {
-        var domEvent = ev.data as CKEDITOR.dom.event;
-        domEvent.preventDefault();
-    });
-}
-
-function test_dom_iterator() {
-    var range = new CKEDITOR.dom.range(new CKEDITOR.dom.element('div'));
-    var iterator = range.createIterator();
-    var paragrah1: CKEDITOR.dom.element = iterator.getNextParagraph();
-    var paragrah2: CKEDITOR.dom.element = iterator.getNextParagraph('div');
-    alert(iterator.forceBrBreak === false);
-    var itRange: CKEDITOR.dom.range = iterator.range;
-}
-
-function test_dom_node() {
-    var p = new CKEDITOR.dom.element('p');
-    var strong = new CKEDITOR.dom.element('strong');
-    strong.appendTo(p);
-    var node = new CKEDITOR.dom.node(new Node());
-    node = node.getAscendant('b');
-    node = node.getAscendant('b', true);
-    var element = CKEDITOR.document.getById('example');
-    alert(element.getDocument().equals(CKEDITOR.document));
-    element.getIndex();
-    element.getIndex(true);
-    var last = element.getFirst().getNext();
-    var parent = node.getParent();
-    alert(parent.getName());
-    var parents = node.getParents();
-    var em = new CKEDITOR.dom.element('em');
-    strong.insertAfter(em);
-    strong.insertBefore(em);
-    strong.insertBeforeMe(em);
-    element.isReadOnly();
-}
-
-function test_dom_nodeList() {
-    var nodeList = CKEDITOR.document.getBody().getChildren();
-    alert(nodeList.count());
-    var nodes: CKEDITOR.dom.node[] = nodeList.toArray();
-}
-
-function test_dom_range() {
-    var editor = new CKEDITOR.editor();
-    var range = new CKEDITOR.dom.range(editor.document);
-    range.selectNodeContents(editor.document.getBody());
-    range.deleteContents();
-    range.selectNodeContents(editor.document.getBody());
-    alert(range.collapsed);
-    range.collapse();
-    alert(range.collapsed);
-    range.selectNodeContents(range.document.getBody());
-    range.selectNodeContents(editor.document.getBody());
-    alert(range.endContainer.getPrivate());
-    range.selectNodeContents(editor.document.getBody());
-    alert(range.endOffset);
-    range.selectNodeContents(editor.document.getBody());
-    alert(range.startContainer.getDocument());
-    range.selectNodeContents(editor.document.getBody());
-    alert(range.startOffset);
-}
-
-function test_dom_selection() {
-    var element: CKEDITOR.dom.element = CKEDITOR.dom.element.get('div');
-    var selection: CKEDITOR.dom.selection = new CKEDITOR.dom.selection(new CKEDITOR.dom.document(document));
-    selection = new CKEDITOR.dom.selection(element);
-    selection = new CKEDITOR.dom.selection(selection);
-
-    var marks: CKEDITOR.dom.bookmark[] = selection.createBookmarks('serialized');
-    var marks2: CKEDITOR.dom.bookmark2[] = selection.createBookmarks2({ normalized: true });
-    selection.fake(element);
-    selection.fake(element, true);
-    element = selection.getCommonAncestor();
-    var domSel: Selection = selection.getNative();
-    var ranges: CKEDITOR.dom.range[] = selection.getRanges();
-    ranges = selection.getRanges(true);
-    element = selection.getSelectedElement();
-    var text: string = selection.getSelectedText();
-    element = selection.getStartElement();
-    
-    var type: number = selection.getType();
-
-    var isSomething: boolean = selection.isCollapsed();
-    isSomething = selection.isHidden();
-    isSomething = selection.isInTable();
-    isSomething = selection.isInTable(false);
-
-    selection.lock();
-    selection.removeAllRanges();
-    selection.reset();
-    selection.removeAllRanges();
-    selection.reset();
-    selection.scrollIntoView();
-    selection = selection.selectBookmarks(marks);
-    selection = selection.selectBookmarks(marks2);
-    selection.selectElement(element);
-    selection.selectRanges(ranges);
-    selection.unlock(false);
-}
-
-function test_dom_walker() {
-    var element: CKEDITOR.dom.element = CKEDITOR.dom.element.get('div');
-    var range: CKEDITOR.dom.range = new CKEDITOR.dom.range(element);
-
-    var walker: CKEDITOR.dom.walker = new CKEDITOR.dom.walker(range);
-    
-    var isSomething: boolean = walker.checkBackward();
-    isSomething = walker.checkForward();
-    walker.end();
-    
-    var node: CKEDITOR.dom.node = walker.lastBackward();
-    node = walker.lastForward();
-    node = walker.next();
-    node = walker.previous();
-    walker.reset();
-
-    isSomething = CKEDITOR.dom.walker.blockBoundary({ 'div': 1 })(node);
-    isSomething = CKEDITOR.dom.walker.bogus()(node);
-    isSomething = CKEDITOR.dom.walker.bogus(isSomething)(node);
-    isSomething = CKEDITOR.dom.walker.bookmark()(node);
-    isSomething = CKEDITOR.dom.walker.bookmark(true)(node);
-    isSomething = CKEDITOR.dom.walker.bookmark(true, false)(node);
-    isSomething = CKEDITOR.dom.walker.editable()(node);
-    isSomething = CKEDITOR.dom.walker.editable(isSomething)(node);
-    isSomething = CKEDITOR.dom.walker.empty()(node);
-    isSomething = CKEDITOR.dom.walker.empty(true)(node);
-    isSomething = CKEDITOR.dom.walker.ignored()(node);
-    isSomething = CKEDITOR.dom.walker.ignored(true)(node);
-    isSomething = CKEDITOR.dom.walker.listItemBoundary()(node);
-    isSomething = CKEDITOR.dom.walker.nodeType(0)(node);
-    isSomething = CKEDITOR.dom.walker.nodeType(1, true)(node);
-    isSomething = CKEDITOR.dom.walker.temp()(node);
-    isSomething = CKEDITOR.dom.walker.temp(isSomething)(node);
-    isSomething = CKEDITOR.dom.walker.whitespaces()(node);
-    isSomething = CKEDITOR.dom.walker.whitespaces(isSomething)(node);
-}
-
-function test_dom_text() {
-    var nativeNode = document.createTextNode('Example');
-    var text = new CKEDITOR.dom.text(nativeNode);
-    var text2 = new CKEDITOR.dom.text('Example');
-    text.substring(1, 2);
-    text.substring(1);
-}
-
-function test_dom_window() {
-    var document = new CKEDITOR.dom.window(window);
-    var win = new CKEDITOR.dom.window(window);
-    var pos = win.getScrollPosition();
-    alert(pos.x);
-    alert(pos.y);
-    var size = win.getViewPaneSize();
-    alert(size.width);
-    alert(size.height);
-
-    var frame: CKEDITOR.dom.element = win.getFrame();
-    win.focus();
-}
-
-function test_ajax() {
-    var req: string = CKEDITOR.ajax.load('https://ckeditor.com/ckeditor-4/');
-    req = CKEDITOR.ajax.load('https://ckeditor.com/ckeditor-4/', (data: any) => console.log(data));
-
-    var xml: CKEDITOR.xml = CKEDITOR.ajax.loadXml('https://ckeditor.com/ckeditor-4/');
-    xml = CKEDITOR.ajax.loadXml('https://ckeditor.com/ckeditor-4/', (data: any) => console.log(data));
-
-    CKEDITOR.ajax.post('https://ckeditor.com/ckeditor-4/', {});
-    CKEDITOR.ajax.post('https://ckeditor.com/ckeditor-4/', {}, 'html');
-    CKEDITOR.ajax.post('https://ckeditor.com/ckeditor-4/', {}, 'text', (data: any) => console.log(data));
-}
-
-function test_dataProcessor() {
-    var processor: CKEDITOR.dataProcessor;
-    processor.toDataFormat('html', 'fix');
-    processor.toHtml('data');
-    processor.toHtml('data', 'fix');
-}
-
-function test_dialog() {
-    var dialog: CKEDITOR.dialog = new CKEDITOR.dialog(CKEDITOR.instances[0], 'dialog');
-
-    var element: CKEDITOR.dom.element = CKEDITOR.dom.element.get('div');
-    dialog.addFocusable(element);
-    dialog.addFocusable(element, 13);
-    dialog.addPage({ some: true, object: false });
-    var ret = dialog.click('1234');
-    dialog.commitContent();
-    dialog.disableButton('some button');
-    dialog.enableButton('4321');
-    dialog = dialog.foreach(() => console.log('hey'));
-
-    var button: CKEDITOR.ui.dialog.button = dialog.getButton('button1');
-    var uiEl: CKEDITOR.ui.dialog.uiElement = dialog.getContentElement('page1', 'element1');
-    element = dialog.getElement();
-    var str: string = dialog.getName();
-    var numb: number = dialog.getPageCount();
-    var editor: CKEDITOR.editor = dialog.getParentEditor();
-    var obj: { [key: string]: any } = dialog.getPosition();
-    element = dialog.getSelectedElement();
-    obj = dialog.getSize();
-    obj = dialog.getValueOf('page1', 'ele1');
-    dialog.hide();
-    dialog.hidePage('1234');
-    dialog.layout();
-    dialog.move(1, 2, true);
-    dialog = dialog.reset();
-    dialog.resize(numb, numb);
-    dialog.selectPage('1');
-    dialog.setState(4);
-    dialog.setValueOf('page1', 'ele1', false);
-    dialog.setupContent();
-    dialog.show();
-    dialog.showPage('1234');
-    dialog.updateStyle();
-
-    CKEDITOR.dialog.add( 'abbrDialog', this.path + 'dialogs/abbr.js' );
-    CKEDITOR.dialog.add( 'abbrDialog', function ( editor: CKEDITOR.editor ) {
-        return {
-            title: 'Abbreviation Properties',
-            minWidth: 400,
-            minHeight: 200,
-            onLoad: () => {},
-            onOk: () => {},
-            onCancel: () => {},
-            onShow: () => {},
-            onHide: () => {},
-            contents: [
-                {
-                    id: 'tab-basic',
-                    label: 'Basic Settings',
-                    elements: <any[]>[]
-                },
-                {
-                    id: 'tab-adv',
-                    label: 'Advanced Settings',
-                    elements: []
-                }
-            ]
-        };
-    });
-
-    CKEDITOR.dialog.addIframe('frame', 'frame', 1234, 4321);
-    CKEDITOR.dialog.addIframe('frame', 'frame', 1234, 4321, () => console.log('loaded'));
-    CKEDITOR.dialog.addIframe('frame', 'frame', 1234, 4321, () => console.log('loaded'), obj);
-
-    CKEDITOR.dialog.addUIElement('node', () => console.log('build'));
-    CKEDITOR.dialog.cancelButton();
-    CKEDITOR.dialog.exists('dialog1');
-    CKEDITOR.dialog.exists(1234);
-    dialog = CKEDITOR.dialog.getCurrent();
-
-    var isEnabled: boolean = CKEDITOR.dialog.isTabEnabled(editor, 'dialog', 'table');
-
-    CKEDITOR.dialog.okButton();
-}
-
-function test_editable() {
-    var element: CKEDITOR.dom.element;
-    var editor: CKEDITOR.editor;
-
-    var editable: CKEDITOR.editable = new CKEDITOR.editable(editor, element);
-    editable = new CKEDITOR.editable(editor, document.createElement('div'));
-
-    editable.attachClass('class');
-    editable.attachListener(editable, 'event', (evt: CKEDITOR.eventInfo) => console.log('listen')).removeListener();
-    editable.attachListener(new CKEDITOR.event(), 'event', (evt: CKEDITOR.eventInfo) => console.log('listen')).removeListener();
-    editable.attachListener(new CKEDITOR.event(), 'event', (evt: CKEDITOR.eventInfo) => console.log('listen'), { scope: 'object' }).removeListener();
-    editable.attachListener(editable, 'event', (evt: CKEDITOR.eventInfo) => console.log('listen'), { scope: 'object' }, 'data').removeListener();
-    editable.attachListener(editable, 'event', (evt: CKEDITOR.eventInfo) => console.log('listen'), { scope: 'object' }, 'data', 1).removeListener();
-
-    editable.changeAttr('attr', 'val');
-    editable.detach();
-
-    var range: CKEDITOR.dom.range;
-    editable.insertElement(element);
-    editable.insertElement(element, range);
-    editable.insertHtml('data');
-    editable.insertHtml('data', 'mode');
-    editable.insertHtml('data', 'mode', range);
-    editable.insertText(new CKEDITOR.dom.text('text'));
-
-    var inline: boolean = editable.isInline();
-    editable.setReadOnly(inline);
-}
-
-function test_fileTools() {
-    var editor: CKEDITOR.editor;
-    var def: CKEDITOR.fileTools.uploadWidgetDefinition;
-    var loader: CKEDITOR.fileTools.fileLoader;
-    var blob: Blob;
-    var element: CKEDITOR.dom.element;
-
-    CKEDITOR.fileTools.addUploadWidget(editor, 'editor', def);
-    CKEDITOR.fileTools.bindNotification(editor, loader);
-    var url: string = CKEDITOR.fileTools.getUploadUrl({ some: 'object' });
-    url = CKEDITOR.fileTools.getUploadUrl({ some: 'object' }, 'type');
-
-    var supported = CKEDITOR.fileTools.isTypeSupported(blob, /regex/);
-    CKEDITOR.fileTools.markElement(element, 'name', 45);
-}
-
-function test_fileTools_fileLoader() {
-    var editor: CKEDITOR.editor;
-    var def: CKEDITOR.fileTools.uploadWidgetDefinition;
-    var blob: Blob;
-    var element: CKEDITOR.dom.element;
-
-    var loader: CKEDITOR.fileTools.fileLoader = new CKEDITOR.fileTools.fileLoader(editor, 'data');
-    loader = new CKEDITOR.fileTools.fileLoader(editor, blob);
-    loader = new CKEDITOR.fileTools.fileLoader(editor, blob, 'name');
-    
-    loader.abort();
-    var finished: boolean = loader.isFinished();
-    loader.load();
-    loader.loadAndUpload('url');
-    loader.loadAndUpload('url', { someHeader: '1234' });
-
-    loader.update();
-    loader.upload('url');
-    loader.upload('url', { someHeader: '1234' });
-}
-
-function test_fileTools_uploadRepository() {
-    var editor: CKEDITOR.editor;
-    var blob: Blob;
-    var repo: CKEDITOR.fileTools.uploadRepository = new CKEDITOR.fileTools.uploadRepository(editor);
-    
-    var loader: CKEDITOR.fileTools.fileLoader = repo.create('data', 'name');
-    loader = repo.create(blob, 'name', 'type');
-
-    var fin: boolean = loader.isFinished();
-}
-
-function test_filter() {
-    var editor: CKEDITOR.editor;
-    var style: CKEDITOR.style;
-
-    var filter: CKEDITOR.filter = new CKEDITOR.filter(editor);
-    filter = new CKEDITOR.filter('rule');
-    filter = new CKEDITOR.filter(style);
-    filter = new CKEDITOR.filter([ style, 'rule', [ style, 'rule' ] ]);
-    filter = CKEDITOR.filter.instances['1234'];
-
-    filter.addContentForms([ { form: true } ]);
-    filter.addElementCallback((el: CKEDITOR.htmlParser.element) => 4);
-    filter.addFeature({ allowedContent: style });
-    filter.addTransformations([ [ 'transform1', { right: (element: CKEDITOR.htmlParser.element, tools: string | CKEDITOR.filter.transformationTools) => true } ] ]);
-    
-    var allowed: boolean = filter.allow(style);
-    allowed = filter.allow([style], 'name');
-    allowed = filter.allow('rule', 'name', false);
-
-    var apply: boolean = filter.applyTo(CKEDITOR.htmlParser.fragment.fromHtml('string'), true, false, 1);
-    apply = filter.applyTo(new CKEDITOR.htmlParser.element('name', null), true, false, 1);
-
-    var checked: boolean = filter.check(style);
-    checked = filter.check('rule', true);
-    checked = filter.check(style, false, true);
-
-    checked = filter.checkFeature({ allowedContent: style });
-
-    filter = filter.clone();
-    filter.destroy();
-    filter.disable();
-
-    filter.disallow(filter.disallowedContent);
-    var mode: number = filter.getAllowedEnterMode(1);
-    mode = filter.getAllowedEnterMode(1, false);
-}
-
-function test_focusManager() {
-    var textarea = document.createElement('textarea');
-    var instance = CKEDITOR.replace(textarea);
-    var element = CKEDITOR.document.getById('myElement');
-
-    instance.focusManager.focus();
-    instance.focusManager.focus(element);
-    instance.focusManager.lock();
-    instance.focusManager.unlock();
-    instance.focusManager.blur();
-    instance.focusManager.blur(true);
-    instance.focusManager.add(element, true);
-    instance.focusManager.remove(element);
-
-    var focusManager = new CKEDITOR.focusManager(CKEDITOR.instances[0]);
-    var object: CKEDITOR.dom.domObject = focusManager.currentActive;
-    var bool: boolean = focusManager.hasFocus;
-}
-
-
-function test_htmlParser_basicWriter() {
-    var writer = new CKEDITOR.htmlParser.basicWriter();
-    writer.attribute('class', 'MyClass');
-    writer.closeTag('p');
-    writer.comment('hello');
-    alert(writer.getHtml(true)); // '<p class="MyClass">Hello</p>'
-    writer.openTag('p', {});
-    writer.openTagClose('p', false);
-    writer.reset();
-    writer.text('Hello');
-    writer.write('data');
-}
-
-function test_htmlParser_cdata() {
-    var cdata: CKEDITOR.htmlParser.cdata = new CKEDITOR.htmlParser.cdata('hey');
-    cdata.writeHtml(new CKEDITOR.htmlParser.basicWriter());
-}
-
-function test_htmlParser_comment() {
-    var filter: CKEDITOR.htmlParser.filter;
-    var comment: CKEDITOR.htmlParser.comment = new CKEDITOR.htmlParser.comment('hey');
-    var filtered: boolean = comment.filter(filter);
-    comment.writeHtml(new CKEDITOR.htmlParser.basicWriter());
-    comment.writeHtml(new CKEDITOR.htmlParser.basicWriter(), filter);
-}
-
-function test_htmlParser_cssStyle() {
-    var element: CKEDITOR.htmlParser.element;
-
-    var style: CKEDITOR.htmlParser.cssStyle = new CKEDITOR.htmlParser.cssStyle(element);
-    style = new CKEDITOR.htmlParser.cssStyle('styles');
-
-    style.populate(element);
-    style.populate(new CKEDITOR.dom.element('div'));
-    style.populate({ 'width': 1 });
-}
-
-function test_htmlParser_element() {
-    var element: CKEDITOR.htmlParser.element = new CKEDITOR.htmlParser.element('el', { 'id': '1'});
-    
-    var node: CKEDITOR.htmlParser.node;
-    element.add(node);
-    element.add(node, 5);
-    element.addClass('class');
-    element = element.clone();
-
-    var filter: CKEDITOR.htmlParser.filter;
-    var filtered: boolean = element.filter(filter);
-    element.filterChildren(filter);
-
-    var nodes: CKEDITOR.htmlParser.node[] = element.find('*');
-    nodes = element.find((el: CKEDITOR.htmlParser.node) => false, true);
-
-    element.forEach((el: CKEDITOR.htmlParser.node) => console.log('node'));
-    element.forEach((el: CKEDITOR.htmlParser.node) => console.log('node'), 1);
-    element.forEach((el: CKEDITOR.htmlParser.node) => false, 2, true);
-
-    var node: CKEDITOR.htmlParser.node = element.getFirst('*');
-    node = element.getFirst({ 'id': '1' });
-    node = element.getFirst((el: CKEDITOR.htmlParser.node) => true);
-
-    var html: string = element.getHtml();
-    html = element.getOuterHtml();
-
-    var hasClass: boolean = element.hasClass('class');
-    element.removeClass('class');
-    element.replaceWithChildren();
-    element.setHtml('html');
-    var el2: CKEDITOR.htmlParser.element = element.split(1);
-
-    element.writeChildrenHtml(new CKEDITOR.htmlParser.basicWriter());
-    element.writeChildrenHtml(new CKEDITOR.htmlParser.basicWriter(), filter);
-
-    element.writeHtml(new CKEDITOR.htmlParser.basicWriter());
-    element.writeHtml(new CKEDITOR.htmlParser.basicWriter(), filter);
-}
-
-function test_htmlParser_filter() {
-    var filter: CKEDITOR.htmlParser.filter = new CKEDITOR.htmlParser.filter({ elementNames: [ 'div' ] });
-    filter = new CKEDITOR.htmlParser.filter();
-
-    filter.addRules({ text: 'text' });
-    filter.addRules({ attributes: { 'id': '1234' }}, 1);
-    filter.addRules({ comment: 'hey', text: 'text' }, { priority: 1 });
-    filter.addRules({ root: document.body }, { applyToAll: false });
-
-    var node: CKEDITOR.htmlParser.node;
-    filter.applyTo(node);
-}
-
-
-function test_htmlParser_filterRulesGroup() {
-    var rules: CKEDITOR.htmlParser.filterRulesGroup = new CKEDITOR.htmlParser.filterRulesGroup();
-
-    rules.add([ 'some', 'rule' ], 1, { applyToAll: false, excludeNestedEditable: true });
-
-    rules.addMany([ (value: CKEDITOR.htmlParser.node | CKEDITOR.htmlParser.fragment | string) => false, [ 'some', 'rule' ] ], 1, { applyToAll: false });
-
-    var nodeFragOrString: CKEDITOR.htmlParser.node | CKEDITOR.htmlParser.fragment | string;
-    nodeFragOrString = rules.exec(nodeFragOrString);
-
-    var str: string;
-    str = rules.execOnName(str);
-
-    var idx: number = rules.findIndex(1);
-}
-
-function test_htmlParser_fragment() {
-    var frag: CKEDITOR.htmlParser.fragment = new CKEDITOR.htmlParser.fragment();
-
-    var node: CKEDITOR.htmlParser.node;
-    frag.add(node);
-    frag.add(node, 1);
-
-    var filter: CKEDITOR.htmlParser.filter;
-    frag.filter(filter);
-    frag.filterChildren(filter);
-    frag.filterChildren(filter, true);
-    frag.forEach((node: CKEDITOR.htmlParser.node) => console.log('node'));
-    frag.forEach((node: CKEDITOR.htmlParser.node) => false, 1);
-    frag.forEach((node: CKEDITOR.htmlParser.node) => false, 2, true);
-
-    frag.writeChildrenHtml(new CKEDITOR.htmlParser.basicWriter());
-    frag.writeChildrenHtml(new CKEDITOR.htmlParser.basicWriter(), filter);
-
-    frag.writeHtml(new CKEDITOR.htmlParser.basicWriter());
-    frag.writeHtml(new CKEDITOR.htmlParser.basicWriter(), filter);
-
-    frag = CKEDITOR.htmlParser.fragment.fromBBCode('code');
-
-    var fragOrEl: CKEDITOR.htmlParser.fragment | CKEDITOR.htmlParser.element = CKEDITOR.htmlParser.fragment.fromHtml('html');
-    fragOrEl = CKEDITOR.htmlParser.fragment.fromHtml('html', 'parent');
-    fragOrEl = CKEDITOR.htmlParser.fragment.fromHtml('html', 'parent', 'fix');
-    fragOrEl = CKEDITOR.htmlParser.fragment.fromHtml('html', new CKEDITOR.htmlParser.element('name', null), true);
-}
-
-function test_htmlParser_node() {
-    var node: CKEDITOR.htmlParser.node = new CKEDITOR.htmlParser.node();
-
-    var el: CKEDITOR.htmlParser.element = node.getAscendant('condition');
-    el = node.getAscendant({ 'id': '1234' });
-    el = node.getAscendant((node: CKEDITOR.htmlParser.element) => false);
-
-    var idx: number = node.getIndex();
-    node.insertAfter(node);
-    node.insertBefore(node);
-    node.remove();
-    node.replaceWith(node);
-    el = node.wrapWith(el);
-
-}
-
-function test_htmlParser_text() {
-    var text: CKEDITOR.htmlParser.text = new CKEDITOR.htmlParser.text('text');
-    var filtered: boolean = text.filter(new CKEDITOR.htmlParser.filter());
-    text.writeHtml(new CKEDITOR.htmlParser.basicWriter());
-    text.writeHtml(new CKEDITOR.htmlParser.basicWriter(), new CKEDITOR.htmlParser.filter());
-}
-
-function test_htmlWriter() {
-    var writer = new CKEDITOR.htmlWriter();
-    writer.openTag('p', {});
-    writer.attribute('class', 'MyClass');
-    writer.openTagClose('p', false);
-    writer.text('Hello');
-    writer.closeTag('p');
-    alert(writer.getHtml(true)); // '<p class="MyClass">Hello</p>'
-
-    writer.indentationChars = '\t';
-    writer.lineBreakChars = '\r\n';
-    writer.selfClosingEnd = '>';
-    writer.indentation();
-    writer.lineBreak();
-    writer.setRules('img', {breakBeforeOpen: true, breakAfterOpen: true});
-}
-
-function test_htmlParser() {
-    var html = '<div><span>text</span></div>';
-    var fragment = CKEDITOR.htmlParser.fragment.fromHtml(html);
-    fragment.forEach(function(node) {
-        if (node instanceof CKEDITOR.htmlParser.element) {
-            node.forEach(function(node) {
-                console.log(node);
-            });
-        }
-    }, CKEDITOR.NODE_ELEMENT, true);
-}
-
-function test_keystrokeHandler() {
-    var handler: CKEDITOR.keystrokeHandler = new CKEDITOR.keystrokeHandler(CKEDITOR.instances[0]);
-    handler.attach(new CKEDITOR.dom.domObject(document.body)); 
-}
-
-function test_lang() {
-    var lang: string = CKEDITOR.lang.detect('en');
-    lang = CKEDITOR.lang.detect('zh', 'sw');
-    
-    CKEDITOR.lang.load('tk', 'pr', (code: string, entries: any) => console.log('loaded'));
-}
-
-function test_loader() {
-    CKEDITOR.loader.load('script');
-    CKEDITOR.loader.load('script', true);
-
-    CKEDITOR.loader.loadPending();
-}
-
-function test_menu() {
-    var menu: CKEDITOR.menu = new CKEDITOR.menu();
-
-    menu.add({ anything: true });
-    menu.addListener((startElement: CKEDITOR.dom.element, selection: CKEDITOR.dom.selection, path: CKEDITOR.dom.elementPath) => 'return');
-    var { item, element } = menu.findItemByCommandName('command');
-    menu.hide();
-    menu.hide(false);
-    menu.removeAll();
-    menu.show(new CKEDITOR.dom.element('div'));
-    menu.show(new CKEDITOR.dom.element('div'), 1);
-    menu.show(new CKEDITOR.dom.element('div'), 1, 2);
-    menu.show(new CKEDITOR.dom.element('div'), 1, 2, 3);
-}
-
-function test_plugins() {
-    CKEDITOR.plugins.add( 'abbr', {
-        init: function( editor: CKEDITOR.editor ) {
-            // empty logic
-        }
-    });
-
-    console.log(CKEDITOR.plugins.registered['abbr']);
-}
-
-function test_resourceManager() {
-    var manager: CKEDITOR.resourceManager = new CKEDITOR.resourceManager('path', 'name');
-
-    manager.add('name');
-    manager.add('name', { hidpi: true });
-    manager.addExternal('names', 'path');
-    manager.addExternal('names', 'path', 'name');
-
-    var def: CKEDITOR.pluginDefinition = manager.get('name');
-    var path: string = manager.getFilePath('path');
-    path = manager.getPath('path');
-
-    manager.load('name', (loaded: string[]) => console.log('hey'));
-    manager.load([ 'name' ], (loaded: string[]) => console.log('hey'), manager);
-}
-
-function test_scriptLoader() {
-    CKEDITOR.scriptLoader.load('url', (succeededUrls: boolean | string[], failedUrls: string[]) => console.log('loaded'));
-    CKEDITOR.scriptLoader.load([ 'url' ], (succeededUrls: boolean | string[], failedUrls: string[]) => console.log('loaded'), null);
-    CKEDITOR.scriptLoader.load([ 'url' ], (succeededUrls: boolean | string[], failedUrls: string[]) => console.log('loaded'), null, true);
-    CKEDITOR.scriptLoader.queue('url', (succeeded: boolean) => console.log('loaded'));
-}
-
-function test_skin() {
-    CKEDITOR.skin.addIcon('name', 'path');
-    CKEDITOR.skin.addIcon('name', 'path', 1);
-    CKEDITOR.skin.addIcon('name', 'path', 1, 'small');
-
-    CKEDITOR.skin.chameleon('editor', 'part');
-
-    var style: any = CKEDITOR.skin.getIconStyle('name');
-    style = CKEDITOR.skin.getIconStyle('name', true);
-    style = CKEDITOR.skin.getIconStyle('name', true, 1);
-    style = CKEDITOR.skin.getIconStyle('name', true, 1, 'large');
-
-    var path: any = CKEDITOR.skin.getPath('part');
-
-    CKEDITOR.skin.loadPart('part', () => console.log('load'));
-
-    var path2: string = CKEDITOR.skin.path();
-}
-
-function test_style() {
-    var style: CKEDITOR.style = new CKEDITOR.style({ element: 'div' }, { 'key': 'value '});
-    style.apply(CKEDITOR.instances[0]);
-
-    var el: CKEDITOR.dom.element;
-    style.applyToObject(el, CKEDITOR.instances[0]);
-
-    var range: Range;
-    style.applyToRange(range, CKEDITOR.instances[0]);
-
-    var str: string = style.buildPreview();
-    str = style.buildPreview('label');
-
-    var path: CKEDITOR.dom.elementPath;
-    var bool: boolean = style.checkActive(path, CKEDITOR.instances[0]);
-
-    var filter: CKEDITOR.filter;
-    bool = style.checkApplicable(path, CKEDITOR.instances[0], filter);
-
-    bool = style.checkElementMatch(el, true, CKEDITOR.instances[0]);
-    bool = style.checkElementRemovable(el, false, CKEDITOR.instances[0]);
-
-    var def: CKEDITOR.style.definition = style.getDefintion();
-    style.remove(CKEDITOR.instances[0]);
-    style.removeFromRange(range, CKEDITOR.instances[0]);
-    
-    var rules: CKEDITOR.filter.allowedContentRules;
-    rules = style.toAllowedContentRules();
-    rules = style.toAllowedContentRules(CKEDITOR.instances[0]);
-}
-
-function test_adding_command_and_buttons() {
-    var textarea = document.createElement('textarea');
-    var instance = CKEDITOR.replace(textarea);
-
-    instance.addCommand( 'aCommand', {
-        exec: function( editor: CKEDITOR.editor ) {
-            // empty logic
-            return true;
-        }
-    });
-
-    instance.ui.addButton( 'firstButton', {
-        icon: 'http://www.example.com/assets/images/icons.png',
-        iconOffset: -32,
-        label: 'Label 1',
-        command: 'aCommand',
-        toolbar: 'tools'
-    });
-
-    instance.ui.addButton( 'secondButton', {
-        label: 'Label 2',
-        command: 'aCommand',
-        toolbar: 'tools'
-    });
-}
-
-function test_adding_widget() {
-    function wrapper(editor: CKEDITOR.editor) {
-            editor.widgets.add("widgetty", {
-            button: "Activate widgetty",
-            template: "<imaginary-element>",
-            dialog: "widgetty",
-            init: function() {
-                // no logic
-            }
-        });
-    }
-}
-
-function test_sharedSpace() {
-    CKEDITOR.inline('content', {
-        removePlugins: 'maximize,resize',
-        sharedSpaces: {
-            top: 'someElementId',
-            bottom: document.getElementById('anotherId')
-        }
-    });
-
-    CKEDITOR.inline('content', {
-        sharedSpaces: { }
-    });
-}
-
-function test_specifying_editor_path() {
-    window.CKEDITOR_BASEPATH = '/ckeditor/';
-}
-
-function test_editor_instance_event() {
-    var textarea = document.createElement('textarea');
-    var instance = CKEDITOR.replace(textarea, {
-        on: {
-            activeEnterModeChange: function() {},
-            activeFilterChange: function() {},
-            afterCommandExec: function() {},
-            afterInsertHtml: function() {},
-            afterPaste: function() {},
-            afterPasteFromWord: function() {},
-            afterSetData: function() {},
-            afterUndoImage: function() {},
-            ariaEditorHelpLabel: function() {},
-            ariaWidget: function() {},
-            autogrow: function() {},
-            beforeCommandExec: function() {},
-            beforeDestroy: function() {},
-            beforeModeUnload: function() {},
-            beforeSetMode: function() {},
-            beforeUndoImage: function() {},
-            blur: function() {},
-            change: function() {},
-            configLoaded: function() {},
-            contentDirChanged: function() {},
-            contentDom: function() {},
-            contentDomInvalidated: function() {},
-            contentDomUnload: function() {},
-            customConfigLoaded: function() {},
-            dataFiltered: function() {},
-            dataReady: function() {},
-            destroy: function() {},
-            dialogHide: function() {},
-            dialogShow: function() {},
-            dirChanged: function() {},
-            doubleclick: function() {},
-            dragend: function() {},
-            dragstart: function() {},
-            drop: function() {},
-            elementsPathUpdate: function() {},
-            fileUploadRequest: function() {},
-            fileUploadResponse: function() {},
-            floatingSpaceLayout: function() {},
-            focus: function() {},
-            getData: function() {},
-            getSnapshot: function() {},
-            insertElement: function() {},
-            insertHtml: function() {},
-            insertText: function() {},
-            instanceReady: function() {},
-            key: function() {},
-            langLoaded: function() {},
-            loadSnapshot: function() {},
-            loaded: function() {},
-            lockSnapshot: function() {},
-            maximize: function() {},
-            menuShow: function() {},
-            mode: function() {},
-            notificationHide: function() {},
-            notificationShow: function() {},
-            notificationUpdate: function() {},
-            paste: function() {},
-            pasteFromWord: function() {},
-            pluginsLoaded: function() {},
-            readOnly: function() {},
-            removeFormatCleanup: function() {},
-            required: function() {},
-            resize: function() {},
-            save: function() {},
-            saveSnapshot: function() {},
-            selectionChange: function() {},
-            setData: function() {},
-            stylesSet: function() {},
-            template: function() {},
-            toDataFormat: function() {},
-            toHtml: function() {},
-            unlockSnapshot: function() {},
-            updateSnapshot: function() {},
-            widgetDefinition: function() {}
-        }
-    });
-}
-
-function test_dtd() {
-    var brConsideredEmptyTag = CKEDITOR.dtd.$empty['br'];
-    var spanCanContainText = CKEDITOR.dtd['span']['#'];
-    var divCanContainSpan = CKEDITOR.dtd['div']['span'];
-}
-
-function test_getSelectedHtml() {
-    var textarea = document.createElement('textarea');
-    var editor = CKEDITOR.replace(textarea);
-
-    // $ExpectType documentFragment
-    var sel1 = editor.getSelectedHtml();
-    console.log(sel1);
-
-    // $ExpectType documentFragment
-    var sel2 = editor.getSelectedHtml(false);
-    console.log(sel2);
-
-    // $ExpectType string
-    var sel3 = editor.getSelectedHtml(true);
-    console.log(sel3);
-
-    // $ExpectType string | documentFragment
-    var sel4 = editor.getSelectedHtml(Math.random() > 0.5);
-    console.log(sel4);
-}
-
-function test_element() {
-    var el = CKEDITOR.document.getById('myElement');
-    el.addClass('class');
-    console.log(el.hasClass('class'));
-    el.removeClass('class');
-}
-
-function test_selection() {
-    var editor = new CKEDITOR.editor();
-    var testNode = CKEDITOR.document.getById('myElement');
-
-    var selection = editor.getSelection(true);
-    var ranges = selection.getRanges();
-    for (var i = 0, c = ranges.length; i < c; i++) {
-        var range = ranges[i];
-        range.setStartBefore(testNode);
-        range.setStartAfter(testNode);
-        range.setEndBefore(testNode);
-        range.setEndAfter(testNode);
-    }
-}
-
-function test_tools() {
-    var obj: { [key: string]: any } = { key: 'value' };
-
-    CKEDITOR.tools.addFunction(console.log);
-    CKEDITOR.tools.addFunction(console.log, obj);
-    var bool = CKEDITOR.tools.arrayCompare([ 1 ], [ 2, 3 ]);
-    CKEDITOR.tools.clone(obj);
-    CKEDITOR.tools.copy(obj);
-    obj = CKEDITOR.tools.createClass(obj);
-    var str = CKEDITOR.tools.cssStyleToDomStyle('style');
-    var prefixes: { [cssClass: string]: string | number } = CKEDITOR.tools.cssVendorPrefix('prop', 'val');
-    prefixes = CKEDITOR.tools.cssVendorPrefix('prop', 'val', true);
-    var fn: (param: any) => boolean
-    fn = CKEDITOR.tools.defer<(param: any) => boolean>(fn);
-    CKEDITOR.tools.enableHtml5Elements(document);
-    CKEDITOR.tools.enableHtml5Elements(document.createDocumentFragment(), true);
-    str = CKEDITOR.tools.escapeCss('css');
-    var { input, reset } = CKEDITOR.tools.eventsBuffer(1, console.log, obj);
-    obj = CKEDITOR.tools.extend(obj, obj, true, obj);
-    bool = CKEDITOR.tools.fixDomain();
-    str = CKEDITOR.tools.genKey(str);
-    str = CKEDITOR.tools.getCookie(str);
-    str = CKEDITOR.tools.getCsrfToken();
-    var numb: number = CKEDITOR.tools.getIndex<string>(['string', 'array'], (element: string) => false);
-    bool = CKEDITOR.tools.getMouseButton(new CKEDITOR.dom.event(document.createEvent(null)));
-    str = CKEDITOR.tools.getNextId();
-    numb = CKEDITOR.tools.getNextNumber();
-    str = CKEDITOR.tools.getUniqueId();
-    str = CKEDITOR.tools.htmlDecode(str);
-    str = CKEDITOR.tools.htmlDecodeAttr(str);
-    str = CKEDITOR.tools.htmlEncode(str);
-    str = CKEDITOR.tools.htmlEncodeAttr(str);
-    numb = CKEDITOR.tools.indexOf<string>(['string', 'array'], 'string');
-    numb = CKEDITOR.tools.indexOf<boolean>([true, false], (val: boolean) => false);    
-    console.log(CKEDITOR.tools.isArray([1])); // true
-    console.log(CKEDITOR.tools.isArray(obj)); // false
-    console.log(CKEDITOR.tools.isArray(null)); // false
-    console.log(CKEDITOR.tools.isArray(undefined)); // false
-    bool = CKEDITOR.tools.isEmpty(obj);
-    var ret1: { display: string[], aria: string[] } = CKEDITOR.tools.keystrokeToArray(obj, 1);
-    var ret2: { display: string, aria: string }  = CKEDITOR.tools.keystrokeToString(obj, 1);
-    str = CKEDITOR.tools.ltrim(str);
-    str = CKEDITOR.tools.normalizeCssText(str, bool);
-    str = CKEDITOR.tools.normalizeHex(str);
-    bool = CKEDITOR.tools.objectCompare(obj, obj);
-    bool = CKEDITOR.tools.objectCompare(obj, obj, true);
-    var strArr: string[] = CKEDITOR.tools.objectKeys(obj);
-    CKEDITOR.tools.override(parseInt, function(_parseInt) {
-        return function(value: any, radix?: number) {
-            return _parseInt(value, radix);
-        };
-    });
-    obj = CKEDITOR.tools.parseCssText(str);
-    obj = CKEDITOR.tools.parseCssText(str, bool);
-    obj = CKEDITOR.tools.parseCssText(str, bool, bool);
-    obj = CKEDITOR.tools.prototypedCopy(obj);
-    CKEDITOR.tools.removeFunction(1);
-    str = CKEDITOR.tools.repeat(str, 40);
-    str = CKEDITOR.tools.rtrim(str);
-    str = CKEDITOR.tools.search<string>(strArr, 'string');
-    str = CKEDITOR.tools.search<string>(strArr, (el: string) => true);
-    CKEDITOR.tools.setCookie('name', 'value');
-    numb = CKEDITOR.tools.setTimeout(console.log);
-    numb = CKEDITOR.tools.setTimeout(console.log, 1000);
-    numb = CKEDITOR.tools.setTimeout(console.log, 1000, obj);
-    numb = CKEDITOR.tools.setTimeout(console.log, 1000, obj, 'timeout');
-    numb = CKEDITOR.tools.setTimeout(console.log, 1000, obj, 'timeout', window);
-    str = CKEDITOR.tools.transformPlainTextToHtml(str, 1);
-    str = CKEDITOR.tools.trim(str);
-    CKEDITOR.tools.tryThese([ console.log, console.warn ]);
-    str = CKEDITOR.tools.writeCssText(obj);
-    str = CKEDITOR.tools.writeCssText(obj, true);
-}
diff --git a/types/ckeditor/index.d.ts b/types/ckeditor/index.d.ts
deleted file mode 100644
index e95429cd29..0000000000
--- a/types/ckeditor/index.d.ts
+++ /dev/null
@@ -1,2770 +0,0 @@
-// Type definitions for CKEditor 4.9
-// Project: https://ckeditor.com/ckeditor-4/
-// Definitions by: Thomas Wittwer <https://github.com/wittwert>
-//                 Stuart Long <https://github.com/stuartlong>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// WORK-IN-PROGRESS: Any contribution support welcomed.
-// See https://github.com/DefinitelyTyped/DefinitelyTyped/issues/1827 for more informations.
-interface Window {
-    CKEDITOR_BASEPATH: string;
-}
-
-declare namespace CKEDITOR {
-
-    // Config options
-    var disableAutoInline: boolean;
-    var replaceClass: string;
-    var skinName: string;
-
-    // Properties
-    const ALT: number;
-    const CTRL: number;
-    const DATA_TRANSFER_CROSS_EDITORS: number;
-    const DATA_TRANSFER_EXTERNAL: number;
-    const DATA_TRANSFER_INTERNAL: number;
-    const DIALOG_RESIZE_BOTH: number;
-    const DIALOG_RESIZE_HEIGHT: number;
-    const DIALOG_RESIZE_NONE: number;
-    const DIALOG_RESIZE_WIDTH: number;
-    const DIALOG_STATE_BUSY: number;
-    const DIALOG_STATE_IDLE: number;
-    const ELEMENT_MODE_APPENDTO: number;
-    const ELEMENT_MODE_INLINE: number;
-    const ELEMENT_MODE_NONE: number;
-    const ELEMENT_MODE_REPLACE: number;
-    const END: number;
-    const ENLARGE_BLOCK_CONTENTS: number;
-    const ENLARGE_ELEMENT: number;
-    const ENLARGE_INLINE: number;
-    const ENLARGE_LIST_ITEM_CONTENTS: number;
-    const ENTER_BR: number;
-    const ENTER_DIV: number;
-    const ENTER_P: number;
-    const EVENT_PHASE_AT_TARGET: number;
-    const EVENT_PHASE_BUBBLING: number;
-    const EVENT_PHASE_CAPTURING: number;
-    const FILTER_SKIP_TREE: number;
-    const LINEUTILS_AFTER: number;
-    const LINEUTILS_BEFORE: number;
-    const LINEUTIS_INSIDE: number;
-    const MOUSE_BUTTON_LEFT: number;
-    const MOUSE_BUTTON_MIDDLE: number;
-    const MOUSE_BUTTON_RIGHT: number;
-    const NODE_COMMENT: number;
-    const NODE_DOCUMENT: number;
-    const NODE_DOCUMENT_FRAGMENT: number;
-    const NODE_ELEMENT: number;
-    const NODE_TEXT: number;
-    const POSITION_AFTER_END: number;
-    const POSITION_AFTER_START: number;
-    const POSITION_BEFORE_END: number;
-    const POSITION_BEFORE_START: number;
-    const POSITION_CONTAINS: number;
-    const POSITION_DISCONNECTED: number;
-    const POSITION_FOLLOWING: number;
-    const POSITION_IDENTICAL: number;
-    const POSITION_IS_CONTAINED: number;
-    const POSITION_PRECEDING: number;
-    const SELECTION_ELEMENT: number;
-    const SELECTION_NONE: number;
-    const SELECTION_TEXT: number;
-    const SHIFT: number;
-    const SHRINK_ELEMENT: number;
-    const SHRINK_TEXT: number;
-    const START: number;
-    const STYLE_BLOCK: string;
-    const STYLE_INLINE: string;
-    const STYLE_OBJECT: string;
-    const TRISTATE_DISABLED: number;
-    const TRISTATE_OFF: number;
-    const TRISTATE_ON: number;
-    const UI_BUTTON: string;
-    const UI_MENUBUTTON: string;
-    const UI_PANEL: string;
-    const UI_PANELBUTTON: string;
-    const UI_RICHCOMBO: string;
-    const UI_SEPARATOR: string;
-    const VERBOSITY_ERROR: number;
-    const VERBOSITY_WARN: number;
-
-    var basePath: string;
-    var currentInstance: editor;
-    var document: dom.document;
-    var instances: { [id: string]: editor };
-    var loadFullCoreTimeout: number;
-    var revision: string;
-    var rnd: number;
-    var status: string;
-    var timestamp: string;
-    var verbosity: number;
-    var version: string;
-    const config: config;
-
-    // Methods
-    function add(editor: editor): void;
-    function addCss(css: string): void;
-    function addTemplate(name: string, source: string): template;
-    function appendTo(element: string | HTMLElement, config?: config, data?: string): editor;
-    function domReady(): void;
-    function editorConfig(config: config): void;
-    function error(errorCode: string, additionalData?: any): void;
-    function getCss(): string;
-    function getTemplate(name: string): template;
-    function getUrl(resource: string): string;
-    function inline(element: string | HTMLElement, instanceConfig?: config): editor;
-    function inlineAll(): void;
-    function loadFullCore(): void;
-    function replace(element: string | HTMLTextAreaElement, config?: config): editor;
-    function replaceAll(className?: string): void;
-    function replaceAll(assertionFunction: (textarea: HTMLTextAreaElement, config: config) => boolean): void;
-    function warn(errorCode: string, additionalData?: any): void;
-
-    // Event interface
-    function capture(): void;
-    function define(name: string, meta: { [key: string]: any }): void;
-    function fire(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
-    function fireOnce(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
-    function hasListeners(eventName: string): boolean;
-    function on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any }, listenerData?: { [key: string]: any }, priority?: number): void;
-    function once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any }, listenerData?: { [key: string]: any }, priority?: number): void;
-    function removeAllListeners(): void;
-    function removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
-
-    type listenerRegistration = {
-        removeListener: () => void;
-    }
-
-    namespace dom {
-
-        interface bookmark {
-            startNode: dom.node | string;
-            endNode: dom.node | string;
-            serializable: boolean;
-            collapsed: boolean;
-        }
-
-        interface bookmark2 {
-            start: number[];
-            end: number[];
-            startOffset: number;
-            endOffset: number;
-            collapsed: boolean;
-            normalized: boolean;
-            is2: boolean;
-        }
-
-        class comment extends node {
-            readonly type: number;
-
-            constructor(comment: string | Node, ownerDocument?: document);
-            getOuterHtml(): string;
-        }
-
-        class document extends domObject {
-            readonly $: Document;
-            readonly type: number;
-
-            constructor(domDocument: { [key: string]: any });
-            appendStyleSheet(cssFileUrl: string): void;
-            appendStyleText(cssStyleText: string): CSSStyleSheet;
-            createElement(name: string, attribsAndStyles?: { attributes?: { [key: string]: string }; styles?: { [key: string]: string }; }): element;
-            createText(text: string): element;
-            find(selector: string): nodeList;
-            findOne(selector: string): element;
-            focus(): void;
-            getActive(): element;
-            getBody(): element;
-            getByAddress(address: any[], normalized?: boolean): node;
-            getById(elementId: string): element;
-            getDocumentElement(): element;
-            getElementsByTag(tagName: string): nodeList;
-            getHead(): element;
-            getSelection(): selection;
-            getWindow(): window;
-            write(html: string): void;
-        }
-
-        class documentFragment extends node {
-            readonly type: number;
-
-            constructor(nodeOrDoc: { [key: string]: any });
-            insertAfterNode(node: node): void;
-        }
-
-        class domObject extends CKEDITOR.event {
-            readonly $: any;
-
-            constructor(nativeDomObject: { [key: string]: any });
-            clearCustomData(): void;
-            equals(object: any): boolean;
-            getCustomData(key: string): any;
-            getPrivate(): any;
-            getUniqueId(): number;
-            removeAllListeners(): void;
-            removeCustomData(key: string): any;
-            setCustomData(key: string, value: any): domObject;
-        }
-
-        class element extends node {
-            readonly $: HTMLElement;
-            readonly type: number;
-
-            constructor(element: string, ownerDocument?: document);
-            constructor(element: HTMLElement, ownerDocument?: document);
-            addClass(className: string): void;
-            append(node: node | string, toStart?: boolean): node;
-            appendBogus(force: boolean): void;
-            appendHtml(html: string): void;
-            appendText(text: string): node;
-            breakParent(parent: element): void;
-            contains(node: node): boolean;
-            copyAttributes(dest: element, skipAttributes: { [key: string]: string }): void;
-            data(name: string, value?: string | false): string;
-            disableContextMenu(): void;
-            find(selector: string): nodeList;
-            findOne(selector: string): element;
-            focus(defer?: boolean): void;
-            focusNext(ignoreChildren?: boolean, indexToUse?: number): void;
-            focusPrevious(ignoreChildren?: boolean, indexToUse?: number): void;
-            forEach(callback: (node: node) => void, type?: number, skipRoot?: boolean): void;
-            getAttribute(name: string): string;
-            getBogus(): node | boolean;
-            getChild(indices: number | number[]): node;
-            getChildCount(): number;
-            getChildren(): nodeList;
-            getClientRect(): ClientRect;
-            getComputedStyle(propertyName: string): string;
-            getDirection(useComputed: boolean): string;
-            getDocumentPosition(refDocument: document): position;
-            getDtd(): dtdDefinition;
-            getEditor(): editor;
-            getElementsByTag(tagName: string): nodeList;
-            getFirst(evaluator?: (node: node) => boolean): node;
-            getFrameDocument(): document;
-            getHtml(): string;
-            getId(): string;
-            getLast(evaluator?: (node: node) => boolean): node;
-            getName(): string;
-            getNameAtt(): string;
-            getOuterHtml(): string;
-            getPositionedAncestor(): element;
-            getSize(type: string, isBorderBox: boolean): void;
-            getStyle(name: string): string;
-            getTabIndex(): number;
-            getText(): string;
-            getValue(): string;
-            getWindow(): window;
-            hasAttributes(): boolean;
-            hasAttribute(name: string): boolean;
-            hasClass(className: string): boolean;
-            hide(): void;
-            is(...name: string[]): boolean;
-            is(name: any): boolean;
-            isBlockBoundary(customNodeNames: { [tagName: string]: 1 }): boolean;
-            isEditable(textCursor?: boolean): boolean;
-            isEmptyInlineRemoveable(): boolean;
-            isIdentical(otherElement: element): boolean;
-            isVisible(): boolean;
-            mergeSiblings(inlineOnly?: boolean): void;
-            moveChildren(target: element, toStart?: boolean): void;
-            removeAttribute(name: string): void;
-            removeAttributes(attributes?: string[]): void;
-            removeClass(className: string): void;
-            removeStyle(name: string): void;
-            renameNode(newTag: string): void;
-            scrollIntoParent(parent: element, alignToTop: boolean, hscroll: boolean): void;
-            scrollIntoParent(parent: window, alignToTop: boolean, hscroll: boolean): void;
-            scrollIntoView(alignToTop?: boolean): void;
-            setAttribute(name: string, value: string): element;
-            setAttributes(attributesPairs: { [key: string]: string }): element;
-            setHtml(html: string): string;
-            setOpacity(opacity: number): void;
-            setSize(type: string, size: number, isBorderBox: boolean): void;
-            setState(state: number, base?: string, useAria?: boolean): void;
-            setStyle(name: string, value: string): element;
-            setStyles(stylesPair: { [key: string]: string }): element;
-            setText(text: string): string;
-            setValue(value: string): element;
-            show(): void;
-            unselectable(): void;
-
-            //static method
-            static clearAllMarkers(database: any): any;
-            static clearMarkers(database: any, element: dom.element, removeFromDatabase: boolean): void;
-            static createFromHtml(html: string): element;
-            static get(element: string | HTMLElement | element): element;
-            static setMarker(database: any, element: dom.element, name: string, value: any): dom.element;
-        }
-
-        class elementPath {
-            readonly block: element;
-            readonly blockLimit: element;
-            readonly elements: element[];
-            readonly lastElement: element;
-            readonly root: element;
-
-            constructor(startNode: element, root?: element);
-            compare(otherPath: elementPath): boolean;
-            contains(query: string | string[] | ((element: element) => boolean) | { [key: string]: any } | element, excludeRoot?: boolean, fromTop?: boolean): element;
-            direction(): 'ltr' | 'rtl';
-            isContextFor(tag: string): boolean;
-        }
-
-        class event {
-            constructor(domEvent: Event);
-            getKey(): number;
-            getKeystroke(): number;
-            preventDefault(stopPropagation?: boolean): void;
-            stopPropagation(): void;
-            getTarget(): node;
-            getPhase(): number;
-            getPhaseOffset(): position;
-            on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: any, listenerData?: any, priority?: number): { removeListener: () => void };
-        }
-
-        class iterator {
-            readonly activeFilter: filter;
-            enforceRealBlocks: boolean;
-            enlargeBr: boolean;
-            readonly filter: filter;
-            forceBrBreak: boolean;
-            readonly range: range;
-            constructor(range: range);
-            getNextParagraph(blockTag?: string): element;
-        }
-
-        class node extends domObject {
-            constructor(domNode: Node);
-            appendTo(element: element): element;
-            clone(includeChildren: boolean, cloneId: boolean): node;
-            hasPrevious(): boolean;
-            hasNext(): boolean;
-            insertAfter(node: node): node;
-            insertBefore(node: node): node;
-            insertBeforeMe(node: node): node;
-            getAddress(normalized?: boolean): number[];
-            getAscendant(reference: string, includeSelf?: boolean): node;
-            getCommonAncestor(node: node): void;
-            getDocument(): document;
-            getIndex(normalized?: boolean): number;
-            getNext(evaluator?: (node: node) => boolean): node;
-            getNextSourceNode(startFromSibling: boolean, nodeType: number, guard: node | ((node: node) => boolean)): void;
-            getParent(allowFragmentParent?: boolean): element;
-            getParents(closerFirst?: boolean): node[];
-            getPosition(otherNode: node): void;
-            getPrevious(evaluator?: (node: node) => boolean): node;
-            getPreviousSourceNode(startFromSibling: boolean, nodeType: number, guard: node | ((node: node) => boolean)): void;
-            hasAscendant(name: string, includeSelf: boolean): boolean;
-            remove(preserveChildren?: boolean): node;
-            replace(nodeToReplace: node): void;
-            trim(): void;
-            ltrim(): void;
-            rtrim(): void;
-            isReadOnly(): boolean;
-        }
-
-        class nodeList {
-            constructor(nativeList: NodeList);
-            count(): number;
-            getItem(index: number): node;
-            toArray(): node[];
-        }
-
-        class range {
-            readonly collapsed: boolean;
-            readonly document: document;
-            readonly endContainer: element | text;
-            readonly endOffset: number;
-            readonly root: element;
-            readonly startContainer: element | text;
-            readonly startOffset: number;
-
-            constructor(root: element | document);
-            checkBoundaryOfElement(element: element, checkType: number): boolean;
-            checkEndOfBlock(): boolean;
-            checkReadOnly(): boolean;
-            checkStartOfBlock(): boolean;
-            clone(cloneId?: boolean): range;
-            cloneContents(): documentFragment;
-            collapse(toStart?: boolean): boolean;
-            createBookmark(serializable?: boolean): bookmark;
-            createBookmark2(normalized?: boolean): bookmark2;
-            createIterator(): iterator;
-            deleteContents(mergeThen?: boolean): void;
-            endPath(): elementPath;
-            enlarge(unit: number, excludeBrs?: boolean): void;
-            extractContents(mergeThen?: boolean, cloneId?: boolean): documentFragment;
-            fixBlock(isStart: boolean, blockTag: string): element;
-            getBoundaryNodes(): { startNode: node; endNode: node; };
-            getCommonAncestor(includeSelf?: boolean, ignoreTextNode?: boolean): element;
-            getEnclosedNode(): node;
-            getNextEditableNode(): element | text;
-            getNextNode(evaluator?: (element: dom.element) => boolean, guard?: (element: dom.element) => boolean, boundary?: element): element;
-            getPreviousEditableNode(): element | text;
-            getPreviousNode(evaluator?: (element: dom.element) => boolean, guard?: (element: dom.element) => boolean, boundary?: element): element;
-            getTouchedEndNode(): node;
-            getTouchedStartNode(): node;
-            insertNode(node: node): void;
-            moveToBookmark(bookmark: bookmark | bookmark2): void;
-            moveToClosestEditablePosition(element?: element, isMoveForward?: boolean): boolean;
-            moveToElementEditEnd(target: element): boolean;
-            moveToElementEditStart(target: element): boolean;
-            moveToElementEditablePosition(element: element, isMoveToEnd: boolean): boolean;
-            moveToPosition(node: node, position: number): void;
-            moveToRange(range: range): void;
-            optimize(): void;
-            optimizeBookmark(): void;
-            removeEmptyBlocksAtEnd(atEnd: boolean): void;
-            scrollIntoView(): void;
-            select(): selection;
-            selectNodeContents(node: node): void;
-            setEnd(endNode: node, endOffset: number): void;
-            setEndAfter(node: node): void;
-            setEndAt(node: node, position: number): void;
-            setEndBefore(node: node): void;
-            setStart(startNode: node, startOffset: number): void;
-            setStartAfter(node: node): void;
-            setStartAt(node: node, position: number): void;
-            setStartBefore(node: node): void;
-            shrink(mode: number, selectContents?: boolean, options?: boolean | shrinkOptions): void;
-            splitBlock(cloneId?: boolean): void;
-            splitElement(toSplit: element, cloneId?: boolean): element;
-            startPath(): elementPath;
-            trim(ignoreStart?: boolean, ignoreEnd?: boolean): void;
-
-            static mergeRanges(ranges: range[]): range[];
-        }
-
-        interface shrinkOptions {
-            shrinkOnBlockBoundary?: boolean,
-            skipBogus?: boolean
-        }
-
-        class rangeList {
-            constructor(ranges?: range | range[]);
-            createBokmarks(serializable?: boolean): bookmark[];
-            createBookmarks2(normalized?: boolean): bookmark2[];
-            createIterator(): rangeListIterator;
-            moveToBookmarks(bookmarks: bookmark[]): void;
-        }
-
-
-        interface rangeListIterator {
-            getNextRange(mergeConsequent?: boolean): range;
-        }
-
-        // see https://docs.com/ckeditor4/latest/api/CKEDITOR_dom_selection.html
-        class selection {
-            readonly FILLING_CHAR_SEQUENCE: string;
-            readonly document: document;
-            readonly isFake: boolean;
-            readonly isLocked: boolean;
-            readonly rev: number;
-            readonly root: element;
-
-            constructor(target: document | element | selection);
-            createBookmarks(serializable: any): bookmark[];
-            createBookmarks2(normalized: any): bookmark2[];
-            fake(element: element, ariaLabel?: boolean): void;
-            getCommonAncestor(): element;
-            getNative(): Selection;
-            getRanges(onlyEditables?: boolean): range[];
-            getSelectedElement(): element;
-            getSelectedText(): string;
-            getStartElement(): element;
-            getType(): number;
-            isCollapsed(): boolean;
-            isHidden(): boolean;
-            isInTable(allowPartialSelection?: boolean): boolean;
-            lock(): void;
-            removeAllRanges(): void;
-            reset(): void;
-            scrollIntoView(): void;
-            selectBookmarks(bookmarks: (bookmark | bookmark2)[]): selection;
-            selectElement(element: element): void;
-            selectRanges(ranges: range[]): void;
-            unlock(restore: boolean): void;
-        }
-
-        class text extends node {
-            readonly $: Text;
-            readonly type: number;
-
-            constructor(text: Text | string, ownerDocument?: document);
-            getLength(): number;
-            getText(): string;
-            setText(text: string): void;
-            split(offset: number): text;
-            substring(indexA: number, indexB?: number): void;
-        }
-
-        class walker {
-            evaluator: (node: node) => boolean;
-            guard: (node: node) => boolean;
-
-            static validEmptyBlockContainers: { [key: string]: any };
-
-            constructor(range: range);
-            checkBackward(): boolean;
-            checkForward(): boolean;
-            end(): void;
-            lastBackward(): node;
-            lastForward(): node;
-            next(): node;
-            previous(): node;
-            reset(): void;
-
-            static blockBoundary(customNodeNames: any): (node: node) => boolean;
-            static bogus(isReject?: boolean): (node: node) => boolean;
-            static bookmark(contentOnly?: boolean, isReject?: boolean): (node: node) => boolean;
-            static editable(isReject?: boolean): (node: node) => boolean;
-            static empty(isReject?: boolean): (node: node) => boolean;
-            static ignored(isReject?: boolean): (node: node) => boolean;
-            static invisible(isReject?: boolean): (node: node) => boolean;
-            static listItemBoundary(): (node: node) => boolean;
-            static nodeType(type: number, isReject?: boolean): (node: node) => boolean;
-            static temp(isReject?: boolean): (node: node) => boolean;
-            static whitespaces(isReject?: boolean): (node: node) => boolean;
-        }
-
-        interface position {
-            x: number;
-            y: number;
-        }
-
-        interface widthAndHeight {
-            width: number;
-            height: number;
-        }
-
-        class window extends domObject {
-            constructor(domWindow: Window);
-            focus(): void;
-            getViewPaneSize(): widthAndHeight;
-            getScrollPosition(): position;
-            getFrame(): element;
-        }
-    }
-
-
-    namespace ajax {
-        function load(url: string, callback?: (data: any) => void): string;
-        function loadXml(url: string, callback?: (data: any) => void): xml;
-        function post(url: string, data: any, contentType?: string, callback?: (data: any) => void): void;
-    }
-
-
-    class command extends event implements commandDefinition {
-        fakeKeystroke: number;
-        previousState: number;
-        state: number;
-        uiItems: any[];
-
-        // Methods
-        constructor(editor: editor, commandDefinition: commandDefinition);
-        checkAllowed(noCache: boolean): boolean;
-        disable(): void;
-        enable(): void;
-        exec(data?: { [key: string]: any }): boolean;
-        refresh(editor: editor, path: dom.elementPath): void;
-        setState(newState: number): boolean;
-        toggleState(): void;
-
-    }
-
-    interface commandDefinition {
-        async?: boolean;
-        canUndo?: boolean;
-        context?: boolean;
-        contextSensitive?: boolean;
-        editorFocus?: boolean;
-        fakeKeystroke?: number;
-        modes?: { [key: string]: any };
-        startDisabled?: boolean;
-        readOnly?: boolean;
-        exec(editor: editor, data?: any): boolean;
-        refresh?(editor: editor, path: dom.elementPath): void;
-    }
-
-    // https://docs.com/ckeditor4/latest/api/CKEDITOR_config.html
-    interface config {
-        allowedContent?: boolean | filter.allowedContentRules;
-        autoEmbed_widget?: string | ((url: string) => string);
-        autoGrow_bottomSpace?: number;
-        autoGrow_maxHeight?: number;
-        autoGrow_minHeight?: number;
-        autoGrow_onStartup?: boolean;
-        autoUpdateElement?: boolean;
-
-        baseFloatZIndex?: number;
-        baseHref?: string;
-        basicEntities?: boolean;
-        blockedKeystrokes?: number[];
-        bodyClass?: string;
-        bodyId?: string;
-        browserContextMenuOnCtrl?: boolean;
-
-        clipboard_defaultContentType?: 'html' | 'text';
-        clipboard_notificationDuration?: number;
-        cloudServices_tokenUrl?: string;
-        cloudServices_uploadUrl?: string;
-        codeSnippetGeshi_url?: string;
-        codeSnippet_codeClass?: string;
-        codeSnippet_languages?: { [key: string]: any };
-        coceSnippet_theme?: string;
-        colorButton_backStyle?: config.styleObject;
-        colorButton_colors?: string;
-        colorButton_colorsPerRow?: number;
-        colorButton_enableAutomatic?: boolean;
-        colorButton_enableMore?: boolean;
-        colorButton_foreStyle?: config.styleObject;
-        colorButton_normalizeBackground?: boolean;
-        contentsCss?: string | string[];
-        contentsLangDirection?: string;
-        contentsLanguage?: string;
-        copyFormatting_allowRules?: string;
-        copyFormatting_allowedContexts?: boolean | string[];
-        copyFormatting_keystrokeCopy?: number;
-        copyFormatting_keystrokePaste?: number;
-        copyFormatting_outerCursor?: boolean;
-        coreStyles_bold?: config.styleObject;
-        coreStyles_italic?: config.styleObject;
-        coreStyles_strike?: config.styleObject;
-        coreStyles_subscript?: config.styleObject;
-        coreStyles_superscript?: config.styleObject;
-        coreStyles_underline?: config.styleObject;
-        customConfig?: string;
-
-        dataIndentationChars?: string;
-        defaultLanguage?: string;
-        devtools_styles?: string;
-        devtools_textCallback?: (editor: editor, dialog: dialog, element: dom.element, tabName: string) => string;
-        dialog_backgroundCoverColor?: string;
-        dialog_backgroundCoverOpacity?: number;
-        dialog_buttonsOrder?: string;
-        dialog_magnetDistance?: number;
-        dialog_noConfirmCancel?: boolean;
-        dialog_startupFocusTab?: boolean;
-        disableNativeSpellChecker?: boolean;
-        disableNativeTableHandles?: boolean;
-        disableNativeObjectResizing?: boolean;
-        disableNativeReadonlyStyling?: boolean;
-        disallowedContent?: filter.disallowedContentRules;
-        div_wrapTable?: boolean;
-        docType?: string;
-
-        easyimage_class?: string;
-        easyimage_defaultStyle?: string;
-        easyimage_styles?: { [key: string]: any };
-        easyimage_toolbar?: string[] | string;
-        emailProtection?: string;
-        embed_provider?: string;
-        enableTabKeyTools?: boolean;
-        enterMode?: number;
-        entities?: boolean;
-        entities_additional?: string;
-        entities_greek?: boolean;
-        entities_latin?: boolean;
-        entities_processNumerical?: boolean | string;
-        extraAllowedContent?: filter.allowedContentRules;
-        extraPlugins?: string;
-
-        fileTools_defaultFileName?: string;
-        fileTools_requestHeaders?: { [key: string]: any };
-        filebrowserBrowseUrl?: string;
-        filebrowserFlashBrowseUrl?: string;
-        filebrowserFlashUploadUrl?: string;
-        filebrowserImageBrowseLinkUrl?: string;
-        filebrowserImageBrowseUrl?: string;
-        filebrowserImageUploadUrl?: string;
-        filebrowserUploadMethod?: string;
-        filebrowserUploadUrl?: string;
-        filebrowserWindowFeatures?: string;
-        filebrowserWindowHeight?: number | string;
-        filebrowserWindowWidth?: number | string;
-        fillEmptyBlocks?: boolean | ((element: htmlParser.element) => boolean);
-        find_highlight?: config.styleObject;
-        flashAddEmbedTag?: boolean;
-        flashConvertOnEdit?: boolean;
-        flashEmbedTagOnly?: boolean;
-        floatSpaceDockedOffsetX?: number;
-        floatSpaceDockedOffsetY?: number;
-        floatSpacePinnedOffsetX?: number;
-        floatSpacePinnedOffsetY?: number;
-        floatSpacePreferRight?: boolean;
-        fontSize_defaultLabel?: string;
-        fontSize_sizes?: string;
-        fontSize_style?: config.styleObject;
-        font_defaultLabel?: string;
-        font_names?: string;
-        font_style?: config.styleObject;
-        forceEnterMode?: boolean;
-        forcePasteAsPlainText?: boolean;
-        forceSimpleAmpersand?: boolean;
-        format_address?: config.styleObject;
-        format_div?: config.styleObject;
-        format_h1?: config.styleObject;
-        format_h2?: config.styleObject;
-        format_h3?: config.styleObject;
-        format_h4?: config.styleObject;
-        format_h5?: config.styleObject;
-        format_h6?: config.styleObject;
-        format_p?: config.styleObject;
-        format_pre?: config.styleObject;
-        format_tags?: string;
-        fullPage?: boolean;
-
-        grayt_autoStartup?: boolean;
-
-        height?: string | number;
-        htmlEncodeOutput?: boolean;
-
-        ignoreEmptyParagraph?: boolean;
-        image2_alignClasses?: string[];
-        image2_altRequired?: boolean;
-        image2_captionedClass?: string;
-        image2_disableResizer?: boolean;
-        image2_prefillDimensions?: boolean;
-        imageUploadUrl?: string;
-        image_prefillDimensions?: boolean;
-        image_previewText?: string;
-        image_removeLinkByEmptyUrl?: boolean;
-        indentClasses?: string[];
-        indentOffset?: number;
-        indentUnit?: string;
-
-        jqueryOverrideVal?: boolean;
-        justifyClasses?: string[];
-
-        keystrokes?: [number, string][];
-
-        language?: string;
-        language_list?: string[];
-        linkJavaScriptLinksAllowed?: boolean;
-        linkShowAdvancedTab?: boolean;
-        linkShowTargetTab?: boolean;
-
-        magicline_color?: string
-        magicline_everywhere?: boolean;
-        magicline_holdDistance?: number;
-        magicline_keystrokeNext?: number;
-        magicline_keystrokePrevious?: number;
-        magicline_tabuList?: string[];
-        magicline_triggerOffset?: number;
-        mathJaxClass?: string;
-        mathJaxLib?: string;
-        menu_groups?: string;
-        menu_subMenuDelay?: number;
-
-        newpage_html?: string;
-        notification_duration?: number;
-
-        on?: editor.eventObject;
-
-        pasteFilter?: string;
-        pasteFromWordCleanupFile?: string;
-        pasteFromWordNumberedHeadingToList?: boolean;
-        pasteFromWordPromptCleanup?: boolean;
-        pasteFromWordRemoveFontStyles?: boolean;
-        pasteFromWorkRemoveStyles?: boolean;
-        pasteFromWord_heuristicsEdgeList?: boolean;
-        pasteFromWord_inlineImages?: boolean;
-        plugins?: string;
-        protectedSource?: RegExp[];
-
-        readOnly?: boolean;
-        removeButtons?: string;
-        removeDialogTabs?: string;
-        removeFormatAttributes?: string;
-        removeFormatTags?: string;
-        removePlugins?: string;
-        resize_dir?: string;
-        resize_enabled?: boolean;
-        resize_maxHeight?: number;
-        resize_maxWidth?: number;
-        resize_minHeight?: number;
-        resize_minWidth?: number;
-
-        scayt_autoStartup?: boolean;
-        scayt_contextCommands?: string;
-        scayt_contextMenuItemsOrder?: string;
-        scayt_customDictionaryIds?: string;
-        scayt_customerId?: string;
-        scayt_disableOptionsStorage?: string | string[];
-        scayt_elementsToIgnore?: string;
-        scayt_handleCheckDirty?: string;
-        scayt_handleUndoRedo?: string;
-        scayt_ignoreAllCapsWords?: boolean;
-        scayt_ignoreDomainNames?: boolean;
-        scayt_ignoreWordsWithMixedCases?: boolean;
-        scayt_ignoreWordsWithNumbers?: boolean;
-        scayt_inlineModeImmediateMarkup?: boolean;
-        scayt_maxSuggestions?: number;
-        scayt_minWordLength?: number;
-        scayt_moreSuggestions?: string;
-        scayt_multiLanguageMode?: boolean;
-        scayt_multiLanguageStyles?: { [key: string]: any };
-        scayt_sLang?: string;
-        scayt_serviceHost?: string;
-        scayt_servicePath?: string;
-        scayt_servicePort?: string;
-        scayt_serviceProtocol?: string;
-        scayt_srcUrl?: string;
-        scayt_uiTabs?: string;
-        scayt_userDictionaryName?: string;
-
-        sharedSpaces?: sharedSpace;
-        shiftEnterMode?: number;
-        skin?: string;
-        smiley_columns?: number;
-        smiley_descriptions?: string[];
-        smiley_images?: string[];
-        smiley_path?: string;
-        sourceAreaTabSize?: number;
-        specialChars?: (string | [string, string])[];
-        startupFocus?: string | boolean;
-        startupMode?: string;
-        startupOutlineBlocks?: boolean;
-        startupShowBorders?: boolean;
-        stylesSet?: string | boolean | config.styleObject[];
-        stylesheetParser_skipSelectors?: RegExp;
-        stylesheetParser_validSelectors?: RegExp;
-
-        tabIndex?: number;
-        tabSpaces?: number;
-        templates?: string;
-        templates_files?: { [key: string]: any };
-        templates_replaceContent?: boolean;
-        title?: string | boolean;
-        toolbar?: string | (string | string[] | { name: string, items?: string[], groups?: string[] })[] | null;
-        toolbarCanCollapse?: boolean;
-        toolbarGroupCycling?: boolean;
-        toolbarGroups?: (toolbarGroups | string)[];
-        toolbarLocation?: string;
-        toolbarStartupExpanded?: boolean;
-
-        uiColor?: string;
-        undoStackSize?: number;
-        uploadUrl?: string;
-        useComputedState?: boolean;
-
-        width?: string | number;
-        wsc_cmd?: string;
-        wsc_customDictionaryIds?: string;
-        wsc_customLoaderScript?: string;
-        wsc_customerId?: string;
-        wsc_height?: string;
-        wsc_lang?: string;
-        wsc_left?: string;
-        wsc_top?: string;
-        wsc_userDictionaryName?: string;
-        wsc_width?: string;
-    }
-
-    interface dataProcessor {
-        toDataFormat(html: string, fixForBody: string): void;
-        toHtml(data: string, fixForBody?: string): void;
-    }
-
-    class dialog {
-        readonly state: number;
-
-        constructor(editor: editor, dialogName: string);
-
-        addFocusable(element: dom.element, index?: number): void;
-        addPage(contents: { [key: string]: any }): void;
-        click(id: string): any;
-        commitContent(): void;
-        disableButton(id: string): void;
-        enableButton(id: string): void;
-        foreach(fn: () => void): dialog;
-        getButton(id: string): ui.dialog.button;
-        getContentElement(pageId: string, elementId: string): ui.dialog.uiElement;
-        getElement(): dom.element;
-        getName(): string;
-        getPageCount(): number;
-        getParentEditor(): editor;
-        getPosition(): { [key: string]: any };
-        getSelectedElement(): dom.element;
-        getSize(): { [key: string]: any };
-        getValueOf(pageId: string, elementId: string): any;
-        hide(): void;
-        hidePage(id: string): void;
-        layout(): void;
-        move(x: number, y: number, save: boolean): void;
-        reset(): dialog;
-        resize(width: number, height: number): void;
-        selectPage(id: string): void;
-        setState(state: number): void;
-        setValueOf(pageId: string, elementId: string, value: any): void;
-        setupContent(): void;
-        show(): void;
-        showPage(id: string): void;
-        updateStyle(): void;
-
-        static add(name: string, dialogDefinition: string | ((editor: editor) => dialog.IDialogDefinition)): void;
-        static addIframe(name: string, title: string, minWidth: number, minHeight: number, onContentLoad?: () => void, userDefinition?: { [key: string]: any }): void;
-        static addUIElement(typeName: string, builder: () => void): void;
-        static cancelButton(): void;
-        static exists(name: string | number): void; // NOTE: documentation says object, but it's an array accessor, so really a string or number will work
-        static getCurrent(): dialog;
-        static isTabEnabled(editor: editor, dialogName: string, tabName: string): boolean;
-        static okButton(): void;
-    }
-
-    namespace dialog {
-
-        namespace definition {
-
-            interface button extends uiElement {
-                disabled?: boolean;
-            }
-
-            interface checkbox extends uiElement {
-                default?: string;
-                validate?: () => boolean;
-            }
-
-            interface content {
-                accessKey?: string;
-                elements?: dialog.definition.uiElement[];
-                id?: string;
-                label?: string;
-                title?: string;
-            }
-
-            interface file extends labeledElement {
-                action?: string;
-                size?: string;
-                validate?: () => boolean;
-            }
-
-            interface fileButton extends uiElement {
-                filebrowser?: string;
-                for?: string;
-                validate?: () => boolean;
-            }
-
-            interface hbox extends uiElement {
-                children?: ui.dialog.uiElement[];
-                height?: number;
-                padding?: number;
-                validate?: () => boolean;
-                widths?: number[];
-            }
-
-            interface html extends uiElement {
-                html?: string;
-            }
-
-            interface labeledElement extends uiElement {
-                controlStyle?: string;
-                inputStyle?: string;
-                labelLayout?: string;
-                labelStyle?: string;
-                widths?: number[];
-            }
-
-            interface radio extends labeledElement {
-                default?: string;
-                items?: string[] | (string[])[];
-                validate?: () => boolean;
-            }
-
-            interface select extends labeledElement {
-                default?: string;
-                items?: string[] | (string[])[];
-                multiple?: boolean;
-                size?: number;
-                validate?: () => boolean;
-            }
-
-            interface textarea extends labeledElement {
-                bidi?: boolean;
-                cols?: number;
-                default?: string;
-                rows?: number;
-                validate?: () => boolean;
-            }
-
-            interface textInput extends labeledElement {
-                bidi?: boolean;
-                default?: string;
-                maxLength?: number;
-                size?: number;
-                validate?: () => boolean;
-            }
-
-            interface uiElement {
-                align?: string;
-                className?: string;
-                commit?: (widget: plugins.widget) => void;
-                id?: string;
-                label?: string;
-                onHide?: (elem: ui.dialog.uiElement) => void;
-                onLoad?: (elem: ui.dialog.uiElement) => void;
-                onShow?: (elem: ui.dialog.uiElement) => void;
-                requiredContent?: string | { [key: string]: any } | style;
-                setup?: (widget: plugins.widget) => void;
-                style?: string;
-                title?: string;
-                type?: string;
-            }
-
-            interface vbox extends uiElement {
-                children?: ui.dialog.uiElement[];
-                expand?: boolean;
-                heights?: number[];
-                padding?: number;
-                styles?: string;
-                width?: number[];
-            }
-        }
-
-        interface IDialogDefinition {
-            buttons?: dialog.definition.button[];
-            contents?: dialog.definition.content[];
-            height?: number;
-            minHeight?: number;
-            minWidth?: number;
-            onCancel?: () => void;
-            onLoad?: () => void;
-            onOk?: () => void;
-            onShow?: () => void;
-            onHide?: () => void;
-            resizable?: number;
-            title?: string;
-            width?: number;
-        }
-    }
-
-    class dialogCommand {
-        value: any;
-
-        constructor(dialogName: string, ext?: { tabId?: string });
-    }
-
-    interface dtdDefinition {
-        [outerTagName: string]: { [innerTagName: string]: 1 };
-        $block: { [tagName: string]: 1 };
-        $blockLimit: { [tagName: string]: 1 };
-        $cdata: { [tagName: string]: 1 };
-        $editable: { [tagName: string]: 1 };
-        $empty: { [tagName: string]: 1 };
-        $inline: { [tagName: string]: 1 };
-        $intermediate: { [tagName: string]: 1 };
-        $list: { [tagName: string]: 1 };
-        $listItem: { [tagName: string]: 1 };
-        $nonBodyContent: { [tagName: string]: 1 };
-        $nonEditable: { [tagName: string]: 1 };
-        $object: { [tagName: string]: 1 };
-        $removeEmpty: { [tagName: string]: 1 };
-        $tabIndex: { [tagName: string]: 1 };
-        $tableContent: { [tagName: string]: 1 };
-        $transparent: { [tagName: string]: 1 };
-    }
-
-    var dtd: dtdDefinition;
-
-    class editable extends dom.element {
-        hasFocus: boolean;
-        readonly status: string;
-
-        constructor(editor: editor, element: HTMLElement | dom.element);
-        attachClass(className: string): void;
-        attachListener(obj: event | editable, eventName: string, listenerFunction: (ei: eventInfo) => void, scopeobj?: {}, listenerData?: any, priority?: number): listenerRegistration;
-        changeAttr(attr: string, val: string): void;
-        detach(): void;
-        insertElement(element: dom.element, range?: dom.range): void;
-        insertHtml(data: string, mode?: string, range?: dom.range): void;
-        insertText(text: dom.text): void;
-        isInline(): boolean;
-        setReadOnly(isReadOnly: boolean): void;
-    }
-
-    class editor extends event {
-        readonly activeEnterMode: number;
-        readonly activeFilter: filter;
-        readonly activeShiftEnterMode: number;
-        readonly blockless: boolean;
-        readonly config: config;
-        readonly container: dom.element;
-        readonly contextMenu: plugins.contextMenu;
-        copyFormatting: plugins.copyformatting.state;
-        dataProcessor: dataProcessor;
-        readonly document: dom.document;
-        readonly element: dom.element;
-        readonly elementMode: number;
-        readonly enterMode: number;
-        readonly filter: filter;
-        readonly focusManager: focusManager;
-        readonly id: string;
-        readonly keystrokeHandler: keystrokeHandler;
-        readonly lang: any;
-        readonly langCode: string;
-        readonly mode: string;
-        readonly name: string;
-        readonly pasteFilter: filter;
-        readonly plugins: any;
-        readonly readOnly: boolean;
-        readonly shiftEnterMode: number;
-        readonly status: string;
-        readonly tabIndex: number;
-        readonly templates: any;
-        readonly title: any;
-        readonly toolbar: any;
-        readonly ui: ui;
-        readonly widgets: plugins.widget.repository;
-        readonly window: dom.window;
-
-        constructor(instanceConfig?: config, element?: dom.element, mode?: number);
-        addCommand(commandName: string, commandDefinition: commandDefinition): void;
-        addContentsCss(cssPath: string): void;
-        addFeature(feature: feature): boolean;
-        addMenuGroup(name: string, order?: number): void;
-        addMenuItem(name: string, definition?: IMenuItemDefinition): void;
-        addMenuItems(definitions: { [id: string]: IMenuItemDefinition }): void;
-        addMode(mode: string, exec: () => void): void;
-        addRemoveFormatFilter(func: (element: dom.element) => boolean): void;
-        applyStyle(style: style): void;
-        attachStyleStateChange(style: style, callback: (state: number) => void): void;
-        checkDirty(): boolean;
-        createFakeElement(realElement: dom.element, className: string, realElementType: string, isResizable: boolean): void;
-        createFakeParserElement(realElement: dom.element, className: string, realElementType: string, isResizable: boolean): void;
-        createRange(): dom.range;
-        destroy(noUpdate?: boolean): void;
-        editable(elementOrEditable?: dom.element | editable): editable;
-        elementPath(startNode?: dom.node): dom.elementPath;
-        execCommand(commandName: string, data?: any): boolean;
-        extractSelectedHtml(toString?: boolean, removeEmptyBlock?: boolean): dom.documentFragment | string | void;
-        focus(): void;
-        forceNextSelectionCheck(): void;
-        getClipboardData(callbackOrOptions: { title: string } | ((data: any) => void), callback: (data: any) => void): void;
-        getColorFromDialog(callback: (color: string) => void, scope?: { [key: string]: any }): void;
-        getCommand(commandName: string): command;
-        getCommandKeystroke(command: command | string): number | null;
-        getData(internal?: boolean): string;
-        getMenuItem(name: string): IMenuItemDefinition;
-        getResizable(forContents: boolean): dom.element;
-        getSelectedHtml(toString?: false): dom.documentFragment;
-        getSelectedHtml(toString: true): string;
-        getSelectedHtml(toString?: boolean): dom.documentFragment | string;
-        getSelection(forceRealSelection?: boolean): dom.selection;
-        getSnapshot(): string;
-        getStylesSet(callback: (stylesDefinitions: style.definition[]) => void): void;
-        getUiColor(): string;
-        insertElement(element: dom.element): void;
-        insertHtml(html: string, mode?: string, range?: dom.range): void;
-        insertText(text: string): void;
-        loadSnapshot(snapshot: any): void;
-        lockSelection(sel?: dom.selection): boolean;
-        openDialog(dialogName: string, callback: () => void): dialog;
-        popup(url: string, width?: number | string, height?: number | string, options?: string): void;
-        removeMenuItem(name: string): void;
-        removeStyle(style: style): void;
-        resetDirty(): void;
-        resetUndo(): void;
-        resize(width: number | string, height: number | string, isContentHeight?: boolean, resizeInner?: boolean): void;
-        restoreRealElement(fakeElement: dom.element): dom.element;
-        selectionChange(checkNow?: boolean): void;
-        setActiveEnterMode(enterMode: number, shiftEnterMode: number): void;
-        setActiveFilter(filter: filter): void;
-        setData(data: string, options?: { internal?: boolean; callback?: () => void; noSnapshot?: boolean; }): void;
-        setKeystroke(keystroke: number, behavior: string | boolean): void;
-        setKeystroke(keystroke: [number, string | boolean][]): void;
-        setMode(newMode: string, callback: () => void): void;
-        setReadOnly(isReadOnly?: boolean): void;
-        setUiColor(color: string): void;
-        showNotification(message: string, type: plugins.notification.type, progressOrDuration: number): plugins.notification;
-        unlockSelection(restore?: boolean): void;
-        updateElement(): void;
-    }
-
-    namespace editor {
-        interface eventObject {
-            activeEnterModeChange?: (evt: eventInfo) => void;
-            activeFilterChange?: (evt: eventInfo) => void;
-            afterCommandExec?: (evt: eventInfo) => void;
-            afterInsertHtml?: (evt: eventInfo) => void;
-            afterPaste?: (evt: eventInfo) => void;
-            afterPasteFromWord?: (evt: eventInfo) => void;
-            afterSetData?: (evt: eventInfo) => void;
-            afterUndoImage?: (evt: eventInfo) => void;
-            ariaEditorHelpLabel?: (evt: eventInfo) => void;
-            ariaWidget?: (evt: eventInfo) => void;
-            autogrow?: (evt: eventInfo) => void;
-
-            beforeCommandExec?: (evt: eventInfo) => void;
-            beforeDestroy?: (evt: eventInfo) => void;
-            beforeGetData?: (evt: eventInfo) => void;
-            beforeModeUnload?: (evt: eventInfo) => void;
-            beforeSetMode?: (evt: eventInfo) => void;
-            beforeUndoImage?: (evt: eventInfo) => void;
-            blur?: (evt: eventInfo) => void;
-
-            change?: (evt: eventInfo) => void;
-            configLoaded?: (evt: eventInfo) => void;
-            contentDirChanged?: (evt: eventInfo) => void;
-            contentDom?: (evt: eventInfo) => void;
-            contentDomInvalidated?: (evt: eventInfo) => void;
-            contentDomUnload?: (evt: eventInfo) => void;
-            customConfigLoaded?: (evt: eventInfo) => void;
-
-            dataFiltered?: (evt: eventInfo) => void;
-            dataReady?: (evt: eventInfo) => void;
-            destroy?: (evt: eventInfo) => void;
-            dialogHide?: (evt: eventInfo) => void;
-            dialogShow?: (evt: eventInfo) => void;
-            dirChanged?: (evt: eventInfo) => void;
-            doubleclick?: (evt: eventInfo) => void;
-            dragend?: (evt: eventInfo) => void;
-            dragstart?: (evt: eventInfo) => void;
-            drop?: (evt: eventInfo) => void;
-
-            elementsPathUpdate?: (evt: eventInfo) => void;
-
-            fileUploadRequest?: (evt: eventInfo) => void;
-            fileUploadResponse?: (evt: eventInfo) => void;
-            floatingSpaceLayout?: (evt: eventInfo) => void;
-            focus?: (evt: eventInfo) => void;
-
-            getData?: (evt: eventInfo) => void;
-            getSnapshot?: (evt: eventInfo) => void;
-
-            insertElement?: (evt: eventInfo) => void;
-            insertHtml?: (evt: eventInfo) => void;
-            insertText?: (evt: eventInfo) => void;
-            instanceReady?: (evt: eventInfo) => void;
-
-            key?: (evt: eventInfo) => void;
-
-            langLoaded?: (evt: eventInfo) => void;
-            loadSnapshot?: (evt: eventInfo) => void;
-            loaded?: (evt: eventInfo) => void;
-            lockSnapshot?: (evt: eventInfo) => void;
-            maximize?: (evt: eventInfo) => void;
-            menuShow?: (evt: eventInfo) => void;
-            mode?: (evt: eventInfo) => void;
-
-            notificationHide?: (evt: eventInfo) => void;
-            notificationShow?: (evt: eventInfo) => void;
-            notificationUpdate?: (evt: eventInfo) => void;
-
-            paste?: (evt: eventInfo) => void;
-            pasteFromWord?: (evt: eventInfo) => void;
-            pluginsLoaded?: (evt: eventInfo) => void;
-
-            readOnly?: (evt: eventInfo) => void;
-            removeFormatCleanup?: (evt: eventInfo) => void;
-            required?: (evt: eventInfo) => void;
-            resize?: (evt: eventInfo) => void;
-
-            save?: (evt: eventInfo) => void;
-            saveSnapshot?: (evt: eventInfo) => void;
-            selectionChange?: (evt: eventInfo) => void;
-            setData?: (evt: eventInfo) => void;
-            stylesSet?: (evt: eventInfo) => void;
-
-            template?: (evt: eventInfo) => void;
-            toDataFormat?: (evt: eventInfo) => void;
-            toHtml?: (evt: eventInfo) => void;
-
-            unlockSnapshot?: (evt: eventInfo) => void;
-            updateSnapshot?: (evt: eventInfo) => void;
-
-            widgetDefinition?: (evt: eventInfo) => void;
-        }
-    }
-
-    namespace env {
-        var air: boolean;
-        var chrome: boolean;
-        var cssClass: string;
-        var edge: boolean;
-        var gecko: boolean;
-        var hc: boolean;
-        var hidpi: boolean;
-        var iOS: boolean;
-        var ie: boolean;
-        var isCompatible: boolean;
-        var mac: boolean;
-        var needsBrFiller: boolean;
-        var needsNbspFiller: boolean;
-        var quirks: boolean;
-        var safari: boolean;
-        var version: number;
-        var webkit: boolean;
-
-        function secure(): boolean;
-    }
-
-    class event {
-        static useCapture: boolean;
-
-        constructor();
-        capture(): void;
-        define(name: string, meta: { [key: string]: any }): void;
-        fire(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
-        fireOnce(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
-        hasListeners(eventName: string): boolean;
-        on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any } | null, listenerData?: any, priority?: number): listenerRegistration;
-        once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any } | null, listenerData?: any, priority?: number): listenerRegistration;
-        removeAllListeners(): void;
-        removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
-
-        static implementOn(targetObject: { [key: string]: any }): void;
-    }
-
-    interface eventInfo {
-        data: any;
-        editor: editor;
-        listenerData: any;
-        name: string;
-        sender: { [key: string]: any };
-
-        cancel(): void;
-        removeListener(): void;
-        stop(): void;
-    }
-
-    interface feature {
-        allowedContent?: filter.allowedContentRules;
-        contentForms?: any;
-        contentTransformations?: any;
-        name?: string;
-        requiredContent?: string | style;
-        toFeature?: () => feature;
-    }
-
-    namespace fileTools {
-        var isFileUploadSupported: boolean;
-
-        function addUploadWidget(editor: editor, name: string, def: uploadWidgetDefinition): void;
-        function bindNotification(editor: editor, fileLoader: fileLoader): void;
-        function getUploadUrl(config: { [key: string]: any }, type?: string): string;
-        function isTypeSupported(file: Blob, supportedTypes: RegExp): boolean;
-        function markElement(element: dom.element, widgetName: string, loaderId: number): void;
-
-        class fileLoader extends event {
-            readonly data: string;
-            readonly file: Blob;
-            readonly fileName: string;
-            readonly id: number;
-            readonly loaded: number;
-            readonly message: string;
-            readonly reader: FileReader;
-            readonly responseData: any;
-            status: string;
-            readonly total: number;
-            readonly uploadTotal: number;
-            readonly uploadUrl: string;
-            readonly uploaded: string;
-            readonly url: string;
-            readonly xhr: XMLHttpRequest;
-
-            constructor(editor: editor, fileOrData: Blob | string, fileName?: string);
-            abort(): void;
-            isFinished(): boolean;
-            load(): void;
-            loadAndUpload(url: string, additionalRequestParameters?: any): void;
-            update(): void;
-            upload(url: string, additionalRequestParameters?: any): void;
-        }
-
-        class uploadRepository extends event {
-            readonly loaders: fileLoader[];
-
-            constructor(editor: editor);
-            create(fileOrData: Blob | string, fileName: string, loaderType?: any): fileLoader;
-            isFinished(): boolean;
-        }
-
-        interface uploadWidgetDefinition extends plugins.widget.definition {
-            additionalRequestParameters: any;
-            fileToElement: (pastedFile: any) => HTMLElement;
-            loadMethod: string;
-            loaderType: any;
-            onAbort: () => boolean;
-            onError: () => boolean;
-            onLoaded: () => boolean;
-            onUploaded: () => boolean;
-            onUploading: () => boolean;
-            replaceWith: () => any;
-            skipNotifications: boolean;
-            supportedTypes: string;
-            uploadUrl: string;
-        }
-    }
-
-    module filter {
-        type allowedContentRule = string | style | { [key: string]: any };
-        type allowedContentRules = allowedContentRule | allowedContentRule[];
-        type contentRule = string | style;
-        type disallowedContentRules = string | { [key: string]: any };
-
-        interface transformation {
-            check?: string;
-            element?: string | style;
-            left?: (element: htmlParser.element | style) => boolean;
-            right: (element: htmlParser.element, tools: string | filter.transformationTools) => boolean;
-        }
-
-        var transformationTools: transformationTools;
-
-        interface transformationTools {
-            alignmentToAttribute(element: htmlParser.element): void;
-            alignmentToStyle(element: htmlParser.element): void;
-            lengthToAttribute(element: htmlParser.element, styleName: string, attrName?: string): void;
-            lengthToStyle(element: htmlParser.element, styleName: string, attrName?: string): void;
-            matchesTyle(element: htmlParser.element, style: style): void;
-            sizeToAttribute(element: htmlParser.element): void;
-            sizeToStyle(element: htmlParser.element): void;
-            splitBorderShorthand(element: htmlParser.element): void;
-            splitMarginShorthand(element: htmlParser.element): void;
-            transform(element: htmlParser.element, form: style | string): void;
-        }
-    }
-
-    class filter {
-        readonly allowedContent: filter.allowedContentRules[];
-        readonly customConfig: boolean;
-        readonly disabled: boolean;
-        readonly disallowedContent: any[];
-        readonly editor: editor;
-        readonly elementCallbacks: ((element: htmlParser.element) => number)[];
-        readonly id: number;
-
-        static instances: { [id: string]: filter };
-
-        constructor(editorOrRules: editor | filter.allowedContentRules);
-        addContentForms(forms: any[]): void;
-        addElementCallback(callback: (element: htmlParser.element) => number): void;
-        addFeature(feature: feature): boolean;
-        addTransformations(transformations: (string | filter.transformation)[][]): void;
-        allow(newRules: filter.allowedContentRules, featureName?: string, overrideCustom?: boolean): boolean;
-        applyTo(fragment: htmlParser.fragment | htmlParser.element, toHrml: boolean, transformOnly: boolean, enterMode: number): boolean;
-        check(test: filter.contentRule, applyTransformations?: boolean, strictCheck?: boolean): boolean;
-        checkFeature(feature: feature): boolean;
-        clone(): filter;
-        destroy(): void;
-        disable(): void;
-        disallow(newRules: filter.disallowedContentRules): void;
-        getAllowedEnterMode(defaultMode: number, reverse?: boolean): number;
-    }
-
-    class focusManager {
-        currentActive: dom.domObject;
-        hasFocus: boolean;
-
-        constructor(editor: editor);
-        add(element: dom.element, isCapture: boolean): void;
-        blur(noDelay?: boolean): void;
-        focus(currentActive?: dom.element): void;
-        lock(): void;
-        remove(element: dom.element): void;
-        unlock(): void;
-    }
-
-    class htmlDataProcessor implements dataProcessor {
-        dataFilter: htmlParser.filter;
-        htmlFilter: htmlParser.filter;
-        writer: htmlParser.basicWriter;
-
-        constructor(editor: editor);
-        toDataFormat(html: string, options?: string | { context?: string, filter?: filter, enterMode?: number }): string;
-        toHtml(data: string, options?: string | htmlDataProcessorOptions): string;
-    }
-
-    interface htmlDataProcessorOptions {
-        context?: string;
-        fixForBody?: boolean;
-        filter?: filter;
-        dontFilter?: boolean;
-        enterMode?: number;
-        protectedWhitespaces?: boolean;
-    }
-
-    namespace htmlParser {
-        class basicWriter {
-            constructor();
-            attribute(attName: string, attValue: string): void;
-            closeTag(tagName: string): void;
-            comment(comment: string): void;
-            getHtml(reset: boolean): string;
-            openTag(tagName: string, attributes: { [key: string]: string }): void;
-            openTagClose(tagName: string, isSelfClose: boolean): void;
-            reset(): void;
-            text(text: string): void;
-            write(data: string): void;
-        }
-
-        class cdata extends node {
-            constructor(value: string);
-            type: number;
-            writeHtml(writer: htmlParser.basicWriter): void;
-        }
-
-        class comment extends node {
-            type: number;
-            value: string;
-
-            constructor(value: string);
-            filter(filter: filter): boolean;
-            writeHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
-        }
-
-        class cssStyle {
-            constructor(elementOrStyleText: htmlParser.element | string);
-            populate(obj: htmlParser.element | dom.element | { [key: string]: any }): void;
-        }
-
-        class element extends node {
-            attributes: { [name: string]: string };
-            children: htmlParser.node[];
-            name: string;
-            type: number;
-
-            constructor(name: string, attributes: { [name: string]: string });
-            add(node: node, index?: number): void;
-            addClass(className: string): void;
-            clone(): element;
-            filter(filter: htmlParser.filter): boolean;
-            filterChildren(filter: htmlParser.filter): void;
-            find(criteria: string | ((el: htmlParser.node) => boolean), recursive?: boolean): htmlParser.node[];
-            forEach(callback: (node: htmlParser.node) => void | false, type?: number, skipRoot?: boolean): void;
-            getFirst(condition: string | { [key: string]: string } | ((node: htmlParser.node) => boolean)): htmlParser.node;
-            getHtml(): string;
-            getOuterHtml(): string;
-            hasClass(className: string): boolean;
-            removeClass(className: string): void;
-            replaceWithChildren(): void;
-            setHtml(html: string): void;
-            split(index: number): htmlParser.element;
-            writeChildrenHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
-            writeHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
-        }
-
-        class filter {
-            attributeNameRules: filterRulesGroup;
-            attributesRules: { [name: string]: filterRulesGroup };
-            commentRules: filterRulesGroup;
-            elementNameRules: filterRulesGroup;
-            elementsRules: { [name: string]: filterRulesGroup };
-            id: number;
-            rootRules: filterRulesGroup;
-            textRules: filterRulesGroup;
-
-            constructor(rules?: filterRulesDefinition);
-            addRules(rules: filterRulesDefinition, options?: number | { priority?: number; applyToAll?: boolean; }): void;
-            applyTo(node: node): void;
-        }
-
-        interface filterRulesDefinition {
-            elementNames?: any;
-            attributeNames?: any;
-            elements?: any;
-            attributes?: any;
-            text?: any;
-            comment?: any;
-            root?: any;
-        }
-
-        class filterRulesGroup {
-            rules: { value: rule, priority: number, option: ruleOptions }[];
-
-            add(rule: rule, priority: number, options: ruleOptions): void;
-            addMany(rules: { [key: string]: any }[], priority: number, options: ruleOptions): void;
-            exec(currentValue: htmlParser.node | htmlParser.fragment | string): htmlParser.node | htmlParser.fragment | string;
-            execOnName(currentName: string): string;
-            findIndex(priority: number): number;
-        }
-
-        class fragment {
-            children: htmlParser.node[];
-            parent: htmlParser.fragment;
-            readonly type: number;
-
-            constructor();
-
-            add(node: htmlParser.node, index?: number): void;
-            filter(filter: htmlParser.filter): void;
-            filterChildren(filter: htmlParser.filter, filterRoot?: boolean): void;
-            forEach(callback: (node: htmlParser.node) => void | false, type?: number, skipRoot?: boolean): void;
-            writeChildrenHtml(writer: basicWriter, filter?: htmlParser.filter, filterRoot?: boolean): void;
-            writeHtml(writer: basicWriter, filter?: htmlParser.filter): void;
-
-            static fromBBCode(source: string): htmlParser.fragment;
-            static fromHtml(fragmentHtml: string, parent?: htmlParser.element | string, fixingBlock?: string | boolean): fragment | htmlParser.element;
-        }
-
-        class node {
-            constructor();
-            getAscendant(condition: string | { [name: string]: string } | ((node: htmlParser.element) => boolean)): element;
-            getIndex(): number;
-            insertAfter(node: node): void;
-            insertBefore(node: node): void;
-            remove(): node;
-            replaceWith(node: node): void;
-            wrapWith(wrapper: element): element;
-        }
-
-        type rule = ((value: htmlParser.node | htmlParser.fragment | string) => boolean) | [string, string];
-
-        interface ruleOptions {
-            applyToAll?: boolean,
-            excludeNestedEditable?: boolean
-        }
-
-        class text extends node {
-            constructor(value: string);
-            type: number;
-            filter(filter: filter): boolean;
-            writeHtml(writer: basicWriter, filter?: filter): void;
-        }
-    }
-
-    class htmlWriter extends htmlParser.basicWriter {
-        indentationChars: string;
-        lineBreakChars: string;
-        selfClosingEnd: string;
-
-        indentation(): void;
-        lineBreak(): void;
-        setRules(tagName: string, rules: { [key: string]: any }): void;
-    }
-
-    class keystrokeHandler {
-        blockedKeystrokes: { [key: number]: string | boolean };
-        keystrokes: { [key: number]: string | boolean };
-
-        constructor(editor: editor);
-
-        attach(domObject: dom.domObject): void;
-    }
-
-    namespace lang {
-        var languages: { [code: string]: number };
-        var rtl: { [code: string]: number };
-
-        function detect(defaultLanguage: string, probeLanguage?: string): string;
-        function load(languageCode: string, defaultLanguage: string, callback: (code: string, entries: any) => void): void;
-    }
-
-    namespace loader {
-        var loadedScripts: string[];
-        var scripts: string[];
-
-        function load(scriptName: string, defer?: boolean): void;
-        function loadPending(): void;
-    }
-
-    class menu {
-        constructor();
-
-        add(item: any): void;
-        addListener(listenerFn: (startElement: dom.element, selection: dom.selection, path: dom.elementPath) => any): void;
-        findItemByCommandName(commandName: string): { item: any, element: dom.element };
-        hide(returnFocus?: boolean): void;
-        removeAll(): void;
-        show(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
-    }
-
-    interface pluginDefinition {
-        hidpi?: boolean;
-        lang?: string | string[];
-        requires?: string | string[];
-
-        afterInit?(editor: editor): any;
-        beforeInit?(editor: editor): any;
-        init?(editor: editor): void;
-        onLoad?(): any;
-    }
-
-    namespace plugins {
-
-        namespace cloudservices {
-            class cloudServicesLoader extends fileTools.fileLoader {
-                customToken: string;
-
-                constructor(editor: editor, fileOrData: Blob | string, fileName?: string, token?: string);
-                loadAndUpload(url?: string, additionalRequestParameters?: any): void;
-                upload(url?: string, additionalRequestParameters?: any): void;
-            }
-        }
-
-        class autoEmbed {
-            getWidgetDefinition(editor: editor, url: string): widget.definition;
-        }
-
-        namespace balloontoolbar {
-            const PRIORITY: { [pri: string]: number };
-
-            class context {
-                editor: editor;
-                options: contextDefinition;
-                toolbar: ui.balloonToolbar;
-
-                constructor(editor: editor, options: contextDefinition);
-                destroy(): void;
-                hide(): void;
-                refresh(): void;
-                show(pointedElement?: dom.element): void;
-            }
-
-            interface contextDefinition {
-                cssSelector?: string;
-                priority?: number;
-                widgets?: string[] | string;
-
-                refresh?: (editor: editor, path: dom.elementPath, selection: dom.selection) => dom.element;
-            }
-
-            class contextManager {
-                editor: editor;
-
-                constructor(editor: editor);
-                add(context: context): void;
-                check(selection?: dom.selection): void;
-                create(options: contextDefinition): context;
-                destroy(): void;
-                hide(): void;
-            }
-        }
-
-        namespace clipboard {
-            const isCustomCopyCutSupported: boolean;
-            const isCustomDataTypesSupported: boolean;
-            const isFileApiSupported: boolean;
-            const mainPasteEvent: string;
-
-            function addPasteButton(editor: editor, name: string, definition: { [key: string]: any }): void;
-            function canClipboardApiBeTrusted(dataTransfer: dataTransfer, editor: editor): boolean;
-            function getDropTarget(editor: editor): dom.domObject;
-            function getRangeAtDropPosition(domEvent: Event, editor: editor): dom.range;
-            function initDragDataTransfer(evt?: dom.event, editor?: editor): void;
-            function initPasteDataTransfer(evt?: dom.event, sourceEditor?: editor): void;
-            function preventDefaultDropOnElement(element: dom.element): void;
-            function resetDragDataTransfer(): void;
-
-            class dataTransfer {
-                readonly $: DataTransfer;
-                readonly id: string;
-                readonly sourceEditor: editor;
-
-                constructor(nativeDataTransfer?: DataTransfer, editor?: editor);
-                cacheData(): void;
-                getData(type: string, getNative?: boolean): string;
-                getFile(i: number): File;
-                getFilesCount(): number;
-                getTransferType(targetEditor: editor): number;
-                isEmpty(): boolean;
-                setData(type: string, value: string): void;
-                storeId(): void;
-            }
-
-            class fallbackDataTransfer {
-                constructor(dataTransfer: dataTransfer);
-                getData(type: string, getNative?: boolean): string;
-                isRequired(): boolean;
-                setData(type: string, value: string): string;
-            }
-        }
-
-        namespace condesnippet {
-            function setHighlighter(highlighter: highlighter): void;
-
-            class highlighter {
-                highlighter: (code: string, lang: string, callback: (highlightedCode: string) => void) => void;
-                init: (ready: () => void) => void;
-                languages: { [lang: string]: string };
-                readonly queue: ((code: string, lang: string, callback: (highlightedCode: string) => void) => void)[];
-                readonly ready: boolean;
-
-                highlight(code: string, lang: string, callback: (highlightedCode: string) => void): void;
-            }
-        }
-
-        class contextMenu extends menu {
-            constructor(editor: editor);
-            addTarget(element: dom.element, nativeContextMenuOnCtrl?: boolean): void;
-            open(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
-        }
-
-        namespace copyformatting {
-            var breakOnElements: string[];
-            var elementsForInlineTransform: string[];
-            var excludedAttributes: string[];
-            var excludedAttributesFromInlineTransform: string[];
-            var inlineBoundary: string[];
-            var preservedElements: string[];
-
-            class state extends event {
-                editor: editor;
-                filter: filter;
-                sticky: boolean;
-                styles: style[];
-
-                constructor(editor: editor);
-            }
-        }
-
-        namespace easyimage {
-
-        }
-
-        namespace embedBase {
-            function createWidgetBaseDefinition(editor: editor): baseDefinition;
-
-            interface baseDefinition extends widget.definition {
-                providerUrl: template;
-                urlRegExp: RegExp;
-
-                getErrorMessage(messageTypeOrMessage: string, url?: string, suffix?: string): string;
-                isUrlValid(url: string): boolean;
-                loadContent(url: string, callback?: () => void, errorCallback?: (error: string) => void, noNotifications?: boolean): request;
-            }
-
-            interface request {
-                callback: () => void;
-                errorCallback: (error: string) => void;
-                response: { [key: string]: string };
-                task: notificationAggregator.task;
-                url: string;
-
-                cancel(): void;
-            }
-        }
-
-        namespace image2 {
-            function checkHasNaturalRatio(image: dom.element): boolean;
-            function getLinkAttributesGetter(): (editor: editor, data: { [key: string]: string }) => { set: { [tag: string]: string }, removed: string[] };
-            function getLinkAttributesParser(): (editor: editor, element: dom.element) => { [key: string]: string };
-            function getNatural(image: dom.element): { [key: string]: string };
-        }
-
-        namespace imagebase {
-            var featuresDefinitions: { [key: string]: string };
-
-            function addFeature(editor: editor, name: string, definition: imageWidgetDefinition): imageWidgetDefinition;
-            function addImageWidget(editor: editor, name: string, definition: imageWidgetDefinition): void;
-
-            interface imageWidgetDefinition extends widget.definition {
-                features: string[];
-                upcast: string;
-            }
-
-            class progressBar extends progressReporter {
-                bar: dom.element;
-
-                constructor();
-
-            }
-
-            class progressReporter {
-                wrapper: dom.element;
-
-                constructor(wrapperHtml?: string);
-                aborted(): void;
-                bindLoader(loader: fileTools.fileLoader): void;
-                done(): void;
-                failed(): void;
-                remove(): void;
-                updated(progress: number): void;
-            }
-        }
-
-        namespace indent {
-            function registerCommands(editor: editor, commands: { [key: string]: command }): void;
-
-            class genericDefinition implements commandDefinition {
-                async: boolean;
-                canUndo: boolean;
-                context: boolean;
-                contextSensitive: boolean;
-                editorFocus: boolean;
-                fakeKeystroke: number;
-                readonly isIndent: boolean;
-                modes: { [key: string]: any };
-                readOnly: boolean;
-                startDisabled: boolean;
-
-                exec(editor: editor, data?: any): boolean;
-                refresh?(editor: editor, path: dom.elementPath): void;
-            }
-
-            class specificDefinition {
-                database: { [key: string]: any };
-                readonly enterBr: boolean;
-                readonly indentKey: { [key: string]: any };
-                readonly isIndent: boolean;
-                readonly jobs: { [priority: string]: { refresh: (editor: editor, path: dom.elementPath) => number, exec: (editor: editor) => boolean } };
-                readonly relatedGlobal: { [key: string]: any };
-
-                execJob(editor: editor, priority: number): boolean;
-                getContext(node: dom.elementPath): dom.element;
-                refreshJob(editor: editor, priority: number): number;
-            }
-        }
-
-        namespace indentList {
-            function firstItemInPath(query: string | string[] | { [tagName: string]: any } | dom.element | ((element: dom.element) => boolean)): boolean;
-        }
-
-        namespace link {
-            // DEPRECATED 4.3.3
-            const emptyAnchorFix: boolean;
-
-            // DEPRECATED 4.3.3
-            const fakeAnchor: boolean;
-
-            // DEPRECATED 4.3.3
-            const synAnchorSelector: boolean;
-
-            function getEditorAnchors(editor: editor): dom.element[];
-            function getLinkAttributes(editor: editor, data: { [key: string]: any }): { set: { [key: string]: string }, removed: string[] }
-            function getSelectedLink(editor: editor, returnMultiple?: boolean): dom.element | dom.element[];
-            function parseLinkAttributes(editor: editor, element: dom.element): { [key: string]: any };
-            function showDisplayTextForElement(element: dom.element, editor: editor): boolean;
-            function tryRestoreFakeAnchor(editor: editor, element: dom.element): dom.element;
-        }
-
-        class list {
-            arrayToList(listArray: any, database: any, paragraphMode: any, dir: any): void;
-            listToArray(listNode: any, database: any, baseArray: any, baseIndentLevel: any, grandparentNode: any): void;
-        }
-
-        class notification {
-            readonly area: notification.area;
-            readonly duration: number;
-            readonly editor: editor;
-            readonly element: dom.element;
-            readonly id: number;
-            readonly message: string;
-            readonly progress: number;
-            readonly type: notification.type;
-
-            constructor(editor: editor, options: notification.options);
-            hide(): void;
-            isVisible(): boolean;
-            show(): void;
-            update(options: notification.updateOptions): void;
-        }
-
-        namespace notification {
-            interface area {
-                readonly editor: editor;
-                readonly element: dom.element;
-                readonly notifications: notification[];
-
-                add(notification: notification): void;
-                remove(notification: notification): void;
-            }
-
-            interface optionsBase {
-                duration?: number;
-                progress?: number;
-                type?: type;
-            }
-
-            interface options extends optionsBase {
-                message: string;
-            }
-
-            interface updateOptions extends optionsBase {
-                message?: string;
-                important?: boolean;
-            }
-
-            type type = 'info' | 'warning' | 'success' | 'progress';
-        }
-
-        class notificationAggregator extends event {
-            readonly editor: editor;
-            readonly notification: notification;
-
-            constructor(editor: editor, message: string, singularMessage?: string);
-            createTask(options?: { weight?: number }): notificationAggregator.task;
-            getDoneTaskCount(): number;
-            getPercentage(): number;
-            getTaskCount(): number;
-            isFinished(): boolean;
-            update(): void;
-        }
-
-        namespace notificationAggregator {
-            class task extends event {
-                constructor(weight?: number);
-                cancel(): void;
-                done(): void;
-                isCanceled(): boolean;
-                isDone(): boolean;
-                update(weight: number): void;
-            }
-        }
-
-        namespace pastefromword {
-            class lists {
-                numbering: lists.numbering;
-            }
-
-            namespace lists {
-                class numbering {
-                    getStyle(marker: string): string;
-                    toNumber(marker: string, markerType: string): number;
-                }
-            }
-
-            class styles {
-                pushStylesLower(element: htmlParser.element, exceptions: { [style: string]: boolean }, wrapText?: boolean): boolean;
-            }
-        }
-
-        namespace tableselection {
-            function getCellsBetween(first: dom.element, last: dom.element): dom.element[];
-        }
-
-        namespace widget {
-            var WRAPPER_CLASS_PREFIX: string;
-
-            function getNestedEditable(guard: dom.element, node: dom.node): dom.element;
-            function isDomDragHandler(node: dom.node): boolean;
-            function isDomDragHandlerContainer(node: dom.node): boolean;
-            function isDomNestedEditable(node: dom.node): boolean;
-            function isDomWidget(node: dom.node): boolean;
-            function isDomWidgetElement(node: dom.node): boolean;
-            function isDomWidgetWrapper(node: dom.node): boolean;
-            function isParserWidgetElement(node: dom.node): boolean;
-            function isParserWidgetWrapper(node: dom.node): boolean;
-
-            namespace nestedEditable {
-                interface definition {
-                    allowedContent?: filter.allowedContentRules;
-                    disallowedContent?: filter.disallowedContentRules;
-                    pathName?: string;
-                    selector?: string;
-                }
-            }
-
-            class nestedEditable extends dom.element {
-                readonly editor: editor;
-                readonly enterMode: number;
-                readonly filter: filter;
-                readonly shiftEnterMode: number;
-
-                constructor(editor: editor, element: dom.element, config: { filter?: filter });
-                getData(): string;
-                setData(data: string): void;
-            }
-
-
-            interface definition extends feature {
-                button?: string;
-                data?: (evt: eventInfo) => void;
-                defaults?: { [key: string]: any };
-                dialog?: string;
-                downcast?: string | ((element: htmlParser.element) => void);
-                downcasts?: { [key: string]: any };
-                draggable?: boolean;
-                edit?: () => void;
-                editables?: { [key: string]: any };
-                getLabel?: () => any;
-                init?: () => void;
-                inline?: boolean;
-                insert?: () => void;
-                mask?: boolean;
-                parts?: { [key: string]: any };
-                pathName?: string;
-                styleToAllowedContentRules?: (style: style) => filter.allowedContentRules;
-                styleableElements?: string;
-                template?: string | template;
-                upcast?: string | ((element: htmlParser.element, data: any) => boolean);
-                upcastPriority?: number;
-                upcasts?: { [key: string]: any };
-            }
-
-            class repository extends event {
-                readonly editor: editor;
-                readonly focused: widget;
-                readonly instances: { [id: string]: widget };
-                readonly registered: { [name: string]: definition };
-                readonly selected: widget[];
-                readonly widgetHoldingFocusedEditable: widget;
-
-                add(name: string, widgetDef: plugins.widget.definition): void;
-                addUpcastCallback(callback: (element: htmlParser.element, data: any) => boolean): void;
-                checkSelection(): void;
-                checkWidgets(options?: { initOnlyNew?: boolean; focusInited?: boolean }): void;
-                del(widget: plugins.widget): void;
-                destroy(widget: plugins.widget, offline?: boolean): void;
-                destroyAll(offline?: boolean): void;
-                finalizeCreation(container: any): void;
-                getByElement(element: any, checkWrapperOnly: boolean): plugins.widget;
-                initOn(element: dom.element, widgetDef?: plugins.widget.definition, startupData?: { [key: string]: any }): plugins.widget;
-                initOn(element: dom.element, widgetDef?: string, startupData?: { [key: string]: any }): plugins.widget;
-                initOnAll(container?: dom.element): plugins.widget[];
-                parseElementClasses(classes: string): any;
-                wrapElement(element: any, widgetName?: string): any;
-            }
-
-            class widgetselection {
-                addFillers(editable: editable): boolean;
-                removeFillers(editable: editable): void;
-            }
-        }
-
-        class widget extends event implements widget.definition {
-            readonly dataReady: boolean;
-            readonly definition: plugins.widget.definition;
-            readonly editor: editor;
-            readonly element: dom.element;
-            readonly focusedEditable: plugins.widget.nestedEditable
-            readonly id: number;
-            readonly inited: boolean;
-            readonly ready: boolean;
-            readonly repository: plugins.widget.repository;
-            readonly wrapper: dom.element;
-
-            constructor(widgetsRepo: plugins.widget.repository, id: number, element: dom.element, widgetDef: plugins.widget.definition, starupData?: any);
-
-            addClass(className: string): void;
-            applyStyle(style: style): void;
-            checkStyleActive(style: style): boolean;
-            destroy(offline?: boolean): void;
-            destroyEditable(editableName: string, offline?: boolean): void;
-            edit(): boolean;
-            focus(): void;
-            getClasses(): any;
-            hasClass(className: string, Whether: boolean): void;
-            initEditable(editableName: string, definition: plugins.widget.nestedEditable.definition): boolean;
-            isInited(): boolean;
-            isReady(): boolean;
-            removeClass(className: string): void;
-            removeStyle(style: style): void;
-            setData(keyOrData: any, value: any): plugins.widget;
-            setFocused(selected: boolean): plugins.widget;
-            setSelected(selected: boolean): plugins.widget;
-            updateDragHandlerPosition(): void;
-        }
-
-        function add(name: string, definition: pluginDefinition): void;
-        function add(name: string): void;
-        function addExternal(name: string, path: string, fileName?: string): void;
-        function get(name: string): any;
-        function getFilePath(name: string): string;
-        function getPath(name: string): string;
-        function load(name: string, callback: (plugins: string[]) => void, scope?: { [key: string]: any }): void;
-        function setLang(pluginName: string, languageCode: string, languageEntries: any): void;
-        var registered: { [key: string]: pluginDefinition };
-    }
-
-    class resourceManager {
-        basePath: string;
-        externals: { [key: string]: any };
-        fileName: string;
-        loaded: { [key: string]: any };
-        registered: { [key: string]: any };
-
-        constructor(basePath: string, fileName: string);
-        add(name: string, definition?: pluginDefinition): void;
-        addExternal(names: string, path: string, fileName?: string): void;
-        get(name: string): pluginDefinition;
-        getFilePath(name: string): string;
-        getPath(name: string): string;
-        load(name: string | string[], callback: (loaded: string[]) => void, scope?: { [key: string]: any }): void;
-    }
-
-    // see https://docs.com/ckeditor4/latest/api/CKEDITOR_scriptLoader.html
-    namespace scriptLoader {
-        function load(scriptUrls: string | string[], callback: (succeededUrls: boolean | string[], failedUrls: string[]) => void, scope?: any, showBusy?: boolean): void;
-        function queue(scriptUrl: string, callback?: (succeeded: boolean) => void): void;
-    }
-
-    namespace skin {
-        var icons: { [name: string]: { path: string } };
-        var name: string;
-        var ua: { [name: string]: any };
-
-        function addIcon(name: string, path: string, offset?: number, bgsize?: string): void;
-        function chameleon(editor: string, part: string): void;
-        function getIconStyle(name: string, rtl?: boolean, overridePath?: number, overrideBgsize?: string): any;
-        function getPath(part: string): any;
-        function loadPart(part: string, fn: () => void): void;
-        function path(): string;
-    }
-
-    namespace style {
-        function addCustomHandler(defintion: customHandler): style;
-        function getStyleText(style: definition): string;
-
-        namespace customHandlers {
-            class widget extends style {
-                group: any[];
-                widget: string;
-                checkElement(element: dom.element): boolean;
-                getClassesArray(): string[];
-                getDefintion(): definition;
-                removeStylesFromSameGroup(editor: editor): boolean;
-            }
-        }
-
-        interface definition {
-            attributes?: { [att: string]: string },
-            element: string,
-            name?: string,
-            styles?: { [att: string]: string },
-            type?: string | number
-        }
-
-        interface customHandler {
-            type: string | number;
-            setup?: (style: definition) => void;
-            assignedTo?: number;
-        }
-    }
-
-    class style {
-        alwaysRemoveElement: boolean;
-        includeReadonly: boolean;
-        constructor(styleDefinition: style.definition, variableValues: any);
-        apply(editor: editor): void;
-        applyToObject(element: dom.element, editor: editor): void;
-        applyToRange(range: Range, editor: editor): void;
-        buildPreview(label?: string): string;
-        checkActive(elementPath: dom.elementPath, editor: editor): boolean;
-        checkApplicable(elementPath: dom.elementPath, editor: editor, filter?: filter): boolean;
-        checkElementMatch(element: dom.element, fullMatch: boolean, editor: editor): boolean;
-        checkElementRemovable(element: dom.element, fullMatch: boolean, editor: editor): boolean;
-        getDefintion(): style.definition;
-        remove(editor: editor): void;
-        removeFromRange(range: dom.range, editor: editor): void;
-        toAllowedContentRules(editor?: editor): filter.allowedContentRules;
-    }
-
-    class styleCommand {
-        constructor(style: style, ext?: any);
-        exec(editor: editor): void;
-    }
-
-    var stylesSet: resourceManager;
-
-    class template {
-        readonly source: string;
-
-        constructor(source: string);
-        output(data: any, buffer?: any[]): string | number;
-    }
-
-    namespace tools {
-        function addFunction(fn: () => any, scope?: any): number;
-        function arrayCompare(arrayA: any[], arrayB: any[]): boolean;
-        function clone(source: { [key: string]: any }): { [key: string]: any };
-        function copy(source: { [key: string]: any }): { [key: string]: any };
-        function createClass(definition: { [key: string]: any }): any;
-        function cssStyleToDomStyle(cssName: string): string;
-        function cssVendorPrefix(property: string, value: string, asString?: boolean): { [cssClass: string]: string | number };
-        function defer<T extends Function>(fn: T): T;
-        function enableHtml5Elements(doc: Document | DocumentFragment, withAppend?: boolean): void;
-        function escapeCss(selector: string): string;
-        function eventsBuffer(minInterval: number, output: () => void, scopeObj: any): { input: () => void, reset: () => void };
-        function extend(target: { [key: string]: any }, source: { [key: string]: any }, overwrite: boolean, properties: { [key: string]: any }): { [key: string]: any };
-        function fixDomain(): boolean;
-        function genKey(subKey: string): string;
-        function getCookie(name: string): string;
-        function getCsrfToken(): string;
-        function getIndex<T>(array: T[], compareFunction: (element: T) => boolean): number;
-        function getMouseButton(evt: dom.event): boolean;
-        function getNextId(): string;
-        function getNextNumber(): number;
-        function getUniqueId(): string;
-        function htmlDecode(text: string): string;
-        function htmlDecodeAttr(text: string): string;
-        function htmlEncode(text: string): string;
-        function htmlEncodeAttr(text: string): string;
-        function indexOf<T>(array: T[], value: T | ((el: T) => boolean)): number;
-        function isArray<T>(object: any): object is T[];
-        function isEmpty(object: { [key: string]: any }): boolean;
-        function keystrokeToArray(lang: { [key: string]: any }, keystroke: number): { display: string[], aria: string[] };
-        function keystrokeToString(lang: { [key: string]: any }, keystroke: number): { display: string, aria: string };
-        function ltrim(str: string): string;
-        function normalizeCssText(styleText: string, nativeNormalize: boolean): string;
-        function normalizeHex(styleText: string): string;
-        function objectCompare(left: { [key: string]: any }, right: { [key: string]: any }, onlyLef?: boolean): boolean;
-        function objectKeys(obj: { [key: string]: any }): string[];
-        function override<T extends Function>(originalFunction: T, functionBuilder: (originalFunction: T) => T): T;
-        function parseCssText(styleText: string, normalize?: boolean, nativeNormalize?: boolean): { [key: string]: any };
-        function prototypedCopy(source: { [key: string]: any }): { [key: string]: any };
-        function removeFunction(ref: number): void;
-        function repeat(str: string, times: number): string;
-        function rtrim(str: string): string;
-        function search<T>(array: T[], value: T | ((element: T) => boolean)): T;
-        function setCookie(name: string, value: string): void;
-        function setTimeout(func: Function, milliseconds?: number, scope?: { [key: string]: any }, args?: any, ownerWindow?: Window): number;
-        function transformPlainTextToHtml(text: string, etnerMode: number): string;
-        function trim(str: string): string;
-        function tryThese(fn: Function[]): any;
-        function writeCssText(styles: { [key: string]: any }, sort?: boolean): string;
-
-        namespace array {
-            function every<T>(array: T[], fn: (value: T, index: number, array: T[]) => boolean, thisArg?: { [key: string]: any }): boolean;
-            function filter<T>(array: T[], fn: (value: T, index: number, array: T[]) => boolean, thisArg?: { [key: string]: any }): T[];
-            function forEach<T>(array: T[], fn: (value: T, index: number, array: T[]) => void, thisArg?: { [key: string]: any }): void;
-            function isArray(object: any): boolean;
-            function map<T, K>(array: T[], fn: (value: T) => K, thisArg?: { [key: string]: any }): K[];
-            function reduce<T, K>(array: T[], fn: (accumulator: K, a: T, index: number, array: T[]) => K, initial: K, thisArg?: { [key: string]: any }): K;
-        }
-
-        namespace object {
-            function findKey(obj: { [key: string]: any }, value: any): string;
-            function merge(obj1: { [key: string]: any }, obj2: { [key: string]: any }): { [key: string]: any };
-        }
-
-        namespace style {
-            namespace parse {
-                function background(value: string): { color: string, unprocessed: string };
-                function border(value: string): { width: string, style: string, color: string };
-                function margin(value: string): { top: number, right: number, bottom: number, left: number };
-            }
-        }
-    }
-
-    class ui extends event {
-        constructor(editor: editor);
-        add(name: string, type: { [key: string]: any }, definition: { [key: string]: any }): void;
-        addButton(name: string, definition: buttonDefinition): void;
-        addHandler(type: { [key: string]: any }, handler: { [key: string]: any }): void;
-        addRichCombo(name: string, definition: { [key: string]: any }): void;
-        addToolbarGroup(name: string, previous: number | string, subgroupOf?: string): void;
-        create(name: string): { [key: string]: any };
-        get(name: string): { [key: string]: any };
-        space(name: string): dom.element;
-        spaceId(name: string): string;
-    }
-
-    namespace ui {
-        namespace dialog {
-            class button extends uiElement {
-                constructor(dialog: dialog, elementDefinition: definitions.button, htmlList: any[]);
-
-                accessKeyDown(): void;
-                accessKeyUp(): void;
-                click(): any;
-            }
-
-            class checkbox extends uiElement {
-                constructor(dialog: dialog, elementDefinition: definitions.checkbox, htmlList: any[]);
-
-                accessKeyUp(): void;
-                getValue(): boolean;
-                setValue(checked: boolean, noChangeEvent: boolean): undefined;
-            }
-
-            namespace definitions {
-                interface button {
-                    label: string;
-                    disabled?: boolean;
-                }
-
-                interface checkbox {
-                    checked?: boolean;
-                    validate?: () => boolean;
-                    label?: string;
-                }
-
-                interface fieldSet {
-                    label?: string;
-                    children: any[];
-                }
-
-                interface file {
-                    validate?: () => boolean;
-                }
-
-                interface fileButton {
-                    for: string;
-                    validate?: () => boolean;
-                }
-
-                interface hbox {
-                    widths?: string[];
-                    height?: string;
-                    padding?: string;
-                    align?: string;
-                }
-
-                interface html {
-                    html: string;
-                }
-
-                interface iframeElement {
-                    src: string;
-                    width: string;
-                    height: string;
-                    onContentLoad?: () => void;
-                }
-
-                interface labeledElement {
-                    label: string;
-                    labelLayout?: 'horizontal' | 'vertical';
-                    widths?: [string, string];
-                    role?: string;
-                    includeLabel?: boolean;
-                }
-
-                interface radio {
-                    default: any;
-                    validate?: () => boolean;
-                    items: ([string, string] | [string])[];
-                }
-
-                interface select {
-                    default: any;
-                    validate?: () => boolean;
-                    items: ([string, string] | [string])[];
-                    multiple?: boolean;
-                    size?: number;
-                }
-
-                interface textarea {
-                    rows?: number;
-                    cols?: number;
-                    default?: string;
-                    validate?: () => boolean;
-                }
-
-                interface textInput {
-                    default?: string;
-                    validate?: () => boolean;
-                    maxLength?: number;
-                    size?: string;
-                }
-
-                interface uiElement {
-                    id: string;
-                    type: number;
-                    title?: string;
-                    hidden?: boolean;
-                    className?: string;
-                    style?: string;
-                    accessKey?: string;
-                }
-
-                interface vbox {
-                    width?: string;
-                    heights?: string[];
-                    align?: string;
-                    padding?: string;
-                    expand?: boolean;
-                }
-            }
-
-            class fieldset extends uiElement {
-                constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.fieldSet);
-            }
-
-
-            class file extends ui.dialog.labeledElement {
-                constructor(dialog: dialog, elementDefinition: definitions.file, htmlList: any[]);
-
-                getAction(): string;
-                registerEvents(definition: { [key: string]: any }): file;
-                reset(): void;
-                setInitValue(): void;
-                submit(): file;
-            }
-
-
-            class fileButton extends button {
-                constructor(dialog: dialog, elementDefinition: definitions.fileButton, htmlList: any[]);
-            }
-
-
-            class hbox extends uiElement {
-                constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.hbox);
-
-                getChild(indices: number): ui.dialog.uiElement;
-                getChild(indices: number[]): ui.dialog.uiElement[];
-            }
-
-
-            class html extends uiElement {
-                constructor(dialog: dialog, elementDefinition: definitions.html, htmlList: any[]);
-
-            }
-
-
-            class iframeElement extends uiElement {
-
-            }
-
-
-            class labeledElement extends uiElement {
-                constructor(dialog: dialog, elementDefinition: definitions.labeledElement, htmlList: any[], contentHtml: () => string);
-
-                getLabel(): string;
-                setlabel(label: string): ui.dialog.labeledElement;
-            }
-
-
-            class radio extends ui.dialog.labeledElement {
-                constructor(dialog: dialog, elementDefinition: definitions.radio, htmlList: any[]);
-
-                accessKeyUp(): void;
-                getValue(): string;
-                setValue(value: string, noChangeEvent: boolean): undefined;
-            }
-
-
-            class select extends uiElement {
-                constructor(dialog: dialog, elementDefinition: definitions.select, htmlList: any[]);
-
-                add(label: string, value?: string, indexedDB?: number): select;
-                clear(): select;
-                remove(index: number): select;
-            }
-
-
-            class textarea extends labeledElement {
-                constructor(dialog: dialog, elementDefinition: definitions.textarea, htmlList: any[]);
-            }
-
-
-            class textInput extends ui.dialog.labeledElement {
-                constructor(dialog: dialog, elementDefinition: definitions.textInput, htmlList: any[]);
-
-                accessKeyUp(): void;
-                focus(): undefined;
-                getDirectionMarker(): string;
-                getValue(): string;
-                select(): void;
-                setDirectionMarker(dir: string): void;
-                setValue(value: string, noChangeEvent: boolean): textInput;
-            }
-
-            class uiElement {
-                eventProcessors: any;
-
-                constructor(dialog: dialog, elementDefinition: definitions.uiElement, htmlList: any[], nodeNameArg?: () => string | string, stylesArg?: () => { [key: string]: any } | { [key: string]: any }, attributesArg?: () => { [key: string]: any } | { [key: string]: any }, contentsArg?: () => { [key: string]: any } | string); // Not sure that the htmlList array type is right.
-
-                accessKeyDown(dialog: dialog, key: string): void;
-                accessKeyUp(dialog: dialog, key: string): void;
-                disable(): void;
-                enable(): void;
-                focus(): ui.dialog.uiElement;
-                getDialog(): dialog;
-                getElement(): dom.element;
-                getInputElement(): dom.element;
-                getValue(): any;
-                isChanged(): boolean;
-                isEnabled(): boolean;
-                isFocusable(): boolean;
-                isVisible(): boolean;
-                registerEvents(definition: CKEDITOR.dialog.definition.uiElement): ui.dialog.uiElement;
-                selectParentTab(): ui.dialog.uiElement;
-                setValue(value: any, noChangeEvent: boolean): ui.dialog.uiElement;
-            }
-
-            class vbox extends hbox {
-                constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.vbox);
-            }
-        }
-
-        class balloonPanel {
-            activeShowListeners: { [id: number]: { removeListener: listenerRegistration } };
-            editor: editor;
-            focusables: { [id: number]: dom.element };
-            height: string;
-            parts: balloonPanel.parts;
-            rect: balloonPanel.rect;
-            showListeners: { [id: number]: () => listenerRegistration };
-            templateDefinitions: balloonPanel.templateDefinitions;
-            templates: balloonPanel.templates;
-            triangleHeight: number;
-            triangleMinDistance: number;
-            triangleWidth: number;
-            width: number;
-
-            activeShowListener(id: number): void;
-            activateShowListeners(): void;
-            addShowListener(listener: () => listenerRegistration): listenerRegistration;
-            attach(element: dom.element, options?: dom.element | boolean | { focusElement?: dom.element | boolean, show?: boolean }): void;
-            blur(): void;
-            build(): void;
-            deactivateShowListener(id: number): void;
-            deregisterFocusable(element: dom.element): void;
-            destroy(): void;
-            getHeight(): number;
-            getWidth(): number;
-            hide(): void;
-            move(top: number, left: number): void;
-            registerFocusable(element: dom.element): void;
-            removeShowListener(id: number): void;
-            resize(width: number, height: number): void;
-            setTitle(title: string): void;
-            setTriangle(side: 'left' | 'right' | 'top' | 'bottom'): void;
-            show(): void;
-        }
-
-        namespace balloonPanel {
-            interface definition {
-                content?: string;
-                title?: string;
-            }
-
-            interface templates {
-                close?: template;
-                content?: template;
-                panel?: template;
-                title?: template;
-                triangle?: template;
-                triangleInner?: template;
-                triangleOuter?: template;
-            }
-
-            interface templateDefinitions {
-                close?: string;
-                content?: string;
-                panel?: string;
-                title?: string;
-                triangle?: string;
-                triangleInner?: string;
-                triangleOuter?: string;
-            }
-
-            interface rect {
-                height?: number;
-                left?: number;
-                top?: number;
-                visible?: boolean;
-                width?: number;
-            }
-
-            interface parts {
-                close?: dom.element;
-                content?: dom.element;
-                panel?: dom.element;
-                title?: dom.element;
-                triangle?: dom.element;
-                triangleInner?: dom.element;
-                triangleOuter?: dom.element;
-            }
-        }
-
-        class balloonToolbar {
-            constructor(editor: editor, definition: { [key: string]: any });
-            addItem(name: string, element: button | richCombo): void;
-            addItems(elements: { [itemName: string]: button | richCombo }): void;
-            deleteItem(name: string): void;
-            destroy(): void;
-            getItem(name: string): button | richCombo;
-            hide(): void;
-            refresh(): void;
-            show(): void;
-        }
-
-        class button {
-            static readonly handler: handlerDefinition<button>;
-
-            constructor(definition: { [key: string]: any });
-            getState(): number;
-            render(editor: editor, output: string[]): void;
-            setState(state: number): void;
-            toFeature(editor: editor): feature;
-        }
-
-        class floatPanel {
-            constructor(editor: editor, parentElement: dom.element, definition: { [key: string]: any }, level: number);
-            addBlock(name: string, block: { [key: string]: any }): void;
-            addListBlock(name: string, multiSelect: boolean): void;
-            allowBlur(allow: boolean): void;
-            blur(): void;
-            focus(): void;
-            getBlock(name: string): panel.block;
-            hide(returnFocus: boolean): void;
-            hideChild(restoreFocus: boolean): void;
-            reposition(): void;
-            showAsChild(panel: floatPanel, blckName: string, offsetParent: dom.element, corner: number, offsetX?: number, offsetY?: number): void;
-            showBlock(name: string, offsetParent: dom.element, corner: number, offsetX?: number, offsetY?: number, callback?: () => void): void;
-        }
-
-        class handlerDefinition<T> {
-            contentsElement: dom.element;
-            create(definition: { [key: string]: any }): T;
-        }
-
-        class menuButton extends button {
-
-        }
-
-        class panel {
-            constructor(document: dom.document, definition: { [key: string]: any });
-            addBlock(name: string, block: { [key: string]: any }): void;
-            getBlock(name: string): panel.block;
-            render(editor: editor, output?: string[]): void;
-            showBlock(name: string): void;
-        }
-
-        namespace panel {
-            class block {
-                getItems(): dom.nodeList;
-                markItem(index: number): void;
-            }
-
-            const handler: handlerDefinition<panel>;
-        }
-
-        class panelButton extends button {
-
-        }
-
-        class richCombo {
-            static readonly handler: handlerDefinition<richCombo>;
-            render(editor: editor, output: string[]): void;
-        }
-    }
-
-    class xml {
-        baseXml: any;
-
-        constructor(xmlObjectOrData: any);
-        getInnerXml(xpath: string, contextNode?: any): string;
-        selectNodes(xpath: string, contextNode?: any): any[];
-        selectSingleNode(xpath: string, contextNode?: any): any;
-    }
-
-    interface toolbarGroups {
-        name?: string;
-        groups?: string[];
-    }
-
-    namespace config {
-        interface styleObject {
-            name?: string;
-            element: string;
-            attributes?: { [key: string]: any };
-            styles?: { [key: string]: any };
-            overrides?: { [key: string]: any };
-        }
-    }
-
-    interface sharedSpace {
-        top?: string | HTMLElement;
-        bottom?: string | HTMLElement;
-    }
-
-    interface IMenuItemDefinition {
-        label: string,
-        command: string,
-        icon: string
-        group: string,
-        order: number
-    }
-
-    interface buttonDefinition {
-        icon?: string;
-        iconOffset?: number;
-        label: string;
-        command: string;
-        toolbar: string;
-    }
-}
diff --git a/types/ckeditor/v2/ckeditor-tests.ts b/types/ckeditor/v2/ckeditor-tests.ts
new file mode 100644
index 0000000000..1a906bc26e
--- /dev/null
+++ b/types/ckeditor/v2/ckeditor-tests.ts
@@ -0,0 +1,600 @@
+
+
+function test_CKEDITOR() {
+    CKEDITOR.basePath = 'test';
+    CKEDITOR.replaceClass = 'rich_editor';
+    CKEDITOR.skinName = 'moono';
+    CKEDITOR.skinName = 'myskin,/customstuff/myskin/';
+    var editor = new CKEDITOR.editor();
+    if (editor.getSelection().getType() == CKEDITOR.SELECTION_ELEMENT)
+        if (editor.getSelection().getType() == CKEDITOR.SELECTION_NONE)
+            if (editor.getSelection().getType() == CKEDITOR.SELECTION_TEXT)
+                alert(CKEDITOR.basePath);
+    if (CKEDITOR.currentInstance)
+        alert(CKEDITOR.currentInstance.name);
+    alert(CKEDITOR.document.getBody().getName());
+    alert(CKEDITOR.instances[0].name);
+    CKEDITOR.loadFullCoreTimeout = 5;
+    alert(CKEDITOR.revision);
+    alert(CKEDITOR.rnd);
+    if (CKEDITOR.status == 'loaded') {
+        CKEDITOR.loadFullCore();
+    }
+    alert(CKEDITOR.timestamp);
+    CKEDITOR.addCss('.cke_editable h1,.cke_editable h2,.cke_editable h3 { border-bottom: 1px dotted red }');
+    CKEDITOR.appendTo('editorSpace');
+    alert(CKEDITOR.getUrl('skins/default/editor.css'));
+    alert(CKEDITOR.getUrl('/skins/default/editor.css'));
+    alert(CKEDITOR.getUrl('http://www.somesite.com/skins/default/editor.css'));
+    CKEDITOR.inline('content');
+    if (CKEDITOR.loadFullCore)
+        CKEDITOR.loadFullCore();
+    CKEDITOR.replace('myfield');
+    var textarea = document.createElement('textarea');
+    CKEDITOR.replace(textarea);
+    CKEDITOR.replaceAll();
+    CKEDITOR.replaceAll('myClassName');
+    CKEDITOR.replaceAll((textarea, config) => false);
+}
+
+function test_CKEDITOR_events() {
+    CKEDITOR.on('instanceCreated', function(event) {
+        // $ExpectType editor
+        event.editor;
+    });
+}
+
+function test_config() {
+    var config1: CKEDITOR.config = {
+        toolbar: 'basic',
+    };
+    var config2: CKEDITOR.config = {
+        toolbar: [
+            [ 'mode', 'document', 'doctools' ],
+            [ 'clipboard', 'undo' ],
+            '/',
+            [ 'find', 'selection', 'spellchecker' ],
+            [ 'basicstyles', 'cleanup' ],
+            '/',
+            [ 'list', 'indent', 'blocks', 'align', 'bidi' ],
+        ],
+    };
+    var config3: CKEDITOR.config = {
+        toolbarGroups: [
+            { name: 'clipboard', groups: [ 'clipboard', 'undo' ] },
+            { name: 'editing', groups: [ 'find', 'selection', 'spellchecker', 'editing' ] },
+            { name: 'links', groups: [ 'links' ] },
+            { name: 'insert', groups: [ 'insert' ] },
+            { name: 'tools', groups: [ 'tools' ] },
+            { name: 'document', groups: [ 'mode' ] },
+            { name: 'about', groups: [ 'about' ] },
+            '/',
+            { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
+            { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'paragraph' ] },
+            '/',
+            { name: 'styles', groups: [ 'styles' ] },
+            { name: 'colors', groups: [ 'colors' ] },
+        ],
+    }
+}
+
+function test_dom_comment() {
+    var type = CKEDITOR.NODE_COMMENT;
+    var nativeNode = document.createComment('Example');
+    var comment = new CKEDITOR.dom.comment(nativeNode);
+    var comment2 = new CKEDITOR.dom.comment('Example');
+}
+
+function test_dom_document() {
+    var document = new CKEDITOR.dom.document(window.document);
+    var type = CKEDITOR.NODE_DOCUMENT;
+    CKEDITOR.document.appendStyleSheet('/mystyles.css');
+    var element = CKEDITOR.document.getBody();
+    alert(element.getName());
+    var element2 = CKEDITOR.document.getById('myElement');
+    alert(element.getId());
+    var element3 = CKEDITOR.document.getHead();
+    alert(element.getName());
+    var selection = CKEDITOR.instances[0].document.getSelection();
+    alert(selection.getType());
+    document.write(
+        '<html>' +
+        '<head><title>Sample Doc</title></head>' +
+        '<body>Document contents created by code</body>' +
+        '</html>'
+        );
+}
+
+function test_dom_documentFragment() {
+    var type = CKEDITOR.NODE_DOCUMENT_FRAGMENT;
+}
+
+function test_dom_domObject() {
+    var element = new CKEDITOR.dom.element('span');
+    alert(element.$.nodeType);
+    var nativeElement = element.$;
+    var doc = new CKEDITOR.dom.document(document);
+    alert(doc.equals(CKEDITOR.document));
+    alert(doc == CKEDITOR.document);
+    var element2 = new CKEDITOR.dom.element('span');
+    alert(element.getCustomData('hasCustomData'));
+    alert(element.getCustomData('nonExistingKey'));
+    var elementA = new CKEDITOR.dom.element(nativeElement);
+    elementA.getPrivate().value = 1;
+    var elementB = new CKEDITOR.dom.element(nativeElement).getPrivate().value;
+    var element3 = new CKEDITOR.dom.element('span');
+    element.setCustomData('hasCustomData', true);
+}
+
+function test_dom_element() {
+    var element = new CKEDITOR.dom.element('span');
+    alert(element.$.nodeType);
+    element.addClass('classA');
+    element.addClass('classB');
+    element.addClass('classA');
+    var p = new CKEDITOR.dom.element('p');
+    var strong = new CKEDITOR.dom.element('strong');
+    p.append(strong);
+    var em = p.append('em');
+    var p = new CKEDITOR.dom.element('p');
+    p.appendText('This is');
+    p.appendText(' some text');
+    element.breakParent(strong);
+    element.data('extra-info', 'test');
+    alert(element.data('extra-info'));
+    element.data('extra-info', false);
+    var element5 = CKEDITOR.document.getById('myTextarea');
+    element.focus();
+    element.focusNext();
+    element.focusPrevious();
+    element.forEach(node=> {
+        console.log(node);
+    });
+    var element2 = CKEDITOR.dom.element.createFromHtml('<input type="text" />');
+    alert(element.getAttribute('type'));
+    alert(element.getComputedStyle('display'));
+    element.appendTo(CKEDITOR.document.getBody());
+    alert(element.getEditor().name);
+    var first = element.getFirst();
+    alert(element.getHtml());
+    alert(element.getId());
+    alert(element.getName());
+    alert('<b>' + element.getNameAtt() + '</b>');
+    alert(element.getOuterHtml());
+    alert(element.getTabIndex());
+    alert(element.getText());
+    alert(element.hasAttributes());
+    alert(element.hasAttributes());
+    element.hide();
+    alert(element.is('span'));
+    alert(element.is('p', 'span'));
+    alert(element.is('p'));
+    alert(element.is('p', 'div'));
+    alert(element.is({ p: 1, span: 1 }));
+    element.removeAttribute('class');
+    element.addClass('classA');
+    element.addClass('classB');
+    element.removeClass('classA');
+    element.removeClass('classB');
+    element.removeStyle('display');
+    element.setAttribute('class', 'myClass');
+    element.setAttribute('title', 'This is an example');
+    element.setAttributes({
+        'class': 'myClass',
+        title: 'This is an example'
+    });
+    p.setHtml('<b>Inner</b> HTML');
+    element.setOpacity(0.75);
+    element.setStyle('background-color', '#ff0000');
+    element.setStyle('margin-top', '10px');
+    element.setStyle('float', 'right');
+    element.setStyles({
+        position: 'absolute',
+        float: 'right'
+    });
+    element.setText('A > B & C < D');
+    element.show();
+    element.unselectable();
+    alert(element.getName());
+    alert(element == CKEDITOR.dom.element.get(element));
+    var htmlElement = document.getElementById('myElement');
+    alert(CKEDITOR.dom.element.get(htmlElement).getName());
+}
+
+function test_dom_event() {
+    var event = new CKEDITOR.dom.event(new Event(""));
+    alert(event.getKey());
+    alert(event.getKeystroke() == 65);
+    alert(event.getKeystroke() == CKEDITOR.CTRL + 65);
+    alert(event.getKeystroke() == CKEDITOR.CTRL + CKEDITOR.SHIFT + 65);
+    var element = new CKEDITOR.dom.element('div');
+    element.on('mousemouse', ev=> {
+        var pageOffset = ev.data.getPageOffset();
+        alert(pageOffset.x);
+        alert(pageOffset.y);
+    });
+    element.on('click', ev=> {
+        var domEvent = ev.data;
+        domEvent.getTarget().addClass('clicked');
+    });
+    element.on('click', ev=> {
+        var domEvent = ev.data as CKEDITOR.dom.event;
+        domEvent.preventDefault();
+    });
+}
+
+function test_dom_iterator() {
+    var range = new CKEDITOR.dom.range(new CKEDITOR.dom.element('div'));
+    var iterator = range.createIterator();
+    iterator.getNextParagraph();
+    iterator.getNextParagraph();
+}
+
+function test_dom_node() {
+    var p = new CKEDITOR.dom.element('p');
+    var strong = new CKEDITOR.dom.element('strong');
+    strong.appendTo(p);
+    var node = new CKEDITOR.dom.node(new Node());
+    node = node.getAscendant('b');
+    node = node.getAscendant('b', true);
+    var element = CKEDITOR.document.getById('example');
+    alert(element.getDocument().equals(CKEDITOR.document));
+    element.getIndex();
+    element.getIndex(true);
+    var last = element.getFirst().getNext();
+    var parent = node.getParent();
+    alert(parent.getName());
+    var parents = node.getParents();
+    var em = new CKEDITOR.dom.element('em');
+    strong.insertAfter(em);
+    strong.insertBefore(em);
+    strong.insertBeforeMe(em);
+    element.isReadOnly();
+}
+
+function test_dom_nodeList() {
+    var nodeList = CKEDITOR.document.getBody().getChildren();
+    alert(nodeList.count());
+}
+
+function test_dom_range() {
+    var editor = new CKEDITOR.editor();
+    var range = new CKEDITOR.dom.range(editor.document);
+    range.selectNodeContents(editor.document.getBody());
+    range.deleteContents();
+    range.selectNodeContents(editor.document.getBody());
+    alert(range.collapsed);
+    range.collapse();
+    alert(range.collapsed);
+    range.selectNodeContents(range.document.getBody());
+    range.selectNodeContents(editor.document.getBody());
+    alert(range.endContainer.getName());
+    range.selectNodeContents(editor.document.getBody());
+    alert(range.endOffset);
+    range.selectNodeContents(editor.document.getBody());
+    alert(range.startContainer.getName());
+    range.selectNodeContents(editor.document.getBody());
+    alert(range.startOffset);
+}
+
+function test_dom_text() {
+    var nativeNode = document.createTextNode('Example');
+    var text = new CKEDITOR.dom.text(nativeNode);
+    var text2 = new CKEDITOR.dom.text('Example');
+}
+
+function test_dom_window() {
+    var document = new CKEDITOR.dom.window(window);
+    var win = new CKEDITOR.dom.window(window);
+    var pos = win.getScrollPosition();
+    alert(pos.x);
+    alert(pos.y);
+    var size = win.getViewPaneSize();
+    alert(size.width);
+    alert(size.height);
+}
+
+function test_adding_command_and_buttons() {
+    var textarea = document.createElement('textarea');
+    var instance = CKEDITOR.replace(textarea);
+
+    instance.addCommand( 'aCommand', {
+        exec: function( editor: CKEDITOR.editor ) {
+            // empty logic
+            return true;
+        }
+    });
+
+    instance.ui.addButton( 'firstButton', {
+        icon: 'http://www.example.com/assets/images/icons.png',
+        iconOffset: -32,
+        label: 'Label 1',
+        command: 'aCommand',
+        toolbar: 'tools'
+    });
+
+    instance.ui.addButton( 'secondButton', {
+        label: 'Label 2',
+        command: 'aCommand',
+        toolbar: 'tools'
+    });
+}
+
+function test_adding_dialog_by_path() {
+    CKEDITOR.dialog.add( 'abbrDialog', this.path + 'dialogs/abbr.js' );
+}
+
+function test_adding_dialog_by_definition() {
+    CKEDITOR.dialog.add( 'abbrDialog', function ( editor: CKEDITOR.editor ) {
+        return {
+            title: 'Abbreviation Properties',
+            minWidth: 400,
+            minHeight: 200,
+            onLoad: () => {},
+            onOk: () => {},
+            onCancel: () => {},
+            onShow: () => {},
+            onHide: () => {},
+            contents: [
+                {
+                    id: 'tab-basic',
+                    label: 'Basic Settings',
+                    elements: <any[]>[]
+                },
+                {
+                    id: 'tab-adv',
+                    label: 'Advanced Settings',
+                    elements: []
+                }
+            ]
+        };
+    });
+}
+
+function test_plugins() {
+    CKEDITOR.plugins.add( 'abbr', {
+        init: function( editor: CKEDITOR.editor ) {
+            // empty logic
+        }
+    });
+
+    console.log(CKEDITOR.plugins.registered['abbr']);
+}
+
+function test_adding_widget() {
+    function wrapper(editor: CKEDITOR.editor) {
+            editor.widgets.add("widgetty", {
+            button: "Activate widgetty",
+            template: "<imaginary-element>",
+            dialog: "widgetty",
+            init: function() {
+                // no logic
+            }
+        });
+    }
+}
+
+function test_focusManager() {
+    var textarea = document.createElement('textarea');
+    var instance = CKEDITOR.replace(textarea);
+    var element = CKEDITOR.document.getById('myElement');
+
+    instance.focusManager.focus();
+    instance.focusManager.focus(element);
+    instance.focusManager.lock();
+    instance.focusManager.unlock();
+    instance.focusManager.blur();
+    instance.focusManager.blur(true);
+    instance.focusManager.add(element, true);
+    instance.focusManager.remove(element);
+
+    var focusManager = new CKEDITOR.focusManager(instance);
+    var object: CKEDITOR.dom.domObject = focusManager.currentActive;
+    var bool: boolean = focusManager.hasFocus;
+}
+
+function test_basicWriter() {
+    var writer = new CKEDITOR.htmlParser.basicWriter();
+    writer.openTag('p', {});
+    writer.attribute('class', 'MyClass');
+    writer.openTagClose('p', false);
+    writer.text('Hello');
+    writer.closeTag('p');
+    alert(writer.getHtml(true)); // '<p class="MyClass">Hello</p>'
+}
+
+function test_htmlWriter() {
+    var writer = new CKEDITOR.htmlWriter();
+    writer.openTag('p', {});
+    writer.attribute('class', 'MyClass');
+    writer.openTagClose('p', false);
+    writer.text('Hello');
+    writer.closeTag('p');
+    alert(writer.getHtml(true)); // '<p class="MyClass">Hello</p>'
+
+    writer.indentationChars = '\t';
+    writer.lineBreakChars = '\r\n';
+    writer.selfClosingEnd = '>';
+    writer.indentation();
+    writer.lineBreak();
+    writer.setRules('img', {breakBeforeOpen: true, breakAfterOpen: true});
+}
+
+function test_sharedSpace() {
+    CKEDITOR.inline('content', {
+        removePlugins: 'maximize,resize',
+        sharedSpaces: {
+            top: 'someElementId',
+            bottom: document.getElementById('anotherId')
+        }
+    });
+
+    CKEDITOR.inline('content', {
+        sharedSpaces: { }
+    });
+}
+
+function test_specifying_editor_path() {
+    window.CKEDITOR_BASEPATH = '/ckeditor/';
+}
+
+function test_editor_instance_event() {
+    var textarea = document.createElement('textarea');
+    var instance = CKEDITOR.replace(textarea, {
+        on: {
+            activeEnterModeChange: function() {},
+            activeFilterChange: function() {},
+            afterCommandExec: function() {},
+            afterInsertHtml: function() {},
+            afterPaste: function() {},
+            afterPasteFromWord: function() {},
+            afterSetData: function() {},
+            afterUndoImage: function() {},
+            ariaEditorHelpLabel: function() {},
+            ariaWidget: function() {},
+            autogrow: function() {},
+            beforeCommandExec: function() {},
+            beforeDestroy: function() {},
+            beforeModeUnload: function() {},
+            beforeSetMode: function() {},
+            beforeUndoImage: function() {},
+            blur: function() {},
+            change: function() {},
+            configLoaded: function() {},
+            contentDirChanged: function() {},
+            contentDom: function() {},
+            contentDomInvalidated: function() {},
+            contentDomUnload: function() {},
+            customConfigLoaded: function() {},
+            dataFiltered: function() {},
+            dataReady: function() {},
+            destroy: function() {},
+            dialogHide: function() {},
+            dialogShow: function() {},
+            dirChanged: function() {},
+            doubleclick: function() {},
+            dragend: function() {},
+            dragstart: function() {},
+            drop: function() {},
+            elementsPathUpdate: function() {},
+            fileUploadRequest: function() {},
+            fileUploadResponse: function() {},
+            floatingSpaceLayout: function() {},
+            focus: function() {},
+            getData: function() {},
+            getSnapshot: function() {},
+            insertElement: function() {},
+            insertHtml: function() {},
+            insertText: function() {},
+            instanceReady: function() {},
+            key: function() {},
+            langLoaded: function() {},
+            loadSnapshot: function() {},
+            loaded: function() {},
+            lockSnapshot: function() {},
+            maximize: function() {},
+            menuShow: function() {},
+            mode: function() {},
+            notificationHide: function() {},
+            notificationShow: function() {},
+            notificationUpdate: function() {},
+            paste: function() {},
+            pasteFromWord: function() {},
+            pluginsLoaded: function() {},
+            readOnly: function() {},
+            removeFormatCleanup: function() {},
+            required: function() {},
+            resize: function() {},
+            save: function() {},
+            saveSnapshot: function() {},
+            selectionChange: function() {},
+            setData: function() {},
+            stylesSet: function() {},
+            template: function() {},
+            toDataFormat: function() {},
+            toHtml: function() {},
+            unlockSnapshot: function() {},
+            updateSnapshot: function() {},
+            widgetDefinition: function() {}
+        }
+    });
+}
+
+function test_dtd() {
+    var brConsideredEmptyTag = CKEDITOR.dtd.$empty['br'];
+    var spanCanContainText = CKEDITOR.dtd['span']['#'];
+    var divCanContainSpan = CKEDITOR.dtd['div']['span'];
+}
+
+function test_getSelectedHtml() {
+    var textarea = document.createElement('textarea');
+    var editor = CKEDITOR.replace(textarea);
+
+    // $ExpectType documentFragment
+    var sel1 = editor.getSelectedHtml();
+    console.log(sel1);
+
+    // $ExpectType documentFragment
+    var sel2 = editor.getSelectedHtml(false);
+    console.log(sel2);
+
+    // $ExpectType string
+    var sel3 = editor.getSelectedHtml(true);
+    console.log(sel3);
+
+    // $ExpectType string | documentFragment
+    var sel4 = editor.getSelectedHtml(Math.random() > 0.5);
+    console.log(sel4);
+}
+
+function test_element() {
+    var el = CKEDITOR.document.getById('myElement');
+    el.addClass('class');
+    console.log(el.hasClass('class'));
+    el.removeClass('class');
+}
+
+function test_selection() {
+    var editor = new CKEDITOR.editor();
+    var testNode = CKEDITOR.document.getById('myElement');
+
+    var selection = editor.getSelection();
+    var ranges = selection.getRanges();
+    for (var i = 0, c = ranges.length; i < c; i++) {
+        var range = ranges[i];
+        range.setStartBefore(testNode);
+        range.setStartAfter(testNode);
+        range.setEndBefore(testNode);
+        range.setEndAfter(testNode);
+    }
+}
+
+function test_tools() {
+    var obj = { key: 'value' };
+    CKEDITOR.tools.clone(obj);
+    CKEDITOR.tools.copy(obj);
+    CKEDITOR.tools.prototypedCopy(obj);
+
+    console.log(CKEDITOR.tools.isArray([1])); // true
+    console.log(CKEDITOR.tools.isArray(obj)); // false
+    console.log(CKEDITOR.tools.isArray(null)); // false
+    console.log(CKEDITOR.tools.isArray(undefined)); // false
+
+    CKEDITOR.tools.override(parseInt, function(_parseInt) {
+        return function(value: any, radix?: number) {
+            return _parseInt(value, radix);
+        };
+    });
+}
+
+function test_htmlParser() {
+    var html = '<div><span>text</span></div>';
+    var fragment = CKEDITOR.htmlParser.fragment.fromHtml(html);
+    fragment.forEach(function(node) {
+        if (node instanceof CKEDITOR.htmlParser.element) {
+            node.forEach(function(node) {
+                console.log(node);
+            });
+        }
+    }, CKEDITOR.NODE_ELEMENT, true);
+}
diff --git a/types/ckeditor/v2/index.d.ts b/types/ckeditor/v2/index.d.ts
new file mode 100644
index 0000000000..ccc58b7f71
--- /dev/null
+++ b/types/ckeditor/v2/index.d.ts
@@ -0,0 +1,1949 @@
+// Type definitions for CKEditor
+// Project: http://ckeditor.com/
+// Definitions by: Thomas Wittwer <https://github.com/wittwert>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// WORK-IN-PROGRESS: Any contribution support welcomed.
+// See https://github.com/DefinitelyTyped/DefinitelyTyped/issues/1827 for more informations.
+interface Window {
+  CKEDITOR_BASEPATH: string;
+}
+
+declare namespace CKEDITOR {
+
+    // Config options
+    var disableAutoInline: boolean;
+    var disableObjectResizing: boolean;
+    var replaceClass: string;
+    var skinName: string;
+
+    // Properties
+    var ALT: number;
+    var CTRL: number;
+    var DIALOG_RESIZE_BOTH: number;
+    var DIALOG_RESIZE_HEIGHT: number;
+    var DIALOG_RESIZE_NONE: number;
+    var DIALOG_RESIZE_WIDTH: number;
+    var DIALOG_STATE_IDLE: number;
+    var DIALOG_STATE_BUSY: number;
+    var ELEMENT_MODE_APPENDTO: number;
+    var ELEMENT_MODE_INLINE: number;
+    var ELEMENT_MODE_NONE: number;
+    var ELEMENT_MODE_REPLACE: number;
+    var END: number;
+    var ENTER_BR: number;
+    var ENTER_P: number;
+    var EVENT_PHASE_AT_TARGET: number;
+    var EVENT_PHASE_BUBBLING: number;
+    var EVENT_PHASE_CAPTURING: number;
+    var LINEUTILS_AFTER: number;
+    var LINEUTILS_BEFORE: number;
+    var LINEUTIS_INSIDE: number;
+    var NODE_COMMENT: number;
+    var NODE_DOCUMENT: number;
+    var NODE_DOCUMENT_FRAGMENT: number;
+    var NODE_ELEMENT: number;
+    var NODE_TEXT: number;
+    var POSITION_BEFORE_START: number;
+    var POSITION_BEFORE_END: number;
+    var POSITION_AFTER_START: number;
+    var POSITION_AFTER_END: number;
+    var SELECTION_ELEMENT: number;
+    var SELECTION_NONE: number;
+    var SELECTION_TEXT: number;
+    var SHIFT: number;
+    var SHRINK_ELEMENT: number;
+    var SHRINK_TEXT: number;
+    var START: number;
+    var STYLE_BLOCK: string;
+    var STYLE_INLINE: string;
+    var STYLE_OBJECT: string;
+    var TRISTATE_DISABLED: number;
+    var TRISTATE_OFF: number;
+    var TRISTATE_ON: number;
+    var UI_BUTTON: string;
+    var UI_MENUBUTTON: string;
+    var UI_PANEL: string;
+    var UI_PANELBUTTON: string;
+    var UI_RICHCOMBO: string;
+    var UI_SEPARATOR: string;
+    var basePath: string;
+    var currentInstance: editor;
+    var document: dom.document;
+    var env: environmentConfig;
+    var instances: { [id: string]: editor | undefined };
+    var loadFullCoreTimeout: number;
+    var revision: string;
+    var rnd: number;
+    var status: string;
+    var timestamp: string;
+    var version: string;
+    var config: config;
+
+    // Methods
+    function add(editor: editor): void;
+    function addCss(css: string): void;
+    function addTemplate(name: string, source: string): template;
+    function appendTo(element: string, config?: config, data?: string): editor;
+    function appendTo(element: HTMLElement, config?: config, data?: string): editor;
+    function domReady(): void;
+    function dialogCommand(dialogName: string): void;
+    function editorConfig(config: config): void;
+    function getCss(): string;
+    function getTemplate(name: string): template;
+    function getUrl(resource: string): string;
+    function inline(element: string, instanceConfig?: config): editor;
+    function inline(element: HTMLElement, instanceConfig?: config): editor;
+    function inlineAll(): void;
+    function loadFullCore(): void;
+    function replace(element: string | HTMLTextAreaElement, config?: config): editor;
+    function replaceAll(className?: string): void;
+    function replaceAll(assertionFunction: (textarea: HTMLTextAreaElement, config: config) => boolean): void;
+
+    // Event interface
+    function capture(): void;
+    function define(name: string, meta: Object): void;
+    function fire(eventName: string, data?: Object, editor?: editor): any;
+    function fireOnce(eventName: string, data?: Object, editor?: editor): any;
+    function hasListeners(eventName: string): boolean;
+    function on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: Object, listenerData?: Object, priority?: number): void;
+    function once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: Object, listenerData?: Object, priority?: number): void;
+    function removeAllListeners(): void;
+    function removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
+
+    type listenerRegistration = {
+        removeListener: () => void;
+    }
+
+    namespace dom {
+
+        interface bookmark {
+            startNode: dom.node | string;
+            endNode: dom.node | string;
+            serializable: boolean;
+            collapsed: boolean;
+        }
+
+        class comment {
+
+            // Properties
+            type: number;
+
+            // Methods
+            constructor(comment: string, ownerDocument?: document);
+            constructor(comment: Object, ownerDocument?: document);
+            getOuterHtml(): string;
+
+        }
+
+
+        class document extends domObject {
+
+            // Properties
+            type: number;
+
+            // Methods
+            constructor(domDocument: Object);
+            appendStyleSheet(cssFileUrl: string): void;
+            appendStyleText(cssStyleText: string): Object;
+            createElement(name: string, attribsAndStyles?: { attributes: Object; styles: Object; }): element;
+            createText(text: string): element;
+            find(selector: string): nodeList;
+            findOne(selector: string): element;
+            focus(): void;
+            getActive(): element;
+            getBody(): element;
+            getByAddress(address: any[], normalized?: boolean): node;
+            getById(elementId: string): element;
+            getDocumentElement(): element;
+            getElementsByTag(tagName: string): nodeList;
+            getHead(): element;
+            getSelection(): selection;
+            getWindow(): window;
+            write(html: string): void;
+
+        }
+
+
+        class documentFragment {
+
+            // Properties
+            type: number;
+
+            // Methods
+            constructor(nodeOrDoc: Object);
+            insertAfterNode(node: node): void;
+
+        }
+
+
+        class domObject extends event {
+
+            // Properties
+            $: HTMLElement;
+
+            // Methods
+            constructor(nativeDomObject: Object);
+            clearCustomData(): void;
+            equals(object: any): boolean;
+            getCustomData(key: string): any;
+            getPrivate(): any;
+            getUniqueId(): number;
+            removeAllListeners(): void;
+            removeCustomData(key: string): Object;
+            setCustomData(key: string, value: Object): domObject;
+
+        }
+
+
+        class element extends node {
+
+            // Properties
+            type: number;
+
+            // Methods
+            constructor(element: string, ownerDocument?: document);
+            constructor(element: HTMLElement, ownerDocument?: document);
+            addClass(className: string): void;
+            append(node: node, toStart?: boolean): node;
+            append(node: string, toStart?: boolean): node;
+            appendBogus(force: boolean): void;
+            appendHtml(html: string): void;
+            appendText(text: string): node;
+            breakParent(parent: element): void;
+            contains(node: node): boolean;
+            copyAttributes(dest: element, skipAttributes: Object): void;
+            data(name: string): string;
+            data(name: string, value: string): void;
+            data(name: string, value: boolean): void;
+            disableContextMenu(): void;
+            find(selector: string): nodeList;
+            findOne(selector: string): element;
+            focus(defer?: boolean): void;
+            focusNext(ignoreChildren?: boolean, indexToUse?: number): void;
+            focusPrevious(ignoreChildren?: boolean, indexToUse?: number): void;
+            forEach(callback: (node: node) => void, type?: number, skipRoot?: boolean): void;
+            getAttribute(name: string): string;
+            getBogus(): node|false;
+            getChild(indices: number): node;
+            getChild(indices: number[]): node;
+            getChildCount(): number;
+            getChildren(): nodeList;
+            getClientRect(): any;
+            getComputedStyle(propertyName: string): string;
+            getDirection(useComputed: boolean): string;
+            getDocumentPosition(refDocument: document): position;
+            getDtd(): any;
+            getEditor(): editor;
+            getElementsByTag(tagName: string): nodeList;
+            getFirst(evaluator?: Function): node;
+            getFrameDocument(): document;
+            getHtml(): string;
+            getId(): string;
+            getLast(evaluator?: Function): node;
+            getName(): string;
+            getNameAtt(): string;
+            getOuterHtml(): string;
+            getPositionedAncestor(): element;
+            getSize(type: string, isBorderBox: boolean): void;
+            getStyle(name: string): string;
+            getTabIndex(): number;
+            getText(): string;
+            getValue(): string;
+            getWindow(): window;
+            hasAttributes(): boolean;
+            hasAttribute(name: string): boolean;
+            hasClass(className: string): boolean;
+            hide(): void;
+            is(...name: string[]): boolean;
+            is(name: any): boolean;
+            isBlockBoundary(customNodeNames: Object): boolean;
+            isEditable(textCursor?: boolean): boolean;
+            isEmptyInlineRemoveable(): boolean;
+            isIdentical(otherElement: element): boolean;
+            isVisible(): boolean;
+            mergeSiblings(inlineOnly?: boolean): void;
+            moveChildren(target: element, toStart?: boolean): void;
+            removeAttribute(name: string): void;
+            removeAttributes(attributes?: string[]): void;
+            removeClass(className: string): void;
+            removeStyle(name: string): void;
+            renameNode(newTag: string): void;
+            scrollIntoParent(parent: element, alignToTop: boolean, hscroll: boolean): void;
+            scrollIntoParent(parent: window, alignToTop: boolean, hscroll: boolean): void;
+            scrollIntoView(alignToTop?: boolean): void;
+            setAttribute(name: string, value: string): element;
+            setAttributes(attributesPairs: Object): element;
+            setHtml(html: string): string;
+            setOpacity(opacity: number): void;
+            setSize(type: string, size: number, isBorderBox: boolean): void;
+            setState(state: number, base?: Object, useAria?: Object): void;
+            setStyle(name: string, value: string): element;
+            setStyles(stylesPair: Object): element;
+            setText(text: string): string;
+            setValue(value: string): element;
+            show(): void;
+            unselectable(): void;
+
+            //static method
+            static clearAllMarkers(database: Object): Object;
+            static clearMarkers(database: Object, element: Object, removeFromDatabase: Object): void;
+            static createFromHtml(html: string): element;
+            static get(element: string): element;
+            static get(element: any): element;
+            static setMarker(database: Object, element: Object, name: Object, value: Object): domObject;
+
+        }
+
+
+        class elementPath {
+            constructor(startNode: element, root: element);
+            constructor(startNode: element);
+            block: element;
+            blockLimit: element;
+            root: element;
+            elements: element[];
+            compare(otherPath: elementPath): boolean;
+            contains(query: string, excludeRoot?: boolean, fromTop?: boolean): element;
+            contains(query: string[], excludeRoot?: boolean, fromTop?: boolean): element;
+            contains(query: (element: element) => boolean, excludeRoot?: boolean, fromTop?: boolean): element;
+            contains(query: Object, excludeRoot?: boolean, fromTop?: boolean): element;
+            contains(query: element, excludeRoot?: boolean, fromTop?: boolean): element;
+            isContextFor(tag: string): boolean;
+            direction(): string;
+        }
+
+
+        class range {
+            constructor(root: element);
+            constructor(root: document);
+            startContainer: any;
+            startOffset: number;
+            endContainer: any;
+            endOffset: number;
+            collapsed: boolean;
+            isDocRoot: boolean;
+            document: document;
+            root: element;
+            clone(): range;
+            collapse(toStart?: boolean): boolean;
+            cloneContents(): documentFragment;
+            deleteContents(mergeThen?: boolean): void;
+            extractContents(mergeThen?: boolean): documentFragment;
+            createBookmark(serializable?: boolean): bookmark;
+            createBookmark2(normalized?: boolean): Object;
+            createIterator(): iterator;
+            moveToBookmark(bookmark: Object): void;
+            getBoundaryNodes(): { startNode: node; endNode: node; };
+            getCommonAncestor(includeSelf?: boolean, ignoreTextNode?: boolean): element;
+            optimize(): void;
+            optimizeBookmark(): void;
+            trim(ignoreStart?: boolean, ignoreEnd?: boolean): void;
+            enlarge(unit: number, excludeBrs?: boolean): void;
+            shrink(mode: number, selectContents: boolean): void;
+            insertNode(node: node): void;
+            moveToPosition(node: node, position: Object): void;
+            moveToRange(range: range): void;
+            selectNodeContents(node: node): void;
+            setStart(startNode: node, startOffset: number): void;
+            setEnd(endNode: node, endOffset: number): void;
+            setEndAfter(node: node): void;
+            setEndBefore(node: node): void;
+            setStartAfter(node: node): void;
+            setStartBefore(node: node): void;
+            setStartAt(node: node, position: number): void;
+            setEndAt(node: node, position: number): void;
+            fixBlock(isStart: boolean, blockTag: Object): Object;
+            select(): selection;
+            splitBlock(blockTag: Object): Object;
+            splitElement(toSplit: element): element;
+            removeEmptyBlocksAtEnd(atEnd: boolean): void;
+            startPath(): elementPath;
+            endPath(): elementPath;
+            checkBoundaryOfElement(element: element, checkType: number): boolean;
+            checkStartOfBlock(): boolean;
+            checkEndOfBlock(): boolean;
+            getPreviousNode(evaluator: Function, guard: Function, boundary: element): element;
+            getNextNode(evaluator: Function, guard: Function, boundary: element): element;
+            checkReadOnly(): boolean;
+            moveToElementEditablePosition(element: element, isMoveToEnd: boolean): boolean;
+            movetoClosestEditablePosition(element: element, isMoveToEnd: boolean): boolean;
+            moveToElementEditStart(target: Object): boolean;
+            moveToElementEditEnd(target: Object): boolean;
+            getEnclosedNode(): node;
+            getTouchedStartNode(): node;
+            getTouchedEndNode(): node;
+            getNextEditableNode(): Object;
+            getPreviousEditableNode(): Object;
+            scrollIntoView(): void;
+        }
+
+
+        interface rangeListIterator {
+
+        }
+
+        class selection {
+            document: document;
+            isFake: boolean;
+            isLocked: boolean;
+            rev: number;
+            root: element;
+            constructor(target: document);
+            constructor(target: element);
+            constructor(target: selection);
+            createBookmarks(serializable: Object): bookmark[];
+            createBookmarks2(normalized: Object): Object[];
+            fake(element: element): void;
+            getCommonAncestor(): element;
+            getNative(): Object;
+            getRanges(onlyEditables?: boolean): any[];
+            getSelectedElement(): element;
+            getSelectedText(): string;
+            getStartElement(): element;
+            getType(): number;
+            isHidden(): boolean;
+            lock(): void;
+            removeAllRanges(): void;
+            reset(): void;
+            scrollIntoView(): void;
+            selectBookmarks(bookmarks: any[]): selection;
+            selectElement(element: element): void;
+            selectRanges(ranges: any[]): void;
+            unlock(restore: Object): void;
+        }
+
+
+        class rangeList {
+            constructor(ranges: range[]);
+            constructor(range: range);
+            createIterator(): rangeListIterator;
+            createBokmarks(serializable?: boolean): bookmark[];
+            createBookmarks2(normalized?: boolean): Object[];
+            moveToBookmark(bookmarks: Object[]): void;
+        }
+
+
+        class iterator {
+            constructor(range: range);
+            getNextParagraph(blockTag?: string): element;
+            activeFilter: filter;
+            enforceRealBlocks: boolean;
+            enlargeBr: boolean;
+            filter: filter;
+        }
+
+
+        class node extends domObject {
+            constructor(domNode: Node);
+            appendTo(element: element): element;
+            clone(includeChildren: boolean, cloneId: boolean): node;
+            hasPrevious(): boolean;
+            hasNext(): boolean;
+            insertAfter(node: node): node;
+            insertBefore(node: node): node;
+            insertBeforeMe(node: node): node;
+            getAddress(normalized?: boolean): Object[];
+            getDocument(): document;
+            getIndex(normalized?: boolean): number;
+            getNextSourceNode(startFromSibling: Object, nodeType: Object, guard: Object): void;
+            getPreviousSourceNode(startFromSibling: Object, nodeType: Object, guard: Object): void;
+            getPrevious(evaluator?: Function): node;
+            getNext(evaluator?: Function): node;
+            getParent(allowFragmentParent?: boolean): element;
+            getParents(closerFirst?: boolean): node[];
+            getCommonAncestor(node: Object): void;
+            getPosition(otherNode: Object): void;
+            getAscendant(reference: string, includeSelf?: boolean): node;
+            hasAscendant(name: Object, includeSelf: any): boolean;
+            remove(preserveChildren?: boolean): node;
+            replace(nodeToReplace: node): void;
+            trim(): void;
+            ltrim(): void;
+            rtrim(): void;
+            isReadOnly(): boolean;
+        }
+
+
+        class nodeList {
+            constructor(nativeList: Object);
+            count(): number;
+            getItem(index: number): node;
+        }
+
+
+        class event {
+            constructor(domEvent: Event);
+            getKey(): number;
+            getKeystroke(): number;
+            preventDefault(stopPropagation?: boolean): void;
+            stopPropagation(): void;
+            getTarget(): node;
+            getPhase(): number;
+            getPhaseOffset(): position;
+            on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: Object, listenerData?: Object, priority?: number): Object;
+        }
+
+
+        interface position {
+            x: number;
+            y: number;
+        }
+
+
+        interface widthAndHeight {
+            width: number;
+            height: number;
+        }
+
+
+        class text extends node {
+            constructor(text: Text, ownerDocument?: document);
+            constructor(text: string, ownerDocument?: document);
+            type: number;
+            getLength(): number;
+            getText(): string;
+            setText(text: string): void;
+            split(offset: number): text;
+            substring(indexA: number, indexB: number): void;
+        }
+
+
+        class window extends domObject {
+            constructor(domWindow: Object);
+            focus(): void;
+            getViewPaneSize(): widthAndHeight;
+            getScrollPosition(): position;
+            getFrame(): element;
+        }
+
+
+        class walker {
+            constructor(range: range);
+            end(): void;
+            next(): node;
+            previous(): node;
+            checkForward(): boolean;
+            checkBackward(): boolean;
+            lastForward(): node;
+            lastBackward(): node;
+            reset(): void;
+            //static methods till the end
+            blockBoundary(customNodeNames: Object): Function;
+            listItemBoundary(): Function;
+            bookmark(contentOnly?: boolean, isReject?: boolean): Function;
+            whitespaces(isReject?: boolean): Function;
+            invisible(isReject?: boolean): Function;
+            nodeType(type: number, isReject?: boolean): Function;
+            bogus(isReject?: boolean): Function;
+            temp(isReject?: boolean): Function;
+            ignored(isReject?: boolean): Function;
+            editable(isReject?: boolean): Function;
+        }
+
+    }
+
+
+    namespace ajax {
+
+        // Methods
+        function load(url: string, callback?: Function): string;
+        function loadXml(url: string, callback?: Function): xml;
+
+    }
+
+
+    interface xml {
+
+    }
+
+
+    class command extends event {
+
+        // Properties
+        contextSensitive: boolean;
+        editorFocus: boolean;
+        modes: any;
+        previousState: number;
+        state: number;
+        uiItems: any[];
+
+        // Methods
+        constructor(editor: editor, commandDefinition: commandDefinition);
+        checkAllowed(noCache: boolean): boolean;
+        disable(): void;
+        enable(): void;
+        exec(data?: Object): boolean;
+        refresh(editor: editor, path: dom.elementPath): void;
+        setState(newState: number): boolean;
+        toggleState(): void;
+
+    }
+
+
+    class focusManager {
+        // Properties
+        currentActive: dom.domObject;
+        hasFocus: boolean;
+
+        // Methods
+        constructor(editor: editor);
+        focus(currentActive?: dom.element): void;
+        lock(): void;
+        unlock(): void;
+        blur(noDelay?: boolean): void;
+        add(element: dom.element, isCapture: boolean): void;
+        remove(element: dom.element): void;
+    }
+
+    interface keystrokeHandler {
+
+    }
+
+    interface toolbarGroups {
+        name?: string;
+        groups?: string[];
+    }
+
+    namespace config {
+        interface styleObject {
+            name?: string;
+            element: string;
+            attributes?: Object;
+            styles?: Object;
+            overrides?: Object;
+        }
+    }
+
+    // Currently very incomplete. See here for all options that should be included:
+    // http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fileTools_defaultFileName
+    interface config {
+        allowedContent?: boolean | string | Object | CKEDITOR.style;
+        autoEmbed_widget?: string | Function;
+        autoGrow_bottomSpace?: number;
+        autoGrow_maxHeight?: number;
+        autoGrow_minHeight?: number;
+        autoGrow_onStartup?: boolean;
+        autoUpdateElement?: boolean;
+
+        baseFloatZIndex?: number;
+        baseHref?: string;
+        basicEntities?: boolean;
+        blockedKeystrokes?: number[];
+        bodyClass?: string;
+        bodyId?: string;
+        browserContextMenuOnCtrl?: boolean;
+
+        clipboard_defaultContentType?: string; // html | text
+        clipboard_notificationDuration?: number;
+        codeSnippet_codeClass?: string;
+        codeSnippet_languages?: Object;
+        coceSnippet_theme?: string;
+        colorButton_backStyle?: config.styleObject;
+        colorButton_colors?: string;
+        colorButton_colorsPerRow?: number;
+        colorButton_enableAutomatic?: boolean;
+        colorButton_enableMore?: boolean;
+        colorButton_foreStyle?: config.styleObject;
+        colorButton_normalizeBackground?: boolean;
+        contentsCss?: string | string[];
+        contentsLangDirection?: string;
+        contentsLanguage?: string;
+        coreStyles_bold?: config.styleObject;
+        coreStyles_italic?: config.styleObject;
+        coreStyles_strike?: config.styleObject;
+        coreStyles_subscript?: config.styleObject;
+        coreStyles_superscript?: config.styleObject;
+        coreStyles_underline?: config.styleObject;
+        customConfig?: string;
+
+        dataIndentationChars?: string;
+        defaultLanguage?: string;
+        devtools_styles?: string;
+        devtools_textCallback?: Function;
+        dialog_backgroundCoverColor?: string;
+        dialog_backgroundCoverOpacity?: number;
+        dialog_buttonsOrder?: string;
+        dialog_magnetDistance?: number;
+        dialog_noConfirmCancel?: boolean;
+        dialog_startupFocusTab?: boolean;
+        disableNativeSpellChecker?: boolean;
+        disableNativeTableHandles?: boolean;
+        disableNativeObjectResizing?: boolean;
+        disableNativeReadonlySTyling?: boolean;
+        disallowedContent?: string | Object; // Documentation calls it CKEDITOR.filter.disallowedContentRules, but it is just a non-governed object or string.
+        div_wrapTable?: boolean;
+        docType?: string;
+
+        emailProtection?: string;
+        embed_provider?: string;
+        enableTabKeyTools?: boolean;
+        enterMode?: number;
+        entities?: boolean;
+        entities_additional?: string;
+        entities_greek?: boolean;
+        entities_latin?: boolean;
+        entities_processNumerical?: boolean | string;
+        extraAllowedContent?: string | Object;
+        extraPlugins?: string;
+
+        fileTools_defaultFileName?: string;
+        filebrowserBrowseUrl?: string;
+        filebrowserFlashBrowseUrl?: string;
+        filebrowserFlashUploadUrl?: string;
+        filebrowserImageBrowseLinkUrl?: string;
+        filebrowserImageBrowseUrl?: string;
+        filebrowserImageUploadUrl?: string;
+        filebrowserUploadUrl?: string;
+        filebrowserWindowFeatures?: string;
+        filebrowserWindowHeight?: number | string;
+        filebrowserWindowWidth?: number | string;
+        fillEmptyBlocks?: boolean | Function;
+        find_highlight?: config.styleObject;
+        flashAddEmbedTag?: boolean;
+        flashConvertOnEdit?: boolean;
+        flashEmbedTagOnly?: boolean;
+        floatSpaceDockedOffsetX?: number;
+        floatSpaceDockedOffsetY?: number;
+        floatSpacePinnedOffsetX?: number;
+        floatSpacePinnedOffsetY?: number;
+        floatSpacePreferRight?: boolean;
+        fontSize_defaultLabel?: string;
+        fontSize_sizes?: string;
+        fontSize_style?: config.styleObject;
+        font_defaultLabel?: string;
+        font_names?: string;
+        font_style?: config.styleObject;
+        forceEnterMode?: boolean;
+        forcePasteAsPlainText?: boolean;
+        forceSimpleAmpersand?: boolean;
+        format_address?: config.styleObject;
+        format_div?: config.styleObject;
+        format_h1?: config.styleObject;
+        format_h2?: config.styleObject;
+        format_h3?: config.styleObject;
+        format_h4?: config.styleObject;
+        format_h5?: config.styleObject;
+        format_h6?: config.styleObject;
+        format_p?: config.styleObject;
+        format_pre?: config.styleObject;
+        format_tags?: string;
+        fullPage?: boolean;
+
+        grayt_autoStartup?: boolean;
+
+        height?: string | number;
+        htmlEncodeOutput?: boolean;
+
+        ignoreEmptyParagraph?: boolean;
+        image2_alignClasses?: string[];
+        image2_captionedClass?: string;
+        image2_disableResizer?: boolean;
+        image2_prefillDimensions?: boolean;
+        imageUploadUrl?: string;
+        image_prefillDimensions?: boolean;
+        image_previewText?: string;
+        image_removeLinkByEmptyUrl?: boolean;
+        indentClasses?: string[];
+        indentOffset?: number;
+        indentUnit?: string;
+
+        jqueryOverrideVal?: boolean;
+        justifyClasses?: string[];
+
+        keystrokes?: any[]; // Number, string pair really... silly structure... they should fix this.
+
+        language?: string;
+        language_list?: string[];
+        linkJavaScriptLinksAllowed?: boolean;
+        linkShowAdvancedTab?: boolean;
+        linkShowTargetTab?: boolean;
+
+        magicline_color?: string
+        magicline_everywhere?: boolean;
+        magicline_holdDistance?: number;
+        magicline_keystrokeNext?: number;
+        magicline_keystrokePrevious?: number;
+        magicline_tabuList?: string[];
+        magicline_triggerOffset?: number;
+        mathJaxLib?: string;
+        menu_groups?: string;
+        menu_subMenuDelay?: string;
+
+        newpage_html?: string;
+        notification_duration?: number;
+
+        on?: editor.eventObject;
+
+        pasteFilter?: string;
+        pasteFromWordCleanupFile?: string;
+        pasteFromWordNumberedHeadingToList?: boolean;
+        pasteFromWordPromptCleanup?: boolean;
+        pasteFromWordRemoveFontStyles?: boolean;
+        pasteFromWorkRemoveStyles?: boolean;
+        plugins?: string;
+        protectedSource?: RegExp[];
+
+        readOnly?: boolean;
+        removeButtons?: string;
+        removeDialogTabs?: string;
+        removeFormatAttributes?: string;
+        removeFormatTags?: string;
+        removePlugins?: string;
+        resize_dir?: string;
+        resize_enabled?: boolean;
+        resize_maxHeight?: number;
+        resize_maxWidth?: number;
+        resize_minHeight?: number;
+        resize_minWidth?: number;
+
+        scayt_autoStartup?: boolean;
+        scayt_contextCommands?: string;
+        scayt_contextMenuItemsOrder?: string;
+        scayt_customDictionaryIds?: string;
+        scayt_customerId?: string;
+        scayt_disableOptionsStorage?: string | string[];
+        scayt_elementsToIgnore?: string;
+        scayt_handleCheckDirty?: string;
+        scayt_handleUndoRedo?: string;
+        scayt_ignoreAllCapsWords?: boolean;
+        scayt_ignoreDomainNames?: boolean;
+        scayt_ignoreWordsWithMixedCases?: boolean;
+        scayt_ignoreWordsWithNumbers?: boolean;
+        scayt_inlineModeImmediateMarkup?: boolean;
+        scayt_maxSuggestions?: number;
+        scayt_minWordLength?: number;
+        scayt_moreSuggestions?: string;
+        scayt_multiLanguageMode?: boolean;
+        scayt_multiLanguageStyles?: Object;
+        scayt_sLang?: string;
+        scayt_serviceHost?: string;
+        scayt_servicePath?: string;
+        scayt_servicePort?: string;
+        scayt_serviceProtocol?: string;
+        scayt_srcUrl?: string;
+        scayt_uiTabs?: string;
+        scayt_userDictionaryName?: string;
+
+        sharedSpaces?: CKEDITOR.sharedSpace;
+        shiftEnterMode?: number;
+        skin?: string;
+        smiley_columns?: number;
+        smiley_descriptions?: string[];
+        smiley_images?: string[];
+        smiley_path?: string;
+        sourceAreaTabSize?: number;
+        specialChars?: any[]; // Seems to be an array of a string, or a two-element string-array
+        startupFocus?: boolean;
+        startupMode?: string;
+        startupOutlineBlocks?: boolean;
+        startupShowBorders?: boolean;
+        stylesSet?: string | boolean | config.styleObject[];
+        stylesheetParser_skipSelectors?: RegExp;
+        stylesheetParser_validSelectors?: RegExp;
+
+        tabIndex?: number;
+        tabSpaces?: number;
+        templates?: string;
+        templates_files?: Object;
+        templates_replaceContent?: boolean;
+        title?: string | boolean;
+        toolbar?: string | (string | string[] | { name: string, items?: string[], groups?: string[] })[] | null;
+        toolbarCanCollapse?: boolean;
+        toolbarGroupCycling?: boolean;
+        toolbarGroups?: (toolbarGroups | string)[];
+        toolbarLocation?: string;
+        toolbarStartupExpanded?: boolean;
+
+        uiColor?: string;
+        undoStackSize?: number;
+        uploadUrl?: string;
+        useComputedState?: boolean;
+
+        width?: string | number;
+        wsc_cmd?: string;
+        wsc_customDictionaryIds?: string;
+        wsc_customLoaderScript?: string;
+        wsc_customerId?: string;
+        wsc_lang?: string;
+        wsc_userDictionaryName?: string;
+    }
+
+
+    interface feature {
+
+    }
+
+
+    interface sharedSpace {
+        top?: string | HTMLElement;
+        bottom?: string | HTMLElement;
+    }
+
+    module skin {
+        var icons: { [name: string]: { path: string } };
+        function addIcon(name: string, path: string, offset?: number, bgsize?: string): void;
+    }
+
+    class style {
+        constructor(something: { element: string, attributes: { [att: string]: string } });
+        applyToRange(range: Range, editor: editor): void;
+    }
+
+    class editable extends dom.element {
+        constructor(editor: editor, element: HTMLElement | dom.element);
+        hasFocus: boolean;
+        attachListener(obj: event | editable, eventName: string, listenerFunction: (ei: eventInfo) => void,
+            scopeobj?: {}, listenerData?: any, priority?: number): listenerRegistration;
+    }
+
+
+    class menu {
+        constructor();
+        add(item: any): void;
+        addListener(listenerFn: (startElement: dom.element, selection: dom.selection, path: dom.elementPath) => any): void;
+        hide(returnFocus?: boolean): void;
+        removeAll(): void;
+        show(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
+    }
+
+
+    namespace plugins {
+
+        class contextMenu extends menu {
+            constructor(editor: editor);
+            addTarget(element: dom.element, nativeContextMenuOnCtrl?: boolean): void;
+            open(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
+        }
+
+
+        namespace link {
+            var emptyAnchorFix: boolean;
+            var fakeAnchor: boolean;
+            var synAnchorSelector: boolean;
+            function getEditorAnchors(editor: editor): dom.element[];
+            function getSelectedLink(editor: editor): dom.elementPath;
+            function tryRestoreFakeAnchor(editor: editor, element: dom.element): dom.element;
+        }
+
+
+        namespace widget {
+
+            namespace nestedEditable {
+                interface definition {
+                    allowedContent?: any;
+                    pathName?: string;
+                    selector?: string;
+                }
+            }
+
+            class nestedEditable extends CKEDITOR.dom.element {
+                editor: CKEDITOR.editor;
+                enterMode: number;
+                filter: CKEDITOR.filter;
+                shiftEnterMode: number;
+
+                constructor(editor: CKEDITOR.editor, element: CKEDITOR.dom.element, config: { filter?: CKEDITOR.filter });
+                getData(): string;
+                setData(data: string): void;
+            }
+
+
+            interface definition {
+                allowedContent?: any;
+                button?: string;
+                contentForms?: Object;
+                contentTransformations?: Object;
+                data?: Object | Function;
+                defaults?: Object;
+                dialog?: string;
+                downcast?: string | Function;
+                downcasts?: Object;
+                draggable?: boolean;
+                edit?: Function;
+                editables?: Object;
+                init?: Function;
+                inline?: boolean;
+                insert?: Function;
+                mask?: boolean;
+                name?: string;
+                parts?: Object;
+                pathName?: string;
+                requiredContent?: string | CKEDITOR.style;
+                styleToAllowedContentRules?: Function;
+                styleableElements?: string;
+                template?: string | CKEDITOR.template;
+                upcast?: string | Function;
+                upcastPriority?: number;
+                upcasts?: Object;
+
+                toFeature?(): CKEDITOR.feature;
+            }
+
+            class repository {
+                add(name: string, widgetDef: CKEDITOR.plugins.widget.definition): void;
+                addUpcastCallback(callback: Function): void;
+                capture(): void;
+                checkSelection(): void;
+                checkWidgets(options?: { initOnlyNew?: boolean; focusInited?: boolean }): void;
+                define(name: string, meta?: { errorProof?: boolean }): void;
+                del(widget: CKEDITOR.plugins.widget): void;
+                destroy(widget: CKEDITOR.plugins.widget, offline?: boolean): void;
+                destroyAll(offline?: boolean): void;
+                finalizeCreation(container: any): void;
+                focused: widget;
+                fire(eventName: string, data: Object, editor: editor): any; // should be boolean | Object
+                getByElement(element: any, checkWrapperOnly: boolean): CKEDITOR.plugins.widget;
+                hasListeners(eventName: string): boolean;
+                initOn(element: dom.element, widgetDef?: CKEDITOR.plugins.widget.definition, startupData?: Object): CKEDITOR.plugins.widget;
+                initOn(element: dom.element, widgetDef?: string, startupData?: Object): CKEDITOR.plugins.widget;
+                initOnAll(container?: dom.element): CKEDITOR.plugins.widget[];
+                instances: { [id: string]: widget };
+                on(eventName: string, listenerFunction: Function, scopeObj?: Object, listenerData?: Object, priority?: number): any;
+                once(): void;
+                parseElementClasses(classes: string): any;
+                removeAllListeners(eventName: string, listenerFunction: Function): void;
+                wrapElement(element: any, widgetName?: string): any;
+            }
+        }
+
+        class widget implements CKEDITOR.plugins.widget.definition {
+            allowedContent: any;
+            button: string;
+            contentForms: any;
+            contentTransformations: any;
+            data: any;
+            dataReady: boolean;
+            defaults: any;
+            definition: CKEDITOR.plugins.widget.definition;
+            dialog: string;
+            downcast: string | Function;
+            downcasts: any;
+            draggable: boolean;
+            editables: any;
+            editor: CKEDITOR.editor;
+            element: CKEDITOR.dom.element;
+            focusedEditable: CKEDITOR.plugins.widget.nestedEditable
+            id: number;
+            init: Function;
+            inited: boolean;
+            inline: boolean;
+            insert: Function;
+            mask: boolean;
+            name: string;
+            parts: any;
+            pathName: string;
+            ready: boolean;
+            repository: CKEDITOR.plugins.widget.repository;
+            requiredContent: string | CKEDITOR.style;
+            styleToAllowedContentRules: Function;
+            styleableElements: string;
+            template: CKEDITOR.template;
+            upcast: string | Function;
+            upcastPriority: number;
+            upcasts: any;
+            wrapper: CKEDITOR.dom.element;
+
+            constructor(widgetsRepo: CKEDITOR.plugins.widget.repository, id: number, element: CKEDITOR.dom.element, widgetDef: CKEDITOR.plugins.widget.definition, starupData?: Object);
+
+            addClass(className: string): void;
+            applyStyle(style: CKEDITOR.style): void;
+            capture(): void;
+            checkStyleActive(style: CKEDITOR.style): boolean;
+            define(name: string, meta: { errorProof?: boolean }): void;
+            destroy(offline?: boolean): void;
+            destroyEditable(editableName: string, offline?: boolean): void;
+            edit(): boolean;
+            fire(eventName: string, data?: Object, editor?: CKEDITOR.editor): any;
+            fireOnce(eventName: string, data?: Object, editor?: CKEDITOR.editor): any;
+            focus(): void;
+            getClasses(): any;
+            hasClass(className: string, Whether: boolean): void;
+            hasListeners(eventName: string): boolean;
+            initEditable(editableName: string, definition: CKEDITOR.plugins.widget.nestedEditable.definition): boolean;
+            isInited(): boolean;
+            isReady(): boolean;
+            on(eventName: string, listenerFunction: Function,
+                scopeObj?: Object, listenerData?: Object, priority?: number): any;
+            once(): void;
+            removeAllListeners(): void;
+            removeClass(className: string): void;
+            removeListener(eventName: string, listenerFunction: Function): void;
+            removeStyle(style: CKEDITOR.style): void;
+            setData(keyOrData: string | Object, value: Object): CKEDITOR.plugins.widget;
+            setFocused(selected: boolean): CKEDITOR.plugins.widget;
+            setSelected(selected: boolean): CKEDITOR.plugins.widget;
+            toFeature(): CKEDITOR.feature;
+            updateDragHandlerPosition(): void;
+        }
+
+        interface IPluginDefinition {
+            hidpi?: boolean;
+            lang?: string | string[];
+            requires?: string | string[];
+            afterInit?(editor: editor): any;
+            beforeInit?(editor: editor): any;
+            init?(editor: editor): void;
+            onLoad?(): any;
+            icons?: string;
+        }
+
+        function add(name: string, definition: IPluginDefinition): void;
+        function add(name: string): void;
+        function addExternal(name: string, path: string, fileName?: string): void;
+        function get(name: string): any;
+        function getFilePath(name: string): string;
+        function getPath(name: string): string;
+        function load(name: string, callback: Function, scope?: Object): void;
+        function setLang(pluginName: string, languageCode: string, languageEntries: any): void;
+        var registered: {[key: string]: IPluginDefinition};
+    }
+
+    interface IMenuItemDefinition {
+        label:string,
+        command:string,
+        icon: string
+        group:string,
+        order:number
+    }
+
+    class editor extends event {
+        activeEnterMode: number;
+        activeFilter: filter;
+        activeShiftEnterMode: number;
+        blockless: boolean;
+        config: config;
+        container: dom.element;
+        contextMenu: plugins.contextMenu;
+        dataProcessor: dataProcessor;
+        document: dom.document;
+        element: dom.element;
+        elementMode: number;
+        enterMode: number;
+        filter: filter;
+        focusManager: focusManager;
+        id: string;
+        keystrokeHandler: keystrokeHandler;
+        lang: any;
+        langCode: string;
+        mode: string;
+        name: string;
+        plugins: any;
+        readOnly: boolean;
+        shiftEnterMode: number;
+        status: string;
+        tabIndex: number;
+        templates: any;
+        title: any;
+        toolbar: any;
+        ui: ui;
+        widgets: plugins.widget.repository;
+        window: dom.window;
+        constructor(instanceConfig?: Object, element?: dom.element, mode?: number);
+        addCommand(commandName: string, commandDefinition: commandDefinition): void;
+        addFeature(feature: feature): boolean;
+        addMenuGroup(name: string, order?: number): void;
+        addMenuItem(name: string, definition?: IMenuItemDefinition): void;
+        addMenuItems(definitions: {[id:string]:IMenuItemDefinition}): void;
+        addMode(mode: string, exec: () => void): void;
+        addRemoveFormatFilter(func: Function): void;
+        applyStyle(style: style): void;
+        attachStyleStateChange(style: style, callback: Function): void;
+        checkDirty(): boolean;
+        commands:any;
+        createFakeElement(realElement: Object, className: Object, realElementType: Object, isResizable: Object): void;
+        createFakeParserElement(realElement: Object, className: Object, realElementType: Object, isResizable: Object): void;
+        createRange(): dom.range;
+        destroy(noUpdate?: boolean): void;
+        editable(): editable | null;
+        editable(elementOrEditable: dom.element): void;
+        editable(elementOrEditable: editable): void;
+        elementPath(startNode?: dom.node): dom.elementPath;
+        execCommand(commandName: string, data?: Object): boolean;
+        focus(): void;
+        forceNextSelectionCheck(): void;
+        getClipboardData(options: Object, callback: Function): void;
+        getColorFromDialog(callback: Function, scope?: Object): void;
+        getCommand(commandName: string): command;
+        getData(noEvents?: Object): string;
+        getMenuItem(name: string): Object;
+        getResizable(forContents: boolean): dom.element;
+        getSelectedHtml(toString?: false): dom.documentFragment;
+        getSelectedHtml(toString: true): string;
+        getSelectedHtml(toString?: boolean): CKEDITOR.dom.documentFragment | string;
+        getSelection(forceRealSelection?: boolean): dom.selection;
+        getSnapshot(): string;
+        getStylesSet(callback: Function): void;
+        getUiColor(): string;
+        insertElement(element: dom.element): void;
+        insertHtml(html: string, mode?: string): void;
+        insertText(text: string): void;
+        loadSnapshot(snapshot: Object): void;
+        lockSelection(sel?: dom.selection): boolean;
+        openDialog(dialogName: string, callback: Function): dialog;
+        popup(url: string, width?: number, height?: number, options?: string): void;
+        popup(url: string, width?: string, height?: number, options?: string): void;
+        popup(url: string, width?: number, height?: string, options?: string): void;
+        popup(url: string, width?: string, height?: string, options?: string): void;
+        removeMenuItem(name: string): void;
+        removeStyle(style: style): void;
+        resetDirty(): void;
+        resetUndo(): void;
+        resize(width: number, height: number, isContentHeight?: boolean, resizeInner?: boolean): void;
+        resize(width: string, height: number, isContentHeight?: boolean, resizeInner?: boolean): void;
+        resize(width: number, height: string, isContentHeight?: boolean, resizeInner?: boolean): void;
+        resize(width: string, height: string, isContentHeight?: boolean, resizeInner?: boolean): void;
+        restoreRealElement(fakeElement: Object): dom.element;
+        selectionChange(checkNow?: boolean): void;
+        setActiveEnterMode(enterMode: number, shiftEnterMode: number): void;
+        setActiveFilter(filter: filter): void;
+        setData(data: string, options?: { internal?: boolean; callback?: Function; noSnapshot?: boolean; }): void;
+        setKeystroke(keystroke: number, behavior?: string): void;
+        setKeystroke(keystroke: any[], behavior?: string): void;
+        setKeystroke(keystroke: number, behavior?: boolean): void;
+        setKeystroke(keystroke: any[], behavior?: boolean): void;
+        setMode(newMode: string, callback: Function): void;
+        setReadOnly(isReadOnly?: boolean): void;
+        setUiColor(color: string): void;
+        unlockSelection(restore?: boolean): void;
+        updateElement(): void;
+    }
+
+    namespace editor {
+        interface eventObject {
+            activeEnterModeChange?: (evt: CKEDITOR.eventInfo) => void;
+            activeFilterChange?: (evt: CKEDITOR.eventInfo) => void;
+            afterCommandExec?: (evt: CKEDITOR.eventInfo) => void;
+            afterInsertHtml?: (evt: CKEDITOR.eventInfo) => void;
+            afterPaste?: (evt: CKEDITOR.eventInfo) => void;
+            afterPasteFromWord?: (evt: CKEDITOR.eventInfo) => void;
+            afterSetData?: (evt: CKEDITOR.eventInfo) => void;
+            afterUndoImage?: (evt: CKEDITOR.eventInfo) => void;
+            ariaEditorHelpLabel?: (evt: CKEDITOR.eventInfo) => void;
+            ariaWidget?: (evt: CKEDITOR.eventInfo) => void;
+            autogrow?: (evt: CKEDITOR.eventInfo) => void;
+
+            beforeCommandExec?: (evt: CKEDITOR.eventInfo) => void;
+            beforeDestroy?: (evt: CKEDITOR.eventInfo) => void;
+            beforeGetData?: (evt: CKEDITOR.eventInfo) => void;
+            beforeModeUnload?: (evt: CKEDITOR.eventInfo) => void;
+            beforeSetMode?: (evt: CKEDITOR.eventInfo) => void;
+            beforeUndoImage?: (evt: CKEDITOR.eventInfo) => void;
+            blur?: (evt: CKEDITOR.eventInfo) => void;
+
+            change?: (evt: CKEDITOR.eventInfo) => void;
+            configLoaded?: (evt: CKEDITOR.eventInfo) => void;
+            contentDirChanged?: (evt: CKEDITOR.eventInfo) => void;
+            contentDom?: (evt: CKEDITOR.eventInfo) => void;
+            contentDomInvalidated?: (evt: CKEDITOR.eventInfo) => void;
+            contentDomUnload?: (evt: CKEDITOR.eventInfo) => void;
+            customConfigLoaded?: (evt: CKEDITOR.eventInfo) => void;
+
+            dataFiltered?: (evt: CKEDITOR.eventInfo) => void;
+            dataReady?: (evt: CKEDITOR.eventInfo) => void;
+            destroy?: (evt: CKEDITOR.eventInfo) => void;
+            dialogHide?: (evt: CKEDITOR.eventInfo) => void;
+            dialogShow?: (evt: CKEDITOR.eventInfo) => void;
+            dirChanged?: (evt: CKEDITOR.eventInfo) => void;
+            doubleclick?: (evt: CKEDITOR.eventInfo) => void;
+            dragend?: (evt: CKEDITOR.eventInfo) => void;
+            dragstart?: (evt: CKEDITOR.eventInfo) => void;
+            drop?: (evt: CKEDITOR.eventInfo) => void;
+
+            elementsPathUpdate?: (evt: CKEDITOR.eventInfo) => void;
+
+            fileUploadRequest?: (evt: CKEDITOR.eventInfo) => void;
+            fileUploadResponse?: (evt: CKEDITOR.eventInfo) => void;
+            floatingSpaceLayout?: (evt: CKEDITOR.eventInfo) => void;
+            focus?: (evt: CKEDITOR.eventInfo) => void;
+
+            getData?: (evt: CKEDITOR.eventInfo) => void;
+            getSnapshot?: (evt: CKEDITOR.eventInfo) => void;
+
+            insertElement?: (evt: CKEDITOR.eventInfo) => void;
+            insertHtml?: (evt: CKEDITOR.eventInfo) => void;
+            insertText?: (evt: CKEDITOR.eventInfo) => void;
+            instanceReady?: (evt: CKEDITOR.eventInfo) => void;
+
+            key?: (evt: CKEDITOR.eventInfo) => void;
+
+            langLoaded?: (evt: CKEDITOR.eventInfo) => void;
+            loadSnapshot?: (evt: CKEDITOR.eventInfo) => void;
+            loaded?: (evt: CKEDITOR.eventInfo) => void;
+            lockSnapshot?: (evt: CKEDITOR.eventInfo) => void;
+            maximize?: (evt: CKEDITOR.eventInfo) => void;
+            menuShow?: (evt: CKEDITOR.eventInfo) => void;
+            mode?: (evt: CKEDITOR.eventInfo) => void;
+
+            notificationHide?: (evt: CKEDITOR.eventInfo) => void;
+            notificationShow?: (evt: CKEDITOR.eventInfo) => void;
+            notificationUpdate?: (evt: CKEDITOR.eventInfo) => void;
+
+            paste?: (evt: CKEDITOR.eventInfo) => void;
+            pasteFromWord?: (evt: CKEDITOR.eventInfo) => void;
+            pluginsLoaded?: (evt: CKEDITOR.eventInfo) => void;
+
+            readOnly?: (evt: CKEDITOR.eventInfo) => void;
+            removeFormatCleanup?: (evt: CKEDITOR.eventInfo) => void;
+            required?: (evt: CKEDITOR.eventInfo) => void;
+            resize?: (evt: CKEDITOR.eventInfo) => void;
+
+            save?: (evt: CKEDITOR.eventInfo) => void;
+            saveSnapshot?: (evt: CKEDITOR.eventInfo) => void;
+            selectionChange?: (evt: CKEDITOR.eventInfo) => void;
+            setData?: (evt: CKEDITOR.eventInfo) => void;
+            stylesSet?: (evt: CKEDITOR.eventInfo) => void;
+
+            template?: (evt: CKEDITOR.eventInfo) => void;
+            toDataFormat?: (evt: CKEDITOR.eventInfo) => void;
+            toHtml?: (evt: CKEDITOR.eventInfo) => void;
+
+            unlockSnapshot?: (evt: CKEDITOR.eventInfo) => void;
+            updateSnapshot?: (evt: CKEDITOR.eventInfo) => void;
+
+            widgetDefinition?: (evt: CKEDITOR.eventInfo) => void;
+        }
+    }
+
+    interface eventInfo {
+        data: any;
+        editor: editor;
+        listenerData: any;
+        name: string;
+        sender: any;
+        cancel(): void;
+        removeListener(): void;
+        stop(): void;
+    }
+
+    module filter {
+        interface allowedContentRules {
+
+        }
+    }
+
+    class filter {
+        allow(newRules: CKEDITOR.filter.allowedContentRules, featureName?: string, overrideCustom?: boolean): boolean;
+
+    }
+
+    interface buttonDefinition {
+        icon?: string;
+        iconOffset?: number;
+        label : string;
+        command : string;
+        toolbar : string;
+    }
+
+    interface template {
+
+    }
+
+
+    interface dataProcessor {
+        toDataFormat(html: string, fixForBody: string): void;
+        toHtml(data: string, fixForBody?: string): void;
+    }
+
+    class htmlDataProcessor {
+        dataFilter: htmlParser.filter;
+        htmlFilter: htmlParser.filter;
+        writer: htmlParser.basicWriter;
+
+        constructor(editor: editor);
+        toDataFormat(html: string, options?: Object): string;
+        toHtml(data: string, options?: Object): string;
+    }
+
+
+    class event {
+        constructor();
+        useCapture: boolean;
+        capture(): void;
+        define(name: string, meta: Object): void;
+        fire(eventName: string, data?: Object, editor?: editor): any;
+        fireOnce(eventName: string, data?: Object, editor?: editor): any;
+        hasListeners(eventName: string): boolean;
+        on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: Object | null, listenerData?: Object | null, priority?: number): listenerRegistration;
+        once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: Object | null, listenerData?: Object | null, priority?: number): listenerRegistration;
+        removeAllListeners(): void;
+        removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
+        static implementOn(targetObject: Object): void;
+    }
+
+
+    interface commandDefinition {
+        async?: boolean;
+        canUndo?: boolean;
+        context?: boolean;
+        contextSensitive?: boolean;
+        editorFocus?: boolean;
+        modes?: Object;
+        startDisabled?: boolean;
+        exec(editor: editor, data?: Object): boolean;
+        readOnly?: boolean;
+        refresh?(editor: editor, path: dom.elementPath): void;
+    }
+
+
+    interface dtdDefinition {
+        [outerTagName: string]: {[innerTagName: string]: 1};
+        $block:          {[tagName: string]: 1};
+        $blockLimit:     {[tagName: string]: 1};
+        $cdata:          {[tagName: string]: 1};
+        $editable:       {[tagName: string]: 1};
+        $empty:          {[tagName: string]: 1};
+        $inline:         {[tagName: string]: 1};
+        $intermediate:   {[tagName: string]: 1};
+        $list:           {[tagName: string]: 1};
+        $listItem:       {[tagName: string]: 1};
+        $nonBodyContent: {[tagName: string]: 1};
+        $nonEditable:    {[tagName: string]: 1};
+        $object:         {[tagName: string]: 1};
+        $removeEmpty:    {[tagName: string]: 1};
+        $tabIndex:       {[tagName: string]: 1};
+        $tableContent:   {[tagName: string]: 1};
+        $transparent:    {[tagName: string]: 1};
+    }
+
+    var dtd: dtdDefinition;
+
+
+    class ui extends event {
+        constructor(editor: editor);
+        add(name: string, type: Object, definition: Object): void;
+        addButton(name: string, definition: buttonDefinition): void;
+        addHandler(type: Object, handler: Object): void;
+    }
+
+    class environmentConfig  {
+        air : boolean;
+        chrome : boolean;
+        cssClass : string;
+        edge : boolean;
+        gecko : boolean;
+        hc : boolean;
+        hidpi : boolean;
+        iOS : boolean;
+        ie : boolean;
+        isCompatible : boolean;
+        mac : boolean;
+        needsBrFiller : boolean;
+        needsNbspFiller : boolean;
+        quirks : boolean;
+        safari : boolean;
+        version : number;
+        webkit : boolean;
+        secure( ) : boolean;
+    }
+
+    namespace ui {
+        namespace dialog {
+            class uiElement {
+                eventProcessors: any;
+
+                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[], nodeNameArg?: Function | string, stylesArg?: Function | Object, attributesArg?: Function | Object, contentsArg?: Function | string); // Not sure that the htmlList array type is right.
+
+                accessKeyDown(dialog: CKEDITOR.dialog, key: string): void;
+                accessKeyUp(dialog: CKEDITOR.dialog, key: string): void;
+                disable(): void;
+                enable(): void;
+                focus(): CKEDITOR.ui.dialog.uiElement;
+                getDialog(): CKEDITOR.dialog;
+                getElement(): CKEDITOR.dom.element;
+                getInputElement(): CKEDITOR.dom.element;
+                getValue(): any;
+                isChanged(): boolean;
+                isEnabled(): boolean;
+                isFocusable(): boolean;
+                isVisible(): boolean;
+                registerEvents(definition: CKEDITOR.dialog.definition.uiElement): CKEDITOR.ui.dialog.uiElement;
+                selectParentTab(): CKEDITOR.ui.dialog.uiElement;
+                setValue(value: Object, noChangeEvent: boolean): CKEDITOR.ui.dialog.uiElement;
+
+                // Change event?
+            }
+
+
+            class button extends uiElement {
+                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+
+                accessKeyDown(): void;
+                accessKeyUp(): void;
+                click(): any;
+            }
+
+
+            class checkbox extends uiElement {
+                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+
+                accessKeyUp(): void;
+                getInputElement(): CKEDITOR.dom.element;
+                getValue(): boolean;
+                setValue(checked: boolean, noChangeEvent: boolean): any; // returns void according to doc, but cannot override base class like that
+            }
+
+
+            class fieldset extends uiElement {
+                constructor(dialog: CKEDITOR.dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: CKEDITOR.dialog.definition.uiElement);
+            }
+
+
+            class file extends CKEDITOR.ui.dialog.labeledElement {
+                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+
+                getAction(): string;
+                getInputElement(): CKEDITOR.dom.element;
+                registerEvents(definition: Object): CKEDITOR.ui.dialog.file;
+                reset(): void;
+                setInitValue(): void;
+                submit(): CKEDITOR.ui.dialog.file;
+            }
+
+
+            class fileButton extends CKEDITOR.ui.dialog.button {
+                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+
+                // formLoaded event ??
+            }
+
+
+            class hbox extends uiElement {
+                constructor(dialog: CKEDITOR.dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: CKEDITOR.dialog.definition.uiElement);
+
+                getChild(indices: number): CKEDITOR.ui.dialog.uiElement;
+                getChild(indices: number[]): CKEDITOR.ui.dialog.uiElement[];
+            }
+
+
+            class html extends uiElement {
+                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+
+            }
+
+
+            class iframeElement extends uiElement {
+
+            }
+
+
+            class labeledElement extends uiElement {
+                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[], contentHtml: Function);
+
+                getLabel(): string;
+                setlabel(label: string): CKEDITOR.ui.dialog.labeledElement;
+            }
+
+
+            class radio extends CKEDITOR.ui.dialog.labeledElement {
+                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+
+                accessKeyUp(): void;
+                getValue(): string;
+                setValue(value: string, noChangeEvent: boolean): any; // returns void according to doc, but cannot override base class like that
+            }
+
+
+            class select extends uiElement {
+                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+
+                add(label: string, value?: string, indexedDB?: number): CKEDITOR.ui.dialog.select;
+                clear(): CKEDITOR.ui.dialog.select;
+                getInputElement(): CKEDITOR.dom.element;
+                remove(index: number): CKEDITOR.ui.dialog.select;
+            }
+
+
+            class textarea extends CKEDITOR.ui.dialog.labeledElement {
+                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+            }
+
+
+            class textInput extends CKEDITOR.ui.dialog.labeledElement {
+                constructor(dialog: CKEDITOR.dialog, elementDefinition: CKEDITOR.dialog.definition.uiElement, htmlList: any[]);
+
+                accessKeyUp(): void;
+                focus(): any; // returns void according to doc, but cannot override base class like that
+                getDirectionMarker(): string;
+                getInputElement(): CKEDITOR.dom.element;
+                getValue(): string;
+                select(): void;
+                setDirectionMarker(dir: string): void;
+                setValue(value: string, noChangeEvent: boolean): CKEDITOR.ui.dialog.textInput;
+            }
+        }
+    }
+
+    class dialog {
+        state: number;
+
+        constructor(editor: Object, dialogName: string);
+
+        addFocusable(element: CKEDITOR.dom.element, index?: number): void;
+        addPage(contents: Object): void;
+        click(id: string): Object;
+        commitContent(): void;
+        diableButton(id: string): void;
+        enableButton(id: string): void;
+        foreach(fn: Function): CKEDITOR.dialog;
+        getButton(id: string): CKEDITOR.ui.dialog.button;
+        getContentElement(pageId: string, elementId: string): CKEDITOR.ui.dialog.uiElement;
+        getElement(): CKEDITOR.dom.element;
+        getName(): string;
+        getPageCount(): number;
+        getParentEditor(): CKEDITOR.editor;
+        getPosition(): Object;
+        getSelectedElement(): CKEDITOR.dom.element;
+        getSize(): Object;
+        getValueOf(pageId: string, elementId: string): Object;
+        hide(): void;
+        hidePage(id: string): void;
+        layout(): void;
+        move(x: number, y: number, save: boolean): void;
+        reset(): CKEDITOR.dialog;
+        resize(width: number, height: number): void;
+        selectPage(id: string): void;
+        setState(state: number): void;
+        setValueOf(pageId: string, elementId: string, value: Object): void;
+        setupContent(): void;
+        show(): void;
+        showPage(id: string): void;
+        updateStyle(): void;
+
+        // NOTE: Static methods are added to dialog module
+    }
+
+
+    namespace dialog {
+
+        namespace definition {
+
+            interface button extends uiElement {
+                disabled?: boolean;
+                label?: string;
+            }
+
+
+            interface checkbox extends uiElement {
+                default?: string;
+                label?: string;
+                validate?: Function;
+            }
+
+
+            interface content {
+                accessKey?: string;
+                elements?: CKEDITOR.dialog.definition.uiElement[];
+                id?: string;
+                label?: string;
+                title?: string;
+            }
+
+
+            interface file extends labeledElement {
+                action?: string;
+                size?: string;
+                validate?: Function;
+            }
+
+
+            interface fileButton extends uiElement {
+                filebrowser?: string;
+                for?: string;
+                label?: string;
+                styles?: string;
+            }
+
+
+            interface hbox extends uiElement {
+                children?: CKEDITOR.ui.dialog.uiElement[];
+                height?: number;
+                padding?: number;
+                validate?: Function;
+                widths?: number[];
+            }
+
+
+            interface html extends uiElement {
+                html?: string;
+            }
+
+
+            interface labeledElement extends uiElement {
+                controlStyle?: string;
+                inputStyle?: string;
+                label?: string;
+                labelLayout?: string;
+                labelStyle?: string;
+                widths?: number[];
+            }
+
+
+            interface radio extends labeledElement {
+                default?: string;
+                items?: string[] | (string[])[];
+                validate?: Function;
+            }
+
+
+
+            interface select extends labeledElement {
+                default?: string;
+                items?: string[] | (string[])[];
+                multiple?: boolean;
+                size?: number;
+                validate?: Function;
+            }
+
+
+
+            interface textarea extends labeledElement {
+                bidi?: boolean;
+                cols?: number;
+                default?: string;
+                rows?: number;
+                validate?: Function;
+            }
+
+
+            interface textInput extends labeledElement {
+                bidi?: boolean;
+                default?: string;
+                maxLength?: number;
+                size?: number;
+                validate?: Function;
+            }
+
+
+            interface uiElement {
+                align?: string;
+                className?: string;
+                commit?: (widget: CKEDITOR.plugins.widget) => void;
+                id?: string;
+                onHide?: (elem: CKEDITOR.ui.dialog.uiElement) => void;
+                onLoad?: (elem: CKEDITOR.ui.dialog.uiElement) => void;
+                onShow?: (elem: CKEDITOR.ui.dialog.uiElement) => void;
+                requiredcontent?: string | Object | CKEDITOR.style;
+                setup?: (widget: CKEDITOR.plugins.widget) => void;
+                style?: string;
+                title?: string;
+                type?: string;
+            }
+
+
+            interface vbox extends uiElement {
+                children?: CKEDITOR.ui.dialog.uiElement[];
+                expand?: boolean;
+                heights?: number[];
+                padding?: number;
+                styles?: string;
+                width?: number[];
+            }
+        }
+
+        interface IDialogDefinition {
+            buttons?: CKEDITOR.dialog.definition.button[];
+            contents?: CKEDITOR.dialog.definition.content[];
+            height?: number;
+            minHeight?: number;
+            minWidth?: number;
+            onCancel?: Function;
+            onLoad?: Function;
+            onOk?: Function;
+            onShow?: Function;
+            onHide?: Function;
+            resizable?: number;
+            title?: string;
+            width?: number;
+        }
+
+        function add(name: string, path: string): void;
+        function add(name: string, dialogDefinition: (editor: CKEDITOR.editor) => IDialogDefinition): void;
+        function addIframe(name: string, title: string, minWidth: number, minHeight: number, onContentLoad?: Function, userDefinition?: Object): void;
+        function addUIElement(typeName: string, builder: Function): void;
+        function cancelButton(): void;
+        function exists(name: string | number): void; // NOTE: documentation says object, but it's an array accessor, so really a string or number will work
+        function getCurrent(): CKEDITOR.dialog;
+        function isTabEnabled(editor: CKEDITOR.editor, dialogName: string, tabName: string): boolean;
+        function okButton(): void;
+    }
+
+
+    namespace htmlParser {
+
+        class basicWriter {
+            constructor();
+            openTag(tagName: string, attributes: Object): void;
+            openTagClose(tagName: string, isSelfClose: boolean): void;
+            attribute(attName: string, attValue: string): void;
+            closeTag(tagName: string): void;
+            text(text: string): void;
+            comment(comment: string): void;
+            write(data: string): void;
+            reset(): void;
+            getHtml(reset: boolean): string;
+        }
+
+
+        class node {
+            constructor();
+            remove(preserveChildren?: boolean): node;
+            replaceWith(node: node): void;
+            insertAfter(node: node): void;
+            insertBefore(node: node): void;
+            getAscendant(condition: string): element;
+            getAscendant(condition: Object): element;
+            getAscendant(condition: Function): element;
+            wrapWith(wrapper: element): element;
+            getIndex(): number;
+        }
+
+
+        class filter {
+            constructor(rules?: filterRulesDefinition);
+            id: number;
+            elementNameRules: filterRulesGroup;
+            attributeNameRules: filterRulesGroup;
+            elementsRules: any;
+            attributesRules: any;
+            textRules: filterRulesGroup;
+            commentRules: filterRulesGroup;
+            rootRules: filterRulesGroup;
+            addRules(rules: filterRulesDefinition, options?: number): void;
+            addRules(rules: filterRulesDefinition, options?: { priority?: number; applyToAll?: boolean; }): void;
+            applyTo(node: node): void;
+        }
+
+
+        interface filterRulesDefinition {
+
+        }
+
+
+        class filterRulesGroup {
+            rules: Object[];
+            add(rule: Function, priority: number, options: Object): void;
+            add(rule: Object[], priority: number, options: Object): void;
+            addMany(rules: Object[], priority: number, options: Object): void;
+            findIndex(priority: number): number;
+            exec(currentValue: Object): any;
+            execOnName(currentName: string): string;
+        }
+
+
+        class cdata extends node {
+            constructor(value: string);
+            type: number;
+            writeHtml(writer: basicWriter): void;
+        }
+
+
+        class comment extends node {
+            constructor(value: string);
+            type: number;
+            filter(filter: filter): boolean;
+            value: string;
+            writeHtml(writer: basicWriter, filter: filter): void;
+        }
+
+
+        class element extends node {
+            constructor(name: string, attributes: Object);
+            name: string;
+            attributes: any;
+            children: any[];
+            type: number;
+            add(node: node): number;
+            add(node: node, index: number): void;
+            addClass(className: string): void;
+            clone(): element;
+            filter(filter: filter): boolean;
+            filterChildren(filter: filter): void;
+            forEach(callback: (node: node, type?: number) => void|false, type?: number, skipRoot?: boolean): void;
+            writeHtml(writer: basicWriter, filter: filter): void;
+            writeChildrenHtml(writer: basicWriter, filter: filter): void;
+            replaceWithChildren(): void;
+            forEach(callback: (node: node, type?: number) => boolean): void;
+            getFirst(condition: string): node;
+            getFirst(condition: Object): node;
+            getFirst(condition: Function): node;
+            getHtml(): string;
+            setHtml(html: string): void;
+            getOuterHtml(): string;
+            split(index: number): element;
+            removeClass(className: string): void;
+            hasClass(className: string): boolean;
+        }
+
+
+        class fragment {
+            constructor();
+            children: any[];
+            parent: any;
+            type: number;
+            static fromHtml(fragmentHtml: string): fragment;
+            static fromHtml(fragmentHtml: string, parent?: element, fixingBlock?: string): fragment | element;
+            static fromHtml(fragmentHtml: string, parent: null, fixingBlock?: string): fragment;
+            static fromHtml(fragmentHtml: string, parent?: string, fixingBlock?: string): fragment | element;
+            static fromHtml(fragmentHtml: string, parent?: element, fixingBlock?: boolean): fragment | element;
+            static fromHtml(fragmentHtml: string, parent?: string, fixingBlock?: boolean): fragment | element;
+            add(node: node, index?: number): void;
+            filter(filter: filter): void;
+            filterChildren(filter: filter, filterRoot?: boolean): void;
+            forEach(callback: (node: node, type?: number) => void|false, type?: number, skipRoot?: boolean): void;
+            writeHtml(writer: basicWriter, filter?: filter): void;
+            writeChildrenHtml(writer: basicWriter, filter?: filter, filterRoot?: boolean): void;
+            forEach(callback: (node: node, type?: number) => boolean, type?: number, skipRoot?: boolean): void;
+        }
+
+
+        class cssStyle {
+            constructor(element: element);
+            constructor(styleText: string);
+            populate(obj: element): void;
+            populate(obj: dom.element): void;
+            populate(obj: Object): void;
+        }
+
+
+        class text extends node {
+            constructor(value: string);
+            type: number;
+            filter(filter: filter): boolean;
+            writeHtml(writer: basicWriter, filter?: filter): void;
+        }
+
+    }
+
+    class htmlWriter extends htmlParser.basicWriter {
+        indentationChars: string;
+        lineBreakChars: string;
+        selfClosingEnd: string;
+
+        indentation(): void;
+        lineBreak(): void;
+        setRules(tagName: string, rules: Object): void;
+    }
+
+
+    namespace tools {
+        var callFunction: Function;
+        function clone(source: Object): Object;
+        function copy(source: Object): Object;
+        function enableHtml5Elements(doc: Object, withAppend?: Boolean): void;
+        function isArray<T>(object: any|null|undefined): object is T[];
+        function override<T extends Function>(originalFunction: T, functionBuilder: (originalFunction: T) => T): T;
+        function parseCssText(styleText: string, normalize?: Boolean, nativeNormalize?: Boolean): { [key: string]: string }
+        function prototypedCopy(source: Object): Object;
+        function writeCssText(style: { [key: string]: string }, sort?: Boolean): string;
+    }
+
+
+    namespace lang {
+        var languages: any;
+        var rtl: any;
+
+        function load(languageCode: string, defaultLanguage: string, callback: Function): void;
+        function detect(defaultLanguage: string, probeLanguage: string): string;
+    }
+}
diff --git a/types/ckeditor/v2/tsconfig.json b/types/ckeditor/v2/tsconfig.json
new file mode 100644
index 0000000000..e845e96c0a
--- /dev/null
+++ b/types/ckeditor/v2/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "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",
+        "ckeditor-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/ckeditor/v2/tslint.json b/types/ckeditor/v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ckeditor/v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}

From 023cfed67e9ccd3c19a407e1e74174450ab9ace7 Mon Sep 17 00:00:00 2001
From: stuartlo <stuartlo@microsoft.com>
Date: Wed, 23 May 2018 16:52:10 -0700
Subject: [PATCH 386/575] Re-added new typgins

---
 types/ckeditor/ckeditor-tests.ts | 1214 +++++++++++++
 types/ckeditor/index.d.ts        | 2770 ++++++++++++++++++++++++++++++
 2 files changed, 3984 insertions(+)
 create mode 100644 types/ckeditor/ckeditor-tests.ts
 create mode 100644 types/ckeditor/index.d.ts

diff --git a/types/ckeditor/ckeditor-tests.ts b/types/ckeditor/ckeditor-tests.ts
new file mode 100644
index 0000000000..d849b52a4a
--- /dev/null
+++ b/types/ckeditor/ckeditor-tests.ts
@@ -0,0 +1,1214 @@
+
+
+function test_CKEDITOR() {
+    CKEDITOR.basePath = 'test';
+    CKEDITOR.replaceClass = 'rich_editor';
+    CKEDITOR.skinName = 'moono';
+    CKEDITOR.skinName = 'myskin,/customstuff/myskin/';
+    var editor = new CKEDITOR.editor();
+    if (editor.getSelection(true).getType() == CKEDITOR.SELECTION_ELEMENT)
+        if (editor.getSelection(false).getType() == CKEDITOR.SELECTION_NONE)
+            if (editor.getSelection(true).getType() == CKEDITOR.SELECTION_TEXT)
+                alert(CKEDITOR.basePath);
+    if (CKEDITOR.currentInstance)
+        alert(CKEDITOR.currentInstance.name);
+    alert(CKEDITOR.document.getBody().getName());
+    alert(CKEDITOR.instances[0].name);
+    CKEDITOR.loadFullCoreTimeout = 5;
+    alert(CKEDITOR.revision);
+    alert(CKEDITOR.rnd);
+    if (CKEDITOR.status == 'loaded') {
+        CKEDITOR.loadFullCore();
+    }
+    alert(CKEDITOR.timestamp);
+    CKEDITOR.addCss('.cke_editable h1,.cke_editable h2,.cke_editable h3 { border-bottom: 1px dotted red }');
+    CKEDITOR.appendTo('editorSpace');
+    alert(CKEDITOR.getUrl('skins/default/editor.css'));
+    alert(CKEDITOR.getUrl('/skins/default/editor.css'));
+    alert(CKEDITOR.getUrl('http://www.somesite.com/skins/default/editor.css'));
+    CKEDITOR.inline('content');
+    if (CKEDITOR.loadFullCore)
+        CKEDITOR.loadFullCore();
+    CKEDITOR.replace('myfield');
+    var textarea = document.createElement('textarea');
+    CKEDITOR.replace(textarea);
+    CKEDITOR.replaceAll();
+    CKEDITOR.replaceAll('myClassName');
+    CKEDITOR.replaceAll((textarea, config) => false);
+
+    var editor: CKEDITOR.editor = CKEDITOR.appendTo('append here', CKEDITOR.config, 'data');
+    var editor: CKEDITOR.editor = CKEDITOR.appendTo(document.createElement('div'));
+    CKEDITOR.error('code');
+    CKEDITOR.error('500', { moreData: true });
+    CKEDITOR.warn('danger');
+    CKEDITOR.warn('303', 12345);
+}
+
+function test_CKEDITOR_events() {
+    CKEDITOR.on('instanceCreated', function(event) {
+        // $ExpectType editor
+        event.editor;
+    });
+}
+
+function test_config() {
+    var config1: CKEDITOR.config = {
+        toolbar: 'basic',
+    };
+    var config2: CKEDITOR.config = {
+        toolbar: [
+            [ 'mode', 'document', 'doctools' ],
+            [ 'clipboard', 'undo' ],
+            '/',
+            [ 'find', 'selection', 'spellchecker' ],
+            [ 'basicstyles', 'cleanup' ],
+            '/',
+            [ 'list', 'indent', 'blocks', 'align', 'bidi' ],
+        ],
+    };
+    var config3: CKEDITOR.config = {
+        toolbarGroups: [
+            { name: 'clipboard', groups: [ 'clipboard', 'undo' ] },
+            { name: 'editing', groups: [ 'find', 'selection', 'spellchecker', 'editing' ] },
+            { name: 'links', groups: [ 'links' ] },
+            { name: 'insert', groups: [ 'insert' ] },
+            { name: 'tools', groups: [ 'tools' ] },
+            { name: 'document', groups: [ 'mode' ] },
+            { name: 'about', groups: [ 'about' ] },
+            '/',
+            { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
+            { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'paragraph' ] },
+            '/',
+            { name: 'styles', groups: [ 'styles' ] },
+            { name: 'colors', groups: [ 'colors' ] },
+        ],
+    }
+}
+
+function test_dom_comment() {
+    var type = CKEDITOR.NODE_COMMENT;
+    var nativeNode = document.createComment('Example');
+    var comment = new CKEDITOR.dom.comment(nativeNode);
+    var comment2 = new CKEDITOR.dom.comment('Example');
+    var comment3 = new CKEDITOR.dom.comment('Example', new CKEDITOR.dom.document(document));
+    var html: string = comment.getOuterHtml();
+}
+
+function test_dom_document() {
+    var document = new CKEDITOR.dom.document(window.document);
+    var type = CKEDITOR.NODE_DOCUMENT;
+    CKEDITOR.document.appendStyleSheet('/mystyles.css');
+    var element = CKEDITOR.document.getBody();
+    alert(element.getName());
+    var element2 = CKEDITOR.document.getById('myElement');
+    alert(element.getId());
+    var element3 = CKEDITOR.document.getHead();
+    alert(element.getName());
+    var selection = CKEDITOR.instances[0].document.getSelection();
+    alert(selection.getType());
+    document.write(
+        '<html>' +
+        '<head><title>Sample Doc</title></head>' +
+        '<body>Document contents created by code</body>' +
+        '</html>'
+        );
+    var styles: CSSStyleSheet = document.appendStyleText('some styles');
+    var element: CKEDITOR.dom.element = document.createElement('div');
+    var element2: CKEDITOR.dom.element = document.createElement('div', { styles: { height: '1234' } });
+    var element3: CKEDITOR.dom.element = document.createElement('div', { attributes: { id: '1234' } });
+    var element4: CKEDITOR.dom.element = document.createElement('div', { attributes: { tabIndex: '1234' }, styles: { width: '1234' } });
+}
+
+function test_dom_documentFragment() {
+    var type = CKEDITOR.NODE_DOCUMENT_FRAGMENT;
+    alert(new CKEDITOR.dom.documentFragment(document.body).type === type);
+}
+
+function test_dom_domObject() {
+    var element = new CKEDITOR.dom.element('span');
+    alert(element.$.nodeType);
+    var nativeElement = element.$;
+    var doc = new CKEDITOR.dom.document(document);
+    alert(doc.equals(CKEDITOR.document));
+    alert(doc == CKEDITOR.document);
+    var element2 = new CKEDITOR.dom.element('span');
+    alert(element.getCustomData('hasCustomData'));
+    alert(element.getCustomData('nonExistingKey'));
+    var elementA = new CKEDITOR.dom.element(nativeElement);
+    elementA.getPrivate().value = 1;
+    var elementB = new CKEDITOR.dom.element(nativeElement).getPrivate().value;
+    var element3 = new CKEDITOR.dom.element('span');
+    element.setCustomData('hasCustomData', true);
+
+    var domObject = new CKEDITOR.dom.domObject(document.createElement('div'));
+}
+
+function test_dom_element() {
+    var element = new CKEDITOR.dom.element('span');
+    alert(element.$.nodeType);
+    element.addClass('classA');
+    element.addClass('classB');
+    element.addClass('classA');
+    var p = new CKEDITOR.dom.element('p');
+    var strong = new CKEDITOR.dom.element('strong');
+    p.append(strong);
+    var em = p.append('em');
+    var p = new CKEDITOR.dom.element('p');
+    p.appendText('This is');
+    p.appendText(' some text');
+    element.breakParent(strong);
+    element.data('extra-info', 'test');
+    alert(element.data('extra-info'));
+    element.data('extra-info', false);
+    var element5 = CKEDITOR.document.getById('myTextarea');
+    element.focus();
+    element.focusNext();
+    element.focusPrevious();
+    element.forEach(node=> {
+        console.log(node);
+    });
+    var element2 = CKEDITOR.dom.element.createFromHtml('<input type="text" />');
+    alert(element.getAttribute('type'));
+    alert(element.getComputedStyle('display'));
+    element.appendTo(CKEDITOR.document.getBody());
+    alert(element.getEditor().name);
+    var first = element.getFirst();
+    var first2 = element.getFirst((node: CKEDITOR.dom.node) => node.equals(document.body));
+    alert(element.getHtml());
+    alert(element.getId());
+    alert(element.getName());
+    alert('<b>' + element.getNameAtt() + '</b>');
+    alert(element.getOuterHtml());
+    alert(element.getTabIndex());
+    alert(element.getText());
+    alert(element.hasAttributes());
+    alert(element.hasAttributes());
+    element.hide();
+    alert(element.is('span'));
+    alert(element.is('p', 'span'));
+    alert(element.is('p'));
+    alert(element.is('p', 'div'));
+    alert(element.is({ p: 1, span: 1 }));
+    element.removeAttribute('class');
+    element.addClass('classA');
+    element.addClass('classB');
+    element.removeClass('classA');
+    element.removeClass('classB');
+    element.removeStyle('display');
+    element.setAttribute('class', 'myClass');
+    element.setAttribute('title', 'This is an example');
+    element.setAttributes({
+        'class': 'myClass',
+        title: 'This is an example'
+    });
+    p.setHtml('<b>Inner</b> HTML');
+    element.setOpacity(0.75);
+    element.setStyle('background-color', '#ff0000');
+    element.setStyle('margin-top', '10px');
+    element.setStyle('float', 'right');
+    element.setStyles({
+        position: 'absolute',
+        float: 'right'
+    });
+    element.setText('A > B & C < D');
+    element.show();
+    element.unselectable();
+    alert(element.getName());
+    alert(element == CKEDITOR.dom.element.get(element));
+    var htmlElement = document.getElementById('myElement');
+    alert(CKEDITOR.dom.element.get(htmlElement).getName());
+
+    var dtd: CKEDITOR.dtdDefinition = element.getDtd();
+    var last: CKEDITOR.dom.node = element.getLast();
+    var last2: CKEDITOR.dom.node = element.getLast((node: CKEDITOR.dom.node) => node.equals(document.body));
+    if (element.isBlockBoundary({ 'div': 1, 'span': 1 })) {
+        element.setState(1, 'hex', false);
+    }
+
+    CKEDITOR.dom.element.clearMarkers({}, element, true);
+    var element1: CKEDITOR.dom.element = CKEDITOR.dom.element.get('div');
+    var element2: CKEDITOR.dom.element = CKEDITOR.dom.element.get(document.createElement('div'));
+    var element3: CKEDITOR.dom.element = CKEDITOR.dom.element.get(element2);
+    var markedElement: CKEDITOR.dom.element = CKEDITOR.dom.element.setMarker({}, element, 'key', 0);
+}
+
+function test_dom_elementPath() {
+    var path: CKEDITOR.dom.elementPath = new CKEDITOR.dom.elementPath(CKEDITOR.dom.element.get('div'));
+    var path2: CKEDITOR.dom.elementPath = new CKEDITOR.dom.elementPath(CKEDITOR.dom.element.get('div'), CKEDITOR.dom.element.get(document.body));
+
+    var dir: 'ltr' | 'rtl' = path.direction();
+}
+
+function test_dom_event() {
+    var event = new CKEDITOR.dom.event(new Event(""));
+    alert(event.getKey());
+    alert(event.getKeystroke() == 65);
+    alert(event.getKeystroke() == CKEDITOR.CTRL + 65);
+    alert(event.getKeystroke() == CKEDITOR.CTRL + CKEDITOR.SHIFT + 65);
+    var element = new CKEDITOR.dom.element('div');
+    element.on('mousemouse', ev=> {
+        var pageOffset = ev.data.getPageOffset();
+        alert(pageOffset.x);
+        alert(pageOffset.y);
+    });
+    element.on('click', ev=> {
+        var domEvent = ev.data;
+        domEvent.getTarget().addClass('clicked');
+    });
+    element.on('click', ev=> {
+        var domEvent = ev.data as CKEDITOR.dom.event;
+        domEvent.preventDefault();
+    });
+}
+
+function test_dom_iterator() {
+    var range = new CKEDITOR.dom.range(new CKEDITOR.dom.element('div'));
+    var iterator = range.createIterator();
+    var paragrah1: CKEDITOR.dom.element = iterator.getNextParagraph();
+    var paragrah2: CKEDITOR.dom.element = iterator.getNextParagraph('div');
+    alert(iterator.forceBrBreak === false);
+    var itRange: CKEDITOR.dom.range = iterator.range;
+}
+
+function test_dom_node() {
+    var p = new CKEDITOR.dom.element('p');
+    var strong = new CKEDITOR.dom.element('strong');
+    strong.appendTo(p);
+    var node = new CKEDITOR.dom.node(new Node());
+    node = node.getAscendant('b');
+    node = node.getAscendant('b', true);
+    var element = CKEDITOR.document.getById('example');
+    alert(element.getDocument().equals(CKEDITOR.document));
+    element.getIndex();
+    element.getIndex(true);
+    var last = element.getFirst().getNext();
+    var parent = node.getParent();
+    alert(parent.getName());
+    var parents = node.getParents();
+    var em = new CKEDITOR.dom.element('em');
+    strong.insertAfter(em);
+    strong.insertBefore(em);
+    strong.insertBeforeMe(em);
+    element.isReadOnly();
+}
+
+function test_dom_nodeList() {
+    var nodeList = CKEDITOR.document.getBody().getChildren();
+    alert(nodeList.count());
+    var nodes: CKEDITOR.dom.node[] = nodeList.toArray();
+}
+
+function test_dom_range() {
+    var editor = new CKEDITOR.editor();
+    var range = new CKEDITOR.dom.range(editor.document);
+    range.selectNodeContents(editor.document.getBody());
+    range.deleteContents();
+    range.selectNodeContents(editor.document.getBody());
+    alert(range.collapsed);
+    range.collapse();
+    alert(range.collapsed);
+    range.selectNodeContents(range.document.getBody());
+    range.selectNodeContents(editor.document.getBody());
+    alert(range.endContainer.getPrivate());
+    range.selectNodeContents(editor.document.getBody());
+    alert(range.endOffset);
+    range.selectNodeContents(editor.document.getBody());
+    alert(range.startContainer.getDocument());
+    range.selectNodeContents(editor.document.getBody());
+    alert(range.startOffset);
+}
+
+function test_dom_selection() {
+    var element: CKEDITOR.dom.element = CKEDITOR.dom.element.get('div');
+    var selection: CKEDITOR.dom.selection = new CKEDITOR.dom.selection(new CKEDITOR.dom.document(document));
+    selection = new CKEDITOR.dom.selection(element);
+    selection = new CKEDITOR.dom.selection(selection);
+
+    var marks: CKEDITOR.dom.bookmark[] = selection.createBookmarks('serialized');
+    var marks2: CKEDITOR.dom.bookmark2[] = selection.createBookmarks2({ normalized: true });
+    selection.fake(element);
+    selection.fake(element, true);
+    element = selection.getCommonAncestor();
+    var domSel: Selection = selection.getNative();
+    var ranges: CKEDITOR.dom.range[] = selection.getRanges();
+    ranges = selection.getRanges(true);
+    element = selection.getSelectedElement();
+    var text: string = selection.getSelectedText();
+    element = selection.getStartElement();
+    
+    var type: number = selection.getType();
+
+    var isSomething: boolean = selection.isCollapsed();
+    isSomething = selection.isHidden();
+    isSomething = selection.isInTable();
+    isSomething = selection.isInTable(false);
+
+    selection.lock();
+    selection.removeAllRanges();
+    selection.reset();
+    selection.removeAllRanges();
+    selection.reset();
+    selection.scrollIntoView();
+    selection = selection.selectBookmarks(marks);
+    selection = selection.selectBookmarks(marks2);
+    selection.selectElement(element);
+    selection.selectRanges(ranges);
+    selection.unlock(false);
+}
+
+function test_dom_walker() {
+    var element: CKEDITOR.dom.element = CKEDITOR.dom.element.get('div');
+    var range: CKEDITOR.dom.range = new CKEDITOR.dom.range(element);
+
+    var walker: CKEDITOR.dom.walker = new CKEDITOR.dom.walker(range);
+    
+    var isSomething: boolean = walker.checkBackward();
+    isSomething = walker.checkForward();
+    walker.end();
+    
+    var node: CKEDITOR.dom.node = walker.lastBackward();
+    node = walker.lastForward();
+    node = walker.next();
+    node = walker.previous();
+    walker.reset();
+
+    isSomething = CKEDITOR.dom.walker.blockBoundary({ 'div': 1 })(node);
+    isSomething = CKEDITOR.dom.walker.bogus()(node);
+    isSomething = CKEDITOR.dom.walker.bogus(isSomething)(node);
+    isSomething = CKEDITOR.dom.walker.bookmark()(node);
+    isSomething = CKEDITOR.dom.walker.bookmark(true)(node);
+    isSomething = CKEDITOR.dom.walker.bookmark(true, false)(node);
+    isSomething = CKEDITOR.dom.walker.editable()(node);
+    isSomething = CKEDITOR.dom.walker.editable(isSomething)(node);
+    isSomething = CKEDITOR.dom.walker.empty()(node);
+    isSomething = CKEDITOR.dom.walker.empty(true)(node);
+    isSomething = CKEDITOR.dom.walker.ignored()(node);
+    isSomething = CKEDITOR.dom.walker.ignored(true)(node);
+    isSomething = CKEDITOR.dom.walker.listItemBoundary()(node);
+    isSomething = CKEDITOR.dom.walker.nodeType(0)(node);
+    isSomething = CKEDITOR.dom.walker.nodeType(1, true)(node);
+    isSomething = CKEDITOR.dom.walker.temp()(node);
+    isSomething = CKEDITOR.dom.walker.temp(isSomething)(node);
+    isSomething = CKEDITOR.dom.walker.whitespaces()(node);
+    isSomething = CKEDITOR.dom.walker.whitespaces(isSomething)(node);
+}
+
+function test_dom_text() {
+    var nativeNode = document.createTextNode('Example');
+    var text = new CKEDITOR.dom.text(nativeNode);
+    var text2 = new CKEDITOR.dom.text('Example');
+    text.substring(1, 2);
+    text.substring(1);
+}
+
+function test_dom_window() {
+    var document = new CKEDITOR.dom.window(window);
+    var win = new CKEDITOR.dom.window(window);
+    var pos = win.getScrollPosition();
+    alert(pos.x);
+    alert(pos.y);
+    var size = win.getViewPaneSize();
+    alert(size.width);
+    alert(size.height);
+
+    var frame: CKEDITOR.dom.element = win.getFrame();
+    win.focus();
+}
+
+function test_ajax() {
+    var req: string = CKEDITOR.ajax.load('https://ckeditor.com/ckeditor-4/');
+    req = CKEDITOR.ajax.load('https://ckeditor.com/ckeditor-4/', (data: any) => console.log(data));
+
+    var xml: CKEDITOR.xml = CKEDITOR.ajax.loadXml('https://ckeditor.com/ckeditor-4/');
+    xml = CKEDITOR.ajax.loadXml('https://ckeditor.com/ckeditor-4/', (data: any) => console.log(data));
+
+    CKEDITOR.ajax.post('https://ckeditor.com/ckeditor-4/', {});
+    CKEDITOR.ajax.post('https://ckeditor.com/ckeditor-4/', {}, 'html');
+    CKEDITOR.ajax.post('https://ckeditor.com/ckeditor-4/', {}, 'text', (data: any) => console.log(data));
+}
+
+function test_dataProcessor() {
+    var processor: CKEDITOR.dataProcessor;
+    processor.toDataFormat('html', 'fix');
+    processor.toHtml('data');
+    processor.toHtml('data', 'fix');
+}
+
+function test_dialog() {
+    var dialog: CKEDITOR.dialog = new CKEDITOR.dialog(CKEDITOR.instances[0], 'dialog');
+
+    var element: CKEDITOR.dom.element = CKEDITOR.dom.element.get('div');
+    dialog.addFocusable(element);
+    dialog.addFocusable(element, 13);
+    dialog.addPage({ some: true, object: false });
+    var ret = dialog.click('1234');
+    dialog.commitContent();
+    dialog.disableButton('some button');
+    dialog.enableButton('4321');
+    dialog = dialog.foreach(() => console.log('hey'));
+
+    var button: CKEDITOR.ui.dialog.button = dialog.getButton('button1');
+    var uiEl: CKEDITOR.ui.dialog.uiElement = dialog.getContentElement('page1', 'element1');
+    element = dialog.getElement();
+    var str: string = dialog.getName();
+    var numb: number = dialog.getPageCount();
+    var editor: CKEDITOR.editor = dialog.getParentEditor();
+    var obj: { [key: string]: any } = dialog.getPosition();
+    element = dialog.getSelectedElement();
+    obj = dialog.getSize();
+    obj = dialog.getValueOf('page1', 'ele1');
+    dialog.hide();
+    dialog.hidePage('1234');
+    dialog.layout();
+    dialog.move(1, 2, true);
+    dialog = dialog.reset();
+    dialog.resize(numb, numb);
+    dialog.selectPage('1');
+    dialog.setState(4);
+    dialog.setValueOf('page1', 'ele1', false);
+    dialog.setupContent();
+    dialog.show();
+    dialog.showPage('1234');
+    dialog.updateStyle();
+
+    CKEDITOR.dialog.add( 'abbrDialog', this.path + 'dialogs/abbr.js' );
+    CKEDITOR.dialog.add( 'abbrDialog', function ( editor: CKEDITOR.editor ) {
+        return {
+            title: 'Abbreviation Properties',
+            minWidth: 400,
+            minHeight: 200,
+            onLoad: () => {},
+            onOk: () => {},
+            onCancel: () => {},
+            onShow: () => {},
+            onHide: () => {},
+            contents: [
+                {
+                    id: 'tab-basic',
+                    label: 'Basic Settings',
+                    elements: <any[]>[]
+                },
+                {
+                    id: 'tab-adv',
+                    label: 'Advanced Settings',
+                    elements: []
+                }
+            ]
+        };
+    });
+
+    CKEDITOR.dialog.addIframe('frame', 'frame', 1234, 4321);
+    CKEDITOR.dialog.addIframe('frame', 'frame', 1234, 4321, () => console.log('loaded'));
+    CKEDITOR.dialog.addIframe('frame', 'frame', 1234, 4321, () => console.log('loaded'), obj);
+
+    CKEDITOR.dialog.addUIElement('node', () => console.log('build'));
+    CKEDITOR.dialog.cancelButton();
+    CKEDITOR.dialog.exists('dialog1');
+    CKEDITOR.dialog.exists(1234);
+    dialog = CKEDITOR.dialog.getCurrent();
+
+    var isEnabled: boolean = CKEDITOR.dialog.isTabEnabled(editor, 'dialog', 'table');
+
+    CKEDITOR.dialog.okButton();
+}
+
+function test_editable() {
+    var element: CKEDITOR.dom.element;
+    var editor: CKEDITOR.editor;
+
+    var editable: CKEDITOR.editable = new CKEDITOR.editable(editor, element);
+    editable = new CKEDITOR.editable(editor, document.createElement('div'));
+
+    editable.attachClass('class');
+    editable.attachListener(editable, 'event', (evt: CKEDITOR.eventInfo) => console.log('listen')).removeListener();
+    editable.attachListener(new CKEDITOR.event(), 'event', (evt: CKEDITOR.eventInfo) => console.log('listen')).removeListener();
+    editable.attachListener(new CKEDITOR.event(), 'event', (evt: CKEDITOR.eventInfo) => console.log('listen'), { scope: 'object' }).removeListener();
+    editable.attachListener(editable, 'event', (evt: CKEDITOR.eventInfo) => console.log('listen'), { scope: 'object' }, 'data').removeListener();
+    editable.attachListener(editable, 'event', (evt: CKEDITOR.eventInfo) => console.log('listen'), { scope: 'object' }, 'data', 1).removeListener();
+
+    editable.changeAttr('attr', 'val');
+    editable.detach();
+
+    var range: CKEDITOR.dom.range;
+    editable.insertElement(element);
+    editable.insertElement(element, range);
+    editable.insertHtml('data');
+    editable.insertHtml('data', 'mode');
+    editable.insertHtml('data', 'mode', range);
+    editable.insertText(new CKEDITOR.dom.text('text'));
+
+    var inline: boolean = editable.isInline();
+    editable.setReadOnly(inline);
+}
+
+function test_fileTools() {
+    var editor: CKEDITOR.editor;
+    var def: CKEDITOR.fileTools.uploadWidgetDefinition;
+    var loader: CKEDITOR.fileTools.fileLoader;
+    var blob: Blob;
+    var element: CKEDITOR.dom.element;
+
+    CKEDITOR.fileTools.addUploadWidget(editor, 'editor', def);
+    CKEDITOR.fileTools.bindNotification(editor, loader);
+    var url: string = CKEDITOR.fileTools.getUploadUrl({ some: 'object' });
+    url = CKEDITOR.fileTools.getUploadUrl({ some: 'object' }, 'type');
+
+    var supported = CKEDITOR.fileTools.isTypeSupported(blob, /regex/);
+    CKEDITOR.fileTools.markElement(element, 'name', 45);
+}
+
+function test_fileTools_fileLoader() {
+    var editor: CKEDITOR.editor;
+    var def: CKEDITOR.fileTools.uploadWidgetDefinition;
+    var blob: Blob;
+    var element: CKEDITOR.dom.element;
+
+    var loader: CKEDITOR.fileTools.fileLoader = new CKEDITOR.fileTools.fileLoader(editor, 'data');
+    loader = new CKEDITOR.fileTools.fileLoader(editor, blob);
+    loader = new CKEDITOR.fileTools.fileLoader(editor, blob, 'name');
+    
+    loader.abort();
+    var finished: boolean = loader.isFinished();
+    loader.load();
+    loader.loadAndUpload('url');
+    loader.loadAndUpload('url', { someHeader: '1234' });
+
+    loader.update();
+    loader.upload('url');
+    loader.upload('url', { someHeader: '1234' });
+}
+
+function test_fileTools_uploadRepository() {
+    var editor: CKEDITOR.editor;
+    var blob: Blob;
+    var repo: CKEDITOR.fileTools.uploadRepository = new CKEDITOR.fileTools.uploadRepository(editor);
+    
+    var loader: CKEDITOR.fileTools.fileLoader = repo.create('data', 'name');
+    loader = repo.create(blob, 'name', 'type');
+
+    var fin: boolean = loader.isFinished();
+}
+
+function test_filter() {
+    var editor: CKEDITOR.editor;
+    var style: CKEDITOR.style;
+
+    var filter: CKEDITOR.filter = new CKEDITOR.filter(editor);
+    filter = new CKEDITOR.filter('rule');
+    filter = new CKEDITOR.filter(style);
+    filter = new CKEDITOR.filter([ style, 'rule', [ style, 'rule' ] ]);
+    filter = CKEDITOR.filter.instances['1234'];
+
+    filter.addContentForms([ { form: true } ]);
+    filter.addElementCallback((el: CKEDITOR.htmlParser.element) => 4);
+    filter.addFeature({ allowedContent: style });
+    filter.addTransformations([ [ 'transform1', { right: (element: CKEDITOR.htmlParser.element, tools: string | CKEDITOR.filter.transformationTools) => true } ] ]);
+    
+    var allowed: boolean = filter.allow(style);
+    allowed = filter.allow([style], 'name');
+    allowed = filter.allow('rule', 'name', false);
+
+    var apply: boolean = filter.applyTo(CKEDITOR.htmlParser.fragment.fromHtml('string'), true, false, 1);
+    apply = filter.applyTo(new CKEDITOR.htmlParser.element('name', null), true, false, 1);
+
+    var checked: boolean = filter.check(style);
+    checked = filter.check('rule', true);
+    checked = filter.check(style, false, true);
+
+    checked = filter.checkFeature({ allowedContent: style });
+
+    filter = filter.clone();
+    filter.destroy();
+    filter.disable();
+
+    filter.disallow(filter.disallowedContent);
+    var mode: number = filter.getAllowedEnterMode(1);
+    mode = filter.getAllowedEnterMode(1, false);
+}
+
+function test_focusManager() {
+    var textarea = document.createElement('textarea');
+    var instance = CKEDITOR.replace(textarea);
+    var element = CKEDITOR.document.getById('myElement');
+
+    instance.focusManager.focus();
+    instance.focusManager.focus(element);
+    instance.focusManager.lock();
+    instance.focusManager.unlock();
+    instance.focusManager.blur();
+    instance.focusManager.blur(true);
+    instance.focusManager.add(element, true);
+    instance.focusManager.remove(element);
+
+    var focusManager = new CKEDITOR.focusManager(CKEDITOR.instances[0]);
+    var object: CKEDITOR.dom.domObject = focusManager.currentActive;
+    var bool: boolean = focusManager.hasFocus;
+}
+
+
+function test_htmlParser_basicWriter() {
+    var writer = new CKEDITOR.htmlParser.basicWriter();
+    writer.attribute('class', 'MyClass');
+    writer.closeTag('p');
+    writer.comment('hello');
+    alert(writer.getHtml(true)); // '<p class="MyClass">Hello</p>'
+    writer.openTag('p', {});
+    writer.openTagClose('p', false);
+    writer.reset();
+    writer.text('Hello');
+    writer.write('data');
+}
+
+function test_htmlParser_cdata() {
+    var cdata: CKEDITOR.htmlParser.cdata = new CKEDITOR.htmlParser.cdata('hey');
+    cdata.writeHtml(new CKEDITOR.htmlParser.basicWriter());
+}
+
+function test_htmlParser_comment() {
+    var filter: CKEDITOR.htmlParser.filter;
+    var comment: CKEDITOR.htmlParser.comment = new CKEDITOR.htmlParser.comment('hey');
+    var filtered: boolean = comment.filter(filter);
+    comment.writeHtml(new CKEDITOR.htmlParser.basicWriter());
+    comment.writeHtml(new CKEDITOR.htmlParser.basicWriter(), filter);
+}
+
+function test_htmlParser_cssStyle() {
+    var element: CKEDITOR.htmlParser.element;
+
+    var style: CKEDITOR.htmlParser.cssStyle = new CKEDITOR.htmlParser.cssStyle(element);
+    style = new CKEDITOR.htmlParser.cssStyle('styles');
+
+    style.populate(element);
+    style.populate(new CKEDITOR.dom.element('div'));
+    style.populate({ 'width': 1 });
+}
+
+function test_htmlParser_element() {
+    var element: CKEDITOR.htmlParser.element = new CKEDITOR.htmlParser.element('el', { 'id': '1'});
+    
+    var node: CKEDITOR.htmlParser.node;
+    element.add(node);
+    element.add(node, 5);
+    element.addClass('class');
+    element = element.clone();
+
+    var filter: CKEDITOR.htmlParser.filter;
+    var filtered: boolean = element.filter(filter);
+    element.filterChildren(filter);
+
+    var nodes: CKEDITOR.htmlParser.node[] = element.find('*');
+    nodes = element.find((el: CKEDITOR.htmlParser.node) => false, true);
+
+    element.forEach((el: CKEDITOR.htmlParser.node) => console.log('node'));
+    element.forEach((el: CKEDITOR.htmlParser.node) => console.log('node'), 1);
+    element.forEach((el: CKEDITOR.htmlParser.node) => false, 2, true);
+
+    var node: CKEDITOR.htmlParser.node = element.getFirst('*');
+    node = element.getFirst({ 'id': '1' });
+    node = element.getFirst((el: CKEDITOR.htmlParser.node) => true);
+
+    var html: string = element.getHtml();
+    html = element.getOuterHtml();
+
+    var hasClass: boolean = element.hasClass('class');
+    element.removeClass('class');
+    element.replaceWithChildren();
+    element.setHtml('html');
+    var el2: CKEDITOR.htmlParser.element = element.split(1);
+
+    element.writeChildrenHtml(new CKEDITOR.htmlParser.basicWriter());
+    element.writeChildrenHtml(new CKEDITOR.htmlParser.basicWriter(), filter);
+
+    element.writeHtml(new CKEDITOR.htmlParser.basicWriter());
+    element.writeHtml(new CKEDITOR.htmlParser.basicWriter(), filter);
+}
+
+function test_htmlParser_filter() {
+    var filter: CKEDITOR.htmlParser.filter = new CKEDITOR.htmlParser.filter({ elementNames: [ 'div' ] });
+    filter = new CKEDITOR.htmlParser.filter();
+
+    filter.addRules({ text: 'text' });
+    filter.addRules({ attributes: { 'id': '1234' }}, 1);
+    filter.addRules({ comment: 'hey', text: 'text' }, { priority: 1 });
+    filter.addRules({ root: document.body }, { applyToAll: false });
+
+    var node: CKEDITOR.htmlParser.node;
+    filter.applyTo(node);
+}
+
+
+function test_htmlParser_filterRulesGroup() {
+    var rules: CKEDITOR.htmlParser.filterRulesGroup = new CKEDITOR.htmlParser.filterRulesGroup();
+
+    rules.add([ 'some', 'rule' ], 1, { applyToAll: false, excludeNestedEditable: true });
+
+    rules.addMany([ (value: CKEDITOR.htmlParser.node | CKEDITOR.htmlParser.fragment | string) => false, [ 'some', 'rule' ] ], 1, { applyToAll: false });
+
+    var nodeFragOrString: CKEDITOR.htmlParser.node | CKEDITOR.htmlParser.fragment | string;
+    nodeFragOrString = rules.exec(nodeFragOrString);
+
+    var str: string;
+    str = rules.execOnName(str);
+
+    var idx: number = rules.findIndex(1);
+}
+
+function test_htmlParser_fragment() {
+    var frag: CKEDITOR.htmlParser.fragment = new CKEDITOR.htmlParser.fragment();
+
+    var node: CKEDITOR.htmlParser.node;
+    frag.add(node);
+    frag.add(node, 1);
+
+    var filter: CKEDITOR.htmlParser.filter;
+    frag.filter(filter);
+    frag.filterChildren(filter);
+    frag.filterChildren(filter, true);
+    frag.forEach((node: CKEDITOR.htmlParser.node) => console.log('node'));
+    frag.forEach((node: CKEDITOR.htmlParser.node) => false, 1);
+    frag.forEach((node: CKEDITOR.htmlParser.node) => false, 2, true);
+
+    frag.writeChildrenHtml(new CKEDITOR.htmlParser.basicWriter());
+    frag.writeChildrenHtml(new CKEDITOR.htmlParser.basicWriter(), filter);
+
+    frag.writeHtml(new CKEDITOR.htmlParser.basicWriter());
+    frag.writeHtml(new CKEDITOR.htmlParser.basicWriter(), filter);
+
+    frag = CKEDITOR.htmlParser.fragment.fromBBCode('code');
+
+    var fragOrEl: CKEDITOR.htmlParser.fragment | CKEDITOR.htmlParser.element = CKEDITOR.htmlParser.fragment.fromHtml('html');
+    fragOrEl = CKEDITOR.htmlParser.fragment.fromHtml('html', 'parent');
+    fragOrEl = CKEDITOR.htmlParser.fragment.fromHtml('html', 'parent', 'fix');
+    fragOrEl = CKEDITOR.htmlParser.fragment.fromHtml('html', new CKEDITOR.htmlParser.element('name', null), true);
+}
+
+function test_htmlParser_node() {
+    var node: CKEDITOR.htmlParser.node = new CKEDITOR.htmlParser.node();
+
+    var el: CKEDITOR.htmlParser.element = node.getAscendant('condition');
+    el = node.getAscendant({ 'id': '1234' });
+    el = node.getAscendant((node: CKEDITOR.htmlParser.element) => false);
+
+    var idx: number = node.getIndex();
+    node.insertAfter(node);
+    node.insertBefore(node);
+    node.remove();
+    node.replaceWith(node);
+    el = node.wrapWith(el);
+
+}
+
+function test_htmlParser_text() {
+    var text: CKEDITOR.htmlParser.text = new CKEDITOR.htmlParser.text('text');
+    var filtered: boolean = text.filter(new CKEDITOR.htmlParser.filter());
+    text.writeHtml(new CKEDITOR.htmlParser.basicWriter());
+    text.writeHtml(new CKEDITOR.htmlParser.basicWriter(), new CKEDITOR.htmlParser.filter());
+}
+
+function test_htmlWriter() {
+    var writer = new CKEDITOR.htmlWriter();
+    writer.openTag('p', {});
+    writer.attribute('class', 'MyClass');
+    writer.openTagClose('p', false);
+    writer.text('Hello');
+    writer.closeTag('p');
+    alert(writer.getHtml(true)); // '<p class="MyClass">Hello</p>'
+
+    writer.indentationChars = '\t';
+    writer.lineBreakChars = '\r\n';
+    writer.selfClosingEnd = '>';
+    writer.indentation();
+    writer.lineBreak();
+    writer.setRules('img', {breakBeforeOpen: true, breakAfterOpen: true});
+}
+
+function test_htmlParser() {
+    var html = '<div><span>text</span></div>';
+    var fragment = CKEDITOR.htmlParser.fragment.fromHtml(html);
+    fragment.forEach(function(node) {
+        if (node instanceof CKEDITOR.htmlParser.element) {
+            node.forEach(function(node) {
+                console.log(node);
+            });
+        }
+    }, CKEDITOR.NODE_ELEMENT, true);
+}
+
+function test_keystrokeHandler() {
+    var handler: CKEDITOR.keystrokeHandler = new CKEDITOR.keystrokeHandler(CKEDITOR.instances[0]);
+    handler.attach(new CKEDITOR.dom.domObject(document.body)); 
+}
+
+function test_lang() {
+    var lang: string = CKEDITOR.lang.detect('en');
+    lang = CKEDITOR.lang.detect('zh', 'sw');
+    
+    CKEDITOR.lang.load('tk', 'pr', (code: string, entries: any) => console.log('loaded'));
+}
+
+function test_loader() {
+    CKEDITOR.loader.load('script');
+    CKEDITOR.loader.load('script', true);
+
+    CKEDITOR.loader.loadPending();
+}
+
+function test_menu() {
+    var menu: CKEDITOR.menu = new CKEDITOR.menu();
+
+    menu.add({ anything: true });
+    menu.addListener((startElement: CKEDITOR.dom.element, selection: CKEDITOR.dom.selection, path: CKEDITOR.dom.elementPath) => 'return');
+    var { item, element } = menu.findItemByCommandName('command');
+    menu.hide();
+    menu.hide(false);
+    menu.removeAll();
+    menu.show(new CKEDITOR.dom.element('div'));
+    menu.show(new CKEDITOR.dom.element('div'), 1);
+    menu.show(new CKEDITOR.dom.element('div'), 1, 2);
+    menu.show(new CKEDITOR.dom.element('div'), 1, 2, 3);
+}
+
+function test_plugins() {
+    CKEDITOR.plugins.add( 'abbr', {
+        init: function( editor: CKEDITOR.editor ) {
+            // empty logic
+        }
+    });
+
+    console.log(CKEDITOR.plugins.registered['abbr']);
+}
+
+function test_resourceManager() {
+    var manager: CKEDITOR.resourceManager = new CKEDITOR.resourceManager('path', 'name');
+
+    manager.add('name');
+    manager.add('name', { hidpi: true });
+    manager.addExternal('names', 'path');
+    manager.addExternal('names', 'path', 'name');
+
+    var def: CKEDITOR.pluginDefinition = manager.get('name');
+    var path: string = manager.getFilePath('path');
+    path = manager.getPath('path');
+
+    manager.load('name', (loaded: string[]) => console.log('hey'));
+    manager.load([ 'name' ], (loaded: string[]) => console.log('hey'), manager);
+}
+
+function test_scriptLoader() {
+    CKEDITOR.scriptLoader.load('url', (succeededUrls: boolean | string[], failedUrls: string[]) => console.log('loaded'));
+    CKEDITOR.scriptLoader.load([ 'url' ], (succeededUrls: boolean | string[], failedUrls: string[]) => console.log('loaded'), null);
+    CKEDITOR.scriptLoader.load([ 'url' ], (succeededUrls: boolean | string[], failedUrls: string[]) => console.log('loaded'), null, true);
+    CKEDITOR.scriptLoader.queue('url', (succeeded: boolean) => console.log('loaded'));
+}
+
+function test_skin() {
+    CKEDITOR.skin.addIcon('name', 'path');
+    CKEDITOR.skin.addIcon('name', 'path', 1);
+    CKEDITOR.skin.addIcon('name', 'path', 1, 'small');
+
+    CKEDITOR.skin.chameleon('editor', 'part');
+
+    var style: any = CKEDITOR.skin.getIconStyle('name');
+    style = CKEDITOR.skin.getIconStyle('name', true);
+    style = CKEDITOR.skin.getIconStyle('name', true, 1);
+    style = CKEDITOR.skin.getIconStyle('name', true, 1, 'large');
+
+    var path: any = CKEDITOR.skin.getPath('part');
+
+    CKEDITOR.skin.loadPart('part', () => console.log('load'));
+
+    var path2: string = CKEDITOR.skin.path();
+}
+
+function test_style() {
+    var style: CKEDITOR.style = new CKEDITOR.style({ element: 'div' }, { 'key': 'value '});
+    style.apply(CKEDITOR.instances[0]);
+
+    var el: CKEDITOR.dom.element;
+    style.applyToObject(el, CKEDITOR.instances[0]);
+
+    var range: CKEDITOR.dom.range;
+    style.applyToRange(range, CKEDITOR.instances[0]);
+
+    var str: string = style.buildPreview();
+    str = style.buildPreview('label');
+
+    var path: CKEDITOR.dom.elementPath;
+    var bool: boolean = style.checkActive(path, CKEDITOR.instances[0]);
+
+    var filter: CKEDITOR.filter;
+    bool = style.checkApplicable(path, CKEDITOR.instances[0], filter);
+
+    bool = style.checkElementMatch(el, true, CKEDITOR.instances[0]);
+    bool = style.checkElementRemovable(el, false, CKEDITOR.instances[0]);
+
+    var def: CKEDITOR.style.definition = style.getDefintion();
+    style.remove(CKEDITOR.instances[0]);
+    style.removeFromRange(range, CKEDITOR.instances[0]);
+    
+    var rules: CKEDITOR.filter.allowedContentRules;
+    rules = style.toAllowedContentRules();
+    rules = style.toAllowedContentRules(CKEDITOR.instances[0]);
+}
+
+function test_adding_command_and_buttons() {
+    var textarea = document.createElement('textarea');
+    var instance = CKEDITOR.replace(textarea);
+
+    instance.addCommand( 'aCommand', {
+        exec: function( editor: CKEDITOR.editor ) {
+            // empty logic
+            return true;
+        }
+    });
+
+    instance.ui.addButton( 'firstButton', {
+        icon: 'http://www.example.com/assets/images/icons.png',
+        iconOffset: -32,
+        label: 'Label 1',
+        command: 'aCommand',
+        toolbar: 'tools'
+    });
+
+    instance.ui.addButton( 'secondButton', {
+        label: 'Label 2',
+        command: 'aCommand',
+        toolbar: 'tools'
+    });
+}
+
+function test_adding_widget() {
+    function wrapper(editor: CKEDITOR.editor) {
+            editor.widgets.add("widgetty", {
+            button: "Activate widgetty",
+            template: "<imaginary-element>",
+            dialog: "widgetty",
+            init: function() {
+                // no logic
+            }
+        });
+    }
+}
+
+function test_sharedSpace() {
+    CKEDITOR.inline('content', {
+        removePlugins: 'maximize,resize',
+        sharedSpaces: {
+            top: 'someElementId',
+            bottom: document.getElementById('anotherId')
+        }
+    });
+
+    CKEDITOR.inline('content', {
+        sharedSpaces: { }
+    });
+}
+
+function test_specifying_editor_path() {
+    window.CKEDITOR_BASEPATH = '/ckeditor/';
+}
+
+function test_editor_instance_event() {
+    var textarea = document.createElement('textarea');
+    var instance = CKEDITOR.replace(textarea, {
+        on: {
+            activeEnterModeChange: function() {},
+            activeFilterChange: function() {},
+            afterCommandExec: function() {},
+            afterInsertHtml: function() {},
+            afterPaste: function() {},
+            afterPasteFromWord: function() {},
+            afterSetData: function() {},
+            afterUndoImage: function() {},
+            ariaEditorHelpLabel: function() {},
+            ariaWidget: function() {},
+            autogrow: function() {},
+            beforeCommandExec: function() {},
+            beforeDestroy: function() {},
+            beforeModeUnload: function() {},
+            beforeSetMode: function() {},
+            beforeUndoImage: function() {},
+            blur: function() {},
+            change: function() {},
+            configLoaded: function() {},
+            contentDirChanged: function() {},
+            contentDom: function() {},
+            contentDomInvalidated: function() {},
+            contentDomUnload: function() {},
+            customConfigLoaded: function() {},
+            dataFiltered: function() {},
+            dataReady: function() {},
+            destroy: function() {},
+            dialogHide: function() {},
+            dialogShow: function() {},
+            dirChanged: function() {},
+            doubleclick: function() {},
+            dragend: function() {},
+            dragstart: function() {},
+            drop: function() {},
+            elementsPathUpdate: function() {},
+            fileUploadRequest: function() {},
+            fileUploadResponse: function() {},
+            floatingSpaceLayout: function() {},
+            focus: function() {},
+            getData: function() {},
+            getSnapshot: function() {},
+            insertElement: function() {},
+            insertHtml: function() {},
+            insertText: function() {},
+            instanceReady: function() {},
+            key: function() {},
+            langLoaded: function() {},
+            loadSnapshot: function() {},
+            loaded: function() {},
+            lockSnapshot: function() {},
+            maximize: function() {},
+            menuShow: function() {},
+            mode: function() {},
+            notificationHide: function() {},
+            notificationShow: function() {},
+            notificationUpdate: function() {},
+            paste: function() {},
+            pasteFromWord: function() {},
+            pluginsLoaded: function() {},
+            readOnly: function() {},
+            removeFormatCleanup: function() {},
+            required: function() {},
+            resize: function() {},
+            save: function() {},
+            saveSnapshot: function() {},
+            selectionChange: function() {},
+            setData: function() {},
+            stylesSet: function() {},
+            template: function() {},
+            toDataFormat: function() {},
+            toHtml: function() {},
+            unlockSnapshot: function() {},
+            updateSnapshot: function() {},
+            widgetDefinition: function() {}
+        }
+    });
+}
+
+function test_dtd() {
+    var brConsideredEmptyTag = CKEDITOR.dtd.$empty['br'];
+    var spanCanContainText = CKEDITOR.dtd['span']['#'];
+    var divCanContainSpan = CKEDITOR.dtd['div']['span'];
+}
+
+function test_getSelectedHtml() {
+    var textarea = document.createElement('textarea');
+    var editor = CKEDITOR.replace(textarea);
+
+    // $ExpectType documentFragment
+    var sel1 = editor.getSelectedHtml();
+    console.log(sel1);
+
+    // $ExpectType documentFragment
+    var sel2 = editor.getSelectedHtml(false);
+    console.log(sel2);
+
+    // $ExpectType string
+    var sel3 = editor.getSelectedHtml(true);
+    console.log(sel3);
+
+    // $ExpectType string | documentFragment
+    var sel4 = editor.getSelectedHtml(Math.random() > 0.5);
+    console.log(sel4);
+}
+
+function test_element() {
+    var el = CKEDITOR.document.getById('myElement');
+    el.addClass('class');
+    console.log(el.hasClass('class'));
+    el.removeClass('class');
+}
+
+function test_selection() {
+    var editor = new CKEDITOR.editor();
+    var testNode = CKEDITOR.document.getById('myElement');
+
+    var selection = editor.getSelection(true);
+    var ranges = selection.getRanges();
+    for (var i = 0, c = ranges.length; i < c; i++) {
+        var range = ranges[i];
+        range.setStartBefore(testNode);
+        range.setStartAfter(testNode);
+        range.setEndBefore(testNode);
+        range.setEndAfter(testNode);
+    }
+}
+
+function test_tools() {
+    var obj: { [key: string]: any } = { key: 'value' };
+
+    CKEDITOR.tools.addFunction(console.log);
+    CKEDITOR.tools.addFunction(console.log, obj);
+    var bool = CKEDITOR.tools.arrayCompare([ 1 ], [ 2, 3 ]);
+    CKEDITOR.tools.clone(obj);
+    CKEDITOR.tools.copy(obj);
+    obj = CKEDITOR.tools.createClass(obj);
+    var str = CKEDITOR.tools.cssStyleToDomStyle('style');
+    var prefixes: { [cssClass: string]: string | number } = CKEDITOR.tools.cssVendorPrefix('prop', 'val');
+    prefixes = CKEDITOR.tools.cssVendorPrefix('prop', 'val', true);
+    var fn: (param: any) => boolean
+    fn = CKEDITOR.tools.defer<(param: any) => boolean>(fn);
+    CKEDITOR.tools.enableHtml5Elements(document);
+    CKEDITOR.tools.enableHtml5Elements(document.createDocumentFragment(), true);
+    str = CKEDITOR.tools.escapeCss('css');
+    var { input, reset } = CKEDITOR.tools.eventsBuffer(1, console.log, obj);
+    obj = CKEDITOR.tools.extend(obj, obj, true, obj);
+    bool = CKEDITOR.tools.fixDomain();
+    str = CKEDITOR.tools.genKey(str);
+    str = CKEDITOR.tools.getCookie(str);
+    str = CKEDITOR.tools.getCsrfToken();
+    var numb: number = CKEDITOR.tools.getIndex<string>(['string', 'array'], (element: string) => false);
+    bool = CKEDITOR.tools.getMouseButton(new CKEDITOR.dom.event(document.createEvent(null)));
+    str = CKEDITOR.tools.getNextId();
+    numb = CKEDITOR.tools.getNextNumber();
+    str = CKEDITOR.tools.getUniqueId();
+    str = CKEDITOR.tools.htmlDecode(str);
+    str = CKEDITOR.tools.htmlDecodeAttr(str);
+    str = CKEDITOR.tools.htmlEncode(str);
+    str = CKEDITOR.tools.htmlEncodeAttr(str);
+    numb = CKEDITOR.tools.indexOf<string>(['string', 'array'], 'string');
+    numb = CKEDITOR.tools.indexOf<boolean>([true, false], (val: boolean) => false);    
+    console.log(CKEDITOR.tools.isArray([1])); // true
+    console.log(CKEDITOR.tools.isArray(obj)); // false
+    console.log(CKEDITOR.tools.isArray(null)); // false
+    console.log(CKEDITOR.tools.isArray(undefined)); // false
+    bool = CKEDITOR.tools.isEmpty(obj);
+    var ret1: { display: string[], aria: string[] } = CKEDITOR.tools.keystrokeToArray(obj, 1);
+    var ret2: { display: string, aria: string }  = CKEDITOR.tools.keystrokeToString(obj, 1);
+    str = CKEDITOR.tools.ltrim(str);
+    str = CKEDITOR.tools.normalizeCssText(str, bool);
+    str = CKEDITOR.tools.normalizeHex(str);
+    bool = CKEDITOR.tools.objectCompare(obj, obj);
+    bool = CKEDITOR.tools.objectCompare(obj, obj, true);
+    var strArr: string[] = CKEDITOR.tools.objectKeys(obj);
+    CKEDITOR.tools.override(parseInt, function(_parseInt) {
+        return function(value: any, radix?: number) {
+            return _parseInt(value, radix);
+        };
+    });
+    obj = CKEDITOR.tools.parseCssText(str);
+    obj = CKEDITOR.tools.parseCssText(str, bool);
+    obj = CKEDITOR.tools.parseCssText(str, bool, bool);
+    obj = CKEDITOR.tools.prototypedCopy(obj);
+    CKEDITOR.tools.removeFunction(1);
+    str = CKEDITOR.tools.repeat(str, 40);
+    str = CKEDITOR.tools.rtrim(str);
+    str = CKEDITOR.tools.search<string>(strArr, 'string');
+    str = CKEDITOR.tools.search<string>(strArr, (el: string) => true);
+    CKEDITOR.tools.setCookie('name', 'value');
+    numb = CKEDITOR.tools.setTimeout(console.log);
+    numb = CKEDITOR.tools.setTimeout(console.log, 1000);
+    numb = CKEDITOR.tools.setTimeout(console.log, 1000, obj);
+    numb = CKEDITOR.tools.setTimeout(console.log, 1000, obj, 'timeout');
+    numb = CKEDITOR.tools.setTimeout(console.log, 1000, obj, 'timeout', window);
+    str = CKEDITOR.tools.transformPlainTextToHtml(str, 1);
+    str = CKEDITOR.tools.trim(str);
+    CKEDITOR.tools.tryThese([ console.log, console.warn ]);
+    str = CKEDITOR.tools.writeCssText(obj);
+    str = CKEDITOR.tools.writeCssText(obj, true);
+}
diff --git a/types/ckeditor/index.d.ts b/types/ckeditor/index.d.ts
new file mode 100644
index 0000000000..53760a7610
--- /dev/null
+++ b/types/ckeditor/index.d.ts
@@ -0,0 +1,2770 @@
+// Type definitions for CKEditor 4.9
+// Project: https://ckeditor.com/ckeditor-4/
+// Definitions by: Thomas Wittwer <https://github.com/wittwert>
+//                 Stuart Long <https://github.com/stuartlong>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// WORK-IN-PROGRESS: Any contribution support welcomed.
+// See https://github.com/DefinitelyTyped/DefinitelyTyped/issues/1827 for more informations.
+interface Window {
+    CKEDITOR_BASEPATH: string;
+}
+
+declare namespace CKEDITOR {
+
+    // Config options
+    var disableAutoInline: boolean;
+    var replaceClass: string;
+    var skinName: string;
+
+    // Properties
+    const ALT: number;
+    const CTRL: number;
+    const DATA_TRANSFER_CROSS_EDITORS: number;
+    const DATA_TRANSFER_EXTERNAL: number;
+    const DATA_TRANSFER_INTERNAL: number;
+    const DIALOG_RESIZE_BOTH: number;
+    const DIALOG_RESIZE_HEIGHT: number;
+    const DIALOG_RESIZE_NONE: number;
+    const DIALOG_RESIZE_WIDTH: number;
+    const DIALOG_STATE_BUSY: number;
+    const DIALOG_STATE_IDLE: number;
+    const ELEMENT_MODE_APPENDTO: number;
+    const ELEMENT_MODE_INLINE: number;
+    const ELEMENT_MODE_NONE: number;
+    const ELEMENT_MODE_REPLACE: number;
+    const END: number;
+    const ENLARGE_BLOCK_CONTENTS: number;
+    const ENLARGE_ELEMENT: number;
+    const ENLARGE_INLINE: number;
+    const ENLARGE_LIST_ITEM_CONTENTS: number;
+    const ENTER_BR: number;
+    const ENTER_DIV: number;
+    const ENTER_P: number;
+    const EVENT_PHASE_AT_TARGET: number;
+    const EVENT_PHASE_BUBBLING: number;
+    const EVENT_PHASE_CAPTURING: number;
+    const FILTER_SKIP_TREE: number;
+    const LINEUTILS_AFTER: number;
+    const LINEUTILS_BEFORE: number;
+    const LINEUTIS_INSIDE: number;
+    const MOUSE_BUTTON_LEFT: number;
+    const MOUSE_BUTTON_MIDDLE: number;
+    const MOUSE_BUTTON_RIGHT: number;
+    const NODE_COMMENT: number;
+    const NODE_DOCUMENT: number;
+    const NODE_DOCUMENT_FRAGMENT: number;
+    const NODE_ELEMENT: number;
+    const NODE_TEXT: number;
+    const POSITION_AFTER_END: number;
+    const POSITION_AFTER_START: number;
+    const POSITION_BEFORE_END: number;
+    const POSITION_BEFORE_START: number;
+    const POSITION_CONTAINS: number;
+    const POSITION_DISCONNECTED: number;
+    const POSITION_FOLLOWING: number;
+    const POSITION_IDENTICAL: number;
+    const POSITION_IS_CONTAINED: number;
+    const POSITION_PRECEDING: number;
+    const SELECTION_ELEMENT: number;
+    const SELECTION_NONE: number;
+    const SELECTION_TEXT: number;
+    const SHIFT: number;
+    const SHRINK_ELEMENT: number;
+    const SHRINK_TEXT: number;
+    const START: number;
+    const STYLE_BLOCK: string;
+    const STYLE_INLINE: string;
+    const STYLE_OBJECT: string;
+    const TRISTATE_DISABLED: number;
+    const TRISTATE_OFF: number;
+    const TRISTATE_ON: number;
+    const UI_BUTTON: string;
+    const UI_MENUBUTTON: string;
+    const UI_PANEL: string;
+    const UI_PANELBUTTON: string;
+    const UI_RICHCOMBO: string;
+    const UI_SEPARATOR: string;
+    const VERBOSITY_ERROR: number;
+    const VERBOSITY_WARN: number;
+
+    var basePath: string;
+    var currentInstance: editor;
+    var document: dom.document;
+    var instances: { [id: string]: editor };
+    var loadFullCoreTimeout: number;
+    var revision: string;
+    var rnd: number;
+    var status: string;
+    var timestamp: string;
+    var verbosity: number;
+    var version: string;
+    const config: config;
+
+    // Methods
+    function add(editor: editor): void;
+    function addCss(css: string): void;
+    function addTemplate(name: string, source: string): template;
+    function appendTo(element: string | HTMLElement, config?: config, data?: string): editor;
+    function domReady(): void;
+    function editorConfig(config: config): void;
+    function error(errorCode: string, additionalData?: any): void;
+    function getCss(): string;
+    function getTemplate(name: string): template;
+    function getUrl(resource: string): string;
+    function inline(element: string | HTMLElement, instanceConfig?: config): editor;
+    function inlineAll(): void;
+    function loadFullCore(): void;
+    function replace(element: string | HTMLTextAreaElement, config?: config): editor;
+    function replaceAll(className?: string): void;
+    function replaceAll(assertionFunction: (textarea: HTMLTextAreaElement, config: config) => boolean): void;
+    function warn(errorCode: string, additionalData?: any): void;
+
+    // Event interface
+    function capture(): void;
+    function define(name: string, meta: { [key: string]: any }): void;
+    function fire(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
+    function fireOnce(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
+    function hasListeners(eventName: string): boolean;
+    function on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any }, listenerData?: { [key: string]: any }, priority?: number): void;
+    function once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any }, listenerData?: { [key: string]: any }, priority?: number): void;
+    function removeAllListeners(): void;
+    function removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
+
+    type listenerRegistration = {
+        removeListener: () => void;
+    }
+
+    namespace dom {
+
+        interface bookmark {
+            startNode: dom.node | string;
+            endNode: dom.node | string;
+            serializable: boolean;
+            collapsed: boolean;
+        }
+
+        interface bookmark2 {
+            start: number[];
+            end: number[];
+            startOffset: number;
+            endOffset: number;
+            collapsed: boolean;
+            normalized: boolean;
+            is2: boolean;
+        }
+
+        class comment extends node {
+            readonly type: number;
+
+            constructor(comment: string | Node, ownerDocument?: document);
+            getOuterHtml(): string;
+        }
+
+        class document extends domObject {
+            readonly $: Document;
+            readonly type: number;
+
+            constructor(domDocument: { [key: string]: any });
+            appendStyleSheet(cssFileUrl: string): void;
+            appendStyleText(cssStyleText: string): CSSStyleSheet;
+            createElement(name: string, attribsAndStyles?: { attributes?: { [key: string]: string }; styles?: { [key: string]: string }; }): element;
+            createText(text: string): element;
+            find(selector: string): nodeList;
+            findOne(selector: string): element;
+            focus(): void;
+            getActive(): element;
+            getBody(): element;
+            getByAddress(address: any[], normalized?: boolean): node;
+            getById(elementId: string): element;
+            getDocumentElement(): element;
+            getElementsByTag(tagName: string): nodeList;
+            getHead(): element;
+            getSelection(): selection;
+            getWindow(): window;
+            write(html: string): void;
+        }
+
+        class documentFragment extends node {
+            readonly type: number;
+
+            constructor(nodeOrDoc: { [key: string]: any });
+            insertAfterNode(node: node): void;
+        }
+
+        class domObject extends CKEDITOR.event {
+            readonly $: any;
+
+            constructor(nativeDomObject: { [key: string]: any });
+            clearCustomData(): void;
+            equals(object: any): boolean;
+            getCustomData(key: string): any;
+            getPrivate(): any;
+            getUniqueId(): number;
+            removeAllListeners(): void;
+            removeCustomData(key: string): any;
+            setCustomData(key: string, value: any): domObject;
+        }
+
+        class element extends node {
+            readonly $: HTMLElement;
+            readonly type: number;
+
+            constructor(element: string, ownerDocument?: document);
+            constructor(element: HTMLElement, ownerDocument?: document);
+            addClass(className: string): void;
+            append(node: node | string, toStart?: boolean): node;
+            appendBogus(force: boolean): void;
+            appendHtml(html: string): void;
+            appendText(text: string): node;
+            breakParent(parent: element): void;
+            contains(node: node): boolean;
+            copyAttributes(dest: element, skipAttributes: { [key: string]: string }): void;
+            data(name: string, value?: string | false): string;
+            disableContextMenu(): void;
+            find(selector: string): nodeList;
+            findOne(selector: string): element;
+            focus(defer?: boolean): void;
+            focusNext(ignoreChildren?: boolean, indexToUse?: number): void;
+            focusPrevious(ignoreChildren?: boolean, indexToUse?: number): void;
+            forEach(callback: (node: node) => void, type?: number, skipRoot?: boolean): void;
+            getAttribute(name: string): string;
+            getBogus(): node | boolean;
+            getChild(indices: number | number[]): node;
+            getChildCount(): number;
+            getChildren(): nodeList;
+            getClientRect(): ClientRect;
+            getComputedStyle(propertyName: string): string;
+            getDirection(useComputed: boolean): string;
+            getDocumentPosition(refDocument: document): position;
+            getDtd(): dtdDefinition;
+            getEditor(): editor;
+            getElementsByTag(tagName: string): nodeList;
+            getFirst(evaluator?: (node: node) => boolean): node;
+            getFrameDocument(): document;
+            getHtml(): string;
+            getId(): string;
+            getLast(evaluator?: (node: node) => boolean): node;
+            getName(): string;
+            getNameAtt(): string;
+            getOuterHtml(): string;
+            getPositionedAncestor(): element;
+            getSize(type: string, isBorderBox: boolean): void;
+            getStyle(name: string): string;
+            getTabIndex(): number;
+            getText(): string;
+            getValue(): string;
+            getWindow(): window;
+            hasAttributes(): boolean;
+            hasAttribute(name: string): boolean;
+            hasClass(className: string): boolean;
+            hide(): void;
+            is(...name: string[]): boolean;
+            is(name: any): boolean;
+            isBlockBoundary(customNodeNames: { [tagName: string]: 1 }): boolean;
+            isEditable(textCursor?: boolean): boolean;
+            isEmptyInlineRemoveable(): boolean;
+            isIdentical(otherElement: element): boolean;
+            isVisible(): boolean;
+            mergeSiblings(inlineOnly?: boolean): void;
+            moveChildren(target: element, toStart?: boolean): void;
+            removeAttribute(name: string): void;
+            removeAttributes(attributes?: string[]): void;
+            removeClass(className: string): void;
+            removeStyle(name: string): void;
+            renameNode(newTag: string): void;
+            scrollIntoParent(parent: element, alignToTop: boolean, hscroll: boolean): void;
+            scrollIntoParent(parent: window, alignToTop: boolean, hscroll: boolean): void;
+            scrollIntoView(alignToTop?: boolean): void;
+            setAttribute(name: string, value: string): element;
+            setAttributes(attributesPairs: { [key: string]: string }): element;
+            setHtml(html: string): string;
+            setOpacity(opacity: number): void;
+            setSize(type: string, size: number, isBorderBox: boolean): void;
+            setState(state: number, base?: string, useAria?: boolean): void;
+            setStyle(name: string, value: string): element;
+            setStyles(stylesPair: { [key: string]: string }): element;
+            setText(text: string): string;
+            setValue(value: string): element;
+            show(): void;
+            unselectable(): void;
+
+            //static method
+            static clearAllMarkers(database: any): any;
+            static clearMarkers(database: any, element: dom.element, removeFromDatabase: boolean): void;
+            static createFromHtml(html: string): element;
+            static get(element: string | HTMLElement | element): element;
+            static setMarker(database: any, element: dom.element, name: string, value: any): dom.element;
+        }
+
+        class elementPath {
+            readonly block: element;
+            readonly blockLimit: element;
+            readonly elements: element[];
+            readonly lastElement: element;
+            readonly root: element;
+
+            constructor(startNode: element, root?: element);
+            compare(otherPath: elementPath): boolean;
+            contains(query: string | string[] | ((element: element) => boolean) | { [key: string]: any } | element, excludeRoot?: boolean, fromTop?: boolean): element;
+            direction(): 'ltr' | 'rtl';
+            isContextFor(tag: string): boolean;
+        }
+
+        class event {
+            constructor(domEvent: Event);
+            getKey(): number;
+            getKeystroke(): number;
+            preventDefault(stopPropagation?: boolean): void;
+            stopPropagation(): void;
+            getTarget(): node;
+            getPhase(): number;
+            getPhaseOffset(): position;
+            on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: any, listenerData?: any, priority?: number): { removeListener: () => void };
+        }
+
+        class iterator {
+            readonly activeFilter: filter;
+            enforceRealBlocks: boolean;
+            enlargeBr: boolean;
+            readonly filter: filter;
+            forceBrBreak: boolean;
+            readonly range: range;
+            constructor(range: range);
+            getNextParagraph(blockTag?: string): element;
+        }
+
+        class node extends domObject {
+            constructor(domNode: Node);
+            appendTo(element: element): element;
+            clone(includeChildren: boolean, cloneId: boolean): node;
+            hasPrevious(): boolean;
+            hasNext(): boolean;
+            insertAfter(node: node): node;
+            insertBefore(node: node): node;
+            insertBeforeMe(node: node): node;
+            getAddress(normalized?: boolean): number[];
+            getAscendant(reference: string, includeSelf?: boolean): node;
+            getCommonAncestor(node: node): void;
+            getDocument(): document;
+            getIndex(normalized?: boolean): number;
+            getNext(evaluator?: (node: node) => boolean): node;
+            getNextSourceNode(startFromSibling: boolean, nodeType: number, guard: node | ((node: node) => boolean)): void;
+            getParent(allowFragmentParent?: boolean): element;
+            getParents(closerFirst?: boolean): node[];
+            getPosition(otherNode: node): void;
+            getPrevious(evaluator?: (node: node) => boolean): node;
+            getPreviousSourceNode(startFromSibling: boolean, nodeType: number, guard: node | ((node: node) => boolean)): void;
+            hasAscendant(name: string, includeSelf: boolean): boolean;
+            remove(preserveChildren?: boolean): node;
+            replace(nodeToReplace: node): void;
+            trim(): void;
+            ltrim(): void;
+            rtrim(): void;
+            isReadOnly(): boolean;
+        }
+
+        class nodeList {
+            constructor(nativeList: NodeList);
+            count(): number;
+            getItem(index: number): node;
+            toArray(): node[];
+        }
+
+        class range {
+            readonly collapsed: boolean;
+            readonly document: document;
+            readonly endContainer: element | text;
+            readonly endOffset: number;
+            readonly root: element;
+            readonly startContainer: element | text;
+            readonly startOffset: number;
+
+            constructor(root: element | document);
+            checkBoundaryOfElement(element: element, checkType: number): boolean;
+            checkEndOfBlock(): boolean;
+            checkReadOnly(): boolean;
+            checkStartOfBlock(): boolean;
+            clone(cloneId?: boolean): range;
+            cloneContents(): documentFragment;
+            collapse(toStart?: boolean): boolean;
+            createBookmark(serializable?: boolean): bookmark;
+            createBookmark2(normalized?: boolean): bookmark2;
+            createIterator(): iterator;
+            deleteContents(mergeThen?: boolean): void;
+            endPath(): elementPath;
+            enlarge(unit: number, excludeBrs?: boolean): void;
+            extractContents(mergeThen?: boolean, cloneId?: boolean): documentFragment;
+            fixBlock(isStart: boolean, blockTag: string): element;
+            getBoundaryNodes(): { startNode: node; endNode: node; };
+            getCommonAncestor(includeSelf?: boolean, ignoreTextNode?: boolean): element;
+            getEnclosedNode(): node;
+            getNextEditableNode(): element | text;
+            getNextNode(evaluator?: (element: dom.element) => boolean, guard?: (element: dom.element) => boolean, boundary?: element): element;
+            getPreviousEditableNode(): element | text;
+            getPreviousNode(evaluator?: (element: dom.element) => boolean, guard?: (element: dom.element) => boolean, boundary?: element): element;
+            getTouchedEndNode(): node;
+            getTouchedStartNode(): node;
+            insertNode(node: node): void;
+            moveToBookmark(bookmark: bookmark | bookmark2): void;
+            moveToClosestEditablePosition(element?: element, isMoveForward?: boolean): boolean;
+            moveToElementEditEnd(target: element): boolean;
+            moveToElementEditStart(target: element): boolean;
+            moveToElementEditablePosition(element: element, isMoveToEnd: boolean): boolean;
+            moveToPosition(node: node, position: number): void;
+            moveToRange(range: range): void;
+            optimize(): void;
+            optimizeBookmark(): void;
+            removeEmptyBlocksAtEnd(atEnd: boolean): void;
+            scrollIntoView(): void;
+            select(): selection;
+            selectNodeContents(node: node): void;
+            setEnd(endNode: node, endOffset: number): void;
+            setEndAfter(node: node): void;
+            setEndAt(node: node, position: number): void;
+            setEndBefore(node: node): void;
+            setStart(startNode: node, startOffset: number): void;
+            setStartAfter(node: node): void;
+            setStartAt(node: node, position: number): void;
+            setStartBefore(node: node): void;
+            shrink(mode: number, selectContents?: boolean, options?: boolean | shrinkOptions): void;
+            splitBlock(cloneId?: boolean): void;
+            splitElement(toSplit: element, cloneId?: boolean): element;
+            startPath(): elementPath;
+            trim(ignoreStart?: boolean, ignoreEnd?: boolean): void;
+
+            static mergeRanges(ranges: range[]): range[];
+        }
+
+        interface shrinkOptions {
+            shrinkOnBlockBoundary?: boolean,
+            skipBogus?: boolean
+        }
+
+        class rangeList {
+            constructor(ranges?: range | range[]);
+            createBokmarks(serializable?: boolean): bookmark[];
+            createBookmarks2(normalized?: boolean): bookmark2[];
+            createIterator(): rangeListIterator;
+            moveToBookmarks(bookmarks: bookmark[]): void;
+        }
+
+
+        interface rangeListIterator {
+            getNextRange(mergeConsequent?: boolean): range;
+        }
+
+        // see https://docs.com/ckeditor4/latest/api/CKEDITOR_dom_selection.html
+        class selection {
+            readonly FILLING_CHAR_SEQUENCE: string;
+            readonly document: document;
+            readonly isFake: boolean;
+            readonly isLocked: boolean;
+            readonly rev: number;
+            readonly root: element;
+
+            constructor(target: document | element | selection);
+            createBookmarks(serializable: any): bookmark[];
+            createBookmarks2(normalized: any): bookmark2[];
+            fake(element: element, ariaLabel?: boolean): void;
+            getCommonAncestor(): element;
+            getNative(): Selection;
+            getRanges(onlyEditables?: boolean): range[];
+            getSelectedElement(): element;
+            getSelectedText(): string;
+            getStartElement(): element;
+            getType(): number;
+            isCollapsed(): boolean;
+            isHidden(): boolean;
+            isInTable(allowPartialSelection?: boolean): boolean;
+            lock(): void;
+            removeAllRanges(): void;
+            reset(): void;
+            scrollIntoView(): void;
+            selectBookmarks(bookmarks: (bookmark | bookmark2)[]): selection;
+            selectElement(element: element): void;
+            selectRanges(ranges: range[]): void;
+            unlock(restore: boolean): void;
+        }
+
+        class text extends node {
+            readonly $: Text;
+            readonly type: number;
+
+            constructor(text: Text | string, ownerDocument?: document);
+            getLength(): number;
+            getText(): string;
+            setText(text: string): void;
+            split(offset: number): text;
+            substring(indexA: number, indexB?: number): void;
+        }
+
+        class walker {
+            evaluator: (node: node) => boolean;
+            guard: (node: node) => boolean;
+
+            static validEmptyBlockContainers: { [key: string]: any };
+
+            constructor(range: range);
+            checkBackward(): boolean;
+            checkForward(): boolean;
+            end(): void;
+            lastBackward(): node;
+            lastForward(): node;
+            next(): node;
+            previous(): node;
+            reset(): void;
+
+            static blockBoundary(customNodeNames: any): (node: node) => boolean;
+            static bogus(isReject?: boolean): (node: node) => boolean;
+            static bookmark(contentOnly?: boolean, isReject?: boolean): (node: node) => boolean;
+            static editable(isReject?: boolean): (node: node) => boolean;
+            static empty(isReject?: boolean): (node: node) => boolean;
+            static ignored(isReject?: boolean): (node: node) => boolean;
+            static invisible(isReject?: boolean): (node: node) => boolean;
+            static listItemBoundary(): (node: node) => boolean;
+            static nodeType(type: number, isReject?: boolean): (node: node) => boolean;
+            static temp(isReject?: boolean): (node: node) => boolean;
+            static whitespaces(isReject?: boolean): (node: node) => boolean;
+        }
+
+        interface position {
+            x: number;
+            y: number;
+        }
+
+        interface widthAndHeight {
+            width: number;
+            height: number;
+        }
+
+        class window extends domObject {
+            constructor(domWindow: Window);
+            focus(): void;
+            getViewPaneSize(): widthAndHeight;
+            getScrollPosition(): position;
+            getFrame(): element;
+        }
+    }
+
+
+    namespace ajax {
+        function load(url: string, callback?: (data: any) => void): string;
+        function loadXml(url: string, callback?: (data: any) => void): xml;
+        function post(url: string, data: any, contentType?: string, callback?: (data: any) => void): void;
+    }
+
+
+    class command extends event implements commandDefinition {
+        fakeKeystroke: number;
+        previousState: number;
+        state: number;
+        uiItems: any[];
+
+        // Methods
+        constructor(editor: editor, commandDefinition: commandDefinition);
+        checkAllowed(noCache: boolean): boolean;
+        disable(): void;
+        enable(): void;
+        exec(data?: { [key: string]: any }): boolean;
+        refresh(editor: editor, path: dom.elementPath): void;
+        setState(newState: number): boolean;
+        toggleState(): void;
+
+    }
+
+    interface commandDefinition {
+        async?: boolean;
+        canUndo?: boolean;
+        context?: boolean;
+        contextSensitive?: boolean;
+        editorFocus?: boolean;
+        fakeKeystroke?: number;
+        modes?: { [key: string]: any };
+        startDisabled?: boolean;
+        readOnly?: boolean;
+        exec(editor: editor, data?: any): boolean;
+        refresh?(editor: editor, path: dom.elementPath): void;
+    }
+
+    // https://docs.com/ckeditor4/latest/api/CKEDITOR_config.html
+    interface config {
+        allowedContent?: boolean | filter.allowedContentRules;
+        autoEmbed_widget?: string | ((url: string) => string);
+        autoGrow_bottomSpace?: number;
+        autoGrow_maxHeight?: number;
+        autoGrow_minHeight?: number;
+        autoGrow_onStartup?: boolean;
+        autoUpdateElement?: boolean;
+
+        baseFloatZIndex?: number;
+        baseHref?: string;
+        basicEntities?: boolean;
+        blockedKeystrokes?: number[];
+        bodyClass?: string;
+        bodyId?: string;
+        browserContextMenuOnCtrl?: boolean;
+
+        clipboard_defaultContentType?: 'html' | 'text';
+        clipboard_notificationDuration?: number;
+        cloudServices_tokenUrl?: string;
+        cloudServices_uploadUrl?: string;
+        codeSnippetGeshi_url?: string;
+        codeSnippet_codeClass?: string;
+        codeSnippet_languages?: { [key: string]: any };
+        coceSnippet_theme?: string;
+        colorButton_backStyle?: config.styleObject;
+        colorButton_colors?: string;
+        colorButton_colorsPerRow?: number;
+        colorButton_enableAutomatic?: boolean;
+        colorButton_enableMore?: boolean;
+        colorButton_foreStyle?: config.styleObject;
+        colorButton_normalizeBackground?: boolean;
+        contentsCss?: string | string[];
+        contentsLangDirection?: string;
+        contentsLanguage?: string;
+        copyFormatting_allowRules?: string;
+        copyFormatting_allowedContexts?: boolean | string[];
+        copyFormatting_keystrokeCopy?: number;
+        copyFormatting_keystrokePaste?: number;
+        copyFormatting_outerCursor?: boolean;
+        coreStyles_bold?: config.styleObject;
+        coreStyles_italic?: config.styleObject;
+        coreStyles_strike?: config.styleObject;
+        coreStyles_subscript?: config.styleObject;
+        coreStyles_superscript?: config.styleObject;
+        coreStyles_underline?: config.styleObject;
+        customConfig?: string;
+
+        dataIndentationChars?: string;
+        defaultLanguage?: string;
+        devtools_styles?: string;
+        devtools_textCallback?: (editor: editor, dialog: dialog, element: dom.element, tabName: string) => string;
+        dialog_backgroundCoverColor?: string;
+        dialog_backgroundCoverOpacity?: number;
+        dialog_buttonsOrder?: string;
+        dialog_magnetDistance?: number;
+        dialog_noConfirmCancel?: boolean;
+        dialog_startupFocusTab?: boolean;
+        disableNativeSpellChecker?: boolean;
+        disableNativeTableHandles?: boolean;
+        disableNativeObjectResizing?: boolean;
+        disableNativeReadonlyStyling?: boolean;
+        disallowedContent?: filter.disallowedContentRules;
+        div_wrapTable?: boolean;
+        docType?: string;
+
+        easyimage_class?: string;
+        easyimage_defaultStyle?: string;
+        easyimage_styles?: { [key: string]: any };
+        easyimage_toolbar?: string[] | string;
+        emailProtection?: string;
+        embed_provider?: string;
+        enableTabKeyTools?: boolean;
+        enterMode?: number;
+        entities?: boolean;
+        entities_additional?: string;
+        entities_greek?: boolean;
+        entities_latin?: boolean;
+        entities_processNumerical?: boolean | string;
+        extraAllowedContent?: filter.allowedContentRules;
+        extraPlugins?: string;
+
+        fileTools_defaultFileName?: string;
+        fileTools_requestHeaders?: { [key: string]: any };
+        filebrowserBrowseUrl?: string;
+        filebrowserFlashBrowseUrl?: string;
+        filebrowserFlashUploadUrl?: string;
+        filebrowserImageBrowseLinkUrl?: string;
+        filebrowserImageBrowseUrl?: string;
+        filebrowserImageUploadUrl?: string;
+        filebrowserUploadMethod?: string;
+        filebrowserUploadUrl?: string;
+        filebrowserWindowFeatures?: string;
+        filebrowserWindowHeight?: number | string;
+        filebrowserWindowWidth?: number | string;
+        fillEmptyBlocks?: boolean | ((element: htmlParser.element) => boolean);
+        find_highlight?: config.styleObject;
+        flashAddEmbedTag?: boolean;
+        flashConvertOnEdit?: boolean;
+        flashEmbedTagOnly?: boolean;
+        floatSpaceDockedOffsetX?: number;
+        floatSpaceDockedOffsetY?: number;
+        floatSpacePinnedOffsetX?: number;
+        floatSpacePinnedOffsetY?: number;
+        floatSpacePreferRight?: boolean;
+        fontSize_defaultLabel?: string;
+        fontSize_sizes?: string;
+        fontSize_style?: config.styleObject;
+        font_defaultLabel?: string;
+        font_names?: string;
+        font_style?: config.styleObject;
+        forceEnterMode?: boolean;
+        forcePasteAsPlainText?: boolean;
+        forceSimpleAmpersand?: boolean;
+        format_address?: config.styleObject;
+        format_div?: config.styleObject;
+        format_h1?: config.styleObject;
+        format_h2?: config.styleObject;
+        format_h3?: config.styleObject;
+        format_h4?: config.styleObject;
+        format_h5?: config.styleObject;
+        format_h6?: config.styleObject;
+        format_p?: config.styleObject;
+        format_pre?: config.styleObject;
+        format_tags?: string;
+        fullPage?: boolean;
+
+        grayt_autoStartup?: boolean;
+
+        height?: string | number;
+        htmlEncodeOutput?: boolean;
+
+        ignoreEmptyParagraph?: boolean;
+        image2_alignClasses?: string[];
+        image2_altRequired?: boolean;
+        image2_captionedClass?: string;
+        image2_disableResizer?: boolean;
+        image2_prefillDimensions?: boolean;
+        imageUploadUrl?: string;
+        image_prefillDimensions?: boolean;
+        image_previewText?: string;
+        image_removeLinkByEmptyUrl?: boolean;
+        indentClasses?: string[];
+        indentOffset?: number;
+        indentUnit?: string;
+
+        jqueryOverrideVal?: boolean;
+        justifyClasses?: string[];
+
+        keystrokes?: [number, string][];
+
+        language?: string;
+        language_list?: string[];
+        linkJavaScriptLinksAllowed?: boolean;
+        linkShowAdvancedTab?: boolean;
+        linkShowTargetTab?: boolean;
+
+        magicline_color?: string
+        magicline_everywhere?: boolean;
+        magicline_holdDistance?: number;
+        magicline_keystrokeNext?: number;
+        magicline_keystrokePrevious?: number;
+        magicline_tabuList?: string[];
+        magicline_triggerOffset?: number;
+        mathJaxClass?: string;
+        mathJaxLib?: string;
+        menu_groups?: string;
+        menu_subMenuDelay?: number;
+
+        newpage_html?: string;
+        notification_duration?: number;
+
+        on?: editor.eventObject;
+
+        pasteFilter?: string;
+        pasteFromWordCleanupFile?: string;
+        pasteFromWordNumberedHeadingToList?: boolean;
+        pasteFromWordPromptCleanup?: boolean;
+        pasteFromWordRemoveFontStyles?: boolean;
+        pasteFromWorkRemoveStyles?: boolean;
+        pasteFromWord_heuristicsEdgeList?: boolean;
+        pasteFromWord_inlineImages?: boolean;
+        plugins?: string;
+        protectedSource?: RegExp[];
+
+        readOnly?: boolean;
+        removeButtons?: string;
+        removeDialogTabs?: string;
+        removeFormatAttributes?: string;
+        removeFormatTags?: string;
+        removePlugins?: string;
+        resize_dir?: string;
+        resize_enabled?: boolean;
+        resize_maxHeight?: number;
+        resize_maxWidth?: number;
+        resize_minHeight?: number;
+        resize_minWidth?: number;
+
+        scayt_autoStartup?: boolean;
+        scayt_contextCommands?: string;
+        scayt_contextMenuItemsOrder?: string;
+        scayt_customDictionaryIds?: string;
+        scayt_customerId?: string;
+        scayt_disableOptionsStorage?: string | string[];
+        scayt_elementsToIgnore?: string;
+        scayt_handleCheckDirty?: string;
+        scayt_handleUndoRedo?: string;
+        scayt_ignoreAllCapsWords?: boolean;
+        scayt_ignoreDomainNames?: boolean;
+        scayt_ignoreWordsWithMixedCases?: boolean;
+        scayt_ignoreWordsWithNumbers?: boolean;
+        scayt_inlineModeImmediateMarkup?: boolean;
+        scayt_maxSuggestions?: number;
+        scayt_minWordLength?: number;
+        scayt_moreSuggestions?: string;
+        scayt_multiLanguageMode?: boolean;
+        scayt_multiLanguageStyles?: { [key: string]: any };
+        scayt_sLang?: string;
+        scayt_serviceHost?: string;
+        scayt_servicePath?: string;
+        scayt_servicePort?: string;
+        scayt_serviceProtocol?: string;
+        scayt_srcUrl?: string;
+        scayt_uiTabs?: string;
+        scayt_userDictionaryName?: string;
+
+        sharedSpaces?: sharedSpace;
+        shiftEnterMode?: number;
+        skin?: string;
+        smiley_columns?: number;
+        smiley_descriptions?: string[];
+        smiley_images?: string[];
+        smiley_path?: string;
+        sourceAreaTabSize?: number;
+        specialChars?: (string | [string, string])[];
+        startupFocus?: string | boolean;
+        startupMode?: string;
+        startupOutlineBlocks?: boolean;
+        startupShowBorders?: boolean;
+        stylesSet?: string | boolean | config.styleObject[];
+        stylesheetParser_skipSelectors?: RegExp;
+        stylesheetParser_validSelectors?: RegExp;
+
+        tabIndex?: number;
+        tabSpaces?: number;
+        templates?: string;
+        templates_files?: { [key: string]: any };
+        templates_replaceContent?: boolean;
+        title?: string | boolean;
+        toolbar?: string | (string | string[] | { name: string, items?: string[], groups?: string[] })[] | null;
+        toolbarCanCollapse?: boolean;
+        toolbarGroupCycling?: boolean;
+        toolbarGroups?: (toolbarGroups | string)[];
+        toolbarLocation?: string;
+        toolbarStartupExpanded?: boolean;
+
+        uiColor?: string;
+        undoStackSize?: number;
+        uploadUrl?: string;
+        useComputedState?: boolean;
+
+        width?: string | number;
+        wsc_cmd?: string;
+        wsc_customDictionaryIds?: string;
+        wsc_customLoaderScript?: string;
+        wsc_customerId?: string;
+        wsc_height?: string;
+        wsc_lang?: string;
+        wsc_left?: string;
+        wsc_top?: string;
+        wsc_userDictionaryName?: string;
+        wsc_width?: string;
+    }
+
+    interface dataProcessor {
+        toDataFormat(html: string, fixForBody: string): void;
+        toHtml(data: string, fixForBody?: string): void;
+    }
+
+    class dialog {
+        readonly state: number;
+
+        constructor(editor: editor, dialogName: string);
+
+        addFocusable(element: dom.element, index?: number): void;
+        addPage(contents: { [key: string]: any }): void;
+        click(id: string): any;
+        commitContent(): void;
+        disableButton(id: string): void;
+        enableButton(id: string): void;
+        foreach(fn: () => void): dialog;
+        getButton(id: string): ui.dialog.button;
+        getContentElement(pageId: string, elementId: string): ui.dialog.uiElement;
+        getElement(): dom.element;
+        getName(): string;
+        getPageCount(): number;
+        getParentEditor(): editor;
+        getPosition(): { [key: string]: any };
+        getSelectedElement(): dom.element;
+        getSize(): { [key: string]: any };
+        getValueOf(pageId: string, elementId: string): any;
+        hide(): void;
+        hidePage(id: string): void;
+        layout(): void;
+        move(x: number, y: number, save: boolean): void;
+        reset(): dialog;
+        resize(width: number, height: number): void;
+        selectPage(id: string): void;
+        setState(state: number): void;
+        setValueOf(pageId: string, elementId: string, value: any): void;
+        setupContent(): void;
+        show(): void;
+        showPage(id: string): void;
+        updateStyle(): void;
+
+        static add(name: string, dialogDefinition: string | ((editor: editor) => dialog.IDialogDefinition)): void;
+        static addIframe(name: string, title: string, minWidth: number, minHeight: number, onContentLoad?: () => void, userDefinition?: { [key: string]: any }): void;
+        static addUIElement(typeName: string, builder: () => void): void;
+        static cancelButton(): void;
+        static exists(name: string | number): void; // NOTE: documentation says object, but it's an array accessor, so really a string or number will work
+        static getCurrent(): dialog;
+        static isTabEnabled(editor: editor, dialogName: string, tabName: string): boolean;
+        static okButton(): void;
+    }
+
+    namespace dialog {
+
+        namespace definition {
+
+            interface button extends uiElement {
+                disabled?: boolean;
+            }
+
+            interface checkbox extends uiElement {
+                default?: string;
+                validate?: () => boolean;
+            }
+
+            interface content {
+                accessKey?: string;
+                elements?: dialog.definition.uiElement[];
+                id?: string;
+                label?: string;
+                title?: string;
+            }
+
+            interface file extends labeledElement {
+                action?: string;
+                size?: string;
+                validate?: () => boolean;
+            }
+
+            interface fileButton extends uiElement {
+                filebrowser?: string;
+                for?: string;
+                validate?: () => boolean;
+            }
+
+            interface hbox extends uiElement {
+                children?: ui.dialog.uiElement[];
+                height?: number;
+                padding?: number;
+                validate?: () => boolean;
+                widths?: number[];
+            }
+
+            interface html extends uiElement {
+                html?: string;
+            }
+
+            interface labeledElement extends uiElement {
+                controlStyle?: string;
+                inputStyle?: string;
+                labelLayout?: string;
+                labelStyle?: string;
+                widths?: number[];
+            }
+
+            interface radio extends labeledElement {
+                default?: string;
+                items?: string[] | (string[])[];
+                validate?: () => boolean;
+            }
+
+            interface select extends labeledElement {
+                default?: string;
+                items?: string[] | (string[])[];
+                multiple?: boolean;
+                size?: number;
+                validate?: () => boolean;
+            }
+
+            interface textarea extends labeledElement {
+                bidi?: boolean;
+                cols?: number;
+                default?: string;
+                rows?: number;
+                validate?: () => boolean;
+            }
+
+            interface textInput extends labeledElement {
+                bidi?: boolean;
+                default?: string;
+                maxLength?: number;
+                size?: number;
+                validate?: () => boolean;
+            }
+
+            interface uiElement {
+                align?: string;
+                className?: string;
+                commit?: (widget: plugins.widget) => void;
+                id?: string;
+                label?: string;
+                onHide?: (elem: ui.dialog.uiElement) => void;
+                onLoad?: (elem: ui.dialog.uiElement) => void;
+                onShow?: (elem: ui.dialog.uiElement) => void;
+                requiredContent?: string | { [key: string]: any } | style;
+                setup?: (widget: plugins.widget) => void;
+                style?: string;
+                title?: string;
+                type?: string;
+            }
+
+            interface vbox extends uiElement {
+                children?: ui.dialog.uiElement[];
+                expand?: boolean;
+                heights?: number[];
+                padding?: number;
+                styles?: string;
+                width?: number[];
+            }
+        }
+
+        interface IDialogDefinition {
+            buttons?: dialog.definition.button[];
+            contents?: dialog.definition.content[];
+            height?: number;
+            minHeight?: number;
+            minWidth?: number;
+            onCancel?: () => void;
+            onLoad?: () => void;
+            onOk?: () => void;
+            onShow?: () => void;
+            onHide?: () => void;
+            resizable?: number;
+            title?: string;
+            width?: number;
+        }
+    }
+
+    class dialogCommand {
+        value: any;
+
+        constructor(dialogName: string, ext?: { tabId?: string });
+    }
+
+    interface dtdDefinition {
+        [outerTagName: string]: { [innerTagName: string]: 1 };
+        $block: { [tagName: string]: 1 };
+        $blockLimit: { [tagName: string]: 1 };
+        $cdata: { [tagName: string]: 1 };
+        $editable: { [tagName: string]: 1 };
+        $empty: { [tagName: string]: 1 };
+        $inline: { [tagName: string]: 1 };
+        $intermediate: { [tagName: string]: 1 };
+        $list: { [tagName: string]: 1 };
+        $listItem: { [tagName: string]: 1 };
+        $nonBodyContent: { [tagName: string]: 1 };
+        $nonEditable: { [tagName: string]: 1 };
+        $object: { [tagName: string]: 1 };
+        $removeEmpty: { [tagName: string]: 1 };
+        $tabIndex: { [tagName: string]: 1 };
+        $tableContent: { [tagName: string]: 1 };
+        $transparent: { [tagName: string]: 1 };
+    }
+
+    var dtd: dtdDefinition;
+
+    class editable extends dom.element {
+        hasFocus: boolean;
+        readonly status: string;
+
+        constructor(editor: editor, element: HTMLElement | dom.element);
+        attachClass(className: string): void;
+        attachListener(obj: event | editable, eventName: string, listenerFunction: (ei: eventInfo) => void, scopeobj?: {}, listenerData?: any, priority?: number): listenerRegistration;
+        changeAttr(attr: string, val: string): void;
+        detach(): void;
+        insertElement(element: dom.element, range?: dom.range): void;
+        insertHtml(data: string, mode?: string, range?: dom.range): void;
+        insertText(text: dom.text): void;
+        isInline(): boolean;
+        setReadOnly(isReadOnly: boolean): void;
+    }
+
+    class editor extends event {
+        readonly activeEnterMode: number;
+        readonly activeFilter: filter;
+        readonly activeShiftEnterMode: number;
+        readonly blockless: boolean;
+        readonly config: config;
+        readonly container: dom.element;
+        readonly contextMenu: plugins.contextMenu;
+        copyFormatting: plugins.copyformatting.state;
+        dataProcessor: dataProcessor;
+        readonly document: dom.document;
+        readonly element: dom.element;
+        readonly elementMode: number;
+        readonly enterMode: number;
+        readonly filter: filter;
+        readonly focusManager: focusManager;
+        readonly id: string;
+        readonly keystrokeHandler: keystrokeHandler;
+        readonly lang: any;
+        readonly langCode: string;
+        readonly mode: string;
+        readonly name: string;
+        readonly pasteFilter: filter;
+        readonly plugins: any;
+        readonly readOnly: boolean;
+        readonly shiftEnterMode: number;
+        readonly status: string;
+        readonly tabIndex: number;
+        readonly templates: any;
+        readonly title: any;
+        readonly toolbar: any;
+        readonly ui: ui;
+        readonly widgets: plugins.widget.repository;
+        readonly window: dom.window;
+
+        constructor(instanceConfig?: config, element?: dom.element, mode?: number);
+        addCommand(commandName: string, commandDefinition: commandDefinition): void;
+        addContentsCss(cssPath: string): void;
+        addFeature(feature: feature): boolean;
+        addMenuGroup(name: string, order?: number): void;
+        addMenuItem(name: string, definition?: IMenuItemDefinition): void;
+        addMenuItems(definitions: { [id: string]: IMenuItemDefinition }): void;
+        addMode(mode: string, exec: () => void): void;
+        addRemoveFormatFilter(func: (element: dom.element) => boolean): void;
+        applyStyle(style: style): void;
+        attachStyleStateChange(style: style, callback: (state: number) => void): void;
+        checkDirty(): boolean;
+        createFakeElement(realElement: dom.element, className: string, realElementType: string, isResizable: boolean): void;
+        createFakeParserElement(realElement: dom.element, className: string, realElementType: string, isResizable: boolean): void;
+        createRange(): dom.range;
+        destroy(noUpdate?: boolean): void;
+        editable(elementOrEditable?: dom.element | editable): editable;
+        elementPath(startNode?: dom.node): dom.elementPath;
+        execCommand(commandName: string, data?: any): boolean;
+        extractSelectedHtml(toString?: boolean, removeEmptyBlock?: boolean): dom.documentFragment | string | void;
+        focus(): void;
+        forceNextSelectionCheck(): void;
+        getClipboardData(callbackOrOptions: { title: string } | ((data: any) => void), callback: (data: any) => void): void;
+        getColorFromDialog(callback: (color: string) => void, scope?: { [key: string]: any }): void;
+        getCommand(commandName: string): command;
+        getCommandKeystroke(command: command | string): number | null;
+        getData(internal?: boolean): string;
+        getMenuItem(name: string): IMenuItemDefinition;
+        getResizable(forContents: boolean): dom.element;
+        getSelectedHtml(toString?: false): dom.documentFragment;
+        getSelectedHtml(toString: true): string;
+        getSelectedHtml(toString?: boolean): dom.documentFragment | string;
+        getSelection(forceRealSelection?: boolean): dom.selection;
+        getSnapshot(): string;
+        getStylesSet(callback: (stylesDefinitions: style.definition[]) => void): void;
+        getUiColor(): string;
+        insertElement(element: dom.element): void;
+        insertHtml(html: string, mode?: string, range?: dom.range): void;
+        insertText(text: string): void;
+        loadSnapshot(snapshot: any): void;
+        lockSelection(sel?: dom.selection): boolean;
+        openDialog(dialogName: string, callback: () => void): dialog;
+        popup(url: string, width?: number | string, height?: number | string, options?: string): void;
+        removeMenuItem(name: string): void;
+        removeStyle(style: style): void;
+        resetDirty(): void;
+        resetUndo(): void;
+        resize(width: number | string, height: number | string, isContentHeight?: boolean, resizeInner?: boolean): void;
+        restoreRealElement(fakeElement: dom.element): dom.element;
+        selectionChange(checkNow?: boolean): void;
+        setActiveEnterMode(enterMode: number, shiftEnterMode: number): void;
+        setActiveFilter(filter: filter): void;
+        setData(data: string, options?: { internal?: boolean; callback?: () => void; noSnapshot?: boolean; }): void;
+        setKeystroke(keystroke: number, behavior: string | boolean): void;
+        setKeystroke(keystroke: [number, string | boolean][]): void;
+        setMode(newMode: string, callback: () => void): void;
+        setReadOnly(isReadOnly?: boolean): void;
+        setUiColor(color: string): void;
+        showNotification(message: string, type: plugins.notification.type, progressOrDuration: number): plugins.notification;
+        unlockSelection(restore?: boolean): void;
+        updateElement(): void;
+    }
+
+    namespace editor {
+        interface eventObject {
+            activeEnterModeChange?: (evt: eventInfo) => void;
+            activeFilterChange?: (evt: eventInfo) => void;
+            afterCommandExec?: (evt: eventInfo) => void;
+            afterInsertHtml?: (evt: eventInfo) => void;
+            afterPaste?: (evt: eventInfo) => void;
+            afterPasteFromWord?: (evt: eventInfo) => void;
+            afterSetData?: (evt: eventInfo) => void;
+            afterUndoImage?: (evt: eventInfo) => void;
+            ariaEditorHelpLabel?: (evt: eventInfo) => void;
+            ariaWidget?: (evt: eventInfo) => void;
+            autogrow?: (evt: eventInfo) => void;
+
+            beforeCommandExec?: (evt: eventInfo) => void;
+            beforeDestroy?: (evt: eventInfo) => void;
+            beforeGetData?: (evt: eventInfo) => void;
+            beforeModeUnload?: (evt: eventInfo) => void;
+            beforeSetMode?: (evt: eventInfo) => void;
+            beforeUndoImage?: (evt: eventInfo) => void;
+            blur?: (evt: eventInfo) => void;
+
+            change?: (evt: eventInfo) => void;
+            configLoaded?: (evt: eventInfo) => void;
+            contentDirChanged?: (evt: eventInfo) => void;
+            contentDom?: (evt: eventInfo) => void;
+            contentDomInvalidated?: (evt: eventInfo) => void;
+            contentDomUnload?: (evt: eventInfo) => void;
+            customConfigLoaded?: (evt: eventInfo) => void;
+
+            dataFiltered?: (evt: eventInfo) => void;
+            dataReady?: (evt: eventInfo) => void;
+            destroy?: (evt: eventInfo) => void;
+            dialogHide?: (evt: eventInfo) => void;
+            dialogShow?: (evt: eventInfo) => void;
+            dirChanged?: (evt: eventInfo) => void;
+            doubleclick?: (evt: eventInfo) => void;
+            dragend?: (evt: eventInfo) => void;
+            dragstart?: (evt: eventInfo) => void;
+            drop?: (evt: eventInfo) => void;
+
+            elementsPathUpdate?: (evt: eventInfo) => void;
+
+            fileUploadRequest?: (evt: eventInfo) => void;
+            fileUploadResponse?: (evt: eventInfo) => void;
+            floatingSpaceLayout?: (evt: eventInfo) => void;
+            focus?: (evt: eventInfo) => void;
+
+            getData?: (evt: eventInfo) => void;
+            getSnapshot?: (evt: eventInfo) => void;
+
+            insertElement?: (evt: eventInfo) => void;
+            insertHtml?: (evt: eventInfo) => void;
+            insertText?: (evt: eventInfo) => void;
+            instanceReady?: (evt: eventInfo) => void;
+
+            key?: (evt: eventInfo) => void;
+
+            langLoaded?: (evt: eventInfo) => void;
+            loadSnapshot?: (evt: eventInfo) => void;
+            loaded?: (evt: eventInfo) => void;
+            lockSnapshot?: (evt: eventInfo) => void;
+            maximize?: (evt: eventInfo) => void;
+            menuShow?: (evt: eventInfo) => void;
+            mode?: (evt: eventInfo) => void;
+
+            notificationHide?: (evt: eventInfo) => void;
+            notificationShow?: (evt: eventInfo) => void;
+            notificationUpdate?: (evt: eventInfo) => void;
+
+            paste?: (evt: eventInfo) => void;
+            pasteFromWord?: (evt: eventInfo) => void;
+            pluginsLoaded?: (evt: eventInfo) => void;
+
+            readOnly?: (evt: eventInfo) => void;
+            removeFormatCleanup?: (evt: eventInfo) => void;
+            required?: (evt: eventInfo) => void;
+            resize?: (evt: eventInfo) => void;
+
+            save?: (evt: eventInfo) => void;
+            saveSnapshot?: (evt: eventInfo) => void;
+            selectionChange?: (evt: eventInfo) => void;
+            setData?: (evt: eventInfo) => void;
+            stylesSet?: (evt: eventInfo) => void;
+
+            template?: (evt: eventInfo) => void;
+            toDataFormat?: (evt: eventInfo) => void;
+            toHtml?: (evt: eventInfo) => void;
+
+            unlockSnapshot?: (evt: eventInfo) => void;
+            updateSnapshot?: (evt: eventInfo) => void;
+
+            widgetDefinition?: (evt: eventInfo) => void;
+        }
+    }
+
+    namespace env {
+        var air: boolean;
+        var chrome: boolean;
+        var cssClass: string;
+        var edge: boolean;
+        var gecko: boolean;
+        var hc: boolean;
+        var hidpi: boolean;
+        var iOS: boolean;
+        var ie: boolean;
+        var isCompatible: boolean;
+        var mac: boolean;
+        var needsBrFiller: boolean;
+        var needsNbspFiller: boolean;
+        var quirks: boolean;
+        var safari: boolean;
+        var version: number;
+        var webkit: boolean;
+
+        function secure(): boolean;
+    }
+
+    class event {
+        static useCapture: boolean;
+
+        constructor();
+        capture(): void;
+        define(name: string, meta: { [key: string]: any }): void;
+        fire(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
+        fireOnce(eventName: string, data?: { [key: string]: any }, editor?: editor): any;
+        hasListeners(eventName: string): boolean;
+        on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any } | null, listenerData?: any, priority?: number): listenerRegistration;
+        once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: { [key: string]: any } | null, listenerData?: any, priority?: number): listenerRegistration;
+        removeAllListeners(): void;
+        removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
+
+        static implementOn(targetObject: { [key: string]: any }): void;
+    }
+
+    interface eventInfo {
+        data: any;
+        editor: editor;
+        listenerData: any;
+        name: string;
+        sender: { [key: string]: any };
+
+        cancel(): void;
+        removeListener(): void;
+        stop(): void;
+    }
+
+    interface feature {
+        allowedContent?: filter.allowedContentRules;
+        contentForms?: any;
+        contentTransformations?: any;
+        name?: string;
+        requiredContent?: string | style;
+        toFeature?: () => feature;
+    }
+
+    namespace fileTools {
+        var isFileUploadSupported: boolean;
+
+        function addUploadWidget(editor: editor, name: string, def: uploadWidgetDefinition): void;
+        function bindNotification(editor: editor, fileLoader: fileLoader): void;
+        function getUploadUrl(config: { [key: string]: any }, type?: string): string;
+        function isTypeSupported(file: Blob, supportedTypes: RegExp): boolean;
+        function markElement(element: dom.element, widgetName: string, loaderId: number): void;
+
+        class fileLoader extends event {
+            readonly data: string;
+            readonly file: Blob;
+            readonly fileName: string;
+            readonly id: number;
+            readonly loaded: number;
+            readonly message: string;
+            readonly reader: FileReader;
+            readonly responseData: any;
+            status: string;
+            readonly total: number;
+            readonly uploadTotal: number;
+            readonly uploadUrl: string;
+            readonly uploaded: string;
+            readonly url: string;
+            readonly xhr: XMLHttpRequest;
+
+            constructor(editor: editor, fileOrData: Blob | string, fileName?: string);
+            abort(): void;
+            isFinished(): boolean;
+            load(): void;
+            loadAndUpload(url: string, additionalRequestParameters?: any): void;
+            update(): void;
+            upload(url: string, additionalRequestParameters?: any): void;
+        }
+
+        class uploadRepository extends event {
+            readonly loaders: fileLoader[];
+
+            constructor(editor: editor);
+            create(fileOrData: Blob | string, fileName: string, loaderType?: any): fileLoader;
+            isFinished(): boolean;
+        }
+
+        interface uploadWidgetDefinition extends plugins.widget.definition {
+            additionalRequestParameters: any;
+            fileToElement: (pastedFile: any) => HTMLElement;
+            loadMethod: string;
+            loaderType: any;
+            onAbort: () => boolean;
+            onError: () => boolean;
+            onLoaded: () => boolean;
+            onUploaded: () => boolean;
+            onUploading: () => boolean;
+            replaceWith: () => any;
+            skipNotifications: boolean;
+            supportedTypes: string;
+            uploadUrl: string;
+        }
+    }
+
+    module filter {
+        type allowedContentRule = string | style | { [key: string]: any };
+        type allowedContentRules = allowedContentRule | allowedContentRule[];
+        type contentRule = string | style;
+        type disallowedContentRules = string | { [key: string]: any };
+
+        interface transformation {
+            check?: string;
+            element?: string | style;
+            left?: (element: htmlParser.element | style) => boolean;
+            right: (element: htmlParser.element, tools: string | filter.transformationTools) => boolean;
+        }
+
+        var transformationTools: transformationTools;
+
+        interface transformationTools {
+            alignmentToAttribute(element: htmlParser.element): void;
+            alignmentToStyle(element: htmlParser.element): void;
+            lengthToAttribute(element: htmlParser.element, styleName: string, attrName?: string): void;
+            lengthToStyle(element: htmlParser.element, styleName: string, attrName?: string): void;
+            matchesTyle(element: htmlParser.element, style: style): void;
+            sizeToAttribute(element: htmlParser.element): void;
+            sizeToStyle(element: htmlParser.element): void;
+            splitBorderShorthand(element: htmlParser.element): void;
+            splitMarginShorthand(element: htmlParser.element): void;
+            transform(element: htmlParser.element, form: style | string): void;
+        }
+    }
+
+    class filter {
+        readonly allowedContent: filter.allowedContentRules[];
+        readonly customConfig: boolean;
+        readonly disabled: boolean;
+        readonly disallowedContent: any[];
+        readonly editor: editor;
+        readonly elementCallbacks: ((element: htmlParser.element) => number)[];
+        readonly id: number;
+
+        static instances: { [id: string]: filter };
+
+        constructor(editorOrRules: editor | filter.allowedContentRules);
+        addContentForms(forms: any[]): void;
+        addElementCallback(callback: (element: htmlParser.element) => number): void;
+        addFeature(feature: feature): boolean;
+        addTransformations(transformations: (string | filter.transformation)[][]): void;
+        allow(newRules: filter.allowedContentRules, featureName?: string, overrideCustom?: boolean): boolean;
+        applyTo(fragment: htmlParser.fragment | htmlParser.element, toHrml: boolean, transformOnly: boolean, enterMode: number): boolean;
+        check(test: filter.contentRule, applyTransformations?: boolean, strictCheck?: boolean): boolean;
+        checkFeature(feature: feature): boolean;
+        clone(): filter;
+        destroy(): void;
+        disable(): void;
+        disallow(newRules: filter.disallowedContentRules): void;
+        getAllowedEnterMode(defaultMode: number, reverse?: boolean): number;
+    }
+
+    class focusManager {
+        currentActive: dom.domObject;
+        hasFocus: boolean;
+
+        constructor(editor: editor);
+        add(element: dom.element, isCapture: boolean): void;
+        blur(noDelay?: boolean): void;
+        focus(currentActive?: dom.element): void;
+        lock(): void;
+        remove(element: dom.element): void;
+        unlock(): void;
+    }
+
+    class htmlDataProcessor implements dataProcessor {
+        dataFilter: htmlParser.filter;
+        htmlFilter: htmlParser.filter;
+        writer: htmlParser.basicWriter;
+
+        constructor(editor: editor);
+        toDataFormat(html: string, options?: string | { context?: string, filter?: filter, enterMode?: number }): string;
+        toHtml(data: string, options?: string | htmlDataProcessorOptions): string;
+    }
+
+    interface htmlDataProcessorOptions {
+        context?: string;
+        fixForBody?: boolean;
+        filter?: filter;
+        dontFilter?: boolean;
+        enterMode?: number;
+        protectedWhitespaces?: boolean;
+    }
+
+    namespace htmlParser {
+        class basicWriter {
+            constructor();
+            attribute(attName: string, attValue: string): void;
+            closeTag(tagName: string): void;
+            comment(comment: string): void;
+            getHtml(reset: boolean): string;
+            openTag(tagName: string, attributes: { [key: string]: string }): void;
+            openTagClose(tagName: string, isSelfClose: boolean): void;
+            reset(): void;
+            text(text: string): void;
+            write(data: string): void;
+        }
+
+        class cdata extends node {
+            constructor(value: string);
+            type: number;
+            writeHtml(writer: htmlParser.basicWriter): void;
+        }
+
+        class comment extends node {
+            type: number;
+            value: string;
+
+            constructor(value: string);
+            filter(filter: filter): boolean;
+            writeHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
+        }
+
+        class cssStyle {
+            constructor(elementOrStyleText: htmlParser.element | string);
+            populate(obj: htmlParser.element | dom.element | { [key: string]: any }): void;
+        }
+
+        class element extends node {
+            attributes: { [name: string]: string };
+            children: htmlParser.node[];
+            name: string;
+            type: number;
+
+            constructor(name: string, attributes: { [name: string]: string });
+            add(node: node, index?: number): void;
+            addClass(className: string): void;
+            clone(): element;
+            filter(filter: htmlParser.filter): boolean;
+            filterChildren(filter: htmlParser.filter): void;
+            find(criteria: string | ((el: htmlParser.node) => boolean), recursive?: boolean): htmlParser.node[];
+            forEach(callback: (node: htmlParser.node) => void | false, type?: number, skipRoot?: boolean): void;
+            getFirst(condition: string | { [key: string]: string } | ((node: htmlParser.node) => boolean)): htmlParser.node;
+            getHtml(): string;
+            getOuterHtml(): string;
+            hasClass(className: string): boolean;
+            removeClass(className: string): void;
+            replaceWithChildren(): void;
+            setHtml(html: string): void;
+            split(index: number): htmlParser.element;
+            writeChildrenHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
+            writeHtml(writer: htmlParser.basicWriter, filter?: htmlParser.filter): void;
+        }
+
+        class filter {
+            attributeNameRules: filterRulesGroup;
+            attributesRules: { [name: string]: filterRulesGroup };
+            commentRules: filterRulesGroup;
+            elementNameRules: filterRulesGroup;
+            elementsRules: { [name: string]: filterRulesGroup };
+            id: number;
+            rootRules: filterRulesGroup;
+            textRules: filterRulesGroup;
+
+            constructor(rules?: filterRulesDefinition);
+            addRules(rules: filterRulesDefinition, options?: number | { priority?: number; applyToAll?: boolean; }): void;
+            applyTo(node: node): void;
+        }
+
+        interface filterRulesDefinition {
+            elementNames?: any;
+            attributeNames?: any;
+            elements?: any;
+            attributes?: any;
+            text?: any;
+            comment?: any;
+            root?: any;
+        }
+
+        class filterRulesGroup {
+            rules: { value: rule, priority: number, option: ruleOptions }[];
+
+            add(rule: rule, priority: number, options: ruleOptions): void;
+            addMany(rules: { [key: string]: any }[], priority: number, options: ruleOptions): void;
+            exec(currentValue: htmlParser.node | htmlParser.fragment | string): htmlParser.node | htmlParser.fragment | string;
+            execOnName(currentName: string): string;
+            findIndex(priority: number): number;
+        }
+
+        class fragment {
+            children: htmlParser.node[];
+            parent: htmlParser.fragment;
+            readonly type: number;
+
+            constructor();
+
+            add(node: htmlParser.node, index?: number): void;
+            filter(filter: htmlParser.filter): void;
+            filterChildren(filter: htmlParser.filter, filterRoot?: boolean): void;
+            forEach(callback: (node: htmlParser.node) => void | false, type?: number, skipRoot?: boolean): void;
+            writeChildrenHtml(writer: basicWriter, filter?: htmlParser.filter, filterRoot?: boolean): void;
+            writeHtml(writer: basicWriter, filter?: htmlParser.filter): void;
+
+            static fromBBCode(source: string): htmlParser.fragment;
+            static fromHtml(fragmentHtml: string, parent?: htmlParser.element | string, fixingBlock?: string | boolean): fragment | htmlParser.element;
+        }
+
+        class node {
+            constructor();
+            getAscendant(condition: string | { [name: string]: string } | ((node: htmlParser.element) => boolean)): element;
+            getIndex(): number;
+            insertAfter(node: node): void;
+            insertBefore(node: node): void;
+            remove(): node;
+            replaceWith(node: node): void;
+            wrapWith(wrapper: element): element;
+        }
+
+        type rule = ((value: htmlParser.node | htmlParser.fragment | string) => boolean) | [string, string];
+
+        interface ruleOptions {
+            applyToAll?: boolean,
+            excludeNestedEditable?: boolean
+        }
+
+        class text extends node {
+            constructor(value: string);
+            type: number;
+            filter(filter: filter): boolean;
+            writeHtml(writer: basicWriter, filter?: filter): void;
+        }
+    }
+
+    class htmlWriter extends htmlParser.basicWriter {
+        indentationChars: string;
+        lineBreakChars: string;
+        selfClosingEnd: string;
+
+        indentation(): void;
+        lineBreak(): void;
+        setRules(tagName: string, rules: { [key: string]: any }): void;
+    }
+
+    class keystrokeHandler {
+        blockedKeystrokes: { [key: number]: string | boolean };
+        keystrokes: { [key: number]: string | boolean };
+
+        constructor(editor: editor);
+
+        attach(domObject: dom.domObject): void;
+    }
+
+    namespace lang {
+        var languages: { [code: string]: number };
+        var rtl: { [code: string]: number };
+
+        function detect(defaultLanguage: string, probeLanguage?: string): string;
+        function load(languageCode: string, defaultLanguage: string, callback: (code: string, entries: any) => void): void;
+    }
+
+    namespace loader {
+        var loadedScripts: string[];
+        var scripts: string[];
+
+        function load(scriptName: string, defer?: boolean): void;
+        function loadPending(): void;
+    }
+
+    class menu {
+        constructor();
+
+        add(item: any): void;
+        addListener(listenerFn: (startElement: dom.element, selection: dom.selection, path: dom.elementPath) => any): void;
+        findItemByCommandName(commandName: string): { item: any, element: dom.element };
+        hide(returnFocus?: boolean): void;
+        removeAll(): void;
+        show(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
+    }
+
+    interface pluginDefinition {
+        hidpi?: boolean;
+        lang?: string | string[];
+        requires?: string | string[];
+
+        afterInit?(editor: editor): any;
+        beforeInit?(editor: editor): any;
+        init?(editor: editor): void;
+        onLoad?(): any;
+    }
+
+    namespace plugins {
+
+        namespace cloudservices {
+            class cloudServicesLoader extends fileTools.fileLoader {
+                customToken: string;
+
+                constructor(editor: editor, fileOrData: Blob | string, fileName?: string, token?: string);
+                loadAndUpload(url?: string, additionalRequestParameters?: any): void;
+                upload(url?: string, additionalRequestParameters?: any): void;
+            }
+        }
+
+        class autoEmbed {
+            getWidgetDefinition(editor: editor, url: string): widget.definition;
+        }
+
+        namespace balloontoolbar {
+            const PRIORITY: { [pri: string]: number };
+
+            class context {
+                editor: editor;
+                options: contextDefinition;
+                toolbar: ui.balloonToolbar;
+
+                constructor(editor: editor, options: contextDefinition);
+                destroy(): void;
+                hide(): void;
+                refresh(): void;
+                show(pointedElement?: dom.element): void;
+            }
+
+            interface contextDefinition {
+                cssSelector?: string;
+                priority?: number;
+                widgets?: string[] | string;
+
+                refresh?: (editor: editor, path: dom.elementPath, selection: dom.selection) => dom.element;
+            }
+
+            class contextManager {
+                editor: editor;
+
+                constructor(editor: editor);
+                add(context: context): void;
+                check(selection?: dom.selection): void;
+                create(options: contextDefinition): context;
+                destroy(): void;
+                hide(): void;
+            }
+        }
+
+        namespace clipboard {
+            const isCustomCopyCutSupported: boolean;
+            const isCustomDataTypesSupported: boolean;
+            const isFileApiSupported: boolean;
+            const mainPasteEvent: string;
+
+            function addPasteButton(editor: editor, name: string, definition: { [key: string]: any }): void;
+            function canClipboardApiBeTrusted(dataTransfer: dataTransfer, editor: editor): boolean;
+            function getDropTarget(editor: editor): dom.domObject;
+            function getRangeAtDropPosition(domEvent: Event, editor: editor): dom.range;
+            function initDragDataTransfer(evt?: dom.event, editor?: editor): void;
+            function initPasteDataTransfer(evt?: dom.event, sourceEditor?: editor): void;
+            function preventDefaultDropOnElement(element: dom.element): void;
+            function resetDragDataTransfer(): void;
+
+            class dataTransfer {
+                readonly $: DataTransfer;
+                readonly id: string;
+                readonly sourceEditor: editor;
+
+                constructor(nativeDataTransfer?: DataTransfer, editor?: editor);
+                cacheData(): void;
+                getData(type: string, getNative?: boolean): string;
+                getFile(i: number): File;
+                getFilesCount(): number;
+                getTransferType(targetEditor: editor): number;
+                isEmpty(): boolean;
+                setData(type: string, value: string): void;
+                storeId(): void;
+            }
+
+            class fallbackDataTransfer {
+                constructor(dataTransfer: dataTransfer);
+                getData(type: string, getNative?: boolean): string;
+                isRequired(): boolean;
+                setData(type: string, value: string): string;
+            }
+        }
+
+        namespace condesnippet {
+            function setHighlighter(highlighter: highlighter): void;
+
+            class highlighter {
+                highlighter: (code: string, lang: string, callback: (highlightedCode: string) => void) => void;
+                init: (ready: () => void) => void;
+                languages: { [lang: string]: string };
+                readonly queue: ((code: string, lang: string, callback: (highlightedCode: string) => void) => void)[];
+                readonly ready: boolean;
+
+                highlight(code: string, lang: string, callback: (highlightedCode: string) => void): void;
+            }
+        }
+
+        class contextMenu extends menu {
+            constructor(editor: editor);
+            addTarget(element: dom.element, nativeContextMenuOnCtrl?: boolean): void;
+            open(offsetParent: dom.element, corner?: number, offsetX?: number, offsetY?: number): void;
+        }
+
+        namespace copyformatting {
+            var breakOnElements: string[];
+            var elementsForInlineTransform: string[];
+            var excludedAttributes: string[];
+            var excludedAttributesFromInlineTransform: string[];
+            var inlineBoundary: string[];
+            var preservedElements: string[];
+
+            class state extends event {
+                editor: editor;
+                filter: filter;
+                sticky: boolean;
+                styles: style[];
+
+                constructor(editor: editor);
+            }
+        }
+
+        namespace easyimage {
+
+        }
+
+        namespace embedBase {
+            function createWidgetBaseDefinition(editor: editor): baseDefinition;
+
+            interface baseDefinition extends widget.definition {
+                providerUrl: template;
+                urlRegExp: RegExp;
+
+                getErrorMessage(messageTypeOrMessage: string, url?: string, suffix?: string): string;
+                isUrlValid(url: string): boolean;
+                loadContent(url: string, callback?: () => void, errorCallback?: (error: string) => void, noNotifications?: boolean): request;
+            }
+
+            interface request {
+                callback: () => void;
+                errorCallback: (error: string) => void;
+                response: { [key: string]: string };
+                task: notificationAggregator.task;
+                url: string;
+
+                cancel(): void;
+            }
+        }
+
+        namespace image2 {
+            function checkHasNaturalRatio(image: dom.element): boolean;
+            function getLinkAttributesGetter(): (editor: editor, data: { [key: string]: string }) => { set: { [tag: string]: string }, removed: string[] };
+            function getLinkAttributesParser(): (editor: editor, element: dom.element) => { [key: string]: string };
+            function getNatural(image: dom.element): { [key: string]: string };
+        }
+
+        namespace imagebase {
+            var featuresDefinitions: { [key: string]: string };
+
+            function addFeature(editor: editor, name: string, definition: imageWidgetDefinition): imageWidgetDefinition;
+            function addImageWidget(editor: editor, name: string, definition: imageWidgetDefinition): void;
+
+            interface imageWidgetDefinition extends widget.definition {
+                features: string[];
+                upcast: string;
+            }
+
+            class progressBar extends progressReporter {
+                bar: dom.element;
+
+                constructor();
+
+            }
+
+            class progressReporter {
+                wrapper: dom.element;
+
+                constructor(wrapperHtml?: string);
+                aborted(): void;
+                bindLoader(loader: fileTools.fileLoader): void;
+                done(): void;
+                failed(): void;
+                remove(): void;
+                updated(progress: number): void;
+            }
+        }
+
+        namespace indent {
+            function registerCommands(editor: editor, commands: { [key: string]: command }): void;
+
+            class genericDefinition implements commandDefinition {
+                async: boolean;
+                canUndo: boolean;
+                context: boolean;
+                contextSensitive: boolean;
+                editorFocus: boolean;
+                fakeKeystroke: number;
+                readonly isIndent: boolean;
+                modes: { [key: string]: any };
+                readOnly: boolean;
+                startDisabled: boolean;
+
+                exec(editor: editor, data?: any): boolean;
+                refresh?(editor: editor, path: dom.elementPath): void;
+            }
+
+            class specificDefinition {
+                database: { [key: string]: any };
+                readonly enterBr: boolean;
+                readonly indentKey: { [key: string]: any };
+                readonly isIndent: boolean;
+                readonly jobs: { [priority: string]: { refresh: (editor: editor, path: dom.elementPath) => number, exec: (editor: editor) => boolean } };
+                readonly relatedGlobal: { [key: string]: any };
+
+                execJob(editor: editor, priority: number): boolean;
+                getContext(node: dom.elementPath): dom.element;
+                refreshJob(editor: editor, priority: number): number;
+            }
+        }
+
+        namespace indentList {
+            function firstItemInPath(query: string | string[] | { [tagName: string]: any } | dom.element | ((element: dom.element) => boolean)): boolean;
+        }
+
+        namespace link {
+            // DEPRECATED 4.3.3
+            const emptyAnchorFix: boolean;
+
+            // DEPRECATED 4.3.3
+            const fakeAnchor: boolean;
+
+            // DEPRECATED 4.3.3
+            const synAnchorSelector: boolean;
+
+            function getEditorAnchors(editor: editor): dom.element[];
+            function getLinkAttributes(editor: editor, data: { [key: string]: any }): { set: { [key: string]: string }, removed: string[] }
+            function getSelectedLink(editor: editor, returnMultiple?: boolean): dom.element | dom.element[];
+            function parseLinkAttributes(editor: editor, element: dom.element): { [key: string]: any };
+            function showDisplayTextForElement(element: dom.element, editor: editor): boolean;
+            function tryRestoreFakeAnchor(editor: editor, element: dom.element): dom.element;
+        }
+
+        class list {
+            arrayToList(listArray: any, database: any, paragraphMode: any, dir: any): void;
+            listToArray(listNode: any, database: any, baseArray: any, baseIndentLevel: any, grandparentNode: any): void;
+        }
+
+        class notification {
+            readonly area: notification.area;
+            readonly duration: number;
+            readonly editor: editor;
+            readonly element: dom.element;
+            readonly id: number;
+            readonly message: string;
+            readonly progress: number;
+            readonly type: notification.type;
+
+            constructor(editor: editor, options: notification.options);
+            hide(): void;
+            isVisible(): boolean;
+            show(): void;
+            update(options: notification.updateOptions): void;
+        }
+
+        namespace notification {
+            interface area {
+                readonly editor: editor;
+                readonly element: dom.element;
+                readonly notifications: notification[];
+
+                add(notification: notification): void;
+                remove(notification: notification): void;
+            }
+
+            interface optionsBase {
+                duration?: number;
+                progress?: number;
+                type?: type;
+            }
+
+            interface options extends optionsBase {
+                message: string;
+            }
+
+            interface updateOptions extends optionsBase {
+                message?: string;
+                important?: boolean;
+            }
+
+            type type = 'info' | 'warning' | 'success' | 'progress';
+        }
+
+        class notificationAggregator extends event {
+            readonly editor: editor;
+            readonly notification: notification;
+
+            constructor(editor: editor, message: string, singularMessage?: string);
+            createTask(options?: { weight?: number }): notificationAggregator.task;
+            getDoneTaskCount(): number;
+            getPercentage(): number;
+            getTaskCount(): number;
+            isFinished(): boolean;
+            update(): void;
+        }
+
+        namespace notificationAggregator {
+            class task extends event {
+                constructor(weight?: number);
+                cancel(): void;
+                done(): void;
+                isCanceled(): boolean;
+                isDone(): boolean;
+                update(weight: number): void;
+            }
+        }
+
+        namespace pastefromword {
+            class lists {
+                numbering: lists.numbering;
+            }
+
+            namespace lists {
+                class numbering {
+                    getStyle(marker: string): string;
+                    toNumber(marker: string, markerType: string): number;
+                }
+            }
+
+            class styles {
+                pushStylesLower(element: htmlParser.element, exceptions: { [style: string]: boolean }, wrapText?: boolean): boolean;
+            }
+        }
+
+        namespace tableselection {
+            function getCellsBetween(first: dom.element, last: dom.element): dom.element[];
+        }
+
+        namespace widget {
+            var WRAPPER_CLASS_PREFIX: string;
+
+            function getNestedEditable(guard: dom.element, node: dom.node): dom.element;
+            function isDomDragHandler(node: dom.node): boolean;
+            function isDomDragHandlerContainer(node: dom.node): boolean;
+            function isDomNestedEditable(node: dom.node): boolean;
+            function isDomWidget(node: dom.node): boolean;
+            function isDomWidgetElement(node: dom.node): boolean;
+            function isDomWidgetWrapper(node: dom.node): boolean;
+            function isParserWidgetElement(node: dom.node): boolean;
+            function isParserWidgetWrapper(node: dom.node): boolean;
+
+            namespace nestedEditable {
+                interface definition {
+                    allowedContent?: filter.allowedContentRules;
+                    disallowedContent?: filter.disallowedContentRules;
+                    pathName?: string;
+                    selector?: string;
+                }
+            }
+
+            class nestedEditable extends dom.element {
+                readonly editor: editor;
+                readonly enterMode: number;
+                readonly filter: filter;
+                readonly shiftEnterMode: number;
+
+                constructor(editor: editor, element: dom.element, config: { filter?: filter });
+                getData(): string;
+                setData(data: string): void;
+            }
+
+
+            interface definition extends feature {
+                button?: string;
+                data?: (evt: eventInfo) => void;
+                defaults?: { [key: string]: any };
+                dialog?: string;
+                downcast?: string | ((element: htmlParser.element) => void);
+                downcasts?: { [key: string]: any };
+                draggable?: boolean;
+                edit?: () => void;
+                editables?: { [key: string]: any };
+                getLabel?: () => any;
+                init?: () => void;
+                inline?: boolean;
+                insert?: () => void;
+                mask?: boolean;
+                parts?: { [key: string]: any };
+                pathName?: string;
+                styleToAllowedContentRules?: (style: style) => filter.allowedContentRules;
+                styleableElements?: string;
+                template?: string | template;
+                upcast?: string | ((element: htmlParser.element, data: any) => boolean);
+                upcastPriority?: number;
+                upcasts?: { [key: string]: any };
+            }
+
+            class repository extends event {
+                readonly editor: editor;
+                readonly focused: widget;
+                readonly instances: { [id: string]: widget };
+                readonly registered: { [name: string]: definition };
+                readonly selected: widget[];
+                readonly widgetHoldingFocusedEditable: widget;
+
+                add(name: string, widgetDef: plugins.widget.definition): void;
+                addUpcastCallback(callback: (element: htmlParser.element, data: any) => boolean): void;
+                checkSelection(): void;
+                checkWidgets(options?: { initOnlyNew?: boolean; focusInited?: boolean }): void;
+                del(widget: plugins.widget): void;
+                destroy(widget: plugins.widget, offline?: boolean): void;
+                destroyAll(offline?: boolean): void;
+                finalizeCreation(container: any): void;
+                getByElement(element: any, checkWrapperOnly: boolean): plugins.widget;
+                initOn(element: dom.element, widgetDef?: plugins.widget.definition, startupData?: { [key: string]: any }): plugins.widget;
+                initOn(element: dom.element, widgetDef?: string, startupData?: { [key: string]: any }): plugins.widget;
+                initOnAll(container?: dom.element): plugins.widget[];
+                parseElementClasses(classes: string): any;
+                wrapElement(element: any, widgetName?: string): any;
+            }
+
+            class widgetselection {
+                addFillers(editable: editable): boolean;
+                removeFillers(editable: editable): void;
+            }
+        }
+
+        class widget extends event implements widget.definition {
+            readonly dataReady: boolean;
+            readonly definition: plugins.widget.definition;
+            readonly editor: editor;
+            readonly element: dom.element;
+            readonly focusedEditable: plugins.widget.nestedEditable
+            readonly id: number;
+            readonly inited: boolean;
+            readonly ready: boolean;
+            readonly repository: plugins.widget.repository;
+            readonly wrapper: dom.element;
+
+            constructor(widgetsRepo: plugins.widget.repository, id: number, element: dom.element, widgetDef: plugins.widget.definition, starupData?: any);
+
+            addClass(className: string): void;
+            applyStyle(style: style): void;
+            checkStyleActive(style: style): boolean;
+            destroy(offline?: boolean): void;
+            destroyEditable(editableName: string, offline?: boolean): void;
+            edit(): boolean;
+            focus(): void;
+            getClasses(): any;
+            hasClass(className: string, Whether: boolean): void;
+            initEditable(editableName: string, definition: plugins.widget.nestedEditable.definition): boolean;
+            isInited(): boolean;
+            isReady(): boolean;
+            removeClass(className: string): void;
+            removeStyle(style: style): void;
+            setData(keyOrData: any, value: any): plugins.widget;
+            setFocused(selected: boolean): plugins.widget;
+            setSelected(selected: boolean): plugins.widget;
+            updateDragHandlerPosition(): void;
+        }
+
+        function add(name: string, definition: pluginDefinition): void;
+        function add(name: string): void;
+        function addExternal(name: string, path: string, fileName?: string): void;
+        function get(name: string): any;
+        function getFilePath(name: string): string;
+        function getPath(name: string): string;
+        function load(name: string, callback: (plugins: string[]) => void, scope?: { [key: string]: any }): void;
+        function setLang(pluginName: string, languageCode: string, languageEntries: any): void;
+        var registered: { [key: string]: pluginDefinition };
+    }
+
+    class resourceManager {
+        basePath: string;
+        externals: { [key: string]: any };
+        fileName: string;
+        loaded: { [key: string]: any };
+        registered: { [key: string]: any };
+
+        constructor(basePath: string, fileName: string);
+        add(name: string, definition?: pluginDefinition): void;
+        addExternal(names: string, path: string, fileName?: string): void;
+        get(name: string): pluginDefinition;
+        getFilePath(name: string): string;
+        getPath(name: string): string;
+        load(name: string | string[], callback: (loaded: string[]) => void, scope?: { [key: string]: any }): void;
+    }
+
+    // see https://docs.com/ckeditor4/latest/api/CKEDITOR_scriptLoader.html
+    namespace scriptLoader {
+        function load(scriptUrls: string | string[], callback: (succeededUrls: boolean | string[], failedUrls: string[]) => void, scope?: any, showBusy?: boolean): void;
+        function queue(scriptUrl: string, callback?: (succeeded: boolean) => void): void;
+    }
+
+    namespace skin {
+        var icons: { [name: string]: { path: string } };
+        var name: string;
+        var ua: { [name: string]: any };
+
+        function addIcon(name: string, path: string, offset?: number, bgsize?: string): void;
+        function chameleon(editor: string, part: string): void;
+        function getIconStyle(name: string, rtl?: boolean, overridePath?: number, overrideBgsize?: string): any;
+        function getPath(part: string): any;
+        function loadPart(part: string, fn: () => void): void;
+        function path(): string;
+    }
+
+    namespace style {
+        function addCustomHandler(defintion: customHandler): style;
+        function getStyleText(style: definition): string;
+
+        namespace customHandlers {
+            class widget extends style {
+                group: any[];
+                widget: string;
+                checkElement(element: dom.element): boolean;
+                getClassesArray(): string[];
+                getDefintion(): definition;
+                removeStylesFromSameGroup(editor: editor): boolean;
+            }
+        }
+
+        interface definition {
+            attributes?: { [att: string]: string },
+            element: string,
+            name?: string,
+            styles?: { [att: string]: string },
+            type?: string | number
+        }
+
+        interface customHandler {
+            type: string | number;
+            setup?: (style: definition) => void;
+            assignedTo?: number;
+        }
+    }
+
+    class style {
+        alwaysRemoveElement: boolean;
+        includeReadonly: boolean;
+        constructor(styleDefinition: style.definition, variableValues: any);
+        apply(editor: editor): void;
+        applyToObject(element: dom.element, editor: editor): void;
+        applyToRange(range: dom.range, editor: editor): void;
+        buildPreview(label?: string): string;
+        checkActive(elementPath: dom.elementPath, editor: editor): boolean;
+        checkApplicable(elementPath: dom.elementPath, editor: editor, filter?: filter): boolean;
+        checkElementMatch(element: dom.element, fullMatch: boolean, editor: editor): boolean;
+        checkElementRemovable(element: dom.element, fullMatch: boolean, editor: editor): boolean;
+        getDefintion(): style.definition;
+        remove(editor: editor): void;
+        removeFromRange(range: dom.range, editor: editor): void;
+        toAllowedContentRules(editor?: editor): filter.allowedContentRules;
+    }
+
+    class styleCommand {
+        constructor(style: style, ext?: any);
+        exec(editor: editor): void;
+    }
+
+    var stylesSet: resourceManager;
+
+    class template {
+        readonly source: string;
+
+        constructor(source: string);
+        output(data: any, buffer?: any[]): string | number;
+    }
+
+    namespace tools {
+        function addFunction(fn: () => any, scope?: any): number;
+        function arrayCompare(arrayA: any[], arrayB: any[]): boolean;
+        function clone(source: { [key: string]: any }): { [key: string]: any };
+        function copy(source: { [key: string]: any }): { [key: string]: any };
+        function createClass(definition: { [key: string]: any }): any;
+        function cssStyleToDomStyle(cssName: string): string;
+        function cssVendorPrefix(property: string, value: string, asString?: boolean): { [cssClass: string]: string | number };
+        function defer<T extends Function>(fn: T): T;
+        function enableHtml5Elements(doc: Document | DocumentFragment, withAppend?: boolean): void;
+        function escapeCss(selector: string): string;
+        function eventsBuffer(minInterval: number, output: () => void, scopeObj: any): { input: () => void, reset: () => void };
+        function extend(target: { [key: string]: any }, source: { [key: string]: any }, overwrite: boolean, properties: { [key: string]: any }): { [key: string]: any };
+        function fixDomain(): boolean;
+        function genKey(subKey: string): string;
+        function getCookie(name: string): string;
+        function getCsrfToken(): string;
+        function getIndex<T>(array: T[], compareFunction: (element: T) => boolean): number;
+        function getMouseButton(evt: dom.event): boolean;
+        function getNextId(): string;
+        function getNextNumber(): number;
+        function getUniqueId(): string;
+        function htmlDecode(text: string): string;
+        function htmlDecodeAttr(text: string): string;
+        function htmlEncode(text: string): string;
+        function htmlEncodeAttr(text: string): string;
+        function indexOf<T>(array: T[], value: T | ((el: T) => boolean)): number;
+        function isArray<T>(object: any): object is T[];
+        function isEmpty(object: { [key: string]: any }): boolean;
+        function keystrokeToArray(lang: { [key: string]: any }, keystroke: number): { display: string[], aria: string[] };
+        function keystrokeToString(lang: { [key: string]: any }, keystroke: number): { display: string, aria: string };
+        function ltrim(str: string): string;
+        function normalizeCssText(styleText: string, nativeNormalize: boolean): string;
+        function normalizeHex(styleText: string): string;
+        function objectCompare(left: { [key: string]: any }, right: { [key: string]: any }, onlyLef?: boolean): boolean;
+        function objectKeys(obj: { [key: string]: any }): string[];
+        function override<T extends Function>(originalFunction: T, functionBuilder: (originalFunction: T) => T): T;
+        function parseCssText(styleText: string, normalize?: boolean, nativeNormalize?: boolean): { [key: string]: any };
+        function prototypedCopy(source: { [key: string]: any }): { [key: string]: any };
+        function removeFunction(ref: number): void;
+        function repeat(str: string, times: number): string;
+        function rtrim(str: string): string;
+        function search<T>(array: T[], value: T | ((element: T) => boolean)): T;
+        function setCookie(name: string, value: string): void;
+        function setTimeout(func: Function, milliseconds?: number, scope?: { [key: string]: any }, args?: any, ownerWindow?: Window): number;
+        function transformPlainTextToHtml(text: string, etnerMode: number): string;
+        function trim(str: string): string;
+        function tryThese(fn: Function[]): any;
+        function writeCssText(styles: { [key: string]: any }, sort?: boolean): string;
+
+        namespace array {
+            function every<T>(array: T[], fn: (value: T, index: number, array: T[]) => boolean, thisArg?: { [key: string]: any }): boolean;
+            function filter<T>(array: T[], fn: (value: T, index: number, array: T[]) => boolean, thisArg?: { [key: string]: any }): T[];
+            function forEach<T>(array: T[], fn: (value: T, index: number, array: T[]) => void, thisArg?: { [key: string]: any }): void;
+            function isArray(object: any): boolean;
+            function map<T, K>(array: T[], fn: (value: T) => K, thisArg?: { [key: string]: any }): K[];
+            function reduce<T, K>(array: T[], fn: (accumulator: K, a: T, index: number, array: T[]) => K, initial: K, thisArg?: { [key: string]: any }): K;
+        }
+
+        namespace object {
+            function findKey(obj: { [key: string]: any }, value: any): string;
+            function merge(obj1: { [key: string]: any }, obj2: { [key: string]: any }): { [key: string]: any };
+        }
+
+        namespace style {
+            namespace parse {
+                function background(value: string): { color: string, unprocessed: string };
+                function border(value: string): { width: string, style: string, color: string };
+                function margin(value: string): { top: number, right: number, bottom: number, left: number };
+            }
+        }
+    }
+
+    class ui extends event {
+        constructor(editor: editor);
+        add(name: string, type: { [key: string]: any }, definition: { [key: string]: any }): void;
+        addButton(name: string, definition: buttonDefinition): void;
+        addHandler(type: { [key: string]: any }, handler: { [key: string]: any }): void;
+        addRichCombo(name: string, definition: { [key: string]: any }): void;
+        addToolbarGroup(name: string, previous: number | string, subgroupOf?: string): void;
+        create(name: string): { [key: string]: any };
+        get(name: string): { [key: string]: any };
+        space(name: string): dom.element;
+        spaceId(name: string): string;
+    }
+
+    namespace ui {
+        namespace dialog {
+            class button extends uiElement {
+                constructor(dialog: dialog, elementDefinition: definitions.button, htmlList: any[]);
+
+                accessKeyDown(): void;
+                accessKeyUp(): void;
+                click(): any;
+            }
+
+            class checkbox extends uiElement {
+                constructor(dialog: dialog, elementDefinition: definitions.checkbox, htmlList: any[]);
+
+                accessKeyUp(): void;
+                getValue(): boolean;
+                setValue(checked: boolean, noChangeEvent: boolean): undefined;
+            }
+
+            namespace definitions {
+                interface button {
+                    label: string;
+                    disabled?: boolean;
+                }
+
+                interface checkbox {
+                    checked?: boolean;
+                    validate?: () => boolean;
+                    label?: string;
+                }
+
+                interface fieldSet {
+                    label?: string;
+                    children: any[];
+                }
+
+                interface file {
+                    validate?: () => boolean;
+                }
+
+                interface fileButton {
+                    for: string;
+                    validate?: () => boolean;
+                }
+
+                interface hbox {
+                    widths?: string[];
+                    height?: string;
+                    padding?: string;
+                    align?: string;
+                }
+
+                interface html {
+                    html: string;
+                }
+
+                interface iframeElement {
+                    src: string;
+                    width: string;
+                    height: string;
+                    onContentLoad?: () => void;
+                }
+
+                interface labeledElement {
+                    label: string;
+                    labelLayout?: 'horizontal' | 'vertical';
+                    widths?: [string, string];
+                    role?: string;
+                    includeLabel?: boolean;
+                }
+
+                interface radio {
+                    default: any;
+                    validate?: () => boolean;
+                    items: ([string, string] | [string])[];
+                }
+
+                interface select {
+                    default: any;
+                    validate?: () => boolean;
+                    items: ([string, string] | [string])[];
+                    multiple?: boolean;
+                    size?: number;
+                }
+
+                interface textarea {
+                    rows?: number;
+                    cols?: number;
+                    default?: string;
+                    validate?: () => boolean;
+                }
+
+                interface textInput {
+                    default?: string;
+                    validate?: () => boolean;
+                    maxLength?: number;
+                    size?: string;
+                }
+
+                interface uiElement {
+                    id: string;
+                    type: number;
+                    title?: string;
+                    hidden?: boolean;
+                    className?: string;
+                    style?: string;
+                    accessKey?: string;
+                }
+
+                interface vbox {
+                    width?: string;
+                    heights?: string[];
+                    align?: string;
+                    padding?: string;
+                    expand?: boolean;
+                }
+            }
+
+            class fieldset extends uiElement {
+                constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.fieldSet);
+            }
+
+
+            class file extends ui.dialog.labeledElement {
+                constructor(dialog: dialog, elementDefinition: definitions.file, htmlList: any[]);
+
+                getAction(): string;
+                registerEvents(definition: { [key: string]: any }): file;
+                reset(): void;
+                setInitValue(): void;
+                submit(): file;
+            }
+
+
+            class fileButton extends button {
+                constructor(dialog: dialog, elementDefinition: definitions.fileButton, htmlList: any[]);
+            }
+
+
+            class hbox extends uiElement {
+                constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.hbox);
+
+                getChild(indices: number): ui.dialog.uiElement;
+                getChild(indices: number[]): ui.dialog.uiElement[];
+            }
+
+
+            class html extends uiElement {
+                constructor(dialog: dialog, elementDefinition: definitions.html, htmlList: any[]);
+
+            }
+
+
+            class iframeElement extends uiElement {
+
+            }
+
+
+            class labeledElement extends uiElement {
+                constructor(dialog: dialog, elementDefinition: definitions.labeledElement, htmlList: any[], contentHtml: () => string);
+
+                getLabel(): string;
+                setlabel(label: string): ui.dialog.labeledElement;
+            }
+
+
+            class radio extends ui.dialog.labeledElement {
+                constructor(dialog: dialog, elementDefinition: definitions.radio, htmlList: any[]);
+
+                accessKeyUp(): void;
+                getValue(): string;
+                setValue(value: string, noChangeEvent: boolean): undefined;
+            }
+
+
+            class select extends uiElement {
+                constructor(dialog: dialog, elementDefinition: definitions.select, htmlList: any[]);
+
+                add(label: string, value?: string, indexedDB?: number): select;
+                clear(): select;
+                remove(index: number): select;
+            }
+
+
+            class textarea extends labeledElement {
+                constructor(dialog: dialog, elementDefinition: definitions.textarea, htmlList: any[]);
+            }
+
+
+            class textInput extends ui.dialog.labeledElement {
+                constructor(dialog: dialog, elementDefinition: definitions.textInput, htmlList: any[]);
+
+                accessKeyUp(): void;
+                focus(): undefined;
+                getDirectionMarker(): string;
+                getValue(): string;
+                select(): void;
+                setDirectionMarker(dir: string): void;
+                setValue(value: string, noChangeEvent: boolean): textInput;
+            }
+
+            class uiElement {
+                eventProcessors: any;
+
+                constructor(dialog: dialog, elementDefinition: definitions.uiElement, htmlList: any[], nodeNameArg?: () => string | string, stylesArg?: () => { [key: string]: any } | { [key: string]: any }, attributesArg?: () => { [key: string]: any } | { [key: string]: any }, contentsArg?: () => { [key: string]: any } | string); // Not sure that the htmlList array type is right.
+
+                accessKeyDown(dialog: dialog, key: string): void;
+                accessKeyUp(dialog: dialog, key: string): void;
+                disable(): void;
+                enable(): void;
+                focus(): ui.dialog.uiElement;
+                getDialog(): dialog;
+                getElement(): dom.element;
+                getInputElement(): dom.element;
+                getValue(): any;
+                isChanged(): boolean;
+                isEnabled(): boolean;
+                isFocusable(): boolean;
+                isVisible(): boolean;
+                registerEvents(definition: CKEDITOR.dialog.definition.uiElement): ui.dialog.uiElement;
+                selectParentTab(): ui.dialog.uiElement;
+                setValue(value: any, noChangeEvent: boolean): ui.dialog.uiElement;
+            }
+
+            class vbox extends hbox {
+                constructor(dialog: dialog, childObjList: any[], childHtmlList: any[], htmlList: any[], elementDefinition: definitions.vbox);
+            }
+        }
+
+        class balloonPanel {
+            activeShowListeners: { [id: number]: { removeListener: listenerRegistration } };
+            editor: editor;
+            focusables: { [id: number]: dom.element };
+            height: string;
+            parts: balloonPanel.parts;
+            rect: balloonPanel.rect;
+            showListeners: { [id: number]: () => listenerRegistration };
+            templateDefinitions: balloonPanel.templateDefinitions;
+            templates: balloonPanel.templates;
+            triangleHeight: number;
+            triangleMinDistance: number;
+            triangleWidth: number;
+            width: number;
+
+            activeShowListener(id: number): void;
+            activateShowListeners(): void;
+            addShowListener(listener: () => listenerRegistration): listenerRegistration;
+            attach(element: dom.element, options?: dom.element | boolean | { focusElement?: dom.element | boolean, show?: boolean }): void;
+            blur(): void;
+            build(): void;
+            deactivateShowListener(id: number): void;
+            deregisterFocusable(element: dom.element): void;
+            destroy(): void;
+            getHeight(): number;
+            getWidth(): number;
+            hide(): void;
+            move(top: number, left: number): void;
+            registerFocusable(element: dom.element): void;
+            removeShowListener(id: number): void;
+            resize(width: number, height: number): void;
+            setTitle(title: string): void;
+            setTriangle(side: 'left' | 'right' | 'top' | 'bottom'): void;
+            show(): void;
+        }
+
+        namespace balloonPanel {
+            interface definition {
+                content?: string;
+                title?: string;
+            }
+
+            interface templates {
+                close?: template;
+                content?: template;
+                panel?: template;
+                title?: template;
+                triangle?: template;
+                triangleInner?: template;
+                triangleOuter?: template;
+            }
+
+            interface templateDefinitions {
+                close?: string;
+                content?: string;
+                panel?: string;
+                title?: string;
+                triangle?: string;
+                triangleInner?: string;
+                triangleOuter?: string;
+            }
+
+            interface rect {
+                height?: number;
+                left?: number;
+                top?: number;
+                visible?: boolean;
+                width?: number;
+            }
+
+            interface parts {
+                close?: dom.element;
+                content?: dom.element;
+                panel?: dom.element;
+                title?: dom.element;
+                triangle?: dom.element;
+                triangleInner?: dom.element;
+                triangleOuter?: dom.element;
+            }
+        }
+
+        class balloonToolbar {
+            constructor(editor: editor, definition: { [key: string]: any });
+            addItem(name: string, element: button | richCombo): void;
+            addItems(elements: { [itemName: string]: button | richCombo }): void;
+            deleteItem(name: string): void;
+            destroy(): void;
+            getItem(name: string): button | richCombo;
+            hide(): void;
+            refresh(): void;
+            show(): void;
+        }
+
+        class button {
+            static readonly handler: handlerDefinition<button>;
+
+            constructor(definition: { [key: string]: any });
+            getState(): number;
+            render(editor: editor, output: string[]): void;
+            setState(state: number): void;
+            toFeature(editor: editor): feature;
+        }
+
+        class floatPanel {
+            constructor(editor: editor, parentElement: dom.element, definition: { [key: string]: any }, level: number);
+            addBlock(name: string, block: { [key: string]: any }): void;
+            addListBlock(name: string, multiSelect: boolean): void;
+            allowBlur(allow: boolean): void;
+            blur(): void;
+            focus(): void;
+            getBlock(name: string): panel.block;
+            hide(returnFocus: boolean): void;
+            hideChild(restoreFocus: boolean): void;
+            reposition(): void;
+            showAsChild(panel: floatPanel, blckName: string, offsetParent: dom.element, corner: number, offsetX?: number, offsetY?: number): void;
+            showBlock(name: string, offsetParent: dom.element, corner: number, offsetX?: number, offsetY?: number, callback?: () => void): void;
+        }
+
+        class handlerDefinition<T> {
+            contentsElement: dom.element;
+            create(definition: { [key: string]: any }): T;
+        }
+
+        class menuButton extends button {
+
+        }
+
+        class panel {
+            constructor(document: dom.document, definition: { [key: string]: any });
+            addBlock(name: string, block: { [key: string]: any }): void;
+            getBlock(name: string): panel.block;
+            render(editor: editor, output?: string[]): void;
+            showBlock(name: string): void;
+        }
+
+        namespace panel {
+            class block {
+                getItems(): dom.nodeList;
+                markItem(index: number): void;
+            }
+
+            const handler: handlerDefinition<panel>;
+        }
+
+        class panelButton extends button {
+
+        }
+
+        class richCombo {
+            static readonly handler: handlerDefinition<richCombo>;
+            render(editor: editor, output: string[]): void;
+        }
+    }
+
+    class xml {
+        baseXml: any;
+
+        constructor(xmlObjectOrData: any);
+        getInnerXml(xpath: string, contextNode?: any): string;
+        selectNodes(xpath: string, contextNode?: any): any[];
+        selectSingleNode(xpath: string, contextNode?: any): any;
+    }
+
+    interface toolbarGroups {
+        name?: string;
+        groups?: string[];
+    }
+
+    namespace config {
+        interface styleObject {
+            name?: string;
+            element: string;
+            attributes?: { [key: string]: any };
+            styles?: { [key: string]: any };
+            overrides?: { [key: string]: any };
+        }
+    }
+
+    interface sharedSpace {
+        top?: string | HTMLElement;
+        bottom?: string | HTMLElement;
+    }
+
+    interface IMenuItemDefinition {
+        label: string,
+        command: string,
+        icon: string
+        group: string,
+        order: number
+    }
+
+    interface buttonDefinition {
+        icon?: string;
+        iconOffset?: number;
+        label: string;
+        command: string;
+        toolbar: string;
+    }
+}

From 3e19417849aaddfcba44bdf0df157a00847ebc87 Mon Sep 17 00:00:00 2001
From: stuartlo <stuartlo@microsoft.com>
Date: Wed, 23 May 2018 16:57:48 -0700
Subject: [PATCH 387/575] Updated tsconfig paths for v2

---
 types/ckeditor/v2/tsconfig.json | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/types/ckeditor/v2/tsconfig.json b/types/ckeditor/v2/tsconfig.json
index e845e96c0a..5cb7f16ad2 100644
--- a/types/ckeditor/v2/tsconfig.json
+++ b/types/ckeditor/v2/tsconfig.json
@@ -9,10 +9,18 @@
         "noImplicitThis": false,
         "strictNullChecks": false,
         "strictFunctionTypes": true,
-        "baseUrl": "../",
+        "baseUrl": "../../",
         "typeRoots": [
-            "../"
+            "../../"
         ],
+        "paths": {
+            "ckeditor": [
+                "ckeditor/v2"
+            ],
+            "ckeditor/*": [
+                "ckeditor/v2/*"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true

From 4daed3919dfdd32e128dcb5922da1cda2f02ca0d Mon Sep 17 00:00:00 2001
From: stuartlo <stuartlo@microsoft.com>
Date: Wed, 23 May 2018 17:25:42 -0700
Subject: [PATCH 388/575] Updating v2 header

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

diff --git a/types/ckeditor/v2/index.d.ts b/types/ckeditor/v2/index.d.ts
index ccc58b7f71..34d243ae3f 100644
--- a/types/ckeditor/v2/index.d.ts
+++ b/types/ckeditor/v2/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for CKEditor
+// Type definitions for CKEditor v2.0.0
 // Project: http://ckeditor.com/
 // Definitions by: Thomas Wittwer <https://github.com/wittwert>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From da4e11734601ec4b4df074dbf5ca67839b524988 Mon Sep 17 00:00:00 2001
From: Vincent Siao <vincent@asana.com>
Date: Wed, 23 May 2018 19:43:54 -0700
Subject: [PATCH 389/575] Add typings for create-subscription

---
 .../create-subscription-tests.tsx             | 119 ++++++++++++++++++
 types/create-subscription/index.d.ts          |  44 +++++++
 types/create-subscription/tsconfig.json       |  24 ++++
 types/create-subscription/tslint.json         |   1 +
 4 files changed, 188 insertions(+)
 create mode 100644 types/create-subscription/create-subscription-tests.tsx
 create mode 100644 types/create-subscription/index.d.ts
 create mode 100644 types/create-subscription/tsconfig.json
 create mode 100644 types/create-subscription/tslint.json

diff --git a/types/create-subscription/create-subscription-tests.tsx b/types/create-subscription/create-subscription-tests.tsx
new file mode 100644
index 0000000000..891adc5ede
--- /dev/null
+++ b/types/create-subscription/create-subscription-tests.tsx
@@ -0,0 +1,119 @@
+import * as React from "react";
+import { createSubscription, Subscription } from "create-subscription";
+
+//
+// Example: Subscribing to event dispatchers
+// https://github.com/facebook/react/blob/fa7fa812c70084e139d13437fb204fcdf9152299/packages/create-subscription/README.md#subscribing-to-event-dispatchers
+// ----------------------------------------------------------------------------
+
+// Start with a simple component.
+// In this case, it's a functional component, but it could have been a class.
+function FollowerComponent({ followersCount }: { followersCount: number }) {
+    return <div>You have {followersCount} followers!</div>;
+}
+
+interface EventDispatcher<T> {
+    value: T;
+    addEventListener(eventName: "change", onChange: (newValue: T) => any): void;
+    removeEventListener(eventName: "change", onChange: (newValue: T) => any): void;
+}
+
+// Create a wrapper component to manage the subscription.
+// $ExpectType Subscription<EventDispatcher<number>, number>
+const EventHandlerSubscription = createSubscription({
+    getCurrentValue: (eventDispatcher: EventDispatcher<number>) => eventDispatcher.value,
+    subscribe: (eventDispatcher: EventDispatcher<number>, callback) => {
+        const onChange = (event: any) => callback(eventDispatcher.value);
+        eventDispatcher.addEventListener("change", onChange);
+        return () => eventDispatcher.removeEventListener("change", onChange);
+    }
+});
+
+declare const eventDispatcher: EventDispatcher<number>;
+
+// Your component can now be used as shown below.
+// In this example, 'eventDispatcher' represents a generic event dispatcher.
+<EventHandlerSubscription source={eventDispatcher}>
+    {value => {
+        // $ExpectType number
+        const followersCount = value;
+        return <FollowerComponent followersCount={followersCount} />;
+    }}
+</EventHandlerSubscription>;
+
+//
+// Example: Subscribing to event dispatchers
+// https://github.com/facebook/react/blob/fa7fa812c70084e139d13437fb204fcdf9152299/packages/create-subscription/README.md#subscribing-to-a-promise
+// ----------------------------------------------------------------------------
+
+// Start with a simple component.
+const LoadingComponent: React.SFC<{ loadingStatus: string | undefined }> = ({ loadingStatus }) => {
+    if (loadingStatus === undefined) {
+        // Loading
+    } else if (loadingStatus === null) {
+        // Error
+    } else {
+        // Success
+    }
+    return null;
+};
+
+// Wrap the functional component with a subscriber HOC.
+// This HOC will manage subscriptions and pass values to the decorated component.
+// It will add and remove subscriptions in an async-safe way when props change.
+// $ExpectType Subscription<Promise<string>, string | undefined>
+const PromiseSubscription = createSubscription({
+    getCurrentValue: promise => {
+        // There is no way to synchronously read a Promise's value,
+        // So this method should return undefined.
+        return undefined;
+    },
+    subscribe: (promise: Promise<string>, callback: (newValue: string | undefined) => void) => {
+        promise.then(
+            // Success
+            callback,
+            // Failure
+            () => callback(undefined)
+        );
+
+        // There is no way to "unsubscribe" from a Promise.
+        // create-subscription will still prevent stale values from rendering.
+        return () => {};
+    }
+});
+
+declare const loadingPromise: Promise<string>;
+
+// Your component can now be used as shown below.
+<PromiseSubscription source={loadingPromise}>
+    {value => {
+        // $ExpectType string | undefined
+        const loadingStatus = value;
+        return <LoadingComponent loadingStatus={loadingStatus} />;
+    }}
+</PromiseSubscription>;
+
+//
+// Error cases
+// ----------------------------------------------------------------------------
+
+declare const wrongPromise: Promise<number>;
+
+// $ExpectError
+<PromiseSubscription source={wrongPromise}>
+    {value => null}
+</PromiseSubscription>;
+
+// $ExpectError
+const MismatchSubscription = createSubscription({
+    getCurrentValue: (a: number) => null,
+    subscribe: (a: string, callback) => (() => undefined)
+});
+
+// $ExpectError
+const NoUnsubscribe = createSubscription({
+    getCurrentValue: (a: number) => a,
+    subscribe: (a: number, callback) => {
+        // oops, should've returned a callback here
+    }
+});
diff --git a/types/create-subscription/index.d.ts b/types/create-subscription/index.d.ts
new file mode 100644
index 0000000000..28cfbd4e31
--- /dev/null
+++ b/types/create-subscription/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for create-subscription 16.4
+// Project: https://github.com/facebook/react/tree/master/packages/create-subscription
+// Definitions by: Asana <https://github.com/Asana>
+//                 Vincent Siao <https://github.com/vsiao>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as React from "react";
+
+export interface SubscriptionProps<S, T> {
+    children: (value: T) => React.ReactNode;
+    source: S;
+}
+
+export interface SubscriptionState<S, T> {
+    source: S;
+    value: T;
+}
+
+export interface Subscription<S, T> extends React.ComponentClass<SubscriptionProps<S, T>> {}
+export type Unsubscribe = () => any;
+
+export interface SubscriptionConfig<S, T> {
+    /**
+     * Synchronously gets the value for the subscribed property.
+     * Return undefined if the subscribable value is undefined,
+     * Or does not support synchronous reading (e.g. native Promise).
+     */
+    getCurrentValue: (source: S) => T;
+
+    /**
+     * Set up a subscription for the subscribable value in props, and return an unsubscribe function.
+     * Return false to indicate the property cannot be unsubscribed from (e.g. native Promises).
+     * Due to the variety of change event types, subscribers should provide their own handlers.
+     * Those handlers should not attempt to update state though;
+     * They should call the callback() instead when a subscription changes.
+     */
+    subscribe: (
+        source: S,
+        callback: (newValue: T) => void
+    ) => Unsubscribe;
+}
+
+export function createSubscription<S, T>(config: SubscriptionConfig<S, T>): Subscription<S, T>;
diff --git a/types/create-subscription/tsconfig.json b/types/create-subscription/tsconfig.json
new file mode 100644
index 0000000000..0e42cd3adb
--- /dev/null
+++ b/types/create-subscription/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",
+        "create-subscription-tests.tsx"
+    ]
+}
diff --git a/types/create-subscription/tslint.json b/types/create-subscription/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/create-subscription/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 664ccf2301ddc6e5805653e1c364f2b119cfb893 Mon Sep 17 00:00:00 2001
From: Vincent Siao <vincent@asana.com>
Date: Wed, 23 May 2018 20:57:57 -0700
Subject: [PATCH 390/575] [create-subscription] Remove unused state interface

---
 types/create-subscription/index.d.ts | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/types/create-subscription/index.d.ts b/types/create-subscription/index.d.ts
index 28cfbd4e31..3a4c090c1e 100644
--- a/types/create-subscription/index.d.ts
+++ b/types/create-subscription/index.d.ts
@@ -7,17 +7,6 @@
 
 import * as React from "react";
 
-export interface SubscriptionProps<S, T> {
-    children: (value: T) => React.ReactNode;
-    source: S;
-}
-
-export interface SubscriptionState<S, T> {
-    source: S;
-    value: T;
-}
-
-export interface Subscription<S, T> extends React.ComponentClass<SubscriptionProps<S, T>> {}
 export type Unsubscribe = () => any;
 
 export interface SubscriptionConfig<S, T> {
@@ -35,10 +24,14 @@ export interface SubscriptionConfig<S, T> {
      * Those handlers should not attempt to update state though;
      * They should call the callback() instead when a subscription changes.
      */
-    subscribe: (
-        source: S,
-        callback: (newValue: T) => void
-    ) => Unsubscribe;
+    subscribe: (source: S, callback: (newValue: T) => void) => Unsubscribe;
 }
 
+export interface SubscriptionProps<S, T> {
+    children: (value: T) => React.ReactNode;
+    source: S;
+}
+
+export interface Subscription<S, T> extends React.ComponentClass<SubscriptionProps<S, T>> {}
+
 export function createSubscription<S, T>(config: SubscriptionConfig<S, T>): Subscription<S, T>;

From de91a324596564c43bb33304b47924d028d334bb Mon Sep 17 00:00:00 2001
From: Ram <g.rmchndrn@gmail.com>
Date: Wed, 23 May 2018 23:59:39 -0400
Subject: [PATCH 391/575] Added definition for SMART on FHIR client library
 'fhirclient'. Version 0.1.12

---
 types/fhirclient/fhirclient-tests.ts | 681 ++++++++++++++++++++++++
 types/fhirclient/index.d.ts          | 740 +++++++++++++++++++++++++++
 types/fhirclient/tsconfig.json       |  24 +
 types/fhirclient/tslint.json         |   6 +
 4 files changed, 1451 insertions(+)
 create mode 100644 types/fhirclient/fhirclient-tests.ts
 create mode 100644 types/fhirclient/index.d.ts
 create mode 100644 types/fhirclient/tsconfig.json
 create mode 100644 types/fhirclient/tslint.json

diff --git a/types/fhirclient/fhirclient-tests.ts b/types/fhirclient/fhirclient-tests.ts
new file mode 100644
index 0000000000..57588c63cb
--- /dev/null
+++ b/types/fhirclient/fhirclient-tests.ts
@@ -0,0 +1,681 @@
+class Component {
+    openFhirServiceUrl = 'https://sb-fhir-stu3.smarthealthit.org/smartstu3/open';
+    closedFhirServiceUrl = 'https://sb-fhir-stu3.smarthealthit.org/smartstu3/data';
+
+    clientSettings: FHIR.SMART.OAuth2ClientSettings = {
+        client_id: '50a7f6ca-075a-47de-ab83-152814c3edb2',
+        scope: 'launch/patient user/*.* openid profile',
+        state: 'RandomStateOverride'
+    };
+
+    oauth2Configuration: FHIR.SMART.OAuth2Configuration = {
+        client: this.clientSettings,
+        server: this.closedFhirServiceUrl
+    };
+
+    authContext: FHIR.SMART.AuthContext = {
+        type: 'none'
+    };
+
+    context: FHIR.SMART.Context = {
+        serviceUrl: this.openFhirServiceUrl,
+        auth: this.authContext,
+        userId: 'tTFt1mD0vgox9npTe2ZA',
+        // Patient name: Abernathy,Francine
+        patientId: 'a509406a-5098-478c-b183-037d68a953d9'
+    };
+
+    observationEntry: FHIR.SMART.Entry = {
+        resource: {
+            'resourceType': 'Observation',
+            'id': 'c179f87f-e7d2-49b0-8838-c7cbf9b0da27',
+            'meta': {
+                'versionId': '1',
+                'lastUpdated': '2018-01-12T19:22:57.000+00:00',
+                'profile': [
+                    'http://standardhealthrecord.org/fhir/StructureDefinition/shr-observation-Observation'
+                ],
+                'tag': [
+                    {
+                        'system': 'https://smarthealthit.org/tags',
+                        'code': 'synthea-7-2017'
+                    }
+                ]
+            },
+            'status': 'final',
+            'category': [
+                {
+                    'coding': [
+                        {
+                            'system': 'http://hl7.org/fhir/observation-category'
+                        }
+                    ]
+                }
+            ],
+            'code': {
+                'coding': [
+                    {
+                        'system': 'http://loinc.org',
+                        'code': '69453-9',
+                        'display': 'Cause of Death [US Standard Certificate of Death]'
+                    }
+                ],
+                'text': 'Cause of Death [US Standard Certificate of Death]'
+            },
+            'subject': {
+                'reference': 'Patient/a509406a-5098-478c-b183-037d68a953d9'
+            },
+            'context': {
+                'reference': 'Encounter/fbebfcf2-86d8-4c56-9539-314be0ce5bed'
+            },
+            'effectiveDateTime': '1989-07-26T17:51:45-04:00',
+            'issued': '1989-07-26T17:51:45-04:00',
+            'valueCodeableConcept': {
+                'coding': [
+                    {
+                        'system': 'http://snomed.info/sct',
+                        'code': '185086009',
+                        'display': 'Chronic obstructive bronchitis (disorder)'
+                    }
+                ],
+                'text': 'Chronic obstructive bronchitis (disorder)'
+            }
+        }
+    };
+
+    weightObservationEntry: FHIR.SMART.Entry = {
+        'resource': {
+            'id': 'RandomId',
+            'resourceType': 'Observation',
+            'text': {
+                'status': 'generated',
+                'div': '<div>Human readable form</div>'
+            },
+            'status': 'final',
+            'category': [
+                {
+                    'coding': [
+                        {
+                            'system': 'http://hl7.org/fhir/observation-category',
+                            'code': 'vital-signs',
+                            'display': 'Vital Signs'
+                        }
+                    ]
+                }
+            ],
+            'code': {
+                'coding': [
+                    {
+                        'system': 'http://loinc.org',
+                        'code': '29463-7',
+                        'display': 'Body Weight'
+                    },
+                    {
+                        'system': 'http://loinc.org',
+                        'code': '3141-9',
+                        'display': 'Body weight Measured'
+                    },
+                    {
+                        'system': 'http://snomed.info/sct',
+                        'code': '27113001',
+                        'display': 'Body weight'
+                    },
+                    {
+                        'system': 'http://acme.org/devices/clinical-codes',
+                        'code': 'body-weight',
+                        'display': 'Body Weight'
+                    }
+                ]
+            },
+            'subject': {
+                'reference': 'Patient/example'
+            },
+            'context': {
+                'reference': 'Encounter/example'
+            },
+            'effectiveDateTime': '2016-03-28',
+            'valueQuantity': {
+                'value': 185,
+                'unit': 'lbs',
+                'system': 'http://unitsofmeasure.org',
+                'code': '[lb_us]'
+            }
+        }
+    };
+
+    bundle: FHIR.SMART.Bundle = {
+        bundle: {
+            'resourceType': 'Bundle',
+            'id': '936286e3-cf22-44c8-be9f-b8d1b950a9a3',
+            'meta': {
+                'lastUpdated': '2018-05-22T22:08:19.000+00:00'
+            },
+            'type': 'searchset',
+            'total': 1,
+            'link': [
+                {
+                    'relation': 'self',
+                    // tslint:disable-next-line:max-line-length
+                    'url': 'https://sb-fhir-stu3.smarthealthit.org/smartstu3/open?_getpages=8bbd1c3c-a90f-49c6-8394-ca7524b46774&_getpagesoffset=10&_count=10&_pretty=true&_bundletype=searchset'
+                },
+                {
+                    'relation': 'next',
+                    // tslint:disable-next-line:max-line-length
+                    'url': 'https://sb-fhir-stu3.smarthealthit.org/smartstu3/open?_getpages=8bbd1c3c-a90f-49c6-8394-ca7524b46774&_getpagesoffset=20&_count=10&_format=json&_pretty=true&_bundletype=searchset'
+                },
+                {
+                    'relation': 'prev',
+                    // tslint:disable-next-line:max-line-length
+                    'url': 'https://sb-fhir-stu3.smarthealthit.org/smartstu3/open?_getpages=8bbd1c3c-a90f-49c6-8394-ca7524b46774&_getpagesoffset=0&_count=10&_format=json&_pretty=true&_bundletype=searchset'
+                }
+            ],
+            'entry': [
+                {
+                    'fullUrl': 'https://sb-fhir-stu3.smarthealthit.org/smartstu3/open/Observation/152759',
+                    'resource': {
+                        'resourceType': 'Observation',
+                        'id': '152759',
+                        'meta': {
+                            'versionId': '1',
+                            'lastUpdated': '2018-05-22T20:42:56.000+00:00',
+                            'profile': [
+                                'http://standardhealthrecord.org/fhir/StructureDefinition/shr-observation-Observation'
+                            ],
+                            'tag': [
+                                {
+                                    'system': 'https://smarthealthit.org/tags',
+                                    'code': 'synthea-7-2017'
+                                }
+                            ]
+                        },
+                        'status': 'final',
+                        'category': [
+                            {
+                                'coding': [
+                                    {
+                                        'system': 'http://hl7.org/fhir/observation-category'
+                                    }
+                                ]
+                            }
+                        ],
+                        'code': {
+                            'coding': [
+                                {
+                                    'system': 'http://loinc.org',
+                                    'code': '69453-9',
+                                    'display': 'Cause of Death [US Standard Certificate of Death]'
+                                }
+                            ],
+                            'text': 'Cause of Death [US Standard Certificate of Death]'
+                        },
+                        'subject': {
+                            'reference': 'Patient/a509406a-5098-478c-b183-037d68a953d9'
+                        },
+                        'context': {
+                            'reference': 'Encounter/fbebfcf2-86d8-4c56-9539-314be0ce5bed'
+                        },
+                        'effectiveDateTime': '1989-07-26T17:51:45-04:00',
+                        'issued': '1989-07-26T17:51:45-04:00',
+                        'valueCodeableConcept': {
+                            'coding': [
+                                {
+                                    'system': 'http://snomed.info/sct',
+                                    'code': '185086009',
+                                    'display': 'Chronic obstructive bronchitis (disorder)'
+                                }
+                            ],
+                            'text': 'Chronic obstructive bronchitis (disorder)'
+                        }
+                    },
+                    'search': {
+                        'mode': 'match'
+                    }
+                }
+            ]
+        }
+    };
+
+    heightObservation: FHIR.SMART.Resource = {
+        'resourceType': 'Observation',
+        'id': 'body-height',
+        'meta': {
+            'profile': [
+                'http://hl7.org/fhir/StructureDefinition/vitalsigns'
+            ]
+        },
+        'text': {
+            'status': 'generated',
+            'div': '<div>Test</div>'
+        },
+        'status': 'final',
+        'category': [
+            {
+                'coding': [
+                    {
+                        'system': 'http://hl7.org/fhir/observation-category',
+                        'code': 'vital-signs',
+                        'display': 'Vital Signs'
+                    }
+                ],
+                'text': 'Vital Signs'
+            }
+        ],
+        'code': {
+            'coding': [
+                {
+                    'system': 'http://loinc.org',
+                    'code': '8302-2',
+                    'display': 'Body height'
+                }
+            ],
+            'text': 'Body height'
+        },
+        'subject': {
+            'reference': 'Patient/example'
+        },
+        'effectiveDateTime': '1999-07-02',
+        'valueQuantity': {
+            'value': 66.899999999999991,
+            'unit': 'in',
+            'system': 'http://unitsofmeasure.org',
+            'code': '[in_i]'
+        }
+    };
+
+    transactionBundle: FHIR.SMART.Bundle = {
+        bundle: {
+            'resourceType': 'Bundle',
+            'id': '936286e3-cf22-44c8-be9f-b8d1b950a9a3',
+            'meta': {
+                'lastUpdated': '2018-05-22T22:08:19.000+00:00'
+            },
+            'type': 'transaction',
+            'total': 1,
+            'link': [
+                {
+                    'relation': 'self',
+                    // tslint:disable-next-line:max-line-length
+                    'url': 'https://sb-fhir-stu3.smarthealthit.org/smartstu3/open?_getpages=8bbd1c3c-a90f-49c6-8394-ca7524b46774&_getpagesoffset=10&_count=10&_pretty=true&_bundletype=searchset'
+                },
+                {
+                    'relation': 'next',
+                    // tslint:disable-next-line:max-line-length
+                    'url': 'https://sb-fhir-stu3.smarthealthit.org/smartstu3/open?_getpages=8bbd1c3c-a90f-49c6-8394-ca7524b46774&_getpagesoffset=20&_count=10&_format=json&_pretty=true&_bundletype=searchset'
+                },
+                {
+                    'relation': 'prev',
+                    // tslint:disable-next-line:max-line-length
+                    'url': 'https://sb-fhir-stu3.smarthealthit.org/smartstu3/open?_getpages=8bbd1c3c-a90f-49c6-8394-ca7524b46774&_getpagesoffset=0&_count=10&_format=json&_pretty=true&_bundletype=searchset'
+                }
+            ],
+            'entry': [
+                {
+                    'fullUrl': 'https://sb-fhir-stu3.smarthealthit.org/smartstu3/open/Observation/152759',
+                    'resource': {
+                        'resourceType': 'Observation',
+                        'id': '152759',
+                        'meta': {
+                            'versionId': '1',
+                            'lastUpdated': '2018-05-22T20:42:56.000+00:00',
+                            'profile': [
+                                'http://standardhealthrecord.org/fhir/StructureDefinition/shr-observation-Observation'
+                            ],
+                            'tag': [
+                                {
+                                    'system': 'https://smarthealthit.org/tags',
+                                    'code': 'synthea-7-2017'
+                                }
+                            ]
+                        },
+                        'status': 'final',
+                        'category': [
+                            {
+                                'coding': [
+                                    {
+                                        'system': 'http://hl7.org/fhir/observation-category'
+                                    }
+                                ]
+                            }
+                        ],
+                        'code': {
+                            'coding': [
+                                {
+                                    'system': 'http://loinc.org',
+                                    'code': '69453-9',
+                                    'display': 'Cause of Death [US Standard Certificate of Death]'
+                                }
+                            ],
+                            'text': 'Cause of Death [US Standard Certificate of Death]'
+                        },
+                        'subject': {
+                            'reference': 'Patient/a509406a-5098-478c-b183-037d68a953d9'
+                        },
+                        'context': {
+                            'reference': 'Encounter/fbebfcf2-86d8-4c56-9539-314be0ce5bed'
+                        },
+                        'effectiveDateTime': '1989-07-26T17:51:45-04:00',
+                        'issued': '1989-07-26T17:51:45-04:00',
+                        'valueCodeableConcept': {
+                            'coding': [
+                                {
+                                    'system': 'http://snomed.info/sct',
+                                    'code': '185086009',
+                                    'display': 'Chronic obstructive bronchitis (disorder)'
+                                }
+                            ],
+                            'text': 'Chronic obstructive bronchitis (disorder)'
+                        }
+                    },
+                    'request': {
+                        'method': 'POST'
+                    },
+                    'search': {
+                        'mode': 'match'
+                    }
+                }
+            ]
+        }
+    };
+
+    searchParameter: FHIR.SMART.SearchParams = {
+        type: 'Observation',
+        query: {
+            code: '69453-9'
+        }
+    };
+
+    patientSpecificSearchParams: FHIR.SMART.SearchParams = {
+        patient: 'a509406a-5098-478c-b183-037d68a953d9',
+        type: 'Observation',
+        query: {
+            code: '69453-9'
+        }
+    };
+
+    resolveParameter: string[] = ['Observation.subject'];
+
+    historyParameter: FHIR.SMART.HistoryParams = {
+        id: '152768',
+        type: 'Observation',
+        count: 10,
+        params: { _extraParam: 'extraParamValue' }
+    };
+
+    resourceType: FHIR.SMART.ResourceType = {
+        type: 'Observation'
+    };
+
+    readParameter: FHIR.SMART.ReadParams = {
+        type: 'Observation',
+        id: '152768'
+    };
+
+    vreadParameter: FHIR.SMART.VersionReadParams = {
+        type: 'Observation',
+        id: '152768',
+        versionId: '1'
+    };
+
+    resolveParameter2: FHIR.SMART.ResolveParams = {
+        reference: this.observationEntry.resource.subject,
+        resource: this.observationEntry.resource,
+        bundle: this.bundle.bundle
+    };
+
+    resourceParameter: FHIR.SMART.ResourceParameter = {
+        resource: 'Patient',
+        id: 'a509406a-5098-478c-b183-037d68a953d9'
+    };
+
+    oauth2ReadyCallback = (smartClient: FHIR.SMART.SMARTClient) => {
+        // Client interacting after a successful OAuth2 authorization workflow
+        const api: FHIR.SMART.Api = smartClient.api;
+
+        // FHIR API methods exposed by fhir.js
+        api.conformance(this.context).then(this.apiSuccess, this.apiError);
+        api.create(this.observationEntry).then(this.apiSuccess, this.apiError);
+        api.delete(this.observationEntry).then(this.apiSuccess, this.apiError);
+        api.document(this.observationEntry).then(this.apiSuccess, this.apiError);
+        api.drain(this.searchParameter, this.drainProcess, this.drainDone, this.apiError);
+        api.fetchAll(this.searchParameter).then(this.fetchAllSuccess, this.apiError);
+        api.fetchAllWithReferences(this.searchParameter, this.resolveParameter)
+            .then(this.fetchAllWithReferencesSuccess, this.apiError);
+        api.history(this.historyParameter).then(this.apiSuccess, this.apiError);
+        api.nextPage(this.bundle).then(this.apiSuccess, this.apiError);
+        api.prevPage(this.bundle).then(this.apiSuccess, this.apiError);
+        api.profile(this.resourceType).then(this.apiSuccess, this.apiError);
+        api.read(this.readParameter).then(this.apiSuccess, this.apiError);
+        api.resolve(this.resolveParameter2).then(this.apiSuccess, this.apiError);
+        api.resourceHistory(this.historyParameter).then(this.apiSuccess, this.apiError);
+        api.search(this.searchParameter).then(this.apiSuccess, this.apiError);
+        api.search(this.patientSpecificSearchParams).then(this.apiSuccess, this.apiError);
+        api.transaction(this.transactionBundle).then(this.apiSuccess, this.apiError);
+        api.typeHistory(this.historyParameter).then(this.apiSuccess, this.apiError);
+        api.update(this.observationEntry).then(this.apiSuccess, this.apiError);
+        api.validate(this.observationEntry).then(this.apiSuccess, this.apiError);
+        api.vread(this.vreadParameter).then(this.apiSuccess, this.apiError);
+
+        const objectPopulatedWithHeader = smartClient.authenticated({});
+        smartClient.fetchBinary(this.observationEntry.resource.subject.reference).then(this.fetchBinarySuccess, this.apiError);
+        smartClient.get(this.resourceParameter).then(this.apiSuccess, this.apiError);
+        smartClient.getBinary(this.observationEntry.resource.subject.reference).then(this.fetchBinarySuccess, this.apiError);
+
+        // Patient scoped FHIR API calls
+        if (smartClient.patient) {
+            const patient: FHIR.SMART.Patient = smartClient.patient;
+            const patientId: string = patient.id;
+            const patientApi: FHIR.SMART.Api = patient.api;
+
+            patientApi.conformance(this.context).then(this.apiSuccess, this.apiError);
+            patientApi.create(this.observationEntry).then(this.apiSuccess, this.apiError);
+            patientApi.delete(this.observationEntry).then(this.apiSuccess, this.apiError);
+            patientApi.document(this.observationEntry).then(this.apiSuccess, this.apiError);
+            patientApi.drain(this.searchParameter, this.drainProcess, this.drainDone, this.apiError);
+            patientApi.fetchAll(this.searchParameter).then(this.fetchAllSuccess, this.apiError);
+            patientApi.fetchAllWithReferences(this.searchParameter, this.resolveParameter)
+                .then(this.fetchAllWithReferencesSuccess, this.apiError);
+            patientApi.history(this.historyParameter).then(this.apiSuccess, this.apiError);
+            patientApi.nextPage(this.bundle).then(this.apiSuccess, this.apiError);
+            patientApi.prevPage(this.bundle).then(this.apiSuccess, this.apiError);
+            patientApi.profile(this.resourceType).then(this.apiSuccess, this.apiError);
+            patientApi.read(this.readParameter).then(this.apiSuccess, this.apiError);
+            patientApi.resolve(this.resolveParameter2).then(this.apiSuccess, this.apiError);
+            patientApi.resourceHistory(this.historyParameter).then(this.apiSuccess, this.apiError);
+            patientApi.search(this.searchParameter).then(this.apiSuccess, this.apiError);
+            patientApi.search(this.patientSpecificSearchParams).then(this.apiSuccess, this.apiError);
+            patientApi.transaction(this.transactionBundle).then(this.apiSuccess, this.apiError);
+            patientApi.typeHistory(this.historyParameter).then(this.apiSuccess, this.apiError);
+            patientApi.update(this.observationEntry).then(this.apiSuccess, this.apiError);
+            patientApi.validate(this.observationEntry).then(this.apiSuccess, this.apiError);
+            patientApi.vread(this.vreadParameter).then(this.apiSuccess, this.apiError);
+
+            patient.read().then(this.apiSuccess, this.apiError);
+        }
+
+        // SMART client context helpers
+        const context: FHIR.SMART.Context = smartClient.server;
+        if (smartClient.server.auth) {
+            const auth: FHIR.SMART.AuthContext = smartClient.server.auth;
+        }
+        if (smartClient.server.patientId) {
+            const patientIdInContext: string = smartClient.server.patientId;
+        }
+        const fhirServiceUrl = smartClient.server.serviceUrl;
+        if (smartClient.server.userId) {
+            const userIdInContext: string = smartClient.server.userId;
+        }
+        const state: FHIR.SMART.OAuth2Configuration = smartClient.state;
+        const tokenResponse = smartClient.tokenResponse;
+
+        // User in context
+        const userId = smartClient.userId;
+        const userInContext = smartClient.user;
+        smartClient.user.read().then(this.apiSuccess, this.apiError);
+
+        // SMART client helper methods
+        // Observation helpers
+        const observationByCodesFn = smartClient.byCodes(this.observationEntry.resource, 'code');
+        const observations = observationByCodesFn('29463-7');
+        const observationsByCodes: FHIR.SMART.ObservationsByCode = smartClient.byCode(this.observationEntry.resource, 'code');
+        // Unit helpers
+        const numericValue = smartClient.units.any(this.observationEntry.resource.valueQuantity);
+        const convertedHeightValueInCm = smartClient.units.cm(this.heightObservation.valueQuantity);
+        const convertedWeightValueInKg = smartClient.units.kg(this.observationEntry.resource.valueQuantity);
+    }
+
+    oauth2ReadyErrback = (error: any) => {
+        FHIR.oauth2.authorize(this.oauth2Configuration, (authError) => {
+            console.log(authError);
+        });
+    }
+
+    oauth2ResolveAuthTypeCallback = (type: string) => {
+        console.log(type);
+    }
+
+    oauth2ResolveAuthTypeErrback = (error: any) => {
+        console.log(error);
+    }
+
+    apiSuccess = (response: FHIR.SMART.Response) => {
+        console.log('Response from the FHIR server:');
+        console.log(response);
+    }
+
+    apiError = (response: FHIR.SMART.Response) => {
+        console.log('Error response from the FHIR server:');
+        console.log(response);
+    }
+
+    drainProcess = (entries: FHIR.SMART.Entry[]) => {
+        console.log('Drain Process:');
+        console.log(entries);
+    }
+
+    drainDone = () => {
+        console.log('Drain Done');
+    }
+
+    fetchAllSuccess = (entries: FHIR.SMART.Entry[]) => {
+        console.log('Fetch all success:');
+        console.log(entries);
+    }
+
+    fetchAllWithReferencesSuccess = (entries: FHIR.SMART.Entry[], resolvedReferences: FHIR.SMART.ResolveFn) => {
+        console.log('Fetch all with references success:');
+        console.log(entries);
+        console.log('Resolved References');
+        console.log(resolvedReferences(this.observationEntry.resource, this.observationEntry.resource.subject));
+    }
+
+    genericCallback = (data: any) => {
+        console.log(data);
+    }
+
+    fetchBinarySuccess = (blob: any) => {
+        // const reader = new FileReader();
+        // reader.addEventListener('loadend', function () {
+        //     console.log('Blob content');
+        //     console.log(reader.result);
+        // });
+        // reader.readAsArrayBuffer(blob);
+    }
+
+    openSmartFhir(): void {
+        // Open SMART on FHIR server interaction
+        const openSmartClient: FHIR.SMART.Client = FHIR.client(this.context);
+        const api: FHIR.SMART.Api = openSmartClient.api;
+
+        api.conformance(this.context).then(this.apiSuccess, this.apiError);
+        api.create(this.observationEntry).then(this.apiSuccess, this.apiError);
+        api.delete(this.observationEntry).then(this.apiSuccess, this.apiError);
+        api.document(this.observationEntry).then(this.apiSuccess, this.apiError);
+        api.drain(this.searchParameter, this.drainProcess, this.drainDone, this.apiError);
+        api.fetchAll(this.searchParameter).then(this.fetchAllSuccess, this.apiError);
+        api.fetchAllWithReferences(this.searchParameter, this.resolveParameter)
+            .then(this.fetchAllWithReferencesSuccess, this.apiError);
+        api.history(this.historyParameter).then(this.apiSuccess, this.apiError);
+        api.nextPage(this.bundle).then(this.apiSuccess, this.apiError);
+        api.prevPage(this.bundle).then(this.apiSuccess, this.apiError);
+        api.profile(this.resourceType).then(this.apiSuccess, this.apiError);
+        api.read(this.readParameter).then(this.apiSuccess, this.apiError);
+        api.resolve(this.resolveParameter2).then(this.apiSuccess, this.apiError);
+        api.resourceHistory(this.historyParameter).then(this.apiSuccess, this.apiError);
+        api.search(this.searchParameter).then(this.apiSuccess, this.apiError);
+        api.search(this.patientSpecificSearchParams).then(this.apiSuccess, this.apiError);
+        api.transaction(this.transactionBundle).then(this.apiSuccess, this.apiError);
+        api.typeHistory(this.historyParameter).then(this.apiSuccess, this.apiError);
+        api.update(this.observationEntry).then(this.apiSuccess, this.apiError);
+        api.validate(this.observationEntry).then(this.apiSuccess, this.apiError);
+        api.vread(this.vreadParameter).then(this.apiSuccess, this.apiError);
+
+        openSmartClient.fetchBinary(this.observationEntry.resource.subject.reference).then(this.fetchBinarySuccess, this.apiError);
+        openSmartClient.get(this.resourceParameter).then(this.apiSuccess, this.apiError);
+        openSmartClient.getBinary(this.observationEntry.resource.subject.reference).then(this.fetchBinarySuccess, this.apiError);
+
+        if (openSmartClient.patient) {
+            const patient: FHIR.SMART.Patient = openSmartClient.patient;
+            const patientApi: FHIR.SMART.Api = patient.api;
+            const patientId: string = patient.id;
+            patientApi.conformance(this.context).then(this.apiSuccess, this.apiError);
+            patientApi.create(this.observationEntry).then(this.apiSuccess, this.apiError);
+            patientApi.delete(this.observationEntry).then(this.apiSuccess, this.apiError);
+            patientApi.document(this.observationEntry).then(this.apiSuccess, this.apiError);
+            patientApi.drain(this.searchParameter, this.drainProcess, this.drainDone, this.apiError);
+            patientApi.fetchAll(this.searchParameter).then(this.fetchAllSuccess, this.apiError);
+            patientApi.fetchAllWithReferences(this.searchParameter, this.resolveParameter)
+                .then(this.fetchAllWithReferencesSuccess, this.apiError);
+            patientApi.history(this.historyParameter).then(this.apiSuccess, this.apiError);
+            patientApi.nextPage(this.bundle).then(this.apiSuccess, this.apiError);
+            patientApi.prevPage(this.bundle).then(this.apiSuccess, this.apiError);
+            patientApi.profile(this.resourceType).then(this.apiSuccess, this.apiError);
+            patientApi.read(this.readParameter).then(this.apiSuccess, this.apiError);
+            patientApi.resolve(this.resolveParameter2).then(this.apiSuccess, this.apiError);
+            patientApi.resourceHistory(this.historyParameter).then(this.apiSuccess, this.apiError);
+            patientApi.search(this.searchParameter).then(this.apiSuccess, this.apiError);
+            patientApi.search(this.patientSpecificSearchParams).then(this.apiSuccess, this.apiError);
+            patientApi.transaction(this.transactionBundle).then(this.apiSuccess, this.apiError);
+            patientApi.typeHistory(this.historyParameter).then(this.apiSuccess, this.apiError);
+            patientApi.update(this.observationEntry).then(this.apiSuccess, this.apiError);
+            patientApi.validate(this.observationEntry).then(this.apiSuccess, this.apiError);
+            patientApi.vread(this.vreadParameter).then(this.apiSuccess, this.apiError);
+            patient.read().then(this.apiSuccess, this.apiError);
+        }
+
+        const context: FHIR.SMART.Context = openSmartClient.server;
+        if (openSmartClient.server.auth) {
+            const auth: FHIR.SMART.AuthContext = openSmartClient.server.auth;
+        }
+        if (openSmartClient.server.patientId) {
+            const patientIdInContext: string = openSmartClient.server.patientId;
+        }
+        const fhirServiceUrl = openSmartClient.server.serviceUrl;
+        if (openSmartClient.server.userId) {
+            const userIdInContext: string = openSmartClient.server.userId;
+        }
+
+        const userId = openSmartClient.userId;
+        const userInContext = openSmartClient.user;
+        openSmartClient.user.read().then(this.apiSuccess, this.apiError);
+
+        const observationByCodesFn = openSmartClient.byCodes(this.observationEntry.resource, 'code');
+        const observations = observationByCodesFn('29463-7');
+        const observationsByCodes: FHIR.SMART.ObservationsByCode = openSmartClient.byCode(this.observationEntry.resource, 'code');
+
+        const numericValue = openSmartClient.units.any(this.observationEntry.resource.valueQuantity);
+        const convertedHeightValueInCm = openSmartClient.units.cm(this.heightObservation.valueQuantity);
+        const convertedWeightValueInKg = openSmartClient.units.kg(this.observationEntry.resource.valueQuantity);
+    }
+
+    closedSmartOnFhir() {
+        // Closed FHIR server which requires user authorization
+        FHIR.oauth2.ready(this.oauth2ReadyCallback, this.oauth2ReadyErrback);
+        FHIR.oauth2.resolveAuthType(this.closedFhirServiceUrl, this.oauth2ResolveAuthTypeCallback, this.oauth2ResolveAuthTypeErrback);
+    }
+}
+
+let component = new Component();
+// Perform the API interactions on the Open SMART on FHIR sandbox server
+component.openSmartFhir();
+// Perform the API interactions on the Closed SMART on FHIR sandbox server(Requires user authorization)
+component.closedSmartOnFhir();
diff --git a/types/fhirclient/index.d.ts b/types/fhirclient/index.d.ts
new file mode 100644
index 0000000000..4d4b52ba5d
--- /dev/null
+++ b/types/fhirclient/index.d.ts
@@ -0,0 +1,740 @@
+// Type definitions for fhirclient 0.1
+// Project: https://github.com/smart-on-fhir/client-js
+// Definitions by: Ramachandran Gokulachandran <https://github.com/rmchndrng>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/**
+ * Namespace containing all global FHIR related definitions
+ */
+declare namespace FHIR {
+    /**
+     * Namespace containing all the SMART on FHIR related definitions
+     */
+    namespace SMART {
+        /**
+         * FHIR API instance which can be used to make API calls to the FHIR server.
+         * This exposes all the methods implemented by jqFhir.js adapter of fhir.js client library
+         * https://github.com/FHIR/fhir.js
+         */
+        interface Api {
+            /**
+             * GET BASEURL/metadata
+             *
+             * @param input : An override to the base config object or just an empty object {}
+             */
+            conformance(input: any): Promise<Response>;
+
+            /**
+             * POST BASEURL/{resourceType} BODY: {entry without id}
+             * @param entry : A valid FHIR entry containing the resource.
+             */
+            create(entry: Entry): Promise<Response>;
+
+            /**
+             * DELETE BASEURL/{resourceType} BODY {entry with id}
+             * @param entry : A valid FHIR entry object containing the resource object
+             * or an object containing the id property(id of the resource to be deleted)
+             */
+            delete(entry: Entry): Promise<Response>;
+
+            /**
+             * POST BASEURL/Document
+             * @param document
+             */
+            document(document: Entry): Promise<Response>;
+
+            /**
+             * GET BASEURL/{resourceType}?searchParams
+             * Fetch all the resources based on the search parameter (keeps on calling next method to gett all the pages)
+             * and process the result set of each page
+             * @param params Search Parameter, same as parameter of the Search method
+             * @param process Function called by passing the result set of each page fetched.
+             * @param done Function called once all the resources are fetched
+             * @param fail Function called when an error occurs in the process
+             */
+            drain(params: SearchParams, process: (entries: Entry[]) => any, done: () => any, fail: (error: any) => any): void;
+
+            /**
+             * GET BASEURL/{resourceType}?searchParams
+             * Fetch all the resources of a particular resource type and that meets the search filter.
+             * @param params Search Parameter, same as parameter of the Search method
+             * Returns a promise
+             * Resolve: (entries:any[]) => { console.log(entries); }
+             * Reject: (error:any) => { console.log(error); }
+             */
+            fetchAll(params: SearchParams): Promise<Entry[]>;
+
+            /**
+             * GET BASEURL/{resourceType}?searchParams
+             * GET BASEURL/{referencedType} referencedType based on the resolveParams
+             * @param params Search Parameter, same as parameter of the Search method
+             * @param resolveParams Resolve Parameter, an array of string containing the each parameter in the format TargetResourceType.TargetElement
+             * eg. ['Observation.subject',Observation.context']
+             * Returns a promise
+             * Resolve: (entries:any[],resolvedReferencesFn:((Resource,{reference:string})=>Resource) => { console.log(entries); console.log(resolvedReferences);}
+             * Reject: (error:any) => { console.log(error); }
+             */
+            fetchAllWithReferences(params: SearchParams, resolveParams: string[]): any;
+
+            /**
+             * GET BASEURL/_history?historyParams
+             * Calls the _history API with the parameters specified
+             * @param params
+             */
+            history(params: HistoryParams): Promise<Response>;
+
+            /**
+             * GET BASEURL/_getpages=XXXX : Next link in the bundle
+             * Fetches the next page based on the input bundle resource's next link.
+             * @param bundle Input bundle resource containing the next link.
+             */
+            nextPage(bundle: Bundle): Promise<Response>;
+
+            /**
+             * GET BASEURL/_getpages=XXXX : Prev link in the bundle
+             * Fetches the previous page based on the input bundle resource's previous link.
+             * @param bundle Input bundle resource containing the previous link
+             */
+            prevPage(bundle: Bundle): Promise<Response>;
+
+            /**
+             * GET BASEURL/Profile/{resourceType}
+             * @param resourceType
+             */
+            profile(resourceType: ResourceType): Promise<Response>;
+
+            /**
+             * GET BASEURL/{resourceType}/{id}
+             * @param params An object with id and resourceType property
+             */
+            read(params: ReadParams): Promise<Response>;
+
+            /**
+             * Pass the node containing the property reference, which needs to be resolved. eg. myObservation.resource.subject
+             * The resource node should be present if the reference is contained within the resource.
+             * If a bundle resource is passed, will try to resolve within that bundle first before querying the server
+             * @param params The reference node to be resolved along with the resource and the bundle to be searched if the reference is a contained one.
+             */
+            resolve(params: ResolveParams): Promise<Response>;
+
+            /**
+             * GET BASEURL/{resourceType}/{id}/_history?otherHistoryParams
+             * @param params Should provide, resourceType and id either through id and type properties or the resource property
+             */
+            resourceHistory(params: HistoryParams): Promise<Response>;
+
+            /**
+             * GET BASEURL/{resourceType}?searchParams
+             * @param searchParams Filters to be applied to the API call
+             */
+            search(params: SearchParams): Promise<Response>;
+
+            /**
+             * POST BASEURL Body: Bundle with entries containing a node 'request': { 'method': 'POST' }. The value of 'method' can be DELETE,POST,PUT or GET.
+             * @param bundle
+             */
+            transaction(bundle: Bundle): Promise<Response>;
+
+            /**
+             * GET BASEURL/{resourceType}/_history?historyParams
+             * @param params
+             */
+            typeHistory(params: HistoryParams): Promise<Response>;
+
+            /**
+             * PUT BASEURL/{resourceType}/{id}
+             * @param entry : Entry containing the Resource to be updated
+             */
+            update(entry: Entry): Promise<Response>;
+
+            /**
+             * POST BASEURL/{resourceType}/_validate BODY: Resource to be validated
+             * PS: Cannot find the _validate endpoint on the SMART on FHIR open server. But $validate exists.
+             * @param entry
+             */
+            validate(entry: Entry): Promise<Response>;
+
+            /**
+             * GET BASEURL/{resourceType}/{id}/_history/{versionId}
+             * Fetches the specific historic version of the resource.
+             * @param params ResourceType, ResourceId and the VersionId
+             */
+            vread(params: VersionReadParams): Promise<Response>;
+        }
+
+        /**
+         * Reference within a resource
+         */
+        interface Reference {
+            reference: string;
+        }
+
+        /**
+         * Funtion type returned by the fetchAllWithReferences method
+         */
+        type ResolveFn = (resource: Resource, reference: Reference) => Resource;
+
+        /**
+         * Represents the parameter to be passed to the resolve api method
+         */
+        interface ResolveParams {
+            /**
+             * Represents a reference within a resource. It can be a contained one(within the resource or a bundle) or a remote resource(eg {ResourceType}/{id})
+             */
+            reference: Reference;
+            /**
+             * The resource in which the reference will be resolved if the reference is a contained one.
+             */
+            resource?: Resource;
+            /**
+             * The Bundle resource in which the reference will be resolved if the reference is a contained one within the bundle.
+             */
+            bundle?: Resource;
+        }
+
+        interface CommonQueryFilters {
+            /**
+             * Number of return records requested. The server is not bound to return the number requested, but cannot return more
+             */
+            count?: number;
+
+            /**
+             * Only include resource versions that were created at or after the given instant in time
+             *
+             * Type: instant An instant in time - known at least to the second and always includes a time zone.
+             * Note: This is intended for precisely observed times (typically system logs etc.), and not human-reported times - for them,
+             * use date and dateTime. instant is a more constrained dateTime xs:dateTime A JSON string - an xs:dateTime
+             * Note: This type is for system times, not human times (see date and dateTime below).
+             */
+            since?: string;
+
+            /**
+             * Addition filters to be applied on the history query. The object will be converted into query string parameters.
+             */
+            params?: {
+                /**
+                 * To specify alternative response formats by their MIME-types.
+                 * This parameter allows a client to override the accept header value when it is unable to set it correctly due to internal limitations
+                 * (e.g. XSLT usage). For the _format parameter, the values xml, text/xml, application/xml, and application/fhir+xml SHALL be interpreted
+                 * to mean the XML format, the codes json, application/json and application/fhir+json SHALL be interpreted
+                 * to mean the JSON format, and the codes ttl and text/turtle SHALL be interpreted to mean the Turtle RDF format.
+                 * In addition, the values html and text/html are allowed.
+                 */
+                _format?: string;
+                /**
+                 * Type: dateTime	Only include resource versions that were current at some point during the time period specified
+                 * in the date time value (may be more than one)
+                 */
+                _at?: string;
+                /**
+                 * Making this interface extendable so that we can add more custom filter parameters
+                 */
+                [propName: string]: any;
+            };
+        }
+
+        interface HistoryParams extends CommonQueryFilters {
+            /**
+             * Resource ID,  if the history to be fetched is resource specific.
+             */
+            id?: string;
+            /**
+             * Type of the resource,  if the history to be fetched is resource specific.
+             */
+            type?: string;
+        }
+
+        /**
+         * FHIR Search parameter : The parameter used to by the FHIR api methods to perform search on a particular resource.
+         */
+        interface SearchParams extends CommonQueryFilters {
+            /**
+             * The name of the resource type on which the query is performed
+             */
+            type: string;
+            /**
+             * The Search filter query object
+             * This object syntaxs adopts mongodb-like query syntax ([see](http://docs.mongodb.org/manual/tutorial/query-documents/)
+             * eg:
+             * {name: 'maud'}
+             * //=> name=maud
+             *
+             * {name: {$exact: 'maud'}}
+             * //=> name:exact=maud
+             *
+             * {name: {$or: ['maud','dave']}}
+             * //=> name=maud,dave
+             *
+             * {name: {$and: ['maud',{$exact: 'dave'}]}}
+             * //=> name=maud&name:exact=Dave
+             *
+             * {birthDate: {$gt: '1970', $lte: '1980'}}
+             * //=> birthDate=gt1970&birthDate=lte1980
+             *
+             * {subject: {$type: 'Patient', name: 'maud', birthDate: {$gt: '1970'}}}
+             * //=> subject:Patient.name=maud&subject:Patient.birthDate=gt1970
+             *
+             * {'subject.name': {$exact: 'maud'}}
+             * //=> subject.name:exact=maud
+             */
+            query?: any;
+
+            /**
+             * The patient id. If provided, will make the search query patient specific by adding the patien query parameter
+             */
+            patient?: string;
+        }
+
+        /**
+         * Used to specify the type of Resource which needs to be considered for the API call
+         */
+        interface ResourceType {
+            type: string;
+        }
+
+        /**
+         * Represents a FHIR entry
+         */
+        interface Entry {
+            /**
+             * Version Stamp of resource
+             */
+            versionId?: string;
+            /**
+             * FHIR Resource type name
+             */
+            type?: string;
+            /**
+             * FHIR Resource
+             */
+            resource: Resource;
+            /**
+             * Making this interface extendable since this is not a complete type definition of FHIR Entry
+             */
+            [propName: string]: any;
+        }
+
+        /**
+         * Represents a FHIR resource
+         */
+        interface Resource {
+            /**
+             * The type of resource. All FHIR resources must have a resource type.
+             */
+            resourceType: string;
+            /**
+             * Making this interface extendable since this is not a complete type definition of FHIR Resource
+             */
+            [propName: string]: any;
+        }
+
+        /**
+         * Represents a FHIR bundle
+         */
+        interface Bundle {
+            /**
+             * The actual FHIR bundle, which is a FHIR resource itself with resourceType: 'Bundle'
+             */
+            bundle: Resource;
+        }
+
+        /**
+         * Parameter to be passed to the read API method
+         */
+        interface ReadParams {
+            /**
+             * Type of the FHIR resource
+             */
+            type: string;
+            /**
+             * ID of the FHIR resource
+             */
+            id: string;
+        }
+
+        /**
+         * Parameter to be passed to the vread API method
+         */
+        interface VersionReadParams extends ReadParams {
+            /**
+             * Version ID of the resource to be fetched
+             */
+            versionId: string;
+        }
+
+        /**
+         * Structure of the response from the FHIR server
+         */
+        interface Response {
+            /**
+             * Data returned from the FHIR server
+             */
+            data?: any;
+            /**
+             * HTTP Status code string
+             */
+            status?: any;
+            /**
+             * HTTP Response headers
+             */
+            headers?: any;
+            /**
+             * Contains state information. Url, type, server configuration used, Id etc
+             */
+            config?: any;
+            /**
+             * Error object returned by the client library.
+             */
+            error?: any;
+        }
+
+        /**
+         * The Patient in context
+         */
+        interface Patient {
+            /**
+             * Patient ID
+             */
+            id: string;
+            /**
+             * Patient scoped fhir.js FHIR API interface. This will ensure that the 'patient' query parameter is passed
+             * along with all the API calls which needs a patient context.
+             */
+            api: Api;
+            /**
+             * Get the Patient resource in context
+             * GET BASEURL/Patient/{id}
+             */
+            read(): Promise<Response>;
+        }
+
+        /**
+         * Authorization Context which needs to be passed to create a SMART client directly
+         */
+        interface AuthContext {
+            /**
+             * Type of Authorization 'none' | 'basic' | 'bearer'
+             */
+            type: string;
+            /**
+             * Username if the type of authorization in 'basic'
+             */
+            username?: string;
+            /**
+             * Password if the type of authorization in 'basic'
+             */
+            password?: string;
+            /**
+             * Access token to be set if the type of authorization is 'bearer'
+             */
+            token?: string;
+        }
+
+        /**
+         * Context passed to create a SMART client directly without completing the SMART on FHIR OAuth2 authorization workflow
+         */
+        interface Context {
+            /**
+             * FHIR service base url
+             */
+            serviceUrl: string;
+            /**
+             * Authorization context
+             */
+            auth?: AuthContext;
+            /**
+             * Patient in context
+             */
+            patientId?: string;
+            /**
+             * User in context
+             */
+            userId?: string;
+        }
+
+        /**
+         * Represents a Resource type with ID
+         * Used by the get method
+         */
+        interface ResourceParameter {
+            /**
+             * Name of the resource type
+             */
+            resource: string;
+            /**
+             * Resource ID
+             */
+            id?: string;
+        }
+
+        /**
+         * User in context
+         */
+        interface User {
+            /**
+             * Fetch the current user information from server. The library expects the userId to be of the format "ResourceType/Id"
+             */
+            read(): Promise<Response>;
+        }
+
+        interface SMARTClient extends Client {
+            /**
+             * Method to add the authorization headers based on the type of authorization Basic or Authorization
+             * @param input
+             * Returns: The object populated with Authorization header
+             */
+            authenticated(input: any): any;
+            /**
+             * OAuth2 configuration used in context
+             */
+            state: OAuth2Configuration;
+
+            /**
+             * OAuth2 Access Token response
+             */
+            tokenResponse?: any;
+        }
+
+        interface Client {
+            /**
+             * fhir.js FHIR API interface
+             */
+            api: Api;
+
+            /**
+             * Fetch a resource as Binary/Blob
+             * @param path Absolute or relative path to the resource to be fetched
+             */
+            fetchBinary(path: string): Promise<Blob>;
+
+            /**
+             * Get the resources based on the resource type and id
+             * @param params Resource type and id
+             */
+            get(params: ResourceParameter): Promise<Response>;
+
+            /**
+             * Fetch a resource as Binary/Blob (Same as fetchBinary)
+             * @param path Absolute url of the resource to be fetched
+             */
+            getBinary(path: string): Promise<Blob>;
+
+            /**
+             * Current server, user and patient in context
+             */
+            server: Context;
+
+            /**
+             * Patient in context and interface to perform FHIR API calls within its context
+             */
+            patient?: Patient;
+
+            /**
+             * Id of the user in context
+             */
+            userId?: string;
+
+            /**
+             * User in context and exposes a method 'read' to get information.
+             */
+            user: User;
+
+            /**
+             * Split a set of observations based on codable concept properties. eg. code
+             * @param observations  Observation resources
+             * @param property  The name of the property which is a codable concept
+             * Returns a function to which you can pass code values and get a filtered array of observations.
+             */
+            byCodes(observations: Resource | Resource[], ...property: string[]): (...codes: string[]) => Resource[];
+
+            /**
+             * Split a set of observations based on codable concept properties. eg. code
+             * @param observations  Observation resources
+             * @param property The name of the property which is a codable concept
+             * Returns an object with code values as index and array of observations as values
+             */
+            byCode(observations: Resource | Resource[], property: string): ObservationsByCode;
+            /**
+             * Helper method to convert units
+             */
+            units: {
+                /**
+                 * Converts the valueQuantity passed into cm based on the code
+                 */
+                cm(valueQuantity: any): number;
+                /**
+                 * Converts the valueQuantity passed into kg based on the code
+                 */
+                kg(valueQuantity: any): number;
+                /**
+                 * Returns the valueQuantity value as number. (As it is)
+                 */
+                any(valueQuantity: any): number;
+            };
+        }
+
+        /**
+         * Indexable type used to represt
+         */
+        interface ObservationsByCode {
+            [index: string]: Resource;
+        }
+
+        /**
+         * SMART client settings for browser behaviour
+         */
+        interface Settings {
+            /**
+             * Replaces the browser's current URL using window.history.replaceState API.
+             * Default to true
+             */
+            replaceBrowserHistory: boolean;
+            /**
+             * When set to true, this variable will fully utilize HTML5 sessionStorage API.
+             * Default to true
+             * This variable can be overriden to false by setting FHIR.oauth2.settings.fullSessionStorageSupport = false.
+             * When set to false, the sessionStorage will be keyed by a state variable. This is to allow the embedded IE browser
+             * instances instantiated on a single thread to continue to function without having sessionStorage data shared
+             * across the embedded IE instances.
+             */
+            fullSessionStorageSupport: boolean;
+        }
+
+        /**
+         * Client or application specific settings provided on the FHIR server during the client/application registration.
+         */
+        interface OAuth2ClientSettings {
+            /**
+             * Unique ID representing the client or application
+             */
+            client_id: string;
+            /**
+             * URI to which the code is sent via query string during the OAuth2 authorization workflow. Defaults to the applications base url.
+             */
+            redirect_uri?: string;
+            /**
+             * Scopes based on the access required by the application
+             */
+            scope?: string;
+            /**
+             * If the application registered is a confidential application, the client_secret needs to be provided during the Token workflow. (Not recommended for public applications)
+             */
+            secret?: string;
+            /**
+             * Override the state parameter set by the SMART JS Client library. The library generates a random string as state.
+             */
+            state?: string;
+        }
+
+        /**
+         * The OAuth2 endpoints (Registration URI, Authorize URI, Token URI)
+         */
+        interface OAuth2Endpoints {
+            /**
+             * OAuth2 Registration URI
+             */
+            registration_uri?: string;
+            /**
+             * OAuth2 Authorize URI
+             */
+            authorize_uri?: string;
+            /**
+             * OAuth2 Token URI
+             */
+            token_uri?: string;
+        }
+
+        /**
+         * OAuth2 Provider information. If provided during the Authorize call, the library skips the conformance statement introspection
+         */
+        interface OAuth2Provider {
+            /**
+             * FHIR Service URL
+             */
+            url: string;
+            /**
+             * Unique name for the provider
+             */
+            name?: string;
+            /**
+             * Description about the provider
+             */
+            description?: string;
+            /**
+             * The OAuth2 endpoints (Registration URI, Authorize URI, Token URI)
+             */
+            oauth2?: OAuth2Endpoints;
+        }
+
+        /**
+         * OAuth2 Configuration of the SMART on FHIR Server
+         */
+        interface OAuth2Configuration {
+            /**
+             * Set the response type based on the Authorization Grant eg. code(Authorization Code Grant), token(Implicit Grant)
+             */
+            response_type?: string;
+            /**
+             * Client or application specific settings provided on the FHIR server during the client/application registration.
+             */
+            client?: OAuth2ClientSettings;
+            /**
+             * FHIR Service URL
+             */
+            server?: string;
+            /**
+             * Fake Access Token Response. Should contain the patient property to set the patient context.
+             */
+            fake_token_response?: any;
+            /**
+             * OAuth2 Provider information. If provided during the Authorize call, the library skips the conformance statement introspection
+             */
+            provider?: OAuth2Provider;
+        }
+
+        /**
+         * SMART on FHIR OAuth2 authorization helper methods and settings
+         */
+        interface OAuth2 {
+            /**
+             * Settings to drive the JS client browser behaviour
+             */
+            settings: Settings;
+
+            /**
+             * Handles the OAuth2 redirect
+             * If the URL contains the code parameter, it will complete the token call and pass the SMART client to the callback method
+             * @param callback Called once the SMART client is ready to be used.
+             * @param errback Called when either the OAuth2 workflow has not been started on an error occured during the OAuth2 workflow.
+             */
+            ready(callback?: (smart: SMARTClient) => void, errback?: (...args: any[]) => void): void;
+
+            /**
+             * Initiate the OAuth2 authorization workflow
+             * @param params OAuth2 Configuration
+             * @param errback Method which is triggered when an error occurs during the OAuth2 authorization workflow
+             */
+            authorize(params: OAuth2Configuration, errback?: (...args: any[]) => void): void;
+
+            /**
+             * Resolves the Authorization type of the FHIR server. Can be used to identify if a server supports SMART on FHIR.
+             * @param fhirServiceUrl FHIR Server Base URL
+             * @param callback Callled once the authorization type is retrieved from the conformance statement.
+             * @param errBack Called when an error occured while trying to fetch the conformance statement.
+             */
+            resolveAuthType(fhirServiceUrl: string, callback?: (type: string) => void, errBack?: (type: string) => void): void;
+        }
+    }
+
+    /**
+     * Construct the SMART client directly without using the Oauth2 workflow
+     * @param context Context required to construct the client.
+     */
+    export function client(context: SMART.Context): SMART.Client;
+
+    /**
+     * Property which exposes the OAUth2 specific workflow helpers
+     */
+    export const oauth2: SMART.OAuth2;
+}
diff --git a/types/fhirclient/tsconfig.json b/types/fhirclient/tsconfig.json
new file mode 100644
index 0000000000..26c7a0a034
--- /dev/null
+++ b/types/fhirclient/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",
+        "fhirclient-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/fhirclient/tslint.json b/types/fhirclient/tslint.json
new file mode 100644
index 0000000000..c56d9c1216
--- /dev/null
+++ b/types/fhirclient/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "object-literal-key-quotes": false
+    }
+}
\ No newline at end of file

From 1b525a8cd1949c215d466d3425be1d37edbf56c9 Mon Sep 17 00:00:00 2001
From: Ram <g.rmchndrn@gmail.com>
Date: Thu, 24 May 2018 00:05:21 -0400
Subject: [PATCH 392/575] FIX for dtslint rule strict-export-declare-modifier.
 Removed the redundant export keyword from the definition.

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

diff --git a/types/fhirclient/index.d.ts b/types/fhirclient/index.d.ts
index 4d4b52ba5d..ea0da80362 100644
--- a/types/fhirclient/index.d.ts
+++ b/types/fhirclient/index.d.ts
@@ -731,10 +731,10 @@ declare namespace FHIR {
      * Construct the SMART client directly without using the Oauth2 workflow
      * @param context Context required to construct the client.
      */
-    export function client(context: SMART.Context): SMART.Client;
+    function client(context: SMART.Context): SMART.Client;
 
     /**
      * Property which exposes the OAUth2 specific workflow helpers
      */
-    export const oauth2: SMART.OAuth2;
+    const oauth2: SMART.OAuth2;
 }

From 0231e7b9449a847618912c446112e7a9f30987c8 Mon Sep 17 00:00:00 2001
From: Vincent Siao <vincent@asana.com>
Date: Wed, 23 May 2018 21:35:11 -0700
Subject: [PATCH 393/575] [create-subscription] Bump required TS version to
 match react

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

diff --git a/types/create-subscription/index.d.ts b/types/create-subscription/index.d.ts
index 3a4c090c1e..79003980ee 100644
--- a/types/create-subscription/index.d.ts
+++ b/types/create-subscription/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Asana <https://github.com/Asana>
 //                 Vincent Siao <https://github.com/vsiao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 

From f4525ae88315d9a2681e4bda9946888f0c1695b6 Mon Sep 17 00:00:00 2001
From: Ram <g.rmchndrn@gmail.com>
Date: Thu, 24 May 2018 01:08:04 -0400
Subject: [PATCH 394/575] Updated the package name to fhir-js-client

---
 types/{fhirclient => fhir-js-client}/fhirclient-tests.ts | 8 ++++----
 types/{fhirclient => fhir-js-client}/index.d.ts          | 8 ++++----
 types/{fhirclient => fhir-js-client}/tsconfig.json       | 0
 types/{fhirclient => fhir-js-client}/tslint.json         | 0
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename types/{fhirclient => fhir-js-client}/fhirclient-tests.ts (99%)
 rename types/{fhirclient => fhir-js-client}/index.d.ts (98%)
 rename types/{fhirclient => fhir-js-client}/tsconfig.json (100%)
 rename types/{fhirclient => fhir-js-client}/tslint.json (100%)

diff --git a/types/fhirclient/fhirclient-tests.ts b/types/fhir-js-client/fhirclient-tests.ts
similarity index 99%
rename from types/fhirclient/fhirclient-tests.ts
rename to types/fhir-js-client/fhirclient-tests.ts
index 57588c63cb..d03a763031 100644
--- a/types/fhirclient/fhirclient-tests.ts
+++ b/types/fhir-js-client/fhirclient-tests.ts
@@ -518,9 +518,9 @@ class Component {
         const observations = observationByCodesFn('29463-7');
         const observationsByCodes: FHIR.SMART.ObservationsByCode = smartClient.byCode(this.observationEntry.resource, 'code');
         // Unit helpers
-        const numericValue = smartClient.units.any(this.observationEntry.resource.valueQuantity);
+        const numericValue = smartClient.units.any(this.heightObservation.valueQuantity);
         const convertedHeightValueInCm = smartClient.units.cm(this.heightObservation.valueQuantity);
-        const convertedWeightValueInKg = smartClient.units.kg(this.observationEntry.resource.valueQuantity);
+        const convertedWeightValueInKg = smartClient.units.kg(this.weightObservationEntry.resource.valueQuantity);
     }
 
     oauth2ReadyErrback = (error: any) => {
@@ -662,9 +662,9 @@ class Component {
         const observations = observationByCodesFn('29463-7');
         const observationsByCodes: FHIR.SMART.ObservationsByCode = openSmartClient.byCode(this.observationEntry.resource, 'code');
 
-        const numericValue = openSmartClient.units.any(this.observationEntry.resource.valueQuantity);
+        const numericValue = openSmartClient.units.any(this.heightObservation.valueQuantity);
         const convertedHeightValueInCm = openSmartClient.units.cm(this.heightObservation.valueQuantity);
-        const convertedWeightValueInKg = openSmartClient.units.kg(this.observationEntry.resource.valueQuantity);
+        const convertedWeightValueInKg = openSmartClient.units.kg(this.weightObservationEntry.resource.valueQuantity);
     }
 
     closedSmartOnFhir() {
diff --git a/types/fhirclient/index.d.ts b/types/fhir-js-client/index.d.ts
similarity index 98%
rename from types/fhirclient/index.d.ts
rename to types/fhir-js-client/index.d.ts
index ea0da80362..7da8bb1a2f 100644
--- a/types/fhirclient/index.d.ts
+++ b/types/fhir-js-client/index.d.ts
@@ -71,8 +71,8 @@ declare namespace FHIR {
              * @param params Search Parameter, same as parameter of the Search method
              * @param resolveParams Resolve Parameter, an array of string containing the each parameter in the format TargetResourceType.TargetElement
              * eg. ['Observation.subject',Observation.context']
-             * Returns a promise
-             * Resolve: (entries:any[],resolvedReferencesFn:((Resource,{reference:string})=>Resource) => { console.log(entries); console.log(resolvedReferences);}
+             * Returns a promise.
+             * Resolve: (entries:Entry[],resolvedReferences:[index: string]: Resource) => { console.log(entries); console.log(resolvedReferences);}
              * Reject: (error:any) => { console.log(error); }
              */
             fetchAllWithReferences(params: SearchParams, resolveParams: string[]): any;
@@ -575,10 +575,10 @@ declare namespace FHIR {
         }
 
         /**
-         * Indexable type used to represt
+         * Indexable type used to represent Observation FHIR resources indexed based on codes.
          */
         interface ObservationsByCode {
-            [index: string]: Resource;
+            [index: string]: Resource[];
         }
 
         /**
diff --git a/types/fhirclient/tsconfig.json b/types/fhir-js-client/tsconfig.json
similarity index 100%
rename from types/fhirclient/tsconfig.json
rename to types/fhir-js-client/tsconfig.json
diff --git a/types/fhirclient/tslint.json b/types/fhir-js-client/tslint.json
similarity index 100%
rename from types/fhirclient/tslint.json
rename to types/fhir-js-client/tslint.json

From a5d6f238c42e0b45ac31f78a1cf52e79675146bb Mon Sep 17 00:00:00 2001
From: Ram <g.rmchndrn@gmail.com>
Date: Thu, 24 May 2018 01:09:59 -0400
Subject: [PATCH 395/575] Corrected the test file name and the package name in
 the definition.

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

diff --git a/types/fhir-js-client/fhirclient-tests.ts b/types/fhir-js-client/fhir-js-client-tests.ts
similarity index 100%
rename from types/fhir-js-client/fhirclient-tests.ts
rename to types/fhir-js-client/fhir-js-client-tests.ts
diff --git a/types/fhir-js-client/index.d.ts b/types/fhir-js-client/index.d.ts
index 7da8bb1a2f..cf8ae2dbad 100644
--- a/types/fhir-js-client/index.d.ts
+++ b/types/fhir-js-client/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for fhirclient 0.1
+// Type definitions for fhir-js-client 1.0
 // Project: https://github.com/smart-on-fhir/client-js
 // Definitions by: Ramachandran Gokulachandran <https://github.com/rmchndrng>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/fhir-js-client/tsconfig.json b/types/fhir-js-client/tsconfig.json
index 26c7a0a034..79aa0c26b5 100644
--- a/types/fhir-js-client/tsconfig.json
+++ b/types/fhir-js-client/tsconfig.json
@@ -19,6 +19,6 @@
     },
     "files": [
         "index.d.ts",
-        "fhirclient-tests.ts"
+        "fhir-js-client-tests.ts"
     ]
 }
\ No newline at end of file

From 9d75d2b3b4aafcdeca276de93301ddf8c5e2276f Mon Sep 17 00:00:00 2001
From: BhaskarM <bhaskar.mandalapu@gmail.com>
Date: Thu, 24 May 2018 11:12:55 +0530
Subject: [PATCH 396/575] Adding calendar event delete functionality in
 gapi.calendar wrapper

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

diff --git a/types/gapi.calendar/index.d.ts b/types/gapi.calendar/index.d.ts
index b13106b9e3..a6a0385661 100644
--- a/types/gapi.calendar/index.d.ts
+++ b/types/gapi.calendar/index.d.ts
@@ -271,6 +271,7 @@ declare namespace gapi.client.calendar {
     static insert(parameters: EventsInsertParameters): HttpRequest<Event>;
     static update(parameters: EventsUpdateParameters): HttpRequest<Event>;
     static get(parameters: EventsGetParameters): HttpRequest<Event>;
+    static delete(parameters: EventsDeleteParameters): HttpRequest<Event>;
   }
 
   interface EventsGetParameters {
@@ -306,6 +307,13 @@ declare namespace gapi.client.calendar {
     resource: EventInput;
   }
 
+  interface EventsDeleteParameters {
+    calendarId: string;
+    eventId: string;
+    
+    sendNotifications?: boolean;
+  }
+
   interface EventInput {
     // Required Properties
     attachments?: {

From 1a20dc303b7a9f8180747e26f145d1ebad3bee93 Mon Sep 17 00:00:00 2001
From: Christian Rackerseder <git@echooff.de>
Date: Thu, 24 May 2018 07:46:15 +0200
Subject: [PATCH 397/575] Fix return type of ready() function

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

diff --git a/types/loadjs/index.d.ts b/types/loadjs/index.d.ts
index e68875e53a..9373308815 100644
--- a/types/loadjs/index.d.ts
+++ b/types/loadjs/index.d.ts
@@ -27,7 +27,7 @@ declare namespace loadjs {
         error?(depsNotFound: string): void;
     }
 
-    function ready(bundleIds: string | string[], optionsOrCallback: ReadyOptions | LoadedFn): void;
+    function ready(bundleIds: string | string[], optionsOrCallback: ReadyOptions | LoadedFn): typeof loadjs;
     function isDefined(bundleId: string): boolean;
     function done(bundleId: string): void;
     function reset(): void;
diff --git a/types/loadjs/test/loadjs-tests.ts b/types/loadjs/test/loadjs-tests.ts
index e61df50ec8..0b3aad142d 100644
--- a/types/loadjs/test/loadjs-tests.ts
+++ b/types/loadjs/test/loadjs-tests.ts
@@ -16,8 +16,8 @@ const readyOptions: importedLoadJs.ReadyOptions = {
 importedLoadJs('/path/to/foo.js', () => {});
 importedLoadJs(['/path/to/foo.js', '/path/to/bar.js'], () => {});
 importedLoadJs(['/path/to/foo.js', '/path/to/bar.js'], 'foobar');
-importedLoadJs.ready('foobar', () => {});
-importedLoadJs.ready(['foo', 'bar'], () => {});
+importedLoadJs.ready('foobar', () => {}).ready('foobar', () => {});
+importedLoadJs.ready(['foo', 'bar'], () => {}).ready(['foo', 'bar'], () => {});
 importedLoadJs.isDefined('foobar');
 importedLoadJs(['/path/to/foo.js', '/path/to/bar.js'], 'foobar', loadOptions);
 importedLoadJs.ready('foobar', readyOptions);
diff --git a/types/loadjs/test/loadjs-umd-tests.ts b/types/loadjs/test/loadjs-umd-tests.ts
index 1a35f04c43..94ee4f5090 100644
--- a/types/loadjs/test/loadjs-umd-tests.ts
+++ b/types/loadjs/test/loadjs-umd-tests.ts
@@ -1,8 +1,8 @@
 loadjs('/path/to/foo.js', () => {});
 loadjs(['/path/to/foo.js', '/path/to/bar.js'], () => {});
 loadjs(['/path/to/foo.js', '/path/to/bar.js'], 'foobar');
-loadjs.ready('foobar', () => {});
-loadjs.ready(['foo', 'bar'], () => {});
+loadjs.ready('foobar', () => {}).ready('foobar', () => {});
+loadjs.ready(['foo', 'bar'], () => {}).ready(['foo', 'bar'], () => {});
 loadjs.isDefined('foobar');
 loadjs(['/path/to/foo.js', '/path/to/bar.js'], 'foobar', {
     before: (path, scriptEl) => {},

From 83d50e9a4cfe57c5763f3f713ff62ddb0ca565fa Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>
Date: Wed, 23 May 2018 22:51:24 -0700
Subject: [PATCH 398/575] Update index.d.ts

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

diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index 8e098a366c..c4cd97b0ba 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -386,7 +386,7 @@ export interface ScatterData {
 	'marker.colorbar': {}; // TODO
 	mode: 'lines' | 'markers' | 'text' | 'lines+markers' | 'text+markers' | 'text+lines' | 'text+lines+markers' | 'none';
 	hoveron: 'points' | 'fills';
-    hoverinfo: 'all' | 'name' | 'none' | 'skip' | 'text' |
+	hoverinfo: 'all' | 'name' | 'none' | 'skip' | 'text' |
                'x' | 'x+text' | 'x+name' |
                'x+y' | 'x+y+text' | 'x+y+name' |
                'x+y+z' | 'x+y+z+text' | 'x+y+z+name' |
@@ -403,12 +403,11 @@ export interface ScatterData {
 	connectgaps: boolean;
 }
 
-/*
-Any combination of "x", "y", "z", "text", "name" joined with a "+" OR "all" or "none" or "skip".
-examples: "x", "y", "x+y", "x+y+z", "all"
-default: "all"
-*/
-
+/**
+ * Any combination of "x", "y", "z", "text", "name" joined with a "+" OR "all" or "none" or "skip".
+ * examples: "x", "y", "x+y", "x+y+z", "all"
+ * default: "all"
+ */
 export interface ScatterMarker {
 	symbol: string | string[]; // Drawing.symbolList
 	color: Color | number[];

From 15eac16cac2740b7d9382ff0e029a9cb08c8e38b Mon Sep 17 00:00:00 2001
From: Denis Malinochkin <mrmlnc@yandex-team.ru>
Date: Thu, 24 May 2018 09:11:52 +0300
Subject: [PATCH 399/575] feat(types): Add typings for "run-parallel" package

---
 types/run-parallel/index.d.ts            | 21 ++++++++++
 types/run-parallel/run-parallel-tests.ts | 52 ++++++++++++++++++++++++
 types/run-parallel/tsconfig.json         | 23 +++++++++++
 types/run-parallel/tslint.json           |  1 +
 4 files changed, 97 insertions(+)
 create mode 100644 types/run-parallel/index.d.ts
 create mode 100644 types/run-parallel/run-parallel-tests.ts
 create mode 100644 types/run-parallel/tsconfig.json
 create mode 100644 types/run-parallel/tslint.json

diff --git a/types/run-parallel/index.d.ts b/types/run-parallel/index.d.ts
new file mode 100644
index 0000000000..3cd4736810
--- /dev/null
+++ b/types/run-parallel/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for run-parallel 1.1
+// Project: https://github.com/feross/run-parallel
+// Definitions by: mrmlnc <https://github.com/mrmlnc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+declare namespace RunParallel {
+    type TaskCallback<T> = (err: Error | null, results?: T) => void;
+    type Task<T> = (callback: TaskCallback<T>) => void;
+    type TaskObj<T> = Record<string, Task<T>>;
+
+    type Callback<T> = (err: Error, results: T) => void;
+}
+
+declare function RunParallel<T>(tasks: Array<RunParallel.Task<T>>): T[];
+declare function RunParallel<T>(tasks: Array<RunParallel.Task<T>>, callback: RunParallel.Callback<T[]>): void;
+
+declare function RunParallel<T>(tasks: RunParallel.TaskObj<T>): Record<string, T>;
+declare function RunParallel<T>(tasks: RunParallel.TaskObj<T>, callback: RunParallel.Callback<Record<string, T>>): void;
+
+export = RunParallel;
diff --git a/types/run-parallel/run-parallel-tests.ts b/types/run-parallel/run-parallel-tests.ts
new file mode 100644
index 0000000000..45af795448
--- /dev/null
+++ b/types/run-parallel/run-parallel-tests.ts
@@ -0,0 +1,52 @@
+import rpl = require('run-parallel');
+
+const tasks: Array<rpl.Task<string>> = [
+    (callback) => () => callback(null, 'string'),
+    (callback) => () => callback(new Error('boom')),
+
+    // $ExpectError
+    (callback) => () => callback(null, 1)
+];
+
+const justTaskCallback: rpl.TaskCallback<string> = (err, result) => {
+    // $ExpectType Error | null
+    err;
+
+    // $ExpectType string | undefined
+    result;
+};
+
+justTaskCallback(null, 'string');
+justTaskCallback(new Error('boom'));
+// $ExpectError
+justTaskCallback(null, 1);
+
+rpl(tasks, (err, results) => {
+    // $ExpectType Error
+    err;
+
+    // $ExpectType string[]
+    results;
+});
+
+// $ExpectType string[]
+const results = rpl(tasks);
+
+const tasksObj: rpl.TaskObj<string> = {
+    one: (callback) => () => callback(null, 'string'),
+    two: (callback) => () => callback(new Error('boom')),
+
+    // $ExpectError
+    three: (callback) => () => callback(1)
+};
+
+rpl(tasksObj, (err, results) => {
+    // $ExpectType Error
+    err;
+
+    // $ExpectType Record<string, string>
+    results;
+});
+
+// $ExpectType Record<string, string>
+const resultsObj = rpl(tasksObj);
diff --git a/types/run-parallel/tsconfig.json b/types/run-parallel/tsconfig.json
new file mode 100644
index 0000000000..d10ae98720
--- /dev/null
+++ b/types/run-parallel/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",
+        "run-parallel-tests.ts"
+    ]
+}
diff --git a/types/run-parallel/tslint.json b/types/run-parallel/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/run-parallel/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b9247f6373a2891bf9f294c314a2ac93cc85fca6 Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Thu, 24 May 2018 14:31:32 +0800
Subject: [PATCH 400/575] fix(prettier): detailed FastPath

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

diff --git a/types/prettier/index.d.ts b/types/prettier/index.d.ts
index 7789c957a6..fd20fdd167 100644
--- a/types/prettier/index.d.ts
+++ b/types/prettier/index.d.ts
@@ -8,15 +8,15 @@ export type AST = any;
 export type Doc = doc.builders.Doc;
 
 // https://github.com/prettier/prettier/blob/master/src/common/fast-path.js
-export interface FastPath {
+export interface FastPath<T = any> {
     stack: any[];
-    getName(): null | number | string;
-    getValue(): any;
-    getNode(count?: number): any;
-    getParentNode(count?: number): any;
-    call<T>(callback: (path: this) => T, ...names: string[]): T;
-    each(callback: (path: this) => void, ...names: string[]): void;
-    map<T>(callback: (path: this, index: number) => T, ...names: string[]): T[];
+    getName(): null | PropertyKey;
+    getValue(): T;
+    getNode(count?: number): null | T;
+    getParentNode(count?: number): null | T;
+    call<U>(callback: (path: this) => U, ...names: PropertyKey[]): U;
+    each(callback: (path: this) => void, ...names: PropertyKey[]): void;
+    map<U>(callback: (path: this, index: number) => U, ...names: PropertyKey[]): U[];
 }
 
 export type BuiltInParser = (text: string, options?: any) => AST;

From 0928df214d94148ab9c11ed76e79a3b4d24ae864 Mon Sep 17 00:00:00 2001
From: Ruben Vermeersch <ruben@rocketeer.be>
Date: Thu, 24 May 2018 10:00:29 +0200
Subject: [PATCH 401/575] Small whitespace cleanups

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

diff --git a/types/fetch-mock/index.d.ts b/types/fetch-mock/index.d.ts
index fc94b18106..e75cb6f2b8 100644
--- a/types/fetch-mock/index.d.ts
+++ b/types/fetch-mock/index.d.ts
@@ -178,6 +178,7 @@ declare namespace fetchMock {
          * @param [options] Additional properties defining the route to mock
          */
         mock(matcher: MockMatcher, response: MockResponse | MockResponseFunction, options?: MockOptions): this;
+
         /**
          * Replaces fetch() with a stub which records its calls, grouped by
          * route, and optionally returns a mocked Response object or passes the
@@ -229,6 +230,7 @@ declare namespace fetchMock {
          * @param [options] Additional properties defining the route to mock
          */
         post(matcher: MockMatcher, reponse: MockResponse | MockResponseFunction, options?: MockOptionsMethodPost): this;
+
         /**
          * Replaces fetch() with a stub which records its calls, grouped by
          * route, and optionally returns a mocked Response object or passes the
@@ -251,6 +253,7 @@ declare namespace fetchMock {
          * @param [options] Additional properties defining the route to mock
          */
         put(matcher: MockMatcher, reponse: MockResponse | MockResponseFunction, options?: MockOptionsMethodPut): this;
+
         /**
          * Replaces fetch() with a stub which records its calls, grouped by
          * route, and optionally returns a mocked Response object or passes the
@@ -273,6 +276,7 @@ declare namespace fetchMock {
          * @param [options] Additional properties defining the route to mock
          */
         delete(matcher: MockMatcher, reponse: MockResponse | MockResponseFunction, options?: MockOptionsMethodDelete): this;
+
         /**
          * Replaces fetch() with a stub which records its calls, grouped by
          * route, and optionally returns a mocked Response object or passes the
@@ -295,6 +299,7 @@ declare namespace fetchMock {
          * @param [options] Additional properties defining the route to mock
          */
         head(matcher: MockMatcher, reponse: MockResponse | MockResponseFunction, options?: MockOptionsMethodHead): this;
+
         /**
          * Replaces fetch() with a stub which records its calls, grouped by
          * route, and optionally returns a mocked Response object or passes the
@@ -317,6 +322,7 @@ declare namespace fetchMock {
          * @param [options] Additional properties defining the route to mock
          */
         patch(matcher: MockMatcher, reponse: MockResponse | MockResponseFunction, options?: MockOptionsMethodHead): this;
+
         /**
          * Replaces fetch() with a stub which records its calls, grouped by
          * route, and optionally returns a mocked Response object or passes the
@@ -370,6 +376,7 @@ declare namespace fetchMock {
          * them or not.
          */
         calls(): MatchedRoutes;
+
         /**
          * Returns all calls to fetch matching matcherName.
          */

From 1d104a5829ca51f5b5dd2aff1ae4c220198e012b Mon Sep 17 00:00:00 2001
From: Oliver Joseph Ash <oliverjash@gmail.com>
Date: Thu, 24 May 2018 09:23:17 +0100
Subject: [PATCH 402/575] Express: `Response` `set`: allow array value

---
 types/express-serve-static-core/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts
index 30fe69c82a..f8521d433d 100644
--- a/types/express-serve-static-core/index.d.ts
+++ b/types/express-serve-static-core/index.d.ts
@@ -707,6 +707,7 @@ export interface Response extends http.ServerResponse, Express.Response {
      */
     set(field: any): Response;
     set(field: string, value?: string): Response;
+    set(field: string, value?: string[]): Response;
 
     header(field: any): Response;
     header(field: string, value?: string): Response;

From ce6036ed64984c213b6a57db84ea05c14c1dade1 Mon Sep 17 00:00:00 2001
From: Matt Etre <matthew.etre@ef.com>
Date: Thu, 24 May 2018 09:33:10 +0100
Subject: [PATCH 403/575] fix react-native image static methods

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index e7e0451845..168db34cc5 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3523,10 +3523,10 @@ declare class ImageComponent extends React.Component<ImageProps> {}
 declare const ImageBase: Constructor<NativeMethodsMixin> & typeof ImageComponent;
 export class Image extends ImageBase {
     resizeMode: ImageResizeMode;
-    getSize(uri: string, success: (width: number, height: number) => void, failure: (error: any) => void): any;
-    prefetch(url: string): any;
-    abortPrefetch?(requestId: number): void;
-    queryCache?(urls: string[]): Promise<Map<string, "memory" | "disk">>;
+    static getSize(uri: string, success: (width: number, height: number) => void, failure: (error: any) => void): any;
+    static prefetch(url: string): any;
+    static abortPrefetch?(requestId: number): void;
+    static queryCache?(urls: string[]): Promise<Map<string, "memory" | "disk">>;
 }
 
 export interface ImageBackgroundProps extends ImagePropsBase {

From 832003e59f7f9cc8bd549f2d19297feaec40b8df Mon Sep 17 00:00:00 2001
From: Ruben Vermeersch <ruben@rocketeer.be>
Date: Thu, 24 May 2018 10:34:00 +0200
Subject: [PATCH 404/575] fetch-mock: Add more missing whitespace to make
 things consistent

---
 types/fetch-mock/index.d.ts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/types/fetch-mock/index.d.ts b/types/fetch-mock/index.d.ts
index e75cb6f2b8..0231d8b208 100644
--- a/types/fetch-mock/index.d.ts
+++ b/types/fetch-mock/index.d.ts
@@ -16,6 +16,7 @@ declare namespace fetchMock {
      * Mock matcher function
      */
     type MockMatcherFunction = (url: string, opts: MockRequest) => boolean;
+
     /**
      * Mock matcher. Can be one of following:
      * string: Either
@@ -39,38 +40,45 @@ declare namespace fetchMock {
          * Set the response body
          */
         body?: string | {};
+
         /**
          * Set the response status
          * @default 200
          */
         status?: number;
+
         /**
          * Set the response headers.
          */
         headers?: { [key: string]: string };
+
         /**
          * If this property is present then a Promise rejected with the value
          * of throws is returned
          */
         throws?: boolean;
+
         /**
          * This property determines whether or not the request body should be
          * JSON.stringified before being sent
          * @default true
          */
         sendAsJson?: boolean;
+
         /**
          * Setting this property to true will automatically add the
          * content-length header
          * @default true
          */
         includeContentLength?: boolean;
+
         /**
          * The URL the response should be from (to imitate followed redirects
          *  - will set redirected: true on the response)
          */
         redirectUrl?: string;
     }
+
     /**
      * Response: A Response instance - will be used unaltered
      * number: Creates a response with this status
@@ -86,6 +94,7 @@ declare namespace fetchMock {
                         | string | Promise<string>
                         | {} | Promise<{}>
                         | MockResponseObject | Promise<MockResponseObject>;
+
     /**
      * Mock response function
      */
@@ -105,32 +114,39 @@ declare namespace fetchMock {
          *  clash)
          */
         name?: string;
+
         /**
          * http method to match
          */
         method?: string;
+
         /**
          * key/value map of headers to match
          */
         headers?: { [key: string]: string };
+
         /**
          * key/value map of query strings to match, in any order
          */
         query?: { [key: string]: string };
+
         /**
          * as specified above
          */
         matcher?: MockMatcher;
+
         /**
          * This option allows for existing routes in a mock to be overwritten.
          * It’s also possible to define multiple routes with ‘the same’ matcher.
          * Default behaviour is to error
          */
         overwriteRoutes?: boolean;
+
         /**
          * as specified above
          */
         response?: MockResponse | MockResponseFunction;
+
         /**
          * integer, n, limiting the number of times the matcher can be used.
          * If the route has already been called n times the route will be
@@ -208,6 +224,7 @@ declare namespace fetchMock {
          * @param [options] Additional properties defining the route to mock
          */
         get(matcher: MockMatcher, reponse: MockResponse | MockResponseFunction, options?: MockOptionsMethodGet): this;
+
         /**
          * Replaces fetch() with a stub which records its calls, grouped by
          * route, and optionally returns a mocked Response object or passes the

From 5e89b5e726a74e140ce624902800b46e6f6bd6c6 Mon Sep 17 00:00:00 2001
From: Matt Etre <matthew.etre@ef.com>
Date: Thu, 24 May 2018 09:43:49 +0100
Subject: [PATCH 405/575] bump typescript version

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 168db34cc5..81076659b3 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -11,7 +11,7 @@
 //                 Michele Bombardi <https://github.com/bm-software>
 //                 Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.7
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //

From 66319cc782b43d0e99195a7da2fa559d5f056a02 Mon Sep 17 00:00:00 2001
From: Matt Etre <matthew.etre@ef.com>
Date: Thu, 24 May 2018 10:04:38 +0100
Subject: [PATCH 406/575] revert ts version

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 81076659b3..168db34cc5 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -11,7 +11,7 @@
 //                 Michele Bombardi <https://github.com/bm-software>
 //                 Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.7
+// TypeScript Version: 2.6
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //

From a868d3c448da2d5c4890b7a150ef238cef33bf0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Herv=C3=A9?= <mail@aurelien-herve.com>
Date: Thu, 24 May 2018 11:18:55 +0200
Subject: [PATCH 407/575] fix(algoliasearch): remove duplicate and buggy
 AlgoliaResponse interface

the typings would still provide the old `AlgoliaResponse` interface, which is a _almost_ duplicate
interface of `Response`, although it is not called anywhere else. Moreover, `AlgoliaResponse` was
buggy (namely, the `nbPages` attribute was declared as `nbPage`. It is more safe to have only one
interface that works, so I deleted the old `AlgoliaResponse` interface.
---
 types/algoliasearch/index.d.ts | 46 ----------------------------------
 1 file changed, 46 deletions(-)

diff --git a/types/algoliasearch/index.d.ts b/types/algoliasearch/index.d.ts
index 9315a7f6b9..b2890573ce 100644
--- a/types/algoliasearch/index.d.ts
+++ b/types/algoliasearch/index.d.ts
@@ -1406,52 +1406,6 @@ declare namespace algoliasearch {
     userData?: string | object;
   }
 
-  interface AlgoliaResponse {
-    /**
-     * Contains all the hits matching the query
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    hits: any[];
-    /**
-     * Current page
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    page: number;
-    /**
-     * Number of total hits matching the query
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    nbHits: number;
-    /**
-     * Number of pages
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    nbPage: number;
-    /**
-     * Number of hits per pages
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    hitsPerPage: number;
-    /**
-     * Engine processing time (excluding network transfer)
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    processingTimeMS: number;
-    /**
-     * Query used to perform the search
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    query: string;
-    /**
-     * GET parameters used to perform the search
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    params: string;
-    facets: {
-      [facetName: string]: { [facetValue: string]: number };
-    };
-  }
-
   namespace SearchForFacetValues {
     interface Parameters extends QueryParameters {
       /**

From 0dc595353abbe20c3302c360688243e9a858febe Mon Sep 17 00:00:00 2001
From: Daniel Waxweiler <daniel.waxweiler@gmail.com>
Date: Thu, 24 May 2018 11:46:51 +0200
Subject: [PATCH 408/575] add definition for methods modifyVars, refreshStyles,
 watch

---
 types/less/index.d.ts    | 10 +++++++++-
 types/less/less-tests.ts |  9 +++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/types/less/index.d.ts b/types/less/index.d.ts
index 354a342bf9..bca5c21c33 100644
--- a/types/less/index.d.ts
+++ b/types/less/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for LESS
 // Project: http://lesscss.org/
-// Definitions by: Tom Hasner <https://github.com/thasner>, Pranay Prakash <https://github.com/pranaygp>
+// Definitions by: Tom Hasner <https://github.com/thasner>
+//                 Pranay Prakash <https://github.com/pranaygp>
+//                 Daniel Waxweiler <https://github.com/dwaxweiler>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace Less {
@@ -79,6 +81,10 @@ declare namespace Less {
 interface LessStatic {
     options: Less.StaticOptions;
     
+    modifyVars(vars: { [name: string]: string }): void;
+    
+    refreshStyles(): void;
+    
     render(input: string, callback: (error: Less.RenderError, output: Less.RenderOutput) => void): void;
     render(input: string, options: Less.Options, callback: (error: Less.RenderError, output: Less.RenderOutput) => void): void;
 
@@ -86,6 +92,8 @@ interface LessStatic {
     render(input: string, options: Less.Options): Promise<Less.RenderOutput>;
 
     version: number[];
+    
+    watch(): void;
 }
 
 declare module "less" {
diff --git a/types/less/less-tests.ts b/types/less/less-tests.ts
index 1668c965fa..5d0029475a 100644
--- a/types/less/less-tests.ts
+++ b/types/less/less-tests.ts
@@ -35,3 +35,12 @@ var options: Less.Options = {
 };
 
 less.render("h1 { background: red; }", options);
+
+less.modifyVars({
+  '@buttonFace': '#5B83AD',
+  '@buttonText': '#D9EEF2'
+});
+
+less.refreshStyles();
+
+less.watch();

From 950a3a946b106cc9a760ebe5580757db086b8019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Herv=C3=A9?= <mail@aurelien-herve.com>
Date: Thu, 24 May 2018 13:51:12 +0200
Subject: [PATCH 409/575] fix(algoliasearch): remove duplicate, buggy interface

same as a868d3c448da2d5c4890b7a150ef238cef33bf0c but applied to algoliasearch/lite
---
 types/algoliasearch/lite/index.d.ts | 52 ++---------------------------
 1 file changed, 3 insertions(+), 49 deletions(-)

diff --git a/types/algoliasearch/lite/index.d.ts b/types/algoliasearch/lite/index.d.ts
index b9932f1346..a567a917a8 100644
--- a/types/algoliasearch/lite/index.d.ts
+++ b/types/algoliasearch/lite/index.d.ts
@@ -8,9 +8,9 @@
 // TypeScript Version: 2.2
 
 declare namespace algoliasearch {
-  /*
-  Interface for the algolia client object
-  */
+  /**
+   * Interface for the algolia client object
+   */
   interface Client {
     /**
      * Initialization of the index
@@ -502,52 +502,6 @@ declare namespace algoliasearch {
     userData?: string | object;
   }
 
-  interface AlgoliaResponse {
-    /**
-     * Contains all the hits matching the query
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    hits: any[];
-    /**
-     * Current page
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    page: number;
-    /**
-     * Number of total hits matching the query
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    nbHits: number;
-    /**
-     * Number of pages
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    nbPage: number;
-    /**
-     * Number of hits per pages
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    hitsPerPage: number;
-    /**
-     * Engine processing time (excluding network transfer)
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    processingTimeMS: number;
-    /**
-     * Query used to perform the search
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    query: string;
-    /**
-     * GET parameters used to perform the search
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    params: string;
-    facets: {
-      [facetName: string]: { [facetValue: string]: number };
-    };
-  }
-
   namespace SearchForFacetValues {
     interface Parameters extends QueryParameters {
       /**

From f3d61f18027f1ca764f614575c6e99a117e28a64 Mon Sep 17 00:00:00 2001
From: Gerhard Stoebich <deb2001-github@yahoo.de>
Date: Thu, 24 May 2018 12:41:23 +0200
Subject: [PATCH 410/575] [node] Argument code in Http2Stream.close() is
 optional

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 9a9fc544e2..11fb56d0fe 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -6888,7 +6888,7 @@ declare module "http2" {
 
     export interface Http2Stream extends stream.Duplex {
         readonly aborted: boolean;
-        close(code: number, callback?: () => void): void;
+        close(code?: number, callback?: () => void): void;
         readonly closed: boolean;
         readonly destroyed: boolean;
         readonly pending: boolean;
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 8651d361b7..52ec31af07 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -3550,6 +3550,11 @@ namespace http2_tests {
             weight: 0
         };
 
+        http2Stream.close();
+        http2Stream.close(0);
+        http2Stream.close(0, () => {});
+        http2Stream.close(undefined, () => {});
+
         // ClientHttp2Stream
         let clientHttp2Stream: http2.ClientHttp2Stream;
         clientHttp2Stream.on('headers', (headers: http2.IncomingHttpHeaders, flags: number) => {});

From f7299d70112130cc3442661dc8a3e4947d7c6f5a Mon Sep 17 00:00:00 2001
From: Dmitry Bogomya <dmitry.bogomya@gmail.com>
Date: Thu, 24 May 2018 12:54:45 +0300
Subject: [PATCH 411/575] Enable esModuleInterop in allure-js-common

---
 types/allure-js-commons/allure-js-commons-tests.ts | 2 +-
 types/allure-js-commons/index.d.ts                 | 4 +++-
 types/allure-js-commons/tsconfig.json              | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/types/allure-js-commons/allure-js-commons-tests.ts b/types/allure-js-commons/allure-js-commons-tests.ts
index 9d4dd653da..8ac15b6831 100644
--- a/types/allure-js-commons/allure-js-commons-tests.ts
+++ b/types/allure-js-commons/allure-js-commons-tests.ts
@@ -1,4 +1,4 @@
-import * as Allure from "allure-js-commons";
+import Allure from "allure-js-commons";
 
 const shouldMakeError = new Allure("test"); // $ExpectError
 const allure = new Allure();
diff --git a/types/allure-js-commons/index.d.ts b/types/allure-js-commons/index.d.ts
index 6331423d1e..3ecd9aebf1 100644
--- a/types/allure-js-commons/index.d.ts
+++ b/types/allure-js-commons/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/allure-framework/allure-js-commons
 // Definitions by: Denis Artyuhovich <https://github.com/zaqqaz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.7
 
 declare class Allure {
     constructor();
@@ -50,6 +50,8 @@ declare namespace Allure {
     class Suite {
         constructor(name: string, timestamp?: number);
 
+        name: string;
+
         end(timestamp?: number): void;
 
         hasTests(): boolean;
diff --git a/types/allure-js-commons/tsconfig.json b/types/allure-js-commons/tsconfig.json
index 9355cb2e42..e536d9acbd 100644
--- a/types/allure-js-commons/tsconfig.json
+++ b/types/allure-js-commons/tsconfig.json
@@ -14,7 +14,8 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
     },
     "files": [
         "index.d.ts",

From 95b41f1a299306cc6ead4a44948d811a872df0f9 Mon Sep 17 00:00:00 2001
From: Duncan <duncan.mackinnon@vortexa.com>
Date: Thu, 24 May 2018 13:43:24 +0100
Subject: [PATCH 412/575] Added n=1->10 cases for aperture types, and tests.

---
 types/ramda/index.d.ts     | 10 ++++++++++
 types/ramda/ramda-tests.ts |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 3ee2bd3dfa..4ff685488b 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -252,6 +252,16 @@ declare namespace R {
          * Returns a new list, composed of n-tuples of consecutive elements If n is greater than the length of the list,
          * an empty list is returned.
          */
+        aperture<T>(n: 1, list: T[]): Array<[T]>;
+        aperture<T>(n: 2, list: T[]): Array<[T, T]>;
+        aperture<T>(n: 3, list: T[]): Array<[T, T, T]>;
+        aperture<T>(n: 4, list: T[]): Array<[T, T, T, T]>;
+        aperture<T>(n: 5, list: T[]): Array<[T, T, T, T, T]>;
+        aperture<T>(n: 6, list: T[]): Array<[T, T, T, T, T, T]>;
+        aperture<T>(n: 7, list: T[]): Array<[T, T, T, T, T, T, T]>;
+        aperture<T>(n: 8, list: T[]): Array<[T, T, T, T, T, T, T, T]>;
+        aperture<T>(n: 9, list: T[]): Array<[T, T, T, T, T, T, T, T, T]>;
+        aperture<T>(n: 10, list: T[]): Array<[T, T, T, T, T, T, T, T, T, T]>;
         aperture<T>(n: number, list: ReadonlyArray<T>): T[][];
         aperture(n: number): <T>(list: ReadonlyArray<T>) => T[][];
 
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 2d8cfb1e21..a9b35692c2 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -475,6 +475,9 @@ R.times(i, 5);
     R.aperture(3, [1, 2, 3, 4, 5]); // => [[1, 2, 3], [2, 3, 4], [3, 4, 5]]
     R.aperture(7, [1, 2, 3, 4, 5]); // => []
     R.aperture(7)([1, 2, 3, 4, 5]); // => []
+
+    const res1: Array<[number, number]> = R.aperture(2, [1, 2, 3, 4, 5]);
+    const res2: number[][] = R.aperture(11, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
 };
 
 () => {

From b590ac58b3173433d7082a20ff3b0daecb077560 Mon Sep 17 00:00:00 2001
From: Sami Kukkonen <sami@samikukkonen.fi>
Date: Thu, 24 May 2018 16:24:59 +0300
Subject: [PATCH 413/575] react-router-redux: Relax redux version constraint

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

diff --git a/types/react-router-redux/package.json b/types/react-router-redux/package.json
index b5b3eb5dd8..cd8748b027 100644
--- a/types/react-router-redux/package.json
+++ b/types/react-router-redux/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "redux": "^3.7.2"
+        "redux": ">= 3.7.2"
     }
 }

From 73f6eb2bcafc6cd1c4618220b4b40a3300e3024b Mon Sep 17 00:00:00 2001
From: James Garbutt <43081j@users.noreply.github.com>
Date: Thu, 24 May 2018 16:03:23 +0100
Subject: [PATCH 414/575] sinon: 5.x release and cleanup (#25491)

* sinon: cleanup types and rewrite tests

* Used a conditional type for Sinon's stub class typings  (#25656)

* Used a conditional type for Sinon's stub class typings

* mochaccino

* sinon: fix some whitespace

* sinon: stub/spy test case

* sinon: cleanup mixed indent
---
 types/karma-chai-sinon/index.d.ts   |   2 +-
 types/mochaccino/index.d.ts         |   2 +-
 types/should-sinon/index.d.ts       |   2 +-
 types/sinon-as-promised/index.d.ts  |   2 +-
 types/sinon-chai/index.d.ts         |   2 +-
 types/sinon-chrome/index.d.ts       |   2 +-
 types/sinon-express-mock/index.d.ts |   2 +-
 types/sinon-mongoose/index.d.ts     |   2 +-
 types/sinon-stub-promise/index.d.ts |   2 +-
 types/sinon-test/index.d.ts         |   2 +-
 types/sinon/index.d.ts              | 291 ++++++------
 types/sinon/sinon-tests.ts          | 680 ++++++++++++++++------------
 types/sinon/tsconfig.json           |   3 +-
 13 files changed, 556 insertions(+), 438 deletions(-)

diff --git a/types/karma-chai-sinon/index.d.ts b/types/karma-chai-sinon/index.d.ts
index 76ee313a40..1ce2672b23 100644
--- a/types/karma-chai-sinon/index.d.ts
+++ b/types/karma-chai-sinon/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/tubalmartin/karma-chai-sinon
 // Definitions by: Václav Ostrožlík <https://github.com/vasek17>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /// <reference types="chai" />
 import Sinon = require("sinon");
diff --git a/types/mochaccino/index.d.ts b/types/mochaccino/index.d.ts
index b230218ee9..3f0a2e9688 100644
--- a/types/mochaccino/index.d.ts
+++ b/types/mochaccino/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/pawelgalazka/mochaccino#readme
 // Definitions by: Thomas-P <https://github.com/thomas-p>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 import * as Sinon from "sinon";
 export interface Expect {
     not: Expect;
diff --git a/types/should-sinon/index.d.ts b/types/should-sinon/index.d.ts
index 25233c1c61..467d217aa9 100644
--- a/types/should-sinon/index.d.ts
+++ b/types/should-sinon/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/shouldjs/sinon
 // Definitions by: AryloYeung <https://github.com/Arylo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import * as s from "sinon";
 import should = require("should");
diff --git a/types/sinon-as-promised/index.d.ts b/types/sinon-as-promised/index.d.ts
index 097e13a1a0..49e9b29bd3 100644
--- a/types/sinon-as-promised/index.d.ts
+++ b/types/sinon-as-promised/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/bendrucker/sinon-as-promised
 // Definitions by: igrayson <https://github.com/igrayson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import * as s from "sinon";
 
diff --git a/types/sinon-chai/index.d.ts b/types/sinon-chai/index.d.ts
index 8c6d7eb2d0..cff6d0b3a2 100644
--- a/types/sinon-chai/index.d.ts
+++ b/types/sinon-chai/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/domenic/sinon-chai
 // Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid>, Jed Mao <https://github.com/jedmao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /// <reference types="chai" />
 /// <reference types="sinon" />
diff --git a/types/sinon-chrome/index.d.ts b/types/sinon-chrome/index.d.ts
index 263135e060..9776b0bb30 100644
--- a/types/sinon-chrome/index.d.ts
+++ b/types/sinon-chrome/index.d.ts
@@ -4,7 +4,7 @@
 //                 CRIMX <https://github.com/crimx>
 //                 kobanyan <https://github.com/kobanyan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.8
 
 /// <reference types="chrome"/>
 /// <reference types="sinon"/>
diff --git a/types/sinon-express-mock/index.d.ts b/types/sinon-express-mock/index.d.ts
index 10c8ef824d..f3974fc005 100644
--- a/types/sinon-express-mock/index.d.ts
+++ b/types/sinon-express-mock/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Jared Chapiewsky <https://github.com/jpchip>
 //                 Tomek Łaziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import {
     SinonStub,
diff --git a/types/sinon-mongoose/index.d.ts b/types/sinon-mongoose/index.d.ts
index 2d9099a060..86109b4917 100644
--- a/types/sinon-mongoose/index.d.ts
+++ b/types/sinon-mongoose/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/underscopeio/sinon-mongoose
 // Definitions by: stevehipwell <https://github.com/stevehipwell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import * as s from "sinon";
 
diff --git a/types/sinon-stub-promise/index.d.ts b/types/sinon-stub-promise/index.d.ts
index 6de3b17b2a..d817113cf7 100644
--- a/types/sinon-stub-promise/index.d.ts
+++ b/types/sinon-stub-promise/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Thiago Temple <https://github.com/vintem>
 //                 Tim Stackhouse <https://github.com/tstackhouse>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /// <reference types="sinon"/>
 
diff --git a/types/sinon-test/index.d.ts b/types/sinon-test/index.d.ts
index 4cda8702a6..902064a7cb 100644
--- a/types/sinon-test/index.d.ts
+++ b/types/sinon-test/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/sinonjs/sinon-test
 // Definitions by: Francis Saul <https://github.com/mummybot>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import * as Sinon from 'sinon';
 
diff --git a/types/sinon/index.d.ts b/types/sinon/index.d.ts
index 2395ee2ed2..4bdf3272ee 100644
--- a/types/sinon/index.d.ts
+++ b/types/sinon/index.d.ts
@@ -1,12 +1,13 @@
-// Type definitions for Sinon 4.3
+// Type definitions for Sinon 5.0
 // Project: http://sinonjs.org/
 // Definitions by: William Sears <https://github.com/mrbigdog2u>
 //                 Jonathan Little <https://github.com/rationull>
 //                 Lukas Spieß <https://github.com/lumaxis>
 //                 Nico Jansen <https://github.com/nicojs>
 //                 James Garbutt <https://github.com/43081j>
+//                 Josh Goldberg <https://github.com/joshuakgoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 // sinon uses DOM dependencies which are absent in browser-less environment like node.js
 // to avoid compiler errors this monkey patch is used
@@ -17,15 +18,13 @@ interface Document { } // tslint:disable-line no-empty-interface
 declare namespace Sinon {
     interface SinonSpyCallApi {
         // Properties
-        thisValue: any;
         args: any[];
-        exception: any;
-        returnValue: any;
 
         // Methods
         calledOn(obj: any): boolean;
         calledWith(...args: any[]): boolean;
         calledWithExactly(...args: any[]): boolean;
+        calledWithNew(): boolean;
         calledOnceWith(...args: any[]): boolean;
         calledOnceWithExactly(...args: any[]): boolean;
         calledWithMatch(...args: any[]): boolean;
@@ -46,9 +45,14 @@ declare namespace Sinon {
     }
 
     interface SinonSpyCall extends SinonSpyCallApi {
+        thisValue: any;
+        exception: any;
+        returnValue: any;
+        callback: Function | undefined;
+        lastArg: any;
+
         calledBefore(call: SinonSpyCall): boolean;
         calledAfter(call: SinonSpyCall): boolean;
-        calledWithNew(call: SinonSpyCall): boolean;
     }
 
     interface SinonSpy extends SinonSpyCallApi {
@@ -74,7 +78,6 @@ declare namespace Sinon {
         calledAfter(anotherSpy: SinonSpy): boolean;
         calledImmediatelyBefore(anotherSpy: SinonSpy): boolean;
         calledImmediatelyAfter(anotherSpy: SinonSpy): boolean;
-        calledWithNew(): boolean;
         withArgs(...args: any[]): SinonSpy;
         alwaysCalledOn(obj: any): boolean;
         alwaysCalledWith(...args: any[]): boolean;
@@ -89,8 +92,6 @@ declare namespace Sinon {
         invokeCallback(...args: any[]): void;
         getCall(n: number): SinonSpyCall;
         getCalls(): SinonSpyCall[];
-        /// @deprecated Use resetHistory() instead
-        reset(): void;
         resetHistory(): void;
         printf(format: string, ...args: any[]): string;
         restore(): void;
@@ -102,13 +103,9 @@ declare namespace Sinon {
         <T>(obj: T, method: keyof T): SinonSpy;
     }
 
-    interface SinonStatic {
-        spy: SinonSpyStatic;
-    }
-
     interface SinonStub extends SinonSpy {
         resetBehavior(): void;
-        resetHistory(): void;
+        reset(): void;
         usingPromise(promiseLibrary: any): SinonStub;
 
         returns(obj: any): SinonStub;
@@ -132,7 +129,7 @@ declare namespace Sinon {
         callsArgOnAsync(index: number, context: any): SinonStub;
         callsArgWithAsync(index: number, ...args: any[]): SinonStub;
         callsArgOnWithAsync(index: number, context: any, ...args: any[]): SinonStub;
-        callsFake(func: (...args: any[]) => void): SinonStub;
+        callsFake(func: (...args: any[]) => any): SinonStub;
         get(func: () => any): SinonStub;
         set(func: (v: any) => void): SinonStub;
         onCall(n: number): SinonStub;
@@ -156,11 +153,6 @@ declare namespace Sinon {
         (): SinonStub;
         <T>(obj: T): SinonStubbedInstance<T>;
         <T>(obj: T, method: keyof T): SinonStub;
-        <T>(obj: T, method: keyof T, func: Function): SinonStub;
-    }
-
-    interface SinonStatic {
-        stub: SinonStubStatic;
     }
 
     interface SinonExpectation extends SinonStub {
@@ -193,23 +185,29 @@ declare namespace Sinon {
         (obj: any): SinonMock;
     }
 
-    interface SinonStatic {
-        expectation: SinonExpectationStatic;
-        mock: SinonMockStatic;
-    }
+    type SinonTimerId = number | { id: number };
 
     interface SinonFakeTimers {
         now: number;
-        create(now: number): SinonFakeTimers;
-        setTimeout(callback: (...args: any[]) => void, timeout: number, ...args: any[]): number;
-        clearTimeout(id: number): void;
-        setInterval(callback: (...args: any[]) => void, timeout: number, ...args: any[]): number;
-        clearInterval(id: number): void;
-        tick(ms: number): number;
+
+        setTimeout(callback: (...args: any[]) => void, timeout: number, ...args: any[]): SinonTimerId;
+        clearTimeout(id: SinonTimerId): void;
+        setInterval(callback: (...args: any[]) => void, timeout: number, ...args: any[]): SinonTimerId;
+        clearInterval(id: SinonTimerId): void;
+        setImmediate(callback: (...args: any[]) => void, ...args: any[]): SinonTimerId;
+        clearImmediate(id: SinonTimerId): void;
+        requestAnimationFrame(callback: (...args: any[]) => void): number;
+        cancelAnimationFrame(id: number): void;
+        nextTick(callback: () => void): void;
+
+        tick(ms: number | string): void;
         next(): void;
         runAll(): void;
         runToLast(): void;
         reset(): void;
+        runMicrotasks(): void;
+        runToFrame(): void;
+
         Date(): Date;
         Date(year: number): Date;
         Date(year: number, month: number): Date;
@@ -218,7 +216,9 @@ declare namespace Sinon {
         Date(year: number, month: number, day: number, hour: number, minute: number): Date;
         Date(year: number, month: number, day: number, hour: number, minute: number, second: number): Date;
         Date(year: number, month: number, day: number, hour: number, minute: number, second: number, ms: number): Date;
+
         restore(): void;
+        uninstall(): void;
 
         /**
          * Simulate the user changing the system clock while your program is running. It changes the 'now' timestamp
@@ -240,16 +240,6 @@ declare namespace Sinon {
         shouldAdvanceTime: boolean;
     }
 
-    interface SinonFakeTimersStatic {
-        (now?: number | Date): SinonFakeTimers;
-        (config?: Partial<SinonFakeTimersConfig>): SinonFakeTimers;
-    }
-
-    interface SinonStatic {
-        useFakeTimers: SinonFakeTimersStatic;
-        clock: SinonFakeTimers;
-    }
-
     interface SinonFakeUploadProgress {
         eventListeners: {
             progress: any[];
@@ -265,7 +255,6 @@ declare namespace Sinon {
 
     interface SinonFakeXMLHttpRequest {
         // Properties
-        onCreate(xhr: SinonFakeXMLHttpRequest): void;
         url: string;
         method: string;
         requestHeaders: any;
@@ -283,8 +272,6 @@ declare namespace Sinon {
 
         // Methods
         restore(): void;
-        useFilters: boolean;
-        addFilter(filter: (method: string, url: string, async: boolean, username: string, password: string) => boolean): void;
         setResponseHeaders(headers: any): void;
         setResponseBody(body: string): void;
         respond(status: number, headers: any, body: string): void;
@@ -293,11 +280,11 @@ declare namespace Sinon {
         onerror(): void;
     }
 
-    type SinonFakeXMLHttpRequestStatic = () => SinonFakeXMLHttpRequest;
-
-    interface SinonStatic {
-        useFakeXMLHttpRequest: SinonFakeXMLHttpRequestStatic;
-        FakeXMLHttpRequest: SinonFakeXMLHttpRequest;
+    interface SinonFakeXMLHttpRequestStatic {
+        new(): SinonFakeXMLHttpRequest;
+        useFilters: boolean;
+        addFilter(filter: (method: string, url: string, async: boolean, username: string, password: string) => boolean): void;
+        onCreate(xhr: SinonFakeXMLHttpRequest): void;
     }
 
     interface SinonFakeServer extends SinonFakeServerOptions {
@@ -326,24 +313,19 @@ declare namespace Sinon {
     }
 
     interface SinonFakeServerOptions {
-        autoRespond?: boolean;
-        autoRespondAfter?: number;
-        fakeHTTPMethods?: boolean;
-        respondImmediately?: boolean;
+        autoRespond: boolean;
+        autoRespondAfter: number;
+        fakeHTTPMethods: boolean;
+        respondImmediately: boolean;
     }
 
     interface SinonFakeServerStatic {
-        create(options?: SinonFakeServerOptions): SinonFakeServer;
-    }
-
-    interface SinonStatic {
-        fakeServer: SinonFakeServerStatic;
-        fakeServerWithClock: SinonFakeServerStatic;
+        create(options?: Partial<SinonFakeServerOptions>): SinonFakeServer;
     }
 
     interface SinonExposeOptions {
-        prefix?: string;
-        includeFail?: boolean;
+        prefix: string;
+        includeFail: boolean;
     }
 
     interface SinonAssert {
@@ -378,16 +360,13 @@ declare namespace Sinon {
         alwaysThrew(spy: SinonSpy, exception: string): void;
         alwaysThrew(spy: SinonSpy, exception: any): void;
         match(actual: any, expected: any): void;
-        expose(obj: any, options?: SinonExposeOptions): void;
-    }
-
-    interface SinonStatic {
-        assert: SinonAssert;
+        expose(obj: any, options?: Partial<SinonExposeOptions>): void;
     }
 
     interface SinonMatcher {
         and(expr: SinonMatcher): SinonMatcher;
         or(expr: SinonMatcher): SinonMatcher;
+        test(val: any): boolean;
     }
 
     interface SinonArrayMatcher extends SinonMatcher {
@@ -443,8 +422,8 @@ declare namespace Sinon {
         (value: number): SinonMatcher;
         (value: string): SinonMatcher;
         (expr: RegExp): SinonMatcher;
-        (obj: any): SinonMatcher;
         (callback: (value: any) => boolean, message?: string): SinonMatcher;
+        (obj: object): SinonMatcher;
         any: SinonMatcher;
         defined: SinonMatcher;
         truthy: SinonMatcher;
@@ -474,86 +453,16 @@ declare namespace Sinon {
         instanceOf(type: any): SinonMatcher;
         has(property: string, expect?: any): SinonMatcher;
         hasOwn(property: string, expect?: any): SinonMatcher;
-    }
-
-    interface SinonStatic {
-        match: SinonMatch;
+        hasNested(path: string, expect?: any): SinonMatcher;
+        every(matcher: SinonMatcher): SinonMatcher;
+        some(matcher: SinonMatcher): SinonMatcher;
     }
 
     interface SinonSandboxConfig {
-        injectInto?: any;
-        properties?: string[];
-        useFakeTimers?: any;
-        useFakeServer?: any;
-    }
-
-    interface SinonSandbox {
-        assert: SinonAssert;
-        clock: SinonFakeTimers;
-        requests: SinonFakeXMLHttpRequest;
-        server: SinonFakeServer;
-        spy: SinonSpyStatic;
-        stub: SinonStubStatic;
-        mock: SinonMockStatic;
-        useFakeTimers: SinonFakeTimersStatic;
-        useFakeXMLHttpRequest: SinonFakeXMLHttpRequestStatic;
-        useFakeServer(): SinonFakeServer;
-        restore(): void;
-        reset(): void;
-        resetHistory(): void;
-        resetBehavior(): void;
-        usingPromise(promiseLibrary: any): SinonSandbox;
-        verify(): void;
-        verifyAndRestore(): void;
-        createStubInstance(constructor: any): any;
-        createStubInstance<TType>(constructor: StubbableType<TType>): SinonStubbedInstance<TType>;
-    }
-
-    interface SinonSandboxStatic {
-        create(config?: SinonSandboxConfig): SinonSandbox;
-    }
-
-    interface SinonStatic {
-        createSandbox(config?: SinonSandboxConfig): SinonSandbox;
-        defaultConfig: SinonSandboxConfig;
-        sandbox: SinonSandboxStatic;
-    }
-
-    interface SinonTestConfig {
-        injectIntoThis?: boolean;
-        injectInto?: any;
-        properties?: string[];
-        useFakeTimers?: boolean;
-        useFakeServer?: boolean;
-    }
-
-    interface SinonTestWrapper extends SinonSandbox {
-        (...args: any[]): any;
-    }
-
-    // Utility overridables
-    interface SinonStatic {
-        /**
-         * Creates a new object with the given functions as the prototype and stubs all implemented functions.
-         *
-         * @param constructor   Object or class to stub.
-         * @returns A stubbed version of the constructor.
-         * @remarks The given constructor function is not invoked. See also the stub API.
-         */
-        createStubInstance(constructor: any): any;
-
-        /**
-         * Creates a new object with the given functions as the prototype and stubs all implemented functions.
-         *
-         * @template TType Type being stubbed.
-         * @param constructor   Object or class to stub.
-         * @returns A stubbed version of the constructor.
-         * @remarks The given constructor function is not invoked. See also the stub API.
-         */
-        createStubInstance<TType>(constructor: StubbableType<TType>): SinonStubbedInstance<TType>;
-
-        format(obj: any): string;
-        restore(object: any): void;
+        injectInto: object | null;
+        properties: string[];
+        useFakeTimers: boolean | Partial<SinonFakeTimersConfig>;
+        useFakeServer: boolean | SinonFakeServer;
     }
 
     /**
@@ -566,15 +475,103 @@ declare namespace Sinon {
     }
 
     /**
-     * An instance of a stubbed object type with members replaced by stubs.
+     * An instance of a stubbed object type with functions replaced by stubs.
      *
      * @template TType Object type being stubbed.
      */
     type SinonStubbedInstance<TType> = {
-        // TODO: this should really only replace functions on TType with SinonStubs, not all properties
-        // Likely infeasible without mapped conditional types, per https://github.com/Microsoft/TypeScript/issues/12424
-        [P in keyof TType]: SinonStub;
+        [P in keyof TType]: SinonStubbedMember<TType[P]>;
     };
+
+    /**
+     * Replaces a type with a Sinon stub if it's a function.
+     */
+    type SinonStubbedMember<T> = T extends Function ? SinonStub : T;
+
+    interface SinonFake {
+        (): SinonSpy;
+        (fn: Function): SinonSpy;
+        returns(val: any): SinonSpy;
+        throws(val: Error | string): SinonSpy;
+        resolves(val: any): SinonSpy;
+        rejects(val: any): SinonSpy;
+        yields(...args: any[]): SinonSpy;
+        yieldsAsync(...args: any[]): SinonSpy;
+    }
+
+    interface SinonSandbox {
+        assert: SinonAssert;
+        clock: SinonFakeTimers;
+        requests: SinonFakeXMLHttpRequest[];
+        server: SinonFakeServer;
+        spy: SinonSpyStatic;
+        stub: SinonStubStatic;
+        mock: SinonMockStatic;
+
+        useFakeTimers(config?: number | Date | Partial<SinonFakeTimersConfig>): SinonFakeTimers;
+        useFakeXMLHttpRequest(): SinonFakeXMLHttpRequestStatic;
+        useFakeServer(): SinonFakeServer;
+        restore(): void;
+        reset(): void;
+        resetHistory(): void;
+        resetBehavior(): void;
+        usingPromise(promiseLibrary: any): SinonSandbox;
+        verify(): void;
+        verifyAndRestore(): void;
+
+        replace<T, TKey extends keyof T>(
+            obj: T,
+            prop: TKey,
+            replacement: T[TKey]): T[TKey];
+        replaceGetter<T, TKey extends keyof T>(
+            obj: T,
+            prop: TKey,
+            replacement: () => T[TKey]): () => T[TKey];
+        replaceSetter<T, TKey extends keyof T>(
+            obj: T,
+            prop: TKey,
+            replacement: (val: T[TKey]) => void): (val: T[TKey]) => void;
+
+        /**
+         * Creates a new object with the given functions as the prototype and stubs all implemented functions.
+         *
+         * @template TType Type being stubbed.
+         * @param constructor   Object or class to stub.
+         * @returns A stubbed version of the constructor.
+         * @remarks The given constructor function is not invoked. See also the stub API.
+         */
+        createStubInstance<TType>(constructor: StubbableType<TType>): SinonStubbedInstance<TType>;
+    }
+
+    interface SinonApi {
+        fake: SinonFake;
+        match: SinonMatch;
+        spyCall(...args: any[]): SinonSpyCall;
+        expectation: SinonExpectationStatic;
+
+        clock: {
+            create(now: number | Date): SinonFakeTimers;
+        };
+
+        FakeXMLHttpRequest: SinonFakeXMLHttpRequestStatic;
+
+        fakeServer: SinonFakeServerStatic;
+        fakeServerWithClock: SinonFakeServerStatic;
+
+        createSandbox(config?: Partial<SinonSandboxConfig>): SinonSandbox;
+        defaultConfig: Partial<SinonSandboxConfig>;
+    }
+
+    interface LegacySandbox {
+        sandbox: {
+            /**
+             * @deprecated Since 5.0, use `sinon.createSandbox` instead
+             */
+            create(config?: Partial<SinonSandboxConfig>): SinonSandbox;
+        };
+    }
+
+    type SinonStatic = SinonSandbox & LegacySandbox & SinonApi;
 }
 
 declare const Sinon: Sinon.SinonStatic;
diff --git a/types/sinon/sinon-tests.ts b/types/sinon/sinon-tests.ts
index 17e8cc6084..0a88a4eeba 100644
--- a/types/sinon/sinon-tests.ts
+++ b/types/sinon/sinon-tests.ts
@@ -1,317 +1,437 @@
 import sinon = require("sinon");
 
-function once(fn: Function) {
-    let called = false;
-    let returnValue: any;
-
-    return function(this: any) {
-        if (!called) {
-            called = true;
-            returnValue = fn.apply(this, arguments);
-        }
-        return returnValue;
-    };
-}
-
-function testOne() {
-    const callback = sinon.spy();
-    const proxy = once(callback);
-    proxy();
-    if (callback.calledOnce) { console.log("test1 calledOnce success"); } else { console.log("test1 calledOnce failure"); }
-}
-
-function testTwo() {
-    const callback = sinon.spy(() => { });
-    const proxy = once(callback);
-    proxy();
-    proxy();
-    if (callback.calledOnce) { console.log("test2 calledOnce success"); } else { console.log("test2 calledOnce failure"); }
-}
-
-function testThree() {
-    const obj = { thisObj: true };
-    const callback = sinon.spy<any>({}, "method");
-    const proxy = once(callback);
-    proxy.call(obj, callback, 1, 2, 3);
-    if (callback.calledOn(obj)) { console.log("test3 calledOn success"); } else { console.log("test3 calledOn failure"); }
-    if (callback.calledWith(callback, 1, 2, 3)) { console.log("test3 calledWith success"); } else { console.log("test3 calledWith failure"); }
-}
-
-function testFour() {
-    const callback = sinon.stub().returns(42);
-    const proxy = once(callback);
-    const val = proxy.apply(callback, [1, 2, 3]);
-    if (val === 42) { console.log("test4 returns success"); } else { console.log("test4 returns failure"); }
-}
-
-function testFive() {
-    const callback = sinon.stub().returnsArg(1);
-    const proxy = once(callback);
-    const val = proxy.apply(callback, [1, 2, 3]);
-    if (val === 2) { console.log("test5 returnsArg success"); } else { console.log("test5 returnsArg failure"); }
-}
-
-const objectUnderTest: any = {
-    process: (obj: any) => {
-        // It doesn't really matter what's here because the stub is going to replace this function
-        return obj.success(99);
-    }
-};
-
-function testSix() {
-    const stub = sinon.stub(objectUnderTest, "process").yieldsTo("success");
-    objectUnderTest.process({
-        success: () => { console.log("test6 yieldsTo success"); },
-        failure: () => { console.log("test6 yieldsTo failure"); }
-    });
-    stub.restore();
-}
-
-function testSeven() {
-    const obj = { functionToTest: () => { } };
-    const mockObj = sinon.mock(obj);
-    obj.functionToTest();
-    mockObj.expects('functionToTest').once();
-}
-
-function testEight() {
-    sinon.match.typeOf("object").and(sinon.match.has("pages"));
-}
-
-function testNine() {
-    const callback = sinon.stub().returns(42);
-    callback({ x: 5, y: 5 });
-    callback.calledWithMatch({ x: 5 });
-    callback.alwaysCalledWithMatch({ y: 5 });
-    callback.neverCalledWithMatch({ x: 6 });
-    callback.notCalledWithMatch({ x: 6 });
-    callback.calledOnceWith({ x: 5, y: 5 });
-    callback.calledOnceWithExactly({ x: 5, y: 5 });
-    sinon.assert.calledWithMatch(callback, { x: 5 });
-    sinon.assert.alwaysCalledWithMatch(callback, { y: 5 });
-    sinon.assert.neverCalledWithMatch(callback, { x: 6 });
-
-    callback.call("this", "that");
-    callback.throws("Error");
-    try {
-        callback(15);
-    } catch (e) { }
-    sinon.assert.calledWith(callback.firstCall, { x: 5, y: 5});
-    sinon.assert.calledWithExactly(callback.firstCall, { x: 5, y: 5 });
-    sinon.assert.calledWithMatch(callback.firstCall, { x: 5 });
-    sinon.assert.calledOn(callback.secondCall, "this");
-    sinon.assert.threw(callback.thirdCall);
-    sinon.assert.threw(callback.thirdCall, "Error");
-    new (callback as any)();
-    sinon.assert.calledWithNew(callback);
-    sinon.assert.calledWithNew(callback.getCall(4));
-}
-
-function testAssert() {
-    sinon.assert.match(1, 1 + 1);
-    sinon.assert.match("abc", "abc");
-    sinon.assert.match({ a: 1 }, { b: 2, c: "abc" });
-}
-
 function testSandbox() {
-    const config = {
-        injectInto: null,
-        properties: ["spy", "stub", "mock", "clock", "server", "requests"],
-        useFakeServer: true,
+    const obj = {};
+
+    sinon.createSandbox({
+        injectInto: obj,
+        properties: ['spy', 'stub'],
         useFakeTimers: true,
-    };
-
-    let sandbox = sinon.sandbox.create();
-    sandbox = sinon.sandbox.create(config);
-    sandbox = sinon.sandbox.create(sinon.defaultConfig);
-
-    sandbox = sinon.createSandbox();
-    sandbox = sinon.createSandbox(config);
-    sandbox = sinon.createSandbox(sinon.defaultConfig);
-
-    sandbox = sandbox.usingPromise(Promise);
-
-    sandbox.assert.notCalled(sinon.spy());
-
-    if (sandbox.spy().called) {
-        sandbox.stub(objectUnderTest, "process").yieldsTo("success");
-        sandbox.mock(objectUnderTest).expects("process").once();
-    }
-    sandbox.useFakeTimers();
-    sandbox.useFakeTimers({
-        now: 1,
-        toFake: ['Date']
+        useFakeServer: true
     });
-    sandbox.useFakeXMLHttpRequest();
-    sandbox.useFakeServer();
-    sandbox.restore();
-    sandbox.reset();
-    sandbox.resetHistory();
-    sandbox.resetBehavior();
-    sandbox.verify();
-    sandbox.verifyAndRestore();
-    sandbox.createStubInstance(TestCreateStubInstance).someTestMethod('some argument');
-    sandbox.createStubInstance<TestCreateStubInstance>(TestCreateStubInstance).someTestMethod('some argument');
-}
+    sinon.createSandbox({
+        injectInto: null
+    });
+    sinon.createSandbox({
+        useFakeTimers: {
+            now: 1000,
+            shouldAdvanceTime: false
+        },
+        useFakeServer: sinon.fakeServer.create()
+    });
+    sinon.createSandbox(sinon.defaultConfig);
+    sinon.sandbox.create();
+    sinon.sandbox.create(sinon.defaultConfig);
 
-function testPromises() {
-    let resolveStub = sinon.stub().resolves();
-    resolveStub = sinon.stub().resolves(10);
-    const rejectStub1 = sinon.stub().rejects();
-    let rejectsStub2 = sinon.stub().rejects(new Error('Specified error'));
-    rejectsStub2 = sinon.stub().rejects("TypeError");
-}
+    const sb = sinon.createSandbox();
 
-function testMatchInvoke() {
-    const stub = sinon.stub();
-    stub(123);
-    stub.calledWithMatch(sinon.match(123));
-    stub.calledWithMatch(sinon.match((value: any) => value === 123));
-    stub.calledWithMatch(sinon.match((value: any) => value === 123, "Must be 123"));
-}
+    sb.assert.pass('foo');
+    sb.clock.tick(1000);
+    sb.spy();
+    sb.stub();
+    sb.mock(obj);
 
-function testSymbolMatch() {
-    const stub = sinon.stub();
-    stub(Symbol('TestSymbol'));
-    stub.calledWithMatch(sinon.match.symbol);
-}
+    sb.useFakeTimers();
+    sb.useFakeTimers(1000);
+    sb.useFakeTimers(new Date());
+    sb.useFakeTimers({
+        now: 1000
+    });
 
-function testResetHistory() {
-    sinon.stub().resetHistory();
-    sinon.spy().resetHistory();
-}
+    const xhr = sb.useFakeXMLHttpRequest();
+    xhr.useFilters = true;
 
-function testUsingPromises() {
-    const stub: sinon.SinonStub = sinon.stub().usingPromise(Promise);
-}
+    const server = sb.useFakeServer();
+    server.respondWith('foo');
 
-function testArrayMatchers() {
-    const stub = sinon.stub();
-    stub([{ a: 'b' }]);
-    stub.calledWithMatch(sinon.match.array);
-    stub.calledWithMatch(sinon.match.array.deepEquals([{ a: 'b' }]));
-    stub.calledWithMatch(sinon.match.array.startsWith([{ a: 'b' }]));
-    stub.calledWithMatch(sinon.match.array.deepEquals([{ a: 'b' }]));
-    stub.calledWithMatch(sinon.match.array.contains([{ a: 'b' }]));
-}
+    sb.restore();
+    sb.reset();
+    sb.resetHistory();
+    sb.resetBehavior();
+    sb.usingPromise(Promise);
+    sb.verify();
+    sb.verifyAndRestore();
 
-function testMapMatcher() {
-    const stub = sinon.stub();
-    stub(new Map([['a', true], ['b', false]]));
-    stub.calledWithMatch(sinon.match.map);
-    stub.calledWithMatch(sinon.match.map.deepEquals(new Map([['a', true], ['b', false]])));
-    stub.calledWithMatch(sinon.match.map.contains(new Map([['a', true]])));
-}
-
-function testSetMatcher() {
-    const stub = sinon.stub();
-    stub(new Set(['a', true]));
-    stub.calledWithMatch(sinon.match.set);
-    stub.calledWithMatch(sinon.match.set.deepEquals(new Set(['a', true])));
-    stub.calledWithMatch(sinon.match.set.contains(new Set([true])));
-}
-
-function testGetterStub() {
-    const myObj = {
-        prop: 'foo'
+    const replaceMe = {
+        prop: 5,
+        method() { return 6; },
+        get getter() { return 7; },
+        get setter() { return true; },
+        set setter(val) { }
     };
 
-    const stub = sinon.stub(myObj, 'prop').get(() => 'bar');
-    stub.restore();
-}
+    sb.replace(replaceMe, 'prop', 10);
+    sb.replace(replaceMe, 'method', sb.spy());
+    sb.replaceGetter(replaceMe, 'getter', () => 14);
+    sb.replaceSetter(replaceMe, 'setter', (v) => { });
 
-function testSetterStub() {
-    const myObj = {
-        prop: 'foo',
-        prop2: 'bar'
+    const cls = class {
+        foo() {}
+        bar: number;
     };
 
-    const stub = sinon.stub(myObj, 'prop').set((val: string) => myObj.prop2 = val);
-    stub.restore();
-}
-
-function testValueStub() {
-    const myObj = {
-        prop: 'foo'
-    };
-
-    const stub = sinon.stub(myObj, 'prop').value('bar');
-    stub.restore();
-}
-
-function testThrowsStub() {
-    sinon.stub().throws(new Error('foo'));
-    sinon.stub().throwsException(new Error('foo'));
-    sinon.stub().throws('foo');
-    sinon.stub().throwsException('foo');
-}
-
-function testSpy() {
-    const otherSpy = sinon.spy();
-    sinon.spy().calledAfter(otherSpy);
-    sinon.spy().calledBefore(otherSpy);
-    sinon.spy().calledImmediatelyAfter(otherSpy);
-    sinon.spy().calledImmediatelyBefore(otherSpy);
+    const stubInstance = sb.createStubInstance(cls);
+    stubInstance.foo.calledWith('foo');
+    const clsFoo: sinon.SinonStub = stubInstance.foo;
+    const clsBar: number = stubInstance.bar;
 }
 
 function testFakeServer() {
+    let s = sinon.fakeServer.create();
+    s = sinon.fakeServerWithClock.create();
+
     sinon.fakeServer.create({
         autoRespond: true,
         autoRespondAfter: 3,
         fakeHTTPMethods: true,
         respondImmediately: false
     });
+
+    sinon.fakeServer.create({
+        autoRespond: true,
+        autoRespondAfter: 3
+    });
 }
 
-function testStubObject() {
-    const myObj = {
-        setStatus() {},
-        json() {}
+function testXHR() {
+    const xhr = new sinon.FakeXMLHttpRequest();
+    const headers = xhr.getAllResponseHeaders();
+    const header = xhr.getResponseHeader('foo');
+
+    xhr.restore();
+    xhr.setResponseHeaders({ 'Content-Type': 'text/html' });
+    xhr.setResponseBody('foo');
+    xhr.respond(200, { 'Content-Type': 'foo' }, 'bar');
+    xhr.error();
+
+    sinon.FakeXMLHttpRequest.useFilters = true;
+    sinon.FakeXMLHttpRequest.addFilter((method, url, async, user, pass) => true);
+    sinon.FakeXMLHttpRequest.onCreate = (xhr) => {};
+}
+
+function testClock() {
+    let clock = sinon.clock.create(1000);
+    clock = sinon.clock.create(new Date());
+
+    let now = 0;
+    now = clock.now;
+
+    const fn = () => {};
+
+    clock.setTimeout(fn, 0);
+    clock.setTimeout(fn, 0, 'a', 'b');
+    clock.setInterval(fn, 0);
+    clock.setInterval(fn, 0, 'a', 'b');
+    clock.setImmediate(fn);
+    clock.setImmediate(fn, 'a', 'b');
+    clock.requestAnimationFrame(fn);
+
+    let timer = clock.setTimeout(fn, 0);
+    clock.clearTimeout(timer);
+    timer = clock.setInterval(fn, 0);
+    clock.clearInterval(timer);
+    timer = clock.setImmediate(fn);
+    clock.clearImmediate(timer);
+
+    const animTimer = clock.requestAnimationFrame(fn);
+    clock.cancelAnimationFrame(animTimer);
+
+    clock.nextTick(fn);
+    clock.tick(1);
+    clock.tick('00:10');
+    clock.next();
+    clock.runAll();
+    clock.runToLast();
+    clock.reset();
+    clock.runMicrotasks();
+    clock.runToFrame();
+    clock.restore();
+    clock.uninstall();
+    clock.setSystemTime(1000);
+    clock.setSystemTime(new Date());
+}
+
+function testExpectation() {
+    const obj = {};
+
+    let ex = sinon.expectation.create();
+    ex = sinon.expectation.create('some name');
+
+    ex.atLeast(5).atMost(10);
+    ex.never();
+    ex.once();
+    ex.twice();
+    ex.thrice();
+    ex.exactly(5);
+    ex.withArgs('a', 'b');
+    ex.withExactArgs('a', 'b');
+    ex.on(obj);
+    ex.verify();
+    ex.restore();
+}
+
+function testMatch() {
+    const obj = {};
+    const fn = () => {};
+
+    sinon.match(5).test(5);
+    sinon.match('str').test('foo');
+    sinon.match(/foo/).test('foo');
+    sinon.match({ a: 5, b: 6 }).test({});
+    sinon.match((v) => true).test('foo');
+    sinon.match((v) => true, 'some message').test('foo');
+    sinon.match.any.test('foo');
+    sinon.match.defined.test('foo');
+    sinon.match.truthy.test('foo');
+    sinon.match.falsy.test('foo');
+    sinon.match.bool.test('foo');
+    sinon.match.number.test('foo');
+    sinon.match.string.test('foo');
+    sinon.match.object.test('foo');
+    sinon.match.func.test(fn);
+    sinon.match.map.test(new Map([['a', 1], ['b', 2]]));
+    sinon.match.set.test(new Set([1, 2, 3]));
+    sinon.match.array.test([1, 2, 3]);
+    sinon.match.regexp.test('foo');
+    sinon.match.date.test('foo');
+    sinon.match.symbol.test('foo');
+    sinon.match.same(obj);
+    sinon.match.typeOf('string').test('foo');
+    sinon.match.instanceOf(fn).test('foo');
+    sinon.match.has('prop').test(obj);
+    sinon.match.has('prop', 123).test(obj);
+    sinon.match.hasOwn('prop').test(obj);
+    sinon.match.hasOwn('prop', 123).test(obj);
+    sinon.match.hasNested('prop.foo.bar').test(obj);
+    sinon.match.hasNested('prop.foo.bar', 123).test(obj);
+    sinon.match.every(sinon.match.number).test([1, 2, 'three']);
+    sinon.match.some(sinon.match.number).test([1, 2, 'three']);
+    sinon.match.array.deepEquals([{ a: 'b' }]).test([]);
+    sinon.match.array.startsWith([{ a: 'b' }]).test([]);
+    sinon.match.array.deepEquals([{ a: 'b' }]).test([]);
+    sinon.match.array.contains([{ a: 'b' }]).test([]);
+    sinon.match.map.deepEquals(new Map([['a', true], ['b', false]])).test(new Map());
+    sinon.match.map.contains(new Map([['a', true]])).test(new Map());
+}
+
+function testFake() {
+    const fn = () => {};
+    let fake = sinon.fake();
+
+    fake = sinon.fake(() => true);
+    fake = sinon.fake.returns(5);
+    fake = sinon.fake.throws('foo');
+    fake = sinon.fake.throws(new Error('foo'));
+    fake = sinon.fake.resolves('foo');
+    fake = sinon.fake.rejects('foo');
+    fake = sinon.fake.yields(1, 2, fn);
+    fake = sinon.fake.yieldsAsync(1, 2, fn);
+
+    fake.calledWith('foo');
+}
+
+function testAssert() {
+    const spy = sinon.spy();
+    const spyTwo = sinon.spy();
+    const obj = {};
+
+    sinon.assert.fail();
+    sinon.assert.fail('foo');
+    sinon.assert.pass('foo');
+    sinon.assert.notCalled(spy);
+    sinon.assert.called(spy);
+    sinon.assert.calledOnce(spy);
+    sinon.assert.calledTwice(spy);
+    sinon.assert.calledThrice(spy);
+    sinon.assert.callCount(spy, 3);
+    sinon.assert.callOrder(spy, spyTwo);
+    sinon.assert.calledOn(spy, obj);
+    sinon.assert.calledOn(spy.firstCall, obj);
+    sinon.assert.alwaysCalledOn(spy, obj);
+    sinon.assert.alwaysCalledWith(spy, 'a', 'b', 'c');
+    sinon.assert.neverCalledWith(spy, 'a', 'b', 'c');
+    sinon.assert.calledWithExactly(spy, 'a', 'b', 'c');
+    sinon.assert.alwaysCalledWithExactly(spy, 'a', 'b', 'c');
+    sinon.assert.calledWithMatch(spy, 'a', 'b', 'c');
+    sinon.assert.calledWithMatch(spy.firstCall, 'a', 'b', 'c');
+    sinon.assert.alwaysCalledWithMatch(spy, 'a', 'b', 'c');
+    sinon.assert.neverCalledWithMatch(spy, 'a', 'b', 'c');
+    sinon.assert.calledWithNew(spy);
+    sinon.assert.calledWithNew(spy.firstCall);
+    sinon.assert.threw(spy);
+    sinon.assert.threw(spy.firstCall);
+    sinon.assert.threw(spy, 'foo error');
+    sinon.assert.threw(spy.firstCall, 'foo error');
+    sinon.assert.threw(spy, new Error('foo'));
+    sinon.assert.threw(spy.firstCall, new Error('foo'));
+    sinon.assert.alwaysThrew(spy);
+    sinon.assert.alwaysThrew(spy, 'foo error');
+    sinon.assert.alwaysThrew(spy, 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 testSpy() {
+    const fn = () => {};
+    const obj = class {
+        foo() {}
     };
-    const stub = sinon.stub(myObj);
-    stub.setStatus.returns(stub);
-    stub.json.callCount;
+    const instance = new obj();
+
+    let spy = sinon.spy();
+    const spyTwo = sinon.spy();
+
+    spy = sinon.spy(fn);
+    spy = sinon.spy(instance, 'foo');
+
+    let count = 0;
+    count = spy.callCount;
+
+    let called = false;
+    called = spy.called;
+    called = spy.notCalled;
+    called = spy.calledOnce;
+    called = spy.calledTwice;
+    called = spy.calledThrice;
+
+    let arr: any[] = [];
+    arr = spy.thisValues;
+    arr = spy.args;
+    arr = spy.exceptions;
+    arr = spy.returnValues;
+
+    spy('a', 'b');
+    spy(1, 2);
+    spy(true);
+
+    spy.calledBefore(spyTwo);
+    spy.calledAfter(spyTwo);
+    spy.calledImmediatelyBefore(spyTwo);
+    spy.calledImmediatelyAfter(spyTwo);
+    spy.calledWithNew();
+    spy.withArgs('a', 1).calledBefore(spyTwo);
+    spy.alwaysCalledOn(instance);
+    spy.alwaysCalledWith('a', 1);
+    spy.alwaysCalledWith('a');
+    spy.alwaysCalledWithExactly('a', 1);
+    spy.alwaysCalledWithMatch('foo');
+    spy.neverCalledWith('b', 2);
+    spy.neverCalledWith('b');
+    spy.neverCalledWithMatch('foo', 'bar');
+    spy.alwaysThrew();
+    spy.alwaysThrew('foo');
+    spy.alwaysThrew(new Error('foo'));
+    spy.alwaysReturned('foo');
+    spy.invokeCallback('a', 'b');
+    spy.calledOn(instance);
+    spy.calledWith('a', 2);
+    spy.calledWithExactly('a', 2);
+    spy.calledOnceWith('a', 2);
+    spy.calledOnceWithExactly('a', 2);
+    spy.calledWithMatch('bar', 2);
+    spy.notCalledWith('a', 2);
+    spy.notCalledWithMatch('a', 2);
+    spy.returned(true);
+    spy.returned('foo');
+    spy.returned(2);
+    spy.threw();
+    spy.threw('foo');
+    spy.threw(new Error('foo'));
+    spy.callArg(1);
+    spy.callArgOn(1, instance);
+    spy.callArgOn(1, instance, 'a', 2);
+    spy.callArgWith(1, 'a', 2);
+    spy.callArgOnWith(1, instance, 'a', 2);
+    spy.yield('a', 2);
+    spy.yieldOn(instance, 'a', 2);
+    spy.yieldTo('prop', 'a', 2);
+    spy.yieldToOn('prop', instance, 'a', 2);
+
+    let call = spy.firstCall;
+    call = spy.secondCall;
+    call = spy.thirdCall;
+    call = spy.lastCall;
+    call = spy.getCall(1);
+    call = spy.getCalls()[0];
+
+    call.calledBefore(call);
+    call.calledAfter(call);
+    call.calledWithNew();
+
+    spy.resetHistory();
+    spy.restore();
 }
 
-testOne();
-testTwo();
-testThree();
-testFour();
-testFive();
-testSix();
-testSeven();
-testEight();
-testNine();
-testPromises();
-testSandbox();
-testSpy();
-testSymbolMatch();
-testResetHistory();
-testUsingPromises();
-testGetterStub();
-testSetterStub();
-testValueStub();
-testThrowsStub();
-testFakeServer();
+function testStub() {
+    const obj = class {
+        foo() {}
+    };
+    const instance = new obj();
 
-const clock = sinon.useFakeTimers();
-clock.setSystemTime(1000);
-clock.setSystemTime(new Date());
+    let stub = sinon.stub();
+    stub = sinon.stub(instance, 'foo');
 
-class TestCreateStubInstance {
-    someTestMethod(testArg: string) { }
+	const spy: sinon.SinonSpy = stub;
+
+    sinon.stub(instance);
+
+    stub.reset();
+    stub.resetBehavior();
+    stub.usingPromise(Promise);
+
+    stub.returns(true);
+    stub.returns(5);
+    stub.returns('foo');
+    stub.returnsArg(1);
+    stub.returnsThis();
+    stub.resolves();
+    stub.resolves('foo');
+    stub.throws();
+    stub.throws('err');
+    stub.throws(new Error('err'));
+    stub.throwsArg(1);
+    stub.throwsException('err');
+    stub.throwsException(new Error('err'));
+    stub.rejects();
+    stub.rejects('TypeError');
+    stub.rejects(1234);
+    stub.callsArg(1);
+    stub.callThrough();
+    stub.callsArgOn(1, instance);
+    stub.callsArgWith(1, 'a', 2);
+    stub.callsArgAsync(1);
+    stub.callsArgOnAsync(1, instance);
+    stub.callsArgWithAsync(1, 'a', 2);
+    stub.callsArgOnWithAsync(1, instance, 'a', 2);
+    stub.callsFake(() => {});
+    stub.get(() => true);
+    stub.set((v) => {});
+    stub.onCall(1).returns(true);
+    stub.onFirstCall().resolves('foo');
+    stub.onSecondCall().resolves('foo');
+    stub.onThirdCall().resolves('foo');
+    stub.value('foo');
+    stub.yields('a', 2);
+    stub.yieldsOn(instance, 'a', 2);
+    stub.yieldsRight('a', 2);
+    stub.yieldsTo('foo', 'a', 2);
+    stub.yieldsToOn('foo', instance, 'a', 2);
+    stub.yieldsAsync('a', 2);
+    stub.yieldsOnAsync(instance, 'a', 2);
+    stub.yieldsToAsync('foo', 'a', 2);
+    stub.yieldsToOnAsync('foo', instance, 'a', 2);
+    stub.withArgs('a', 2).returns(true);
 }
 
-sinon.createStubInstance(TestCreateStubInstance).someTestMethod('some argument');
-sinon.createStubInstance<TestCreateStubInstance>(TestCreateStubInstance).someTestMethod('some argument');
+function testMock() {
+    const obj = {};
+    const mock = sinon.mock(obj);
 
-function testGetCalls() {
-    const double = sinon.spy((a: number) => a * 2);
-    double(2);
-    double(4);
-    double.getCall(0).args.length === 1;
-    const secondCall = double.getCalls().find(call => call.args[0] === 4);
-    if (secondCall) {
-        secondCall.returnValue === 8;
-    }
+    mock.expects('method').atLeast(2).atMost(5);
+    mock.restore();
+    mock.verify();
 }
diff --git a/types/sinon/tsconfig.json b/types/sinon/tsconfig.json
index 2c9b85ec00..3a554d52cc 100644
--- a/types/sinon/tsconfig.json
+++ b/types/sinon/tsconfig.json
@@ -1,5 +1,6 @@
 {
     "compilerOptions": {
+        "target": "es5",
         "module": "commonjs",
         "lib": [
             "es6",
@@ -21,4 +22,4 @@
         "index.d.ts",
         "sinon-tests.ts"
     ]
-}
\ No newline at end of file
+}

From d7c858f68be01b276ba59d01263e3d5f53afd118 Mon Sep 17 00:00:00 2001
From: Dave Wasmer <davewasmer@gmail.com>
Date: Thu, 24 May 2018 09:29:31 -0600
Subject: [PATCH 415/575] Remove Context index signature

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

diff --git a/types/koa/index.d.ts b/types/koa/index.d.ts
index 07ddadc0c8..ea6bd60a46 100644
--- a/types/koa/index.d.ts
+++ b/types/koa/index.d.ts
@@ -659,8 +659,6 @@ declare namespace Application {
          * Default error handling.
          */
         onerror(err: Error): void;
-
-        [key: string]: any;
     }
 
     interface Request extends BaseRequest {

From de36724537fb493b5632a1f04fada67bba1bccb0 Mon Sep 17 00:00:00 2001
From: Tom Fletcher <fletcher.tom@gmail.com>
Date: Thu, 24 May 2018 17:07:54 +0100
Subject: [PATCH 416/575] change default type value of ComponentLifecycle
 snapshot to any

---
 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 ce80b41c35..b7a40110e9 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -369,7 +369,7 @@ declare namespace React {
     // This should actually be something like `Lifecycle<P, S> | DeprecatedLifecycle<P, S>`,
     // as React will _not_ call the deprecated lifecycle methods if any of the new lifecycle
     // methods are present.
-    interface ComponentLifecycle<P, S, SS = never> extends NewLifecycle<P, S, SS>, DeprecatedLifecycle<P, S> {
+    interface ComponentLifecycle<P, S, SS = any> extends NewLifecycle<P, S, SS>, DeprecatedLifecycle<P, S> {
         /**
          * Called immediately after a compoment is mounted. Setting state here will trigger re-rendering.
          */

From 1eaa6ae99a7bb7a7a63a836291bc14890ce256db Mon Sep 17 00:00:00 2001
From: Dan Freeman <dfreeman@salsify.com>
Date: Thu, 24 May 2018 12:59:13 -0400
Subject: [PATCH 417/575] Ember.Application extends Ember.Engine

---
 types/ember/index.d.ts          | 14 ++++++++++----
 types/ember/test/application.ts | 14 ++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index a1cfc84334..0cae10cd24 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -390,7 +390,7 @@ declare module 'ember' {
         An instance of Ember.Application is the starting point for every Ember application. It helps to
         instantiate, initialize and coordinate the many objects that make up your app.
         **/
-        class Application extends Namespace {
+        class Application extends Engine {
             /**
             Call advanceReadiness after any asynchronous setup logic has completed.
             Each call to deferReadiness must be matched by a call to advanceReadiness
@@ -1056,11 +1056,17 @@ declare module 'ember' {
              */
             namespace: Application;
         }
+        interface Initializer<T> {
+            name: string;
+            before?: string[];
+            after?: string[];
+            initialize(application: T): void;
+        }
         /**
          * The `Engine` class contains core functionality for both applications and
          * engines.
          */
-        class Engine extends Namespace {
+        class Engine extends Namespace.extend(_RegistryProxyMixin) {
             /**
              * The goal of initializers should be to register dependencies and injections.
              * This phase runs once. Because these initializers may load code, they are
@@ -1069,14 +1075,14 @@ declare module 'ember' {
              * after all initializers and therefore after all code is loaded and the app is
              * ready.
              */
-            initializer(initializer: {}): any;
+            initializer(initializer: Initializer<Engine>): void;
             /**
              * Instance initializers run after all initializers have run. Because
              * instance initializers run after the app is fully set up. We have access
              * to the store, container, and other items. However, these initializers run
              * after code has loaded and are not allowed to defer readiness.
              */
-            instanceInitializer(instanceInitializer: any): any;
+            instanceInitializer(instanceInitializer: Initializer<EngineInstance>): void;
             /**
              * Set this to provide an alternate class to `Ember.DefaultResolver`
              */
diff --git a/types/ember/test/application.ts b/types/ember/test/application.ts
index 0589e64879..c2df458214 100755
--- a/types/ember/test/application.ts
+++ b/types/ember/test/application.ts
@@ -7,6 +7,20 @@ let App = Ember.Application.create({
     }
 });
 
+App.initializer({
+    name: 'my-initializer',
+    initialize(app) {
+        app.register('foo:bar', Ember.Object.extend({ foo: 'bar' }));
+    }
+});
+
+App.instanceInitializer({
+    name: 'my-instance-initializer',
+    initialize(app) {
+        app.lookup('foo:bar').get('foo');
+    }
+});
+
 let App2 = Ember.Application.create({
     customEvents: {
         mouseenter: null,

From b7bbd0eb79682e6a7d85de2a1486581475a31d11 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 24 May 2018 10:25:52 -0700
Subject: [PATCH 418/575] wu: lint, expose WuIterable interface

---
 types/wu/index.d.ts  | 123 ++++++++++++++++++++++---------------------
 types/wu/tslint.json |   9 +---
 types/wu/wu-tests.ts |  10 ++--
 3 files changed, 68 insertions(+), 74 deletions(-)

diff --git a/types/wu/index.d.ts b/types/wu/index.d.ts
index 5bd56f391b..3d44b5140f 100644
--- a/types/wu/index.d.ts
+++ b/types/wu/index.d.ts
@@ -3,71 +3,74 @@
 // Definitions by: phiresky <https://github.com/phiresky>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare namespace Wu {
+declare function wu<T>(iterable: Iterable<T>): wu.WuIterable<T>;
+
+export = wu;
+export as namespace wu;
+
+declare namespace wu {
 	type Consumer<T> = (t: T) => void;
 	type Filter<T> = (t: T) => boolean;
 
-	interface WuStatic {
-		<T>(iterable: Iterable<T>): WuIterable<T>;
-		// only static
-		chain<T>(...iters: Array<Iterable<T>>): WuIterable<T>;
-		count(start?: number, step?: number): WuIterable<number>;
-		curryable<T>(fun: (...x: any[]) => T, expected?: number): any;
-		entries<T>(obj: { [i: string]: T }): WuIterable<[string, T]>;
-		keys<T>(obj: { [i: string]: T }): WuIterable<string>;
-		values<T>(obj: { [i: string]: T }): WuIterable<T>;
-		repeat<T>(obj: T, times?: number): WuIterable<T>;
-		// also copied to WuInterface
-		asyncEach<T>(fn: Consumer<T>, maxBlock?: number, timeout?: number): void;
-		drop<T>(n: number, iter: Iterable<T>): WuIterable<T>;
-		dropWhile<T>(fn: Filter<T>, iter: Iterable<T>): WuIterable<T>;
-		cycle<T>(iter: Iterable<T>): Iterable<T>;
-		chunk<T>(n: number, iter: Iterable<T>): WuIterable<T[]>;
-		concatMap<T, U>(fn: (t: T) => Iterable<U>, iter: Iterable<T>): WuIterable<U>;
-		enumerate<T>(iter: Iterable<T>): Iterable<[number, T]>;
-		every<T>(fn: Filter<T>, iter: Iterable<T>): boolean;
-		filter<T>(fn: Filter<T>, iter: Iterable<T>): WuIterable<T>;
-		find<T>(fn: Filter<T>, iter: Iterable<T>): T;
-		flatten(iter: Iterable<any>): WuIterable<any>;
-		flatten(shallow: boolean, iter: Iterable<any>): WuIterable<any>;
-		forEach<T>(fn: Consumer<T>, iter: Iterable<T>): void;
-		has<T>(t: T, iter: Iterable<T>): boolean;
-		// invoke<T, U>(name:string, ...t:T[], iter: Iterable<(t:T)=>U>): WuIterable<U>;
-		invoke: any;
-		map<T, U>(fn: (t: T) => U, iter: Iterable<T>): WuIterable<U>;
-		// pluck<T>(attribute:string, iter: Iterable<{[attribute]: T}>): WuIterable<T>;
-		pluck(attribute: string, iter: Iterable<any>): WuIterable<any>;
-		reduce<T>(fn: (a: T, b: T) => T, iter: Iterable<T>): T;
-		reduce<T>(fn: (a: T, b: T) => T, initial: T, iter: Iterable<T>): T;
-		reduce<T, U>(fn: (a: U, b: T) => U, iter: Iterable<T>): U;
-		reduce<T, U>(fn: (a: U, b: T) => U, initial: U, iter: Iterable<T>): U;
-		reductions<T>(fn: (a: T, b: T) => T, iter: Iterable<T>): WuIterable<T>;
-		reductions<T>(fn: (a: T, b: T) => T, initial: T, iter: Iterable<T>): WuIterable<T>;
-		reductions<T, U>(fn: (a: U, b: T) => U, iter: Iterable<T>): WuIterable<U>;
-		reductions<T, U>(fn: (a: U, b: T) => U, initial: U, iter: Iterable<T>): WuIterable<U>;
-		reject<T>(fn: Filter<T>, iter: Iterable<T>): WuIterable<T>;
-		slice<T>(iter: Iterable<T>): WuIterable<T>;
-		slice<T>(start: number, iter: Iterable<T>): WuIterable<T>;
-		slice<T>(start: number, stop: number, iter: Iterable<T>): WuIterable<T>;
-		some<T>(fn: Filter<T>, iter: Iterable<T>): boolean;
-		spreadMap<T>(fn: (...x: any[]) => T, iter: Iterable<any[]>): WuIterable<T>;
-		take<T>(n: number, iter: Iterable<T>): WuIterable<T>;
-		takeWhile<T>(fn: Filter<T>, iter: Iterable<T>): WuIterable<T>;
-		tap<T>(fn: Consumer<T>, iter: Iterable<T>): WuIterable<T>;
-		unique<T>(iter: Iterable<T>): WuIterable<T>;
-		zip<T, U>(iter2: Iterable<T>, iter: Iterable<U>): WuIterable<[T, U]>;
-		zipLongest<T, U>(iter2: Iterable<T>, iter: Iterable<U>): WuIterable<[T, U]>;
-		zipWith: any;
-		unzip: any;
-		tee<T>(iter: Iterable<T>): Array<WuIterable<T>>;
-		tee<T>(n: number, iter: Iterable<T>): Array<WuIterable<T>>;
-	}
+	// only static
+	function chain<T>(...iters: Array<Iterable<T>>): WuIterable<T>;
+	function count(start?: number, step?: number): WuIterable<number>;
+	function curryable(fun: (...x: any[]) => any, expected?: number): any;
+	function entries<T>(obj: { [i: string]: T }): WuIterable<[string, T]>;
+	function keys(obj: { [i: string]: any }): WuIterable<string>;
+	function values<T>(obj: { [i: string]: T }): WuIterable<T>;
+	function repeat<T>(obj: T, times?: number): WuIterable<T>;
+	// also copied to WuIterable
+	function asyncEach(fn: Consumer<any>, maxBlock?: number, timeout?: number): void;
+	function drop<T>(n: number, iter: Iterable<T>): WuIterable<T>;
+	function dropWhile<T>(fn: Filter<T>, iter: Iterable<T>): WuIterable<T>;
+	function cycle<T>(iter: Iterable<T>): Iterable<T>;
+	function chunk<T>(n: number, iter: Iterable<T>): WuIterable<T[]>;
+	function concatMap<T, U>(fn: (t: T) => Iterable<U>, iter: Iterable<T>): WuIterable<U>;
+	function enumerate<T>(iter: Iterable<T>): Iterable<[number, T]>;
+	function every<T>(fn: Filter<T>, iter: Iterable<T>): boolean;
+	function filter<T>(fn: Filter<T>, iter: Iterable<T>): WuIterable<T>;
+	function find<T>(fn: Filter<T>, iter: Iterable<T>): T;
+	function flatten(iter: Iterable<any>): WuIterable<any>;
+	function flatten(shallow: boolean, iter: Iterable<any>): WuIterable<any>;
+	function forEach<T>(fn: Consumer<T>, iter: Iterable<T>): void;
+	function has<T>(t: T, iter: Iterable<T>): boolean;
+	// invoke<T, U>(name:string, ...t:T[], iter: Iterable<(t:T)=>U>): WuIterable<U>;
+	const invoke: any;
+	function map<T, U>(fn: (t: T) => U, iter: Iterable<T>): WuIterable<U>;
+	// pluck<T>(attribute:string, iter: Iterable<{[attribute]: T}>): WuIterable<T>;
+	function pluck(attribute: string, iter: Iterable<any>): WuIterable<any>;
+	function reduce<T>(fn: (a: T, b: T) => T, iter: Iterable<T>): T;
+	function reduce<T>(fn: (a: T, b: T) => T, initial: T, iter: Iterable<T>): T;
+	function reduce<T, U>(fn: (a: U, b: T) => U, iter: Iterable<T>): U;
+	function reduce<T, U>(fn: (a: U, b: T) => U, initial: U, iter: Iterable<T>): U;
+	function reductions<T>(fn: (a: T, b: T) => T, iter: Iterable<T>): WuIterable<T>;
+	function reductions<T>(fn: (a: T, b: T) => T, initial: T, iter: Iterable<T>): WuIterable<T>;
+	function reductions<T, U>(fn: (a: U, b: T) => U, iter: Iterable<T>): WuIterable<U>;
+	function reductions<T, U>(fn: (a: U, b: T) => U, initial: U, iter: Iterable<T>): WuIterable<U>;
+	function reject<T>(fn: Filter<T>, iter: Iterable<T>): WuIterable<T>;
+	function slice<T>(iter: Iterable<T>): WuIterable<T>;
+	function slice<T>(start: number, iter: Iterable<T>): WuIterable<T>;
+	function slice<T>(start: number, stop: number, iter: Iterable<T>): WuIterable<T>;
+	function some<T>(fn: Filter<T>, iter: Iterable<T>): boolean;
+	function spreadMap<T>(fn: (...x: any[]) => T, iter: Iterable<any[]>): WuIterable<T>;
+	function take<T>(n: number, iter: Iterable<T>): WuIterable<T>;
+	function takeWhile<T>(fn: Filter<T>, iter: Iterable<T>): WuIterable<T>;
+	function tap<T>(fn: Consumer<T>, iter: Iterable<T>): WuIterable<T>;
+	function unique<T>(iter: Iterable<T>): WuIterable<T>;
+	function zip<T, U>(iter2: Iterable<T>, iter: Iterable<U>): WuIterable<[T, U]>;
+	function zipLongest<T, U>(iter2: Iterable<T>, iter: Iterable<U>): WuIterable<[T, U]>;
+	const zipWith: any;
+	const unzip: any;
+	function tee<T>(iter: Iterable<T>): Array<WuIterable<T>>;
+	function tee<T>(n: number, iter: Iterable<T>): Array<WuIterable<T>>;
+
 	interface WuIterable<T> extends IterableIterator<T> {
 		// generated from section "copied to WuIterable" above via
 		// sed -r 's/(, )?iter: Iterable<\w+>//' |
 		// sed -r 's/^(\s+\w+)<T>/\1/' |
 		// sed -r 's/^(\s+\w+)<T, /\1</'
-		asyncEach<T>(fn: Consumer<T>, maxBlock?: number, timeout?: number): any;
+		asyncEach(fn: Consumer<any>, maxBlock?: number, timeout?: number): any;
 		drop(n: number): WuIterable<T>;
 		dropWhile(fn: Filter<T>): WuIterable<T>;
 		cycle(): Iterable<T>;
@@ -97,13 +100,13 @@ declare namespace Wu {
 		takeWhile(fn: Filter<T>): WuIterable<T>;
 		tap(fn: Consumer<T>): WuIterable<T>;
 		unique(): WuIterable<T>;
+		// TODO: this makes no sense, where did the second entry come from?
+		// tslint:disable-next-line no-unnecessary-generics
 		zip<U>(iter2: Iterable<T>): WuIterable<[T, U]>;
+		// tslint:disable-next-line no-unnecessary-generics
 		zipLongest<U>(iter2: Iterable<T>): WuIterable<[T, U]>;
 		zipWith: any;
 		unzip: any;
 		tee(n?: number): Array<WuIterable<T>>;
 	}
 }
-declare const wu: Wu.WuStatic;
-export = wu;
-export as namespace wu;
diff --git a/types/wu/tslint.json b/types/wu/tslint.json
index 9d0759ec89..3db14f85ea 100644
--- a/types/wu/tslint.json
+++ b/types/wu/tslint.json
@@ -1,8 +1 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        // TODO
-        "no-void-expression": false,
-        "no-unnecessary-generics": false
-    }
-}
+{ "extends": "dtslint/dt.json" }
diff --git a/types/wu/wu-tests.ts b/types/wu/wu-tests.ts
index 385190d417..86be4300db 100644
--- a/types/wu/wu-tests.ts
+++ b/types/wu/wu-tests.ts
@@ -222,15 +222,13 @@ describe("wu.has", () => {
 });
 describe("wu.invoke", () => {
   it("should yield the method invokation on each item", () => {
-    function Greeter(name: string) {
-      this.name = name;
+    class Greeter {
+      constructor(readonly name: string) {}
+      greet(tail: string) { return `hello ${this.name}${tail}`; }
     }
-    Greeter.prototype.greet = function(tail: string) {
-      return `hello ${this.name}${tail}`;
-    };
     assert.eqArray(["hello world!", "hello test!"],
                    wu.invoke("greet", "!",
-                             [Greeter("world"), Greeter("test")]));
+                             [new Greeter("world"), new Greeter("test")]));
   });
 });
 describe("wu.keys", () => {

From 4ba9fb918f20ad92dc42751d4724c1249dc04ff4 Mon Sep 17 00:00:00 2001
From: Dave Wasmer <davewasmer@gmail.com>
Date: Thu, 24 May 2018 11:30:02 -0600
Subject: [PATCH 419/575] Add module augmentation to tests

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

diff --git a/types/koa/koa-tests.ts b/types/koa/koa-tests.ts
index ea0a4a18b8..2eff16857a 100644
--- a/types/koa/koa-tests.ts
+++ b/types/koa/koa-tests.ts
@@ -1,5 +1,11 @@
 import Koa = require("koa");
 
+declare module 'koa' {
+    export interface Context {
+        db(): void;
+    }
+}
+
 const app = new Koa();
 
 app.context.db = () => {};

From e7e9982b49106de3916544019e7e06d87dd10c9f Mon Sep 17 00:00:00 2001
From: Karim Alibhai <karim@foko.co>
Date: Thu, 24 May 2018 13:35:15 -0400
Subject: [PATCH 420/575] Add: null as a possible result for find methods

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

diff --git a/types/loopback/index.d.ts b/types/loopback/index.d.ts
index c743db10ce..ce096b23db 100644
--- a/types/loopback/index.d.ts
+++ b/types/loopback/index.d.ts
@@ -1490,7 +1490,7 @@ declare namespace l {
                         skip?: number;
                         where?: any;
                   }
-            ): Promise<T[]>;
+            ): Promise<T[] | null>;
 
             /**
              * Find object by ID with an optional filter for include/fields
@@ -1540,7 +1540,7 @@ declare namespace l {
                         fields?: string|any|any[];
                         include?: string|any|any[];
                   },
-            ): Promise<T>;
+            ): Promise<T | null>;
 
             /**
              * Find one model instance that matches `filter` specification.
@@ -1616,7 +1616,7 @@ declare namespace l {
                         skip?: number;
                         where?: any;
                   }
-            ): Promise<T>;
+            ): Promise<T | null>;
 
             /**
              * Finds one record matching the optional filter object. If not found, creates
@@ -1715,7 +1715,7 @@ declare namespace l {
                         skip?: number;
                         where?: any;
                   }
-            ): Promise<{instance: T, created: boolean}>;
+            ): Promise<{instance: T, created: boolean} | null>;
 
             /**
              * Get the `Change` model.

From f6f8d7f3b50a17a7e3a777bdc7e7ba24865478fc Mon Sep 17 00:00:00 2001
From: Karim Alibhai <karim@foko.co>
Date: Thu, 24 May 2018 14:18:47 -0400
Subject: [PATCH 421/575] Remove: callback-based find with arity of 1

---
 types/loopback/index.d.ts | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/types/loopback/index.d.ts b/types/loopback/index.d.ts
index ce096b23db..9d8563a810 100644
--- a/types/loopback/index.d.ts
+++ b/types/loopback/index.d.ts
@@ -1413,17 +1413,6 @@ declare namespace l {
              */
             static exists(id: any): Promise<boolean>;
 
-            /**
-             * Find all model instances that match `filter` specification.
-             * See [Querying models](docs.strongloop.com/display/LB/Querying+models)
-             * @callback {() => void} callback Callback function called with `(err, returned-instances)` arguments.    Required.
-             * @param {Error} err Error object; see [Error object](docs.strongloop.com/display/LB/Error+object).
-             * @param {Array} models Model instances matching the filter, or null if none found
-             */
-            static find<T = any>(
-                  callback: CallbackWithResult<T[]>
-            ): void;
-
             /**
              * Find all model instances that match `filter` specification.
              * See [Querying models](docs.strongloop.com/display/LB/Querying+models)

From 7e4bfb8a0285f77a1011444d364083d1546e8437 Mon Sep 17 00:00:00 2001
From: TheAppleFreak <theapplefreak@pcmasterrace.org>
Date: Thu, 24 May 2018 14:29:20 -0400
Subject: [PATCH 422/575] @types/snoowrap - Make config parameter optional

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

diff --git a/types/snoowrap/index.d.ts b/types/snoowrap/index.d.ts
index a2a36ff58e..cd2e3171d6 100644
--- a/types/snoowrap/index.d.ts
+++ b/types/snoowrap/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for snoowrap 1.15
+// Type definitions for snoowrap 1.16
 // Project: https://github.com/not-an-aardvark/snoowrap
 // Definitions by: Vito Samson <https://github.com/vitosamson>
 //                 TheAppleFreak <https://github.com/TheAppleFreak>
@@ -49,7 +49,7 @@ declare class Snoowrap {
   checkCaptchaRequirement(): Promise<boolean>;
   checkUsernameAvailability(name: string): Promise<boolean>;
   composeMessage(options: Snoowrap.ComposeMessageParams): Promise<any>;
-  config(opts: Snoowrap.ConfigOptions): Snoowrap.ConfigOptions;
+  config(opts?: Snoowrap.ConfigOptions): Snoowrap.ConfigOptions;
   createLivethread(options: LiveThreadSettings): Promise<_LiveThread>;
   createMultireddit(options: MultiRedditProperties & { name: string; subreddits: _Subreddit[] | string[]}): Promise<_MultiReddit>;
   createSubreddit(options: SubredditSettings): Promise<_Subreddit>;
diff --git a/types/snoowrap/snoowrap-tests.ts b/types/snoowrap/snoowrap-tests.ts
index dac5233653..5f83d5dfa2 100644
--- a/types/snoowrap/snoowrap-tests.ts
+++ b/types/snoowrap/snoowrap-tests.ts
@@ -54,3 +54,11 @@ export function getNewComments(subreddit: string): Listing<Comment> {
 export function thenable(): Promise<string> {
   return r.getMe().then(me => me.name);
 }
+
+export function getConfig(): Snoowrap.ConfigOptions {
+  return r.config();
+}
+
+export function setConfig(options: Snoowrap.ConfigOptions): Snoowrap.ConfigOptions {
+  return r.config(options);
+}

From e711b702bfbc0f080992ca3d452883fe56c65388 Mon Sep 17 00:00:00 2001
From: Dave Wasmer <davewasmer@gmail.com>
Date: Thu, 24 May 2018 13:24:24 -0600
Subject: [PATCH 423/575] Add tests for BaseContext as well as Context

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

diff --git a/types/koa/koa-tests.ts b/types/koa/koa-tests.ts
index 2eff16857a..2ddf9b41e2 100644
--- a/types/koa/koa-tests.ts
+++ b/types/koa/koa-tests.ts
@@ -1,9 +1,12 @@
 import Koa = require("koa");
 
 declare module 'koa' {
-    export interface Context {
+    export interface BaseContext {
         db(): void;
     }
+    export interface Context {
+        user: {};
+    }
 }
 
 const app = new Koa();
@@ -12,6 +15,7 @@ app.context.db = () => {};
 
 app.use(async ctx => {
     console.log(ctx.db);
+    ctx.user = {};
 });
 
 app.use((ctx, next) => {

From 62d867ed550721b08a8179c36849a1b378ac1668 Mon Sep 17 00:00:00 2001
From: Simon Nielsen <simonhn@gmail.com>
Date: Thu, 24 May 2018 21:49:24 +0200
Subject: [PATCH 424/575] add hierarchyRootSeparator

---
 types/storybook__addon-options/index.d.ts     |  2 ++
 .../storybook__addon-options-tests.ts         | 21 ++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/types/storybook__addon-options/index.d.ts b/types/storybook__addon-options/index.d.ts
index 2638cdab8d..9e5876101d 100644
--- a/types/storybook__addon-options/index.d.ts
+++ b/types/storybook__addon-options/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for @storybook/addon-options 3.2
 // Project: https://github.com/storybooks/storybook
 // Definitions by: Joscha Feth <https://github.com/joscha>
+//                 Simon Helle Nielsen <https://github.com/simonhn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -14,6 +15,7 @@ export interface Options {
     downPanelInRight?: boolean;
     sortStoriesByKind?: boolean;
     hierarchySeparator?: RegExp | string;
+    hierarchyRootSeparator?: RegExp | string;
 }
 
 export function setOptions(options: Options): void;
diff --git a/types/storybook__addon-options/storybook__addon-options-tests.ts b/types/storybook__addon-options/storybook__addon-options-tests.ts
index b88cf0504f..8524304624 100644
--- a/types/storybook__addon-options/storybook__addon-options-tests.ts
+++ b/types/storybook__addon-options/storybook__addon-options-tests.ts
@@ -1,17 +1,18 @@
 import { setOptions } from '@storybook/addon-options';
 
 setOptions({
-  name: 'My Storybook',
-  url: 'https://example.com',
-  goFullScreen: false,
-  showLeftPanel: false,
-  showDownPanel: false,
-  showSearchBox: false,
-  downPanelInRight: false,
-  sortStoriesByKind: false,
-  hierarchySeparator: /\//,
+    name: 'My Storybook',
+    url: 'https://example.com',
+    goFullScreen: false,
+    showLeftPanel: false,
+    showDownPanel: false,
+    showSearchBox: false,
+    downPanelInRight: false,
+    sortStoriesByKind: false,
+    hierarchySeparator: /\//,
+    hierarchyRootSeparator: /\|/
 });
 
 setOptions({
-  hierarchySeparator: '.',
+    hierarchySeparator: '.'
 });

From 5337f52ec155f7e6448cef322774fe5950dfe8fa Mon Sep 17 00:00:00 2001
From: Simon Nielsen <simonhn@gmail.com>
Date: Thu, 24 May 2018 21:52:01 +0200
Subject: [PATCH 425/575] spaces

---
 .../storybook__addon-options-tests.ts         | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/types/storybook__addon-options/storybook__addon-options-tests.ts b/types/storybook__addon-options/storybook__addon-options-tests.ts
index 8524304624..03c2ebfcda 100644
--- a/types/storybook__addon-options/storybook__addon-options-tests.ts
+++ b/types/storybook__addon-options/storybook__addon-options-tests.ts
@@ -1,18 +1,18 @@
 import { setOptions } from '@storybook/addon-options';
 
 setOptions({
-    name: 'My Storybook',
-    url: 'https://example.com',
-    goFullScreen: false,
-    showLeftPanel: false,
-    showDownPanel: false,
-    showSearchBox: false,
-    downPanelInRight: false,
-    sortStoriesByKind: false,
-    hierarchySeparator: /\//,
-    hierarchyRootSeparator: /\|/
+  name: 'My Storybook',
+  url: 'https://example.com',
+  goFullScreen: false,
+  showLeftPanel: false,
+  showDownPanel: false,
+  showSearchBox: false,
+  downPanelInRight: false,
+  sortStoriesByKind: false,
+  hierarchySeparator: /\//,
+  hierarchyRootSeparator: /\|/
 });
 
 setOptions({
-    hierarchySeparator: '.'
+  hierarchySeparator: '.'
 });

From 235072eab26a40527778755dd477cce3bcc494ae Mon Sep 17 00:00:00 2001
From: Michael Zlatkovsky <michael.zlatkovsky@microsoft.com>
Date: Thu, 24 May 2018 16:01:47 -0700
Subject: [PATCH 426/575] Improve Outlook IntelliSense experience

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 729b4c1bc1..a6d4375fb2 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -4645,11 +4645,6 @@ declare namespace Office {
         urls: Array<string>;
     }
     export interface Item {
-        /**
-        * You can cast item with `(Item as Office.[CAST_TYPE])` where CAST_TYPE is one of the following: ItemRead, ItemCompose, Message,
-        * MessageRead, MessageCompose, Appointment, AppointmentRead, AppointmentCompose
-        */
-        __BeSureToCastThisObject__: void;
         body: Body;
         itemType: Office.MailboxEnums.ItemType;
         notificationMessages: NotificationMessages;
@@ -4925,7 +4920,11 @@ declare namespace Office {
     export interface Mailbox {
         diagnostics: Diagnostics;
         ewsUrl: string;
-        item: Item;
+        /** The mailbox item.  Depending on the context in which the add-in opened, the item may be of any number of types.
+         * If you want to see IntelliSense for only a specific type, you should cast this item to one of the following:
+         * `ItemCompose`, `ItemRead`, `MessageCompose`, `MessageRead`, `AppointmentCompose`, `AppointmentRead`
+         */
+        item: Item & MessageRead & MessageCompose & AppointmentRead & AppointmentCompose;
         userProfile: UserProfile;
         /**
          * Adds an event handler for a supported event
@@ -47186,4 +47185,4 @@ declare namespace Visio {
 
 ////////////////////////////////////////////////////////////////
 //////////////////////// End Visio APIs ////////////////////////
-////////////////////////////////////////////////////////////////Contains the host in which the add-in (web application) is running in. Possible values are: Word, Excel, PowerPoint
\ No newline at end of file
+////////////////////////////////////////////////////////////////

From dc04b32deb3e02a4154838cc75ed3ba6545655c3 Mon Sep 17 00:00:00 2001
From: Niels de Bruin <nielsdB97@gmail.com>
Date: Fri, 25 May 2018 01:43:47 +0200
Subject: [PATCH 427/575] Added gamma method to Scale type

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

diff --git a/types/chroma-js/index.d.ts b/types/chroma-js/index.d.ts
index 797752c8ad..daf53a0e10 100644
--- a/types/chroma-js/index.d.ts
+++ b/types/chroma-js/index.d.ts
@@ -293,6 +293,8 @@ declare namespace chroma {
 
         mode(mode: keyof ColorSpaces): this;
 
+        gamma(g: number): this;
+
         cache(use: boolean): boolean;
 
         correctLightness(enable?: boolean): this;

From 78ad9898503b70146222bd4726b20cbefb3f4b5f Mon Sep 17 00:00:00 2001
From: Matthias Adler <macedigital@users.noreply.github.com>
Date: Fri, 25 May 2018 02:10:27 +0200
Subject: [PATCH 428/575] Add all parser options to express-xml-bodyparser

All `xml2js` configuration options can be passed into the middleware,
not only a select few.

Add test to assert that it is possible to change regexp even though this potentially affects
all parser instances.
---
 .../express-xml-bodyparser-tests.ts           | 52 +++++++++++++++++--
 types/express-xml-bodyparser/index.d.ts       | 18 +++----
 2 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/types/express-xml-bodyparser/express-xml-bodyparser-tests.ts b/types/express-xml-bodyparser/express-xml-bodyparser-tests.ts
index e8deca25e3..6ea6f652a4 100644
--- a/types/express-xml-bodyparser/express-xml-bodyparser-tests.ts
+++ b/types/express-xml-bodyparser/express-xml-bodyparser-tests.ts
@@ -3,8 +3,54 @@ import xmlparser = require('express-xml-bodyparser');
 
 const app: express.Express = express();
 
+// xml-parser with no options
 app.use(xmlparser());
 
-app.post("/auth", xmlparser({explicitArray: false}), (req, res, next) => {
-    res.send("Success!");
-});
+// xml-parser with implicit default options
+app.use(xmlparser({}));
+
+// xml-parser with explicit default options
+app.use(xmlparser({
+    async: false,
+    explicitArray: true,
+    normalize: true,
+    normalizeTags: true,
+    trim: true
+}));
+
+// xml-parser with all options
+app.use(xmlparser({
+    async: true,
+    attrkey: 'attrkey',
+    attrNameProcessors: [(name => String.fromCharCode((42 + name.length) & 127))],
+    attrValueProcessors: [(name => String.fromCharCode((24 + name.length) & 127))],
+    charkey: 'charKey',
+    charsAsChildren: true,
+    childkey: 'childkey',
+    emptyTag: 'emptyTag',
+    explicitArray: true,
+    explicitCharkey: true,
+    explicitChildren: true,
+    explicitRoot: true,
+    ignoreAttrs: false,
+    includeWhiteChars: false,
+    mergeAttrs: true,
+    normalize: true,
+    normalizeTags: true,
+    strict: true,
+    tagNameProcessors: [(name) => name.toLocaleLowerCase()],
+    trim: true,
+    validator: () => false,
+    valueProcessors: [],
+    xmlns: true,
+}));
+
+// xml-parser as route middleware with custom options
+const routeMiddleware: express.Handler = xmlparser({ explicitArray: false, strict: false });
+const routeHandler: express.RequestHandler = (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    res.send('Success!');
+};
+app.post('/auth', [routeMiddleware], routeHandler);
+
+// overriding mime-type regexp
+xmlparser.regexp = /text\/(stranger|things)/;
diff --git a/types/express-xml-bodyparser/index.d.ts b/types/express-xml-bodyparser/index.d.ts
index 1c674d71fb..07c99ecdbb 100644
--- a/types/express-xml-bodyparser/index.d.ts
+++ b/types/express-xml-bodyparser/index.d.ts
@@ -1,23 +1,19 @@
 // Type definitions for express-xml-bodyparser 0.3
 // Project: https://github.com/macedigital/express-xml-bodyparser
-// Definitions by: Notice Maker <https://github.com/noticeMaker>
+// Definitions by:  Notice Maker <https://github.com/noticeMaker>
+//                  Matthias Adler <https://github.com/macedigital>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import { Request, Response, NextFunction } from 'express';
+import { Handler } from 'express';
 
-declare function xmlparser(options?: xmlparser.XmlparserOptions): (req: Request, res: Response, next: NextFunction) => void;
+import { Options as XmlParserOptions } from 'xml2js';
+
+declare function xmlparser(options?: XmlParserOptions): Handler;
 
 declare namespace xmlparser {
+    // @deprecated Will be removed in future versions
     let regexp: RegExp;
-
-    interface XmlparserOptions {
-        async?: boolean;
-        explicitArray?: boolean;
-        normalize?: boolean;
-        normalizeTags?: boolean;
-        trim?: boolean;
-    }
 }
 
 export = xmlparser;

From f7a6ab5f33bb328030c6395dcd56e11e1991f757 Mon Sep 17 00:00:00 2001
From: Bryce Godfrey <bryce.godfrey@avanade.com>
Date: Thu, 24 May 2018 17:41:50 -0700
Subject: [PATCH 429/575] servicenow jakarta api

---
 types/servicenow-jakarta/index.d.ts           | 595 ++++++++++++++++++
 .../servicenow-jakarta-tests.ts               |  26 +
 types/servicenow-jakarta/tsconfig.json        |  23 +
 types/servicenow-jakarta/tslint.json          |   1 +
 4 files changed, 645 insertions(+)
 create mode 100644 types/servicenow-jakarta/index.d.ts
 create mode 100644 types/servicenow-jakarta/servicenow-jakarta-tests.ts
 create mode 100644 types/servicenow-jakarta/tsconfig.json
 create mode 100644 types/servicenow-jakarta/tslint.json

diff --git a/types/servicenow-jakarta/index.d.ts b/types/servicenow-jakarta/index.d.ts
new file mode 100644
index 0000000000..8e92fa0ce0
--- /dev/null
+++ b/types/servicenow-jakarta/index.d.ts
@@ -0,0 +1,595 @@
+declare const email: servicenow.IGlideEmailOutbound;
+declare const g_processor: servicenow.IGlideScriptedProcessor;
+declare const g_request: servicenow.IGlideServletRequest;
+declare const g_response: servicenow.IGlideServletResponse;
+declare const gs: servicenow.IGlideSystem;
+declare const GlideRecordSecure: servicenow.IGlideRecord;
+declare const GlideRecord: servicenow.IGlideRecord;
+
+declare namespace sn_ws {
+    class RESTMessageV2 {
+        constructor();
+        constructor (name: string, methodName: servicenow.RestHTTPMethods);
+        execute(): servicenow.IRESTResponseV2;
+        executeAsync(): servicenow.IRESTResponseV2;
+        getEndpoint(): string;
+        getRequestBody(): string;
+        getRequestHeader(headerName: string): string;
+        getRequestHeaders(): object;
+        saveResponseBodyAsAttachment(tableName: string, recordSysId: string, fileName: string, encryptContext?: string): void;
+        setAuthenticationProfile(type: string, profileId: string): void;
+        setBasicAuth(userName: string, userPass: string): void;
+        setEccCorrelator(correlator: string): void;
+        setEccParameter(name: string, value: string): void;
+        setEndpoint(endpoint: string): void;
+        setHttpMethod(method: servicenow.RestHTTPMethods): void;
+        setHttpTimeout(timeoutMs: number): void;
+        setLogLevel(level: 'basic'|'elevated'|'all'): void;
+        setMIDServer(midServer: string): void;
+        setMutualAuth(profileName: string): void;
+        setQueryParameter(name: string, value: string): void;
+        setRequestBody(body: string): void;
+        setRequestBodyFromAttachment(sys_id: string): void;
+        setRequestBodyFromStream(stream: object): void;
+        setRequestHeader(name: string, value: string): void;
+        setRequestorProfile(requestorContext: string, requestorId: string): void;
+        setStringParameter(name: string, value: string): void;
+        setStringParameterNoEscape(name: string, value: string): void;
+    }
+
+    class SOAPMessageV2 {
+        constructor ();
+        constructor (soapMessage: string, soapFunction: string);
+        execute(): servicenow.ISOAPResponseV2;
+        executeAsync(): servicenow.ISOAPResponseV2;
+        setHttpMethod(method: string): void;
+        setHttpTimeout(timeoutMs: number): void;
+        setBasicAuth(userName: string, userPass: string): void;
+        setMutualAuth(profileName: string): void;
+        setEccCorrelator(correlator: string): void;
+        setEccParameter(name: string, value: string): void;
+        setEndpoint(endpoint: string): void;
+        setMIDServer(midServer: string): void;
+        setRequestBody(body: string): void;
+        setRequestHeader(name: string, value: string): void;
+        setStringParameter(name: string, value: string): void;
+        setStringParameterNoEscape(name: string, value: string): void;
+        setWSSecurity(keystoreId: string, keystoreAlias: string, keystorePassword: string, certificateId: string): void;
+        getRequestBody(): string;
+        getEndpoint(): string;
+        getRequestHeader(headerName: string): string;
+        getRequestHeaders(): object;
+    }
+}
+
+declare namespace global {
+    class GlideStringUtil {
+        static base64Decode(value: string): string;
+        static base64DecodeAsBytes(value: string): any;
+        static escapeHTML(value: string): string;
+        static getStringFromStream(stream: object): string;
+    }
+
+    class Class {
+        static create(): any;
+    }
+
+    class Workflow {
+        constructor();
+        broadcastEvent(contextId: string, eventName: string): void;
+        cancel(record: servicenow.IGlideRecord): void;
+        cancelContext(context: servicenow.IGlideRecord): void;
+        deleteWorkflow(current: servicenow.IGlideRecord): void;
+        fireEvent(eventRecord: servicenow.IGlideRecord, eventName: string): void;
+        fireEventById(eventRecordId: string, eventName: string): void;
+        getContexts(record: servicenow.IGlideRecord): servicenow.IGlideRecord;
+        getEstimatedDeliveryTime(workflowId: string): string;
+        getEstimatedDeliveryTimeFromWFVersion(wfVersion: servicenow.IGlideRecord): string;
+        getReturnValue(workflowID: string, amount: number, result: boolean): any|null;
+        getRunningFlows(record: servicenow.IGlideRecord): servicenow.IGlideRecord;
+        getVersion(workflowId: string): void;
+        getVersionFromName(workflowName: string): void;
+        getWorkflowFromName(workflowName: string): void;
+        hasWorkflow(record: servicenow.IGlideRecord): boolean;
+        restartWorkflow(record: servicenow.IGlideRecord, maintainStateFlag: boolean): void;
+        runFlows(record: servicenow.IGlideRecord, operation: servicenow.GlideRecordOperation): void;
+        startFlow(workflowId: string, current: servicenow.IGlideRecord|null, operation: servicenow.GlideRecordOperation, vars?: object) : string;
+        startFlowFromContextInsert(context: servicenow.IGlideRecord, operation: servicenow.GlideRecordOperation): void;
+        startFlowRetroactive(workflowID: string, retroactiveMSecs: number, current: servicenow.IGlideRecord, operation: servicenow.GlideRecordOperation, vars?: object, withSchedule?: any): servicenow.IGlideRecord;
+   
+    }
+}
+
+declare class GlideDateTime {
+    constructor ();
+    constructor (value: string);
+    constructor (g: GlideDateTime);
+
+    add(gd: servicenow.IGlideTime): void;
+    add(milliseconds: number): void;
+    addDaysLocalTime(amount: number): void;
+    addDaysUTC(amount: number): void;
+    addMonthsLocalTime(amount: number): void;
+    addMonthsUTC(amount: number): void;
+    addSeconds(value: number): void;
+    addWeeksLocalTime(amount: number): void;
+    addWeeksUTC(amount: number): void;
+    addYearsLocalTime(amount: number): void;
+    addYearsUTC(amount: number): void;
+    compareTo(o: object): number;
+    equals(o: object): boolean;
+    getDSTOffset(): number;
+    getDate(): servicenow.IGlideTime;
+    getDayOfMonthLocalTime(): number;
+    getDayOfMonthUTC(): number;
+    getDayOfWeekLocalTime(): number;
+    getDayOfWeekUTC(): number;
+    getDaysInMonthUTC(): number;
+    getDisplayValue(): string;
+    getDisplayValueInternal(): string;
+    getDSTOffset(): number;
+    getErrorMsg(): string;
+    getLocalDate(): servicenow.IGlideTime;
+    getLocalTime(): servicenow.IGlideTime;
+    getMonthLocalTime(): number;
+    getMonthUTC(): number;
+    getNumericValue(): number;
+    getTZOffset(): number;
+    getTime(): servicenow.IGlideTime;
+    getValue(): string;
+    getWeekOfYearLocalTime(): number;
+    getWeekOfYearUTC(): number;
+    getYearLocalTime(): number;
+    getYearUTC(): number;
+    hasDate(): boolean;
+    isDST(): boolean;
+    isValid(): boolean;
+    setDayOfMonthLocalTime(day: number): void;
+    setDayOfMonthUTC(day: number): void;
+    setDisplayValue(asDisplayed: string): void;
+    setDisplayValue(value: string, format: string): void;
+    setDisplayValueInternal(value: string): void;
+    setGlideDateTime(g: GlideDateTime): void;
+    setMonthLocalTime(month: number): void;
+    setMonthUTC(month: number): void;
+    setNumericValue(milliseconds: number): void;
+    setValue(o: string|number|GlideDateTime): void;
+    setValueUTC(dt: string, format: string): void;
+    setYearLocalTime(year: number): void;
+    setYearUTC(year: number): void;
+    subtract(gd: servicenow.IGlideTime): void;
+    subtract(start: GlideDateTime, end: GlideDateTime): GlideDuration;
+    subtract(value: number): void;
+    subtract(time: servicenow.IGlideTime): void;
+    toString(): string;
+}
+
+declare class RP {
+    static getReferringURL(): string;
+    static isDialog(): boolean;
+    static isHomePage(): boolean;
+    static isPrint(): boolean;
+    static isMobile(): boolean;
+    static getParameterValue(value: string): string;
+    static getParameters(): Array<string>;
+    static getViewID(): string;
+}
+
+declare class XMLDocument2 {
+    constructor ();
+    parseXML(xmlDoc: string): void;
+    getNodeText(xpath: string): string;
+    getNode(xpath: string): servicenow.IXMLNode;
+    getFirstNode(xpath: string): servicenow.IXMLNode;
+    getNextNode(prev: object): servicenow.IXMLNode;
+    createElement(name: string): servicenow.IXMLNode;
+    createElementWithTextValue(name: string, value: string): servicenow.IXMLNode;
+    setCurrentElement(element: servicenow.IXMLNode): void;
+    getDocumentElement(): servicenow.IXMLNode;
+    toString(): string;
+}
+
+declare class GlideDuration {
+    constructor ();
+    constructor (another: GlideDuration);
+    constructor (ms: number);
+    constructor (displayValue: string);
+    add(value: GlideDuration): GlideDuration;
+    getByFormat(format: string): string;
+    getDayPart(): number;
+    getRoundedDayPart(): number;
+    getDisplayValue(): string;
+    getDurationValue(): string;
+    getValue(): string;
+    setDisplayValue(asDisplayed: string): void;
+    setValue(o: object): void;
+    subtract(value: GlideDuration): GlideDuration;
+    getNumericValue(): number;
+}
+
+declare class GlideFilter {
+    static checkRecord(gr: servicenow.IGlideRecord, filter: string, matchAll?: object): boolean;
+}
+
+declare class GlideGuid {
+    static generate(): string;
+}
+
+declare class GlideLocale {
+    static get(): GlideLocale;
+    getGroupingSeparator(): string;
+    getDecimalSeparator(): string;
+}
+
+declare class GlidePluginManager {
+    static isActive(pluginId: string): boolean;
+}
+
+declare class GlideSchedule {
+    constructor ();
+    constructor (sysId: string, timeZone: string);
+    add(startDate: GlideDateTime, offset: GlideDuration): GlideDateTime;
+    duration(startDate: GlideDateTime, endDate: GlideDateTime): GlideDuration;
+    getName(): string;
+    isInSchedule(time: GlideDateTime): string;
+    isValid(): boolean;
+    load(sysId: string, timeZone: string, excludeSpanId: string): void;
+    setTimeZone(tz: string): void;
+    whenNext(time: GlideDateTime, timeZone: string): number;
+}
+
+declare class GlideEvaluator {
+    constructor ();
+    evaluateScript(grObj: servicenow.IGlideRecord, scriptField?: string, variables?: object): object;
+    getVariable<T>(name: string): T;
+    putVariable<T>(name: string, value: T): void;
+}
+
+declare class GlideSecureRandomUtil {
+    static getSecureRandomInt(): number;
+    static getSecureRandomIntBound(bound: number): number;
+    static getSecureRandomLong(): number;
+    static getSecureRandomString(length: number): string;
+}
+
+declare class GlideSysAttachment {
+    constructor ();
+    copy(sourceTable: string, sourceSysId: string, destinationTable: string, destinationSysId: string): void;
+    deleteAttachment(sysId: string): void;
+    getContent(record: servicenow.IGlideRecord): any;
+    getContentBase64(record: servicenow.IGlideRecord): string;
+    getContentStream(sysId: string): object;
+    write(record: servicenow.IGlideRecord, fileName: string, contentType: string, data: any): string;
+    writeBase64(record: servicenow.IGlideRecord, fileName: string, contentType: string, base64Content: string): string;
+    writeContentStream(record: servicenow.IGlideRecord, fileName: string, contentType: string, inputStream: object): string;
+}
+
+declare namespace servicenow {
+    export interface IGlideRecord {
+        readonly sys_created_by: string & IGlideElement;
+        readonly sys_created_on: GlideDateTime & IGlideElement;
+        readonly sys_id: string;
+        readonly sys_mod_count: number & IGlideElement;
+        readonly sys_updated_by: string & IGlideElement;
+        readonly sys_updated_on: GlideDateTime & IGlideElement;
+        
+        new (type: string) : IGlideRecord;
+
+        addActiveQuery(): IGlideQueryCondition;
+        addEncodedQuery(query: string): void;
+        addJoinQuery(joinTable: string, primaryField?: string, joinTableField?: string): IGlideQueryCondition;
+        addNotNullQuery(fieldName: string): IGlideQueryCondition;
+        addNullQuery(fieldName: string): IGlideQueryCondition;
+        addQuery(encodedQuery: string): IGlideQueryCondition;
+        addQuery(fieldName: string, operator: QueryOperator, value: object|string|number): IGlideQueryCondition;
+        addQuery(fieldName: string, value: object|string|number): IGlideQueryCondition;
+        canCreate(): boolean;
+        canDelete(): boolean;
+        canRead(): boolean;
+        canWrite(): boolean;
+        chooseWindow(firstRow: number, lastRow: number, forceCount?: boolean): void;
+        deleteMultiple(): void;
+        deleteRecord(): boolean;
+        get(name: string, value?: string): boolean;
+        getAttribute(fieldName: string): string;
+        getClassDisplayValue(): string;
+        getDisplayValue(field?: string): string;
+        getED(): IGlideElementDescriptor;
+        getElement(columnName: string): IGlideElement;
+        getEncodedQuery(): string;
+        getLabel(): string;
+        getLastErrorMessage(): string;
+        getLink(noStack: boolean): string;
+        getRecordClassName(): string;
+        getRowCount(): number;
+        getTableName(): string;
+        getUniqueValue(): string;
+        getValue(name: string): string;
+        hasNext(): boolean;
+        initialize(): void;
+        insert(): string;
+        isActionAborted(): boolean;
+        isNewRecord(): boolean;
+        isValid(): boolean;
+        isValidField(columnName: string): boolean;
+        isValidRecord(): boolean;
+        newRecord(): void;
+        next(): boolean;
+        _next(): boolean;
+        operation(): servicenow.GlideRecordOperation;
+        orderBy(name: string): void;
+        orderByDesc(name: string): void;
+        query(): void;
+        query(field: string, value: object): void;
+        query(query: string): void;
+        _query(field: string, value: object): void;
+        setAbortAction(b: boolean): void;
+        setNewGuidValue(guid: string): void;
+        setLimit(limit: number): void;
+        setValue(name: string, value: object): void;
+        setWorkflow(enable: boolean): void;
+        update(reason?: string): string;
+        updateMultiple(): void;
+    }
+export interface IGlideEmailOutbound {
+    getSubject(): string;
+    setSubject(subject: string): void;
+    setFrom(address: string): void;
+    setReplyTo(address: string): void;
+    addAddress(type: string, address: string, displayName: string): void;
+    setBody(bodyText: string): void;
+}
+
+export interface IGlideQueryCondition {
+    addCondition(name: string, value: object|string|number): IGlideQueryCondition;
+    addCondition(name: string, oper: QueryOperator, value: object|string|number): IGlideQueryCondition;
+    addOrCondition(name: string, oper: QueryOperator, value: object|string|number): IGlideQueryCondition;
+    addOrCondition(name: string, value: object|string|number): IGlideQueryCondition;
+}
+
+export interface IGlideElement {
+    changes(): boolean;
+    changesFrom(value: object): boolean;
+    changesTo(value: object): boolean;
+    getChoices(name?: string): Array<any>;
+    getDecryptedValue(): string;
+    getDisplayValue(maxCharacters?: number): string;
+    getED(): IGlideElementDescriptor
+    getReferenceTable(): string;
+    getRefRecord(): IGlideRecord;
+    nil(): boolean;
+    setDisplayValue(value: object): void;
+    setError(value: string): void;
+    setValue(value: object|string): void;
+    toString(): string;
+}
+
+export interface IGlideElementDescriptor {
+    getAttachmentEncryptionType(): string;
+    getEncryptionType(): string;
+    getInternalType(): string;
+    getLabel(): string;
+    getLength(): number;
+    getName(): string;
+    getPlural(): boolean;
+    hasAttachmentsEncrypted(): boolean;
+    isAutoOrSysID(): boolean;
+    isChoiceTable(): boolean;
+    isEdgeEncrypted(): boolean;
+    isVirtual(): boolean;
+}
+
+export interface IGlideScriptedProcessor {
+    redirect(url: string): void;
+    writeOutput(s: string): void;
+    writeOutput(contentType: string, s: string): void;
+    writeJSON(o: object): void;
+}
+
+export interface IGlideServletRequest {
+    getContentType(): string;
+    getHeader(name: string): string;
+    getParameter(name: string): string;
+    writeOutput(mimeType: string, output: string): void;
+    toString(): string;
+}
+
+export interface IGlideServletResponse {
+    setContentType(type: string): void;
+    setHeader(name: string, value: string): void;
+    setStatus(value: number): void;
+}
+
+export interface IGlideSession {
+    isInteractive(): boolean;
+    isLoggedIn(): boolean;
+    getClientData(paramName: string): string;
+    getClientIP(): string;
+    getCurrentApplicationId(): string;
+    getLanguage(): string;
+    getTimeZoneName(): string;
+    getSessionToken(): string;
+    getUrlOnStack(): string;
+    putClientData(paramName: string, paramValue: string): void;
+}
+
+
+
+export interface IGlideTime {
+    new (milliseconds: number): IGlideTime;
+    getByFormat(format: string): string;
+    getDisplayValue(): string;
+    getDisplayValueinternal(): string;
+    getValue(): string;
+    setDisplayValue(asDisplayed: string): void;
+    setValue(o: string): void;
+    subtract(start: IGlideTime, end: IGlideTime): GlideDuration;
+}
+
+export interface IGlideSystem {
+    addErrorMessage(message: string): void;
+    addInfoMessage(message: string): void;
+    base64Decode(source: string): string;
+    base64Encode(source: string): string;
+    beginningOfLastMonth(): string;
+    beginningOfLastWeek(): string;
+    beginningOfNextWeek(): string;
+    beginningOfNextMonth(): string;
+    beginningOfNextYear(): string;
+    beginningOfThisMonth(): string;
+    beginningOfThisQuarter(): string;
+    beginningOfThisWeek(): string;
+    beginningOfThisYear(): string;
+    dateGenerate(date: string): string;
+    daysAgo(days: number): string;
+    daysAgoEnd(days: number): string;
+    daysAgoStart(days: number): string;
+    debug(message: string, parm1?: any, parm2?: any, parm3?: any, parm4?: any, parm5?: any): void;
+    endOfLastMonth(): string;
+    endOfLastWeek(): string;
+    endOfLastYear(): string;
+    endOfNextMonth(): string;
+    endOfNextWeek(): string;
+    endOfNextYear(): string;
+    endOfThisMonth(): string;
+    endOfThisQuarter(): string;
+    endOfThisWeek(): string;
+    endOfThisYear(): string;
+    error(message: string, parm1?: any, parm2?: any, parm3?: any, parm4?: any, parm5?: any): void;
+    eventQueue(eventName: string, gr: IGlideRecord, optionalParam1: string, optionalParam2: string, eventQueue?: string): void;
+    eventQueueScheduled(name: string, instance: IGlideRecord, parm1: string, parm2: string, expiration: object): void;
+    executeNow(job: IGlideRecord): string;
+    generateGUID(): string;
+    getCallerScopeName(): string;
+    getCssCacheVersionString(): string;
+    getCurrentApplicationId(): string;
+    getCurrentScopeName(): string;
+    getErrorMessages(id: string, args?: Array<string>): string;
+    getMessage(id: string, object?: any): string;
+    getProperty<T>(key: string, altobject?: T): T;
+    getSession(): string | IGlideSession;
+    getSessionID(): string;
+    getSessionToken(): string;
+    getTimeZoneName(): string;
+    getUrlOnStack(): string;
+    getUser(): IGlideUser;
+    getUserDisplayName(): string;
+    getUserID(): string;
+    getUserName(): string;
+    getUserNameByUserID(id: string): string;
+    hasRole(roleName: string): boolean;
+    include(include: string): void;
+    info(message: string, parm1?: any, parm2?: any, parm3?: any, parm4?: any, parm5?: any): void;
+    isDebugging(): boolean;
+    isInteractive(): boolean;
+    isLoggedIn(): boolean;
+    isMobile(): boolean;
+    minutesAgoEnd(num: number): string;
+    minutesAgoStart(num: number): string;
+    monthsAgo(num: number): string;
+    monthsAgoEnd(num: number): string;
+    monthsAgoStart(num: number): string;
+    nil(object: any): boolean;
+    quartersAgoEnd(num: number): string;
+    quartersAgoStart(num: number): string;
+    setRedirect(uri: string): void;
+    tableExists(table: string): boolean;
+    warn(message: string, parm1?: any, parm2?: any, parm3?: any, parm4?: any, parm5?: any): void;
+    xmlToJSON(xml: string): any;
+    yearsAgo(years: number): string;
+    yesterday(): string;
+}
+
+export interface IGlideUser {
+    getCompanyID(): string;
+    getDisplayName(): string;
+    getID(): string;
+    getName(): string;
+    getPreference(name: string): string;
+    hasRole(role: string): boolean;
+    isMemberOf(group: string): boolean;
+    savePreference(name: string, value: string): void;
+}
+
+export interface IXMLNode {
+    getLastChild(): IXMLNode;
+    getFirstChild(): IXMLNode;
+    getNodeValue(): string;
+    getNodeName(): string;
+    hasAttribute(name: string): boolean;
+    getAttribute(attribute: string): string;
+    getChildNodeIterator(): IXMLNodeIterator;
+    getTextContent(): string;
+    toString(): string;
+}
+
+export interface IXMLNodeIterator {
+    hasNext(): Boolean;
+    next(): IXMLNode;
+}
+
+export interface ISOAPResponseV2 {
+    waitForResponse(timeoutSecs: number): void;
+    getStatusCode(): number;
+    getHeader(name: string): string;
+    getHeaders(): object;
+    getBody(): string;
+    haveError(): boolean;
+    getErrorCode(): number;
+    getErrorMessage(): string;
+}
+
+export interface IRESTResponseV2 {
+    getBody(): string;
+    getCookies(): {size: ()=>number, get: (index: number)=>string};
+    getErrorCode(): number;
+    getErrorMessage(): string;
+    getHeader(name: string): string;
+    getHeaders(): object;
+    getQueryString(): string;
+    getResponseAttachmentSysid(): string;
+    getStatusCode(): number;
+    haveError(): boolean;
+    waitForResponse(timeoutSecs: number): void;
+}
+
+export interface IRESTAPIRequest<T> {
+    body: IRESTAPIRequestBody<T>;
+    pathParams: { [paramName: string]: string };
+    queryParams: { [paramName: string]: Array<string> };
+    queryString: string;
+    uri: string;
+    url: string;
+    headers: { [paramName: string]: string };
+    getHeader(header: string): string;
+    getSupportedResponseContentTypes(): Array<string>;
+}
+
+export interface IRESTAPIRequestBody<T> {
+    data: T;
+    dataStream: any;
+    dataString: string;
+    hasNext(): boolean;
+    nextEntry(): any;
+}
+
+export interface IRESTAPIResponse {
+    getStreamWriter(): IRESTAPIResponseStream;
+    setBody(body: any): void;
+    setHeaders(headers: any): void;
+    setLocation(location: string): void;
+    setStatus(status: number): void;
+    setHeader(header: string, value: string): void;
+    setContentType(contentType: string): void;
+    setError(error: any): void;
+}
+
+export interface IRESTAPIResponseStream {
+    writeStream(stream: object): void;
+    writeString(data: string): void;
+}
+
+export type QueryOperator = "="|"!="|">"|">="|"<"|"<="|"IN"|"STARTSWITH"|"ENDSWITH"|"CONTAINS"|"DOESNOTCONTAIN"|"INSTANCEOF"
+export type RestHTTPMethods = "get"|"post"|"delete"|"patch"|"put"|"head"|"delete"|"options";
+export type GlideRecordOperation = "insert"|"update"|"delete";
+}
\ No newline at end of file
diff --git a/types/servicenow-jakarta/servicenow-jakarta-tests.ts b/types/servicenow-jakarta/servicenow-jakarta-tests.ts
new file mode 100644
index 0000000000..3edecfb841
--- /dev/null
+++ b/types/servicenow-jakarta/servicenow-jakarta-tests.ts
@@ -0,0 +1,26 @@
+const firstrecord = new GlideRecord("core_company");
+
+const record = new GlideRecord("core_company");
+record.addQuery('property', '=', firstrecord.sys_id);
+record.addQuery('property2', '!=', 'somevalue');
+if(record.get('somesysid')){
+    gs.info('got it');
+}
+
+const wf = new global.Workflow();
+
+const rest = new sn_ws.RESTMessageV2();
+
+//test merging
+declare namespace servicenow {
+    export interface IGlideRecord {
+        new(type: "othertype"): IOtherType
+    }
+
+    export interface IOtherType extends IGlideRecord {
+        someproperty: string;
+    }
+}
+
+const record2 = new GlideRecord("othertype");
+record2.someproperty = "foo";
\ No newline at end of file
diff --git a/types/servicenow-jakarta/tsconfig.json b/types/servicenow-jakarta/tsconfig.json
new file mode 100644
index 0000000000..a2d4b7687b
--- /dev/null
+++ b/types/servicenow-jakarta/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "lib": [
+            "es5"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "noLib": false
+    },
+    "files": [
+        "index.d.ts",
+        "servicenow-jakarta-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/servicenow-jakarta/tslint.json b/types/servicenow-jakarta/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/servicenow-jakarta/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file

From 9308bb6a20ffdac8e5447e47d1cf3c0f1db8721e Mon Sep 17 00:00:00 2001
From: tsuyoshiwada <wadackel@gmail.com>
Date: Fri, 25 May 2018 10:18:48 +0900
Subject: [PATCH 430/575] Add missing props for react-content-loader

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

diff --git a/types/react-content-loader/index.d.ts b/types/react-content-loader/index.d.ts
index d0e23901cc..ce48b63b77 100644
--- a/types/react-content-loader/index.d.ts
+++ b/types/react-content-loader/index.d.ts
@@ -9,7 +9,7 @@ import * as React from 'react';
 
 export interface ContentLoaderProps {
     style?: React.CSSProperties;
-    type?: 'facebook' | 'instagram' | 'list' | 'bullet-list' | 'code';
+    animate?: boolean;
     speed?: number;
     width?: number;
     height?: number;
@@ -20,6 +20,7 @@ export interface ContentLoaderProps {
     preserveAspectRatio?: 'none' | 'xMinYMin meet' | 'xMidYMin meet' | 'xMaxYMin meet' | 'xMinYMid meet' | 'xMidYMid meet' | 'xMaxYMid meet' |
     'xMinYMax meet' | 'xMidYMax meet' | 'xMaxYMax meet' | 'xMinYMin slice' | 'xMidYMin slice' | 'xMaxYMin slice' | 'xMinYMid slice' |
     'xMidYMid slice' | 'xMaxYMid slice' | 'xMinYMax slice' | 'xMidYMax slice' | 'xMaxYMax slice';
+    uniquekey?: string;
     className?: string;
 }
 export default class ContentLoader extends React.Component<ContentLoaderProps> { }
diff --git a/types/react-content-loader/react-content-loader-tests.tsx b/types/react-content-loader/react-content-loader-tests.tsx
index 22e3dbaa7d..70cdec26f0 100644
--- a/types/react-content-loader/react-content-loader-tests.tsx
+++ b/types/react-content-loader/react-content-loader-tests.tsx
@@ -5,6 +5,7 @@ const CustomComponent = () => {
     return (
         <ContentLoader
             style={{ borderBottom: '1px solid' }}
+            animate={false}
             speed={1}
             height={100}
             width={100}
@@ -13,6 +14,7 @@ const CustomComponent = () => {
             primaryOpacity={0.06}
             secondaryOpacity={0.12}
             preserveAspectRatio="xMinYMin meet"
+            uniquekey="reactcontentloader"
             className="my-class"
         >
             {/* Pure SVG */}

From c920d3c63915c126e8616f9c5bebdfd382563b7a Mon Sep 17 00:00:00 2001
From: cavarzan <deividi.cavarzan@gmail.com>
Date: Thu, 24 May 2018 23:36:51 -0300
Subject: [PATCH 431/575] react-native-sqlite-storage promise support

---
 types/react-native-sqlite-storage/index.d.ts  | 17 +++++++
 .../react-native-sqlite-storage-tests.ts      | 50 ++++++++++++++-----
 2 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/types/react-native-sqlite-storage/index.d.ts b/types/react-native-sqlite-storage/index.d.ts
index d0691edb86..1a4688fd67 100644
--- a/types/react-native-sqlite-storage/index.d.ts
+++ b/types/react-native-sqlite-storage/index.d.ts
@@ -1,11 +1,17 @@
 // Type definitions for react-native-sqlite-storage 3.3
 // Project: https://github.com/andpor/react-native-sqlite-storage
 // Definitions by: Sergei Dryganets <https://github.com/dryganets>
+//                 Deividi Cavarzan <https://github.com/cavarzan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
+export function DEBUG(isDebug: boolean): void;
+export function enablePromise(enablePromise: boolean): void;
+
+export function openDatabase(params: DatabaseParams): Promise<SQLiteDatabase>;
 export function openDatabase(params: DatabaseParams, success?: () => void, error?: (e: SQLError) => void): SQLiteDatabase;
 export function deleteDatabase(params: DatabaseParams, success?: () => void, error?: (err: SQLError) => void): void;
+export function deleteDatabase(params: DatabaseParams): Promise<void>;
 export type Location = 'default' | 'Library' | 'Documents';
 export interface DatabaseOptionalParams {
     createFromLocation?: number | string;
@@ -55,17 +61,28 @@ export interface SQLError {
 export type StatementCallback = (transaction: Transaction, resultSet: ResultSet) => void;
 export type StatementErrorCallback = (transaction: Transaction, error: SQLError) => void;
 export interface Transaction {
+    executeSql(sqlStatement: string, arguments?: any[]): Promise<TransactionStatementPromise>;
     executeSql(sqlStatement: string, arguments?: any[], callback?: StatementCallback, errorCallback?: StatementErrorCallback): void;
 }
 
 export type TransactionCallback = (transaction: Transaction) => void;
 export type TransactionErrorCallback = (error: SQLError) => void;
+export type StatementPromise = [ResultSet];
+export type TransactionStatementPromise = [Transaction, ResultSet];
 
 export interface SQLiteDatabase {
+    transaction(scope: (tx: Transaction) => void): Promise<Transaction>;
     transaction(scope: (tx: Transaction) => void, error?: TransactionErrorCallback, success?: TransactionCallback): void;
+    readTransaction(scope: (tx: Transaction) => void): Promise<TransactionCallback>;
     readTransaction(scope: (tx: Transaction) => void, error?: TransactionErrorCallback, success?: TransactionCallback): void;
+    close(): Promise<void>;
     close(success: () => void, error: (err: SQLError) => void): void;
+    executeSql(statement: string, params?: any[]): Promise<StatementPromise>;
     executeSql(statement: string, params?: any[], success?: StatementCallback, error?: StatementErrorCallback): void;
+
+    attach(nameToAttach: string, alias: string): Promise<void>;
     attach(nameToAttach: string, alias: string, success?: () => void, error?: (err: SQLError) => void): void;
+
+    dettach(alias: string): Promise<void>;
     dettach(alias: string, success?: () => void, error?: (err: SQLError) => void): void;
 }
diff --git a/types/react-native-sqlite-storage/react-native-sqlite-storage-tests.ts b/types/react-native-sqlite-storage/react-native-sqlite-storage-tests.ts
index 76451cfe32..89d46ba8c4 100644
--- a/types/react-native-sqlite-storage/react-native-sqlite-storage-tests.ts
+++ b/types/react-native-sqlite-storage/react-native-sqlite-storage-tests.ts
@@ -1,16 +1,40 @@
 import * as sqlite from 'react-native-sqlite-storage';
 
-const db = sqlite.openDatabase({name: 'test.db', location: 'default'}, () => {
-    db.transaction((tx) => {
-        tx.executeSql('SELECT * FROM Employees a, Departments b WHERE a.department = b.department_id', [], (tx, results) => {
-            // Get rows with Web SQL Database spec compliance.
-            const len = results.rows.length;
-            for (let i = 0; i < len; i++) {
-              const row = results.rows.item(i);
-              const log = `Employee name: ${row.name}, Dept Name: ${row.deptName}`;
-            }
-          });
-      });
-}, (err) => {
-    // log error
+const db = sqlite.openDatabase(
+    { name: 'test.db', location: 'default' },
+    () => {
+        db.transaction((tx) => {
+            tx.executeSql('SELECT * FROM Employees a, Departments b WHERE a.department = b.department_id', [], (tx, results) => {
+                // Get rows with Web SQL Database spec compliance.
+                const len = results.rows.length;
+                for (let i = 0; i < len; i++) {
+                    const row = results.rows.item(i);
+                    const log = `Employee name: ${row.name}, Dept Name: ${row.deptName}`;
+                }
+            });
+        });
+    },
+    (err) => {
+        // log error
+    }
+);
+
+sqlite.openDatabase({ name: 'test.db', location: 'default' }).then((db) => {
+    db
+        .transaction((tx) => {
+            tx
+                .executeSql('SELECT * FROM Employees a, Departments b WHERE a.department = b.department_id', [])
+                .then((result: sqlite.TransactionStatementPromise) => {
+                    // handle result
+                });
+        })
+        .then(() => {
+            // handle transaction finished
+        })
+        .catch((e: sqlite.SQLError) => {
+            // log error
+        });
+    db.executeSql('SELECT * FROM Employees a, Departments b WHERE a.department = b.department_id', []).then((result: sqlite.StatementPromise) => {
+        // handle result
+    });
 });

From 0a7d31d63e76c00a3b2f6048190d6259a6701c10 Mon Sep 17 00:00:00 2001
From: cavarzan <deividi.cavarzan@gmail.com>
Date: Thu, 24 May 2018 23:48:13 -0300
Subject: [PATCH 432/575] fix mthod order and keep organized

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

diff --git a/types/react-native-sqlite-storage/index.d.ts b/types/react-native-sqlite-storage/index.d.ts
index 1a4688fd67..4a8262a802 100644
--- a/types/react-native-sqlite-storage/index.d.ts
+++ b/types/react-native-sqlite-storage/index.d.ts
@@ -10,8 +10,8 @@ export function enablePromise(enablePromise: boolean): void;
 
 export function openDatabase(params: DatabaseParams): Promise<SQLiteDatabase>;
 export function openDatabase(params: DatabaseParams, success?: () => void, error?: (e: SQLError) => void): SQLiteDatabase;
-export function deleteDatabase(params: DatabaseParams, success?: () => void, error?: (err: SQLError) => void): void;
 export function deleteDatabase(params: DatabaseParams): Promise<void>;
+export function deleteDatabase(params: DatabaseParams, success?: () => void, error?: (err: SQLError) => void): void;
 export type Location = 'default' | 'Library' | 'Documents';
 export interface DatabaseOptionalParams {
     createFromLocation?: number | string;

From 8433c4990bf83c11df1489af6b742dce108c37ff Mon Sep 17 00:00:00 2001
From: Simon Nielsen <simonhn@gmail.com>
Date: Fri, 25 May 2018 07:56:59 +0200
Subject: [PATCH 433/575] test string as hierarchyRootSeparator

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

diff --git a/types/storybook__addon-options/storybook__addon-options-tests.ts b/types/storybook__addon-options/storybook__addon-options-tests.ts
index 03c2ebfcda..c19307564c 100644
--- a/types/storybook__addon-options/storybook__addon-options-tests.ts
+++ b/types/storybook__addon-options/storybook__addon-options-tests.ts
@@ -14,5 +14,6 @@ setOptions({
 });
 
 setOptions({
-  hierarchySeparator: '.'
+  hierarchySeparator: '.',
+  hierarchyRootSeparator: '#',
 });

From 6345e48b3521d5858a9417becd09324e47d61318 Mon Sep 17 00:00:00 2001
From: Zhang Yijiang <mediumdeviation@gmail.com>
Date: Fri, 25 May 2018 13:57:52 +0800
Subject: [PATCH 434/575] Add missing properties in InitializeOptions

---
 types/redux-form/v6/lib/actions.d.ts | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/types/redux-form/v6/lib/actions.d.ts b/types/redux-form/v6/lib/actions.d.ts
index 7e7ea5762a..3703973271 100644
--- a/types/redux-form/v6/lib/actions.d.ts
+++ b/types/redux-form/v6/lib/actions.d.ts
@@ -84,14 +84,22 @@ export function destroy(...form: string[]): FormAction;
 export function focus(form: string, field: string): FormAction;
 
 /**
- * Sets the initial values in the form with which future data values will be compared to calculate dirty and pristine.
- * The data parameter may contain deep nested array and object values that match the shape of your form fields.
- * If the keepDirty parameter is true, the values of the currently dirty fields will be retained to avoid overwriting
- * user edits.
+ * Sets the initial values in the form with which future data values will be compared to calculate dirty and pristine. 
+ * 
+ * If the keepDirty parameter is true, the values of currently dirty fields will be retained to avoid overwriting user edits.
+ * 
+ * If the keepSubmitSucceeded parameter is true, it will not clear the submitSucceeded flag if it is set.
+ * 
+ * If the updateUnregisteredFields parameter is true, it will update every initialValue if still pristine instead of only 
+ * registered fields. Highly recommended, defaults to false because of non-breaking backwards compatibility.
+ * 
+ * If the keepValues parameter is true, it will keep the old values and initial values.
  */
 interface InitializeOptions {
     keepDirty: boolean;
     keepSubmitSucceeded: boolean;
+    updateUnregisteredFields: boolean;
+    keepValues: boolean;
 }
 
 export function initialize(form: string, data: any, keepDirty?: boolean | InitializeOptions, options?: InitializeOptions): FormAction;

From 9651dad2f1a974b4aed32428dcbaf0c6c3a59f10 Mon Sep 17 00:00:00 2001
From: Zhang Yijiang <mediumdeviation@gmail.com>
Date: Fri, 25 May 2018 14:13:21 +0800
Subject: [PATCH 435/575] Add resetSection action and method

---
 types/redux-form/v6/lib/actionTypes.d.ts | 1 +
 types/redux-form/v6/lib/actions.d.ts     | 5 +++++
 types/redux-form/v6/lib/reduxForm.d.ts   | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/types/redux-form/v6/lib/actionTypes.d.ts b/types/redux-form/v6/lib/actionTypes.d.ts
index ce1ba5d208..02b47849d3 100644
--- a/types/redux-form/v6/lib/actionTypes.d.ts
+++ b/types/redux-form/v6/lib/actionTypes.d.ts
@@ -20,6 +20,7 @@ export interface ActionTypes {
     INITIALIZE: string;
     REGISTER_FIELD: string;
     RESET: string;
+    RESET_SECTION: string;
     SET_SUBMIT_FAILED: string;
     SET_SUBMIT_SUCCEEDED: string;
     START_ASYNC_VALIDATION: string;
diff --git a/types/redux-form/v6/lib/actions.d.ts b/types/redux-form/v6/lib/actions.d.ts
index 3703973271..67638a2784 100644
--- a/types/redux-form/v6/lib/actions.d.ts
+++ b/types/redux-form/v6/lib/actions.d.ts
@@ -114,6 +114,11 @@ export function registerField(form: string, name: string, type: FieldType): Form
  */
 export function reset(form: string): FormAction;
 
+/**
+ * Resets the values in the form sections back to the values past in with the most recent initialize action. 
+ */
+export function resetSection(form: string, ...sections: string[]): FormAction;
+
 /**
  * Flips the asyncValidating flag true
  */
diff --git a/types/redux-form/v6/lib/reduxForm.d.ts b/types/redux-form/v6/lib/reduxForm.d.ts
index 53ad871c0c..2900137019 100644
--- a/types/redux-form/v6/lib/reduxForm.d.ts
+++ b/types/redux-form/v6/lib/reduxForm.d.ts
@@ -518,6 +518,11 @@ export interface StrictFormProps<FormData extends DataShape, P, S> {
      */
     reset(): void;
 
+    /**
+     * Resets the form sections to the initialValues. It will be pristine after reset.
+     */
+    resetSection(...sections: string[]) : void;
+
     /**
      * Whether or not your form is currently submitting. This prop will only
      * work if you have passed an onSubmit function that returns a promise. It

From 6e93161f3d752401d8194a84081c8d71203a5f0b Mon Sep 17 00:00:00 2001
From: Bart Haalstra <bart.haalstra@prowise.com>
Date: Fri, 25 May 2018 12:13:57 +0200
Subject: [PATCH 436/575] Made open functions return a promise. Made
 file.buffer a function returning a promise. Make source.size a function
 returning a promise.

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

diff --git a/types/unzipper/index.d.ts b/types/unzipper/index.d.ts
index 865660bd76..8b5f7140e2 100644
--- a/types/unzipper/index.d.ts
+++ b/types/unzipper/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/ZJONSSON/node-unzipper#readme
 // Definitions by: s73obrien <https://github.com/s73obrien>
 //                 Nate <https://github.com/natemara>
+//                 Bart <https://github.com/bartje321>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 /// <reference types="node" />
@@ -49,19 +50,19 @@ export interface Entry extends PassThrough {
 export function unzip(
     source: {
         stream: Readable;
-        size: Promise<number>;
+        size: () => Promise<number>;
     },
     offset: number,
     _password: string
 ): Entry;
 
 export namespace Open {
-    function file(filename: string): CentralDirectory;
+    function file(filename: string): Promise<CentralDirectory>;
     function url(
         request: ClientRequest,
         opt: string | RequestOptions
-    ): CentralDirectory;
-    function s3(client: any, params: any): CentralDirectory;
+    ): Promise<CentralDirectory>;
+    function s3(client: any, params: any): Promise<CentralDirectory>;
 }
 
 export function BufferStream(entry: Entry): Promise<Buffer>;
@@ -97,7 +98,7 @@ export interface CentralDirectory {
             path: string;
             comment: string;
             stream: Entry;
-            buffer: Promise<Buffer>;
+            buffer: () => Promise<Buffer>;
         }
     ];
 }
diff --git a/types/unzipper/unzipper-tests.ts b/types/unzipper/unzipper-tests.ts
index e5d06f6055..7a8fbf9f4a 100644
--- a/types/unzipper/unzipper-tests.ts
+++ b/types/unzipper/unzipper-tests.ts
@@ -38,6 +38,6 @@ createReadStream("http://example.org/path/to/archive.zip")
         console.log("Finished reading stream");
     });
 
-const dir1: CentralDirectory = Open.file("Z:\\path\\to\\archive.zip");
-const dir2: CentralDirectory = Open.url(get("url/to/archive.zip"), {});
-const dir3: CentralDirectory = Open.s3("any", "any");
+const dir1: Promise<CentralDirectory> = Open.file("Z:\\path\\to\\archive.zip");
+const dir2: Promise<CentralDirectory> = Open.url(get("url/to/archive.zip"), {});
+const dir3: Promise<CentralDirectory> = Open.s3("any", "any");

From e22898d5b679ae1fe06d75344b4440a839835455 Mon Sep 17 00:00:00 2001
From: Francesco Soncina <phra@users.noreply.github.com>
Date: Fri, 25 May 2018 14:37:22 +0200
Subject: [PATCH 437/575] fix: declare SymbolConstructor.observable

if `SymbolConstructor.observable` symbol is not defined in the types, the inclusion of the latest rxjs (v6) breaks the compilation in a strict environment.
---
 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 9a9fc544e2..1acd3d6c7e 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -164,6 +164,7 @@ interface Iterator<T> {
 interface IteratorResult<T> { }
 interface AsyncIterableIterator<T> {}
 interface SymbolConstructor {
+    readonly observable: symbol;
     readonly iterator: symbol;
     readonly asyncIterator: symbol;
 }

From f5afb177e5e69d488b64c28d7c6277c0e5b2c5e4 Mon Sep 17 00:00:00 2001
From: Wouter van Heeswijk <woutervh@gmail.com>
Date: Fri, 25 May 2018 14:44:21 +0200
Subject: [PATCH 438/575] Replace placeholder array by actual recursive array

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

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index ce80b41c35..1a9a51602c 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -143,8 +143,8 @@ declare namespace React {
     type ReactText = string | number;
     type ReactChild = ReactElement<any> | ReactText;
 
-    // Should be Array<ReactNode> but type aliases cannot be recursive
-    type ReactFragment = {} | Array<ReactChild | any[] | boolean>;
+    interface ReactNodeArray extends Array<ReactNode> {}
+    type ReactFragment = {} | ReactNodeArray;
     type ReactNode = ReactChild | ReactFragment | ReactPortal | string | number | boolean | null | undefined;
 
     //
diff --git a/types/react/v15/index.d.ts b/types/react/v15/index.d.ts
index 2111008d0d..feaa8f7480 100644
--- a/types/react/v15/index.d.ts
+++ b/types/react/v15/index.d.ts
@@ -183,8 +183,8 @@ declare namespace React {
     type ReactText = string | number;
     type ReactChild = ReactElement<any> | ReactText;
 
-    // Should be Array<ReactNode> but type aliases cannot be recursive
-    type ReactFragment = {} | Array<ReactChild | any[] | boolean>;
+    interface ReactNodeArray extends Array<ReactNode> {}
+    type ReactFragment = {} | ReactNodeArray;
     type ReactNode = ReactChild | ReactFragment | boolean | null | undefined;
 
     //

From 02474f65996088b2b462af78a1ace7cda06639ec Mon Sep 17 00:00:00 2001
From: cavarzan <deividi.cavarzan@gmail.com>
Date: Fri, 25 May 2018 11:42:24 -0300
Subject: [PATCH 439/575] changed StatementPromise to ResultSetPromise and
 TransactionStatementPromise to TransactionResultSetPromise

---
 types/react-native-sqlite-storage/index.d.ts              | 8 ++++----
 .../react-native-sqlite-storage-tests.ts                  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/react-native-sqlite-storage/index.d.ts b/types/react-native-sqlite-storage/index.d.ts
index 4a8262a802..59aa52553c 100644
--- a/types/react-native-sqlite-storage/index.d.ts
+++ b/types/react-native-sqlite-storage/index.d.ts
@@ -61,14 +61,14 @@ export interface SQLError {
 export type StatementCallback = (transaction: Transaction, resultSet: ResultSet) => void;
 export type StatementErrorCallback = (transaction: Transaction, error: SQLError) => void;
 export interface Transaction {
-    executeSql(sqlStatement: string, arguments?: any[]): Promise<TransactionStatementPromise>;
+    executeSql(sqlStatement: string, arguments?: any[]): Promise<TransactionResultSetPromise>;
     executeSql(sqlStatement: string, arguments?: any[], callback?: StatementCallback, errorCallback?: StatementErrorCallback): void;
 }
 
 export type TransactionCallback = (transaction: Transaction) => void;
 export type TransactionErrorCallback = (error: SQLError) => void;
-export type StatementPromise = [ResultSet];
-export type TransactionStatementPromise = [Transaction, ResultSet];
+export type ResultSetPromise = [ResultSet];
+export type TransactionResultSetPromise = [Transaction, ResultSet];
 
 export interface SQLiteDatabase {
     transaction(scope: (tx: Transaction) => void): Promise<Transaction>;
@@ -77,7 +77,7 @@ export interface SQLiteDatabase {
     readTransaction(scope: (tx: Transaction) => void, error?: TransactionErrorCallback, success?: TransactionCallback): void;
     close(): Promise<void>;
     close(success: () => void, error: (err: SQLError) => void): void;
-    executeSql(statement: string, params?: any[]): Promise<StatementPromise>;
+    executeSql(statement: string, params?: any[]): Promise<ResultSetPromise>;
     executeSql(statement: string, params?: any[], success?: StatementCallback, error?: StatementErrorCallback): void;
 
     attach(nameToAttach: string, alias: string): Promise<void>;
diff --git a/types/react-native-sqlite-storage/react-native-sqlite-storage-tests.ts b/types/react-native-sqlite-storage/react-native-sqlite-storage-tests.ts
index 89d46ba8c4..f93e763004 100644
--- a/types/react-native-sqlite-storage/react-native-sqlite-storage-tests.ts
+++ b/types/react-native-sqlite-storage/react-native-sqlite-storage-tests.ts
@@ -24,7 +24,7 @@ sqlite.openDatabase({ name: 'test.db', location: 'default' }).then((db) => {
         .transaction((tx) => {
             tx
                 .executeSql('SELECT * FROM Employees a, Departments b WHERE a.department = b.department_id', [])
-                .then((result: sqlite.TransactionStatementPromise) => {
+                .then((result: sqlite.TransactionResultSetPromise) => {
                     // handle result
                 });
         })
@@ -34,7 +34,7 @@ sqlite.openDatabase({ name: 'test.db', location: 'default' }).then((db) => {
         .catch((e: sqlite.SQLError) => {
             // log error
         });
-    db.executeSql('SELECT * FROM Employees a, Departments b WHERE a.department = b.department_id', []).then((result: sqlite.StatementPromise) => {
+    db.executeSql('SELECT * FROM Employees a, Departments b WHERE a.department = b.department_id', []).then((result: sqlite.ResultSetPromise) => {
         // handle result
     });
 });

From 5cb225c23c25e10b66fce1094fa896a80b817f0c Mon Sep 17 00:00:00 2001
From: Samuel Maddock <samuel.maddock@gmail.com>
Date: Fri, 25 May 2018 13:36:24 -0400
Subject: [PATCH 440/575] Change cast interfaces to use enums

---
 types/chrome/chrome-cast.d.ts | 345 +++++++++++++++++-----------------
 1 file changed, 171 insertions(+), 174 deletions(-)

diff --git a/types/chrome/chrome-cast.d.ts b/types/chrome/chrome-cast.d.ts
index 5c240ff25c..397037a23e 100644
--- a/types/chrome/chrome-cast.d.ts
+++ b/types/chrome/chrome-cast.d.ts
@@ -12,85 +12,88 @@ declare namespace chrome.cast {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.AutoJoinPolicy
      */
-    export interface AutoJoinPolicy {
-        TAB_AND_ORIGIN_SCOPED: string;
-        ORIGIN_SCOPED: string;
-        PAGE_SCOPED: string;
+    export enum AutoJoinPolicy {
+        CUSTOM_CONTROLLER_SCOPED = "custom_controller_scoped",
+        TAB_AND_ORIGIN_SCOPED = "tab_and_origin_scoped",
+        ORIGIN_SCOPED = "origin_scoped",
+        PAGE_SCOPED = "page_scoped"
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.DefaultActionPolicy
      */
-    export interface DefaultActionPolicy {
-        CREATE_SESSION: string;
-        CAST_THIS_TAB: string;
+    export enum DefaultActionPolicy {
+        CREATE_SESSION = "create_session",
+        CAST_THIS_TAB = "cast_this_tab"
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.Capability
      */
-    export interface Capability {
-        VIDEO_OUT: string;
-        AUDIO_OUT: string;
-        VIDEO_IN: string;
-        AUDIO_IN: string;
+    export enum Capability {
+        VIDEO_OUT = "video_out",
+        AUDIO_OUT = "audio_out",
+        VIDEO_IN = "video_in",
+        AUDIO_IN = "audio_in",
+        MULTIZONE_GROUP = "multizone_group"
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.ErrorCode
      */
-    export interface ErrorCode {
-        CANCEL: string;
-        TIMEOUT: string;
-        API_NOT_INITIALIZED: string;
-        INVALID_PARAMETER: string;
-        EXTENSION_NOT_COMPATIBLE: string;
-        EXTENSION_MISSING: string;
-        RECEIVER_UNAVAILABLE: string;
-        SESSION_ERROR: string;
-        CHANNEL_ERROR: string;
-        LOAD_MEDIA_FAILED: string;
+    export enum ErrorCode {
+        CANCEL = "cancel",
+        TIMEOUT = "timeout",
+        API_NOT_INITIALIZED = "api_not_initialized",
+        INVALID_PARAMETER = "invalid_parameter",
+        EXTENSION_NOT_COMPATIBLE = "extension_not_compatible",
+        EXTENSION_MISSING = "extension_missing",
+        RECEIVER_UNAVAILABLE = "receiver_unavailable",
+        SESSION_ERROR = "session_error",
+        CHANNEL_ERROR = "channel_error",
+        LOAD_MEDIA_FAILED = "load_media_failed"
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.ReceiverAvailability
      */
-    export interface ReceiverAvailability {
-        AVAILABLE: string;
-        UNAVAILABLE: string;
+    export enum ReceiverAvailability {
+        AVAILABLE = "available",
+        UNAVAILABLE = "unavailable"
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.SenderPlatform
      */
-    export interface SenderPlatform {
-        CHROME: string;
-        IOS: string;
-        ANDROID: string;
+    export enum SenderPlatform {
+        CHROME = "chrome",
+        IOS = "ios",
+        ANDROID = "android"
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.ReceiverType
      */
-    export interface ReceiverType {
-        CAST: string;
-        HANGOUT: string;
-        CUSTOM: string;
+    export enum ReceiverType {
+        CAST = "cast",
+        DIAL = "dial",
+        HANGOUT = "hangout",
+        CUSTOM = "custom"
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.ReceiverAction
      */
-    export interface ReceiverAction {
-        CAST: string;
-        STOP: string;
+    export enum ReceiverAction {
+        CAST = "cast",
+        STOP = "stop"
     }
 
 
@@ -99,10 +102,10 @@ declare namespace chrome.cast {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.SessionStatus
      */
-    export interface SessionStatus {
-        CONNECTED: string;
-        DISCONNECTED: string;
-        STOPPED: string;
+    export enum SessionStatus {
+        CONNECTED = "connected",
+        DISCONNECTED = "disconnected",
+        STOPPED = "stopped"
     }
 
     /**
@@ -208,7 +211,7 @@ declare namespace chrome.cast {
             receiverListener: (receiverAvailability: chrome.cast.ReceiverAvailability) => void,
             autoJoinPolicy?: chrome.cast.AutoJoinPolicy,
             defaultActionPolicy?: chrome.cast.DefaultActionPolicy
-        ):ApiConfig;
+        ): ApiConfig;
 
         sessionRequest: chrome.cast.SessionRequest;
         sessionListener: (session: chrome.cast.Session) => void;
@@ -229,7 +232,7 @@ declare namespace chrome.cast {
             code: chrome.cast.ErrorCode,
             description?: string,
             details?: Object
-        ):Error;
+        ): Error;
 
         code: chrome.cast.ErrorCode;
         description?: string;
@@ -245,7 +248,7 @@ declare namespace chrome.cast {
          */
         new(
             url: string
-        ):Image;
+        ): Image;
 
         url: string;
         height?: number;
@@ -260,7 +263,7 @@ declare namespace chrome.cast {
          */
         new(
             platform: chrome.cast.SenderPlatform
-        ):SenderApplication;
+        ): SenderApplication;
 
         platform: chrome.cast.SenderPlatform;
         url?: string;
@@ -279,7 +282,7 @@ declare namespace chrome.cast {
             appId: string,
             capabilities?: Array<chrome.cast.Capability>,
             timeout?: number
-        ):SessionRequest;
+        ): SessionRequest;
 
         appId: string;
         capabilities: Array<chrome.cast.Capability>;
@@ -303,7 +306,7 @@ declare namespace chrome.cast {
             displayName: string,
             appImages: Array<chrome.cast.Image>,
             receiver: chrome.cast.Receiver
-        ):Session;
+        ): Session;
 
         sessionId: string;
         appId: string;
@@ -311,7 +314,7 @@ declare namespace chrome.cast {
         appImages: Array<chrome.cast.Image>;
         receiver: chrome.cast.Receiver;
         senderApps: Array<chrome.cast.SenderApplication>;
-        namespaces: Array<{name: string}>;
+        namespaces: Array<{ name: string }>;
         media: Array<chrome.cast.media.Media>;
         status: chrome.cast.SessionStatus
 
@@ -324,7 +327,7 @@ declare namespace chrome.cast {
             newLevel: number,
             successCallback: Function,
             errorCallback: (error: chrome.cast.Error) => void
-        ):void
+        ): void
 
         /**
          * @param {boolean} muted
@@ -335,7 +338,7 @@ declare namespace chrome.cast {
             muted: boolean,
             successCallback: Function,
             errorCallback: (error: chrome.cast.Error) => void
-        ):void
+        ): void
 
         /**
          * @param {function()} successCallback
@@ -344,7 +347,7 @@ declare namespace chrome.cast {
         leave(
             successCallback: Function,
             errorCallback: (error: chrome.cast.Error) => void
-        ):void
+        ): void
 
         /**
          * @param {function()} successCallback
@@ -353,7 +356,7 @@ declare namespace chrome.cast {
         stop(
             successCallback: Function,
             errorCallback: (error: chrome.cast.Error) => void
-        ):void
+        ): void
 
         /**
          * @param {string} namespace
@@ -366,21 +369,21 @@ declare namespace chrome.cast {
             message: string,
             successCallback: Function,
             errorCallback: (error: chrome.cast.Error) => void
-        ):void
+        ): void
 
         /**
          * @param {function(boolean)} listener
          */
         addUpdateListener(
-            listener: (isAlive:boolean) => void
-        ):void
+            listener: (isAlive: boolean) => void
+        ): void
 
         /**
          * @param {function(boolean)} listener
          */
         removeUpdateListener(
-            listener: (isAlive:boolean) => void
-        ):void
+            listener: (isAlive: boolean) => void
+        ): void
 
         /**
          * @param {string} namespace
@@ -389,7 +392,7 @@ declare namespace chrome.cast {
         addMessageListener(
             namespace: string,
             listener: (namespace: string, message: string) => void
-        ):void
+        ): void
 
         /**
          * @param {string} namespace
@@ -397,22 +400,22 @@ declare namespace chrome.cast {
          */
         removeMessageListener(
             namespace: string,
-            listener: (namespace:string, message:string) => void
-        ):void
+            listener: (namespace: string, message: string) => void
+        ): void
 
         /**
          * @param {function(!chrome.cast.media.Media)} listener
          */
         addMediaListener(
             listener: (media: chrome.cast.media.Media) => void
-        ):void
+        ): void
 
         /**
          * @param {function(!chrome.cast.media.Media)} listener
          */
         removeMediaListener(
             listener: (media: chrome.cast.media.Media) => void
-        ):void
+        ): void
 
         /**
          * @param {!chrome.cast.media.LoadRequest} loadRequest
@@ -423,7 +426,7 @@ declare namespace chrome.cast {
             loadRequest: chrome.cast.media.LoadRequest,
             successCallback: (media: chrome.cast.media.Media) => void,
             errorCallback: (error: chrome.cast.Error) => void
-        ):void
+        ): void
 
         /**
          * @param {!chrome.cast.media.QueueLoadRequest} queueLoadRequest
@@ -434,7 +437,7 @@ declare namespace chrome.cast {
             queueLoadRequest: chrome.cast.media.QueueLoadRequest,
             successCallback: (media: chrome.cast.media.Media) => void,
             errorCallback: (error: chrome.cast.Error) => void
-        ):void
+        ): void
     }
 
     export interface Receiver {
@@ -451,7 +454,7 @@ declare namespace chrome.cast {
             friendlyName: string,
             capabilities?: Array<chrome.cast.Capability>,
             volume?: chrome.cast.Volume
-        ):Receiver;
+        ): Receiver;
 
         label: string;
         friendlyName: string;
@@ -471,7 +474,7 @@ declare namespace chrome.cast {
         new(
             statusText: string,
             appImages: Array<chrome.cast.Image>
-        ):ReceiverDisplayStatus;
+        ): ReceiverDisplayStatus;
 
         statusText: string;
         appImages: Array<chrome.cast.Image>;
@@ -487,7 +490,7 @@ declare namespace chrome.cast {
         new(
             level?: number,
             muted?: boolean
-        ):Volume;
+        ): Volume;
 
         level?: number;
         muted?: boolean;
@@ -502,75 +505,75 @@ declare namespace chrome.cast.media {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.MediaCommand
      */
-    export interface MediaCommand {
-        PAUSE: string;
-        SEEK: string;
-        STREAM_VOLUME: string;
-        STREAM_MUTE: string;
+    export enum MediaCommand {
+        PAUSE = "pause",
+        SEEK = "seek",
+        STREAM_VOLUME = "stream_volume",
+        STREAM_MUTE = "stream_mute"
     }
 
     /**
      * @enum {number}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.MetadataType
      */
-    export interface MetadataType {
-        GENERIC: number;
-        TV_SHOW: number;
-        MOVIE: number;
-        MUSIC_TRACK: number;
-        PHOTO: number;
+    export enum MetadataType {
+        GENERIC,
+        TV_SHOW,
+        MOVIE,
+        MUSIC_TRACK,
+        PHOTO
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.PlayerState
      */
-    export interface PlayerState {
-        IDLE: string;
-        PLAYING: string;
-        PAUSED: string;
-        BUFFERING: string;
+    export enum PlayerState {
+        IDLE = "IDLE",
+        PLAYING = "PLAYING",
+        PAUSED = "PAUSED",
+        BUFFERING = "BUFFERING"
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.ResumeState
      */
-    export interface ResumeState {
-        PLAYBACK_START: string;
-        PLAYBACK_PAUSE: string;
+    export enum ResumeState {
+        PLAYBACK_START = "PLAYBACK_START",
+        PLAYBACK_PAUSE = "PLAYBACK_PAUSE"
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.StreamType
      */
-    export interface StreamType {
-        BUFFERED: string;
-        LIVE: string;
-        OTHER: string;
+    export enum StreamType {
+        BUFFERED = "BUFFERED",
+        LIVE = "LIVE",
+        OTHER = "OTHER"
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.IdleReason
      */
-    export interface IdleReason {
-        CANCELLED: string;
-        INTERRUPTED: string;
-        FINISHED: string;
-        ERROR: string;
+    export enum IdleReason {
+        CANCELLED = "CANCELLED",
+        INTERRUPTED = "INTERRUPTED",
+        FINISHED = "FINISHED",
+        ERROR = "ERROR"
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media#.RepeatMode
      */
-    export interface RepeatMode {
-        OFF:string;
-        ALL:string;
-        SINGLE:string;
-        ALL_AND_SHUFFLE:string;
+    export enum RepeatMode {
+        OFF = "REPEAT_OFF",
+        ALL = "REPEAT_ALL",
+        SINGLE = "REPEAT_SINGLE",
+        ALL_AND_SHUFFLE = "REPEAT_ALL_AND_SHUFFLE"
     }
 
     export interface QueueItem {
@@ -581,7 +584,7 @@ declare namespace chrome.cast.media {
          */
         new(
             mediaInfo: chrome.cast.media.MediaInfo
-        ):QueueItem;
+        ): QueueItem;
 
         activeTrackIds: Array<Number>;
         autoplay: boolean;
@@ -600,7 +603,7 @@ declare namespace chrome.cast.media {
          */
         new(
             items: Array<chrome.cast.media.QueueItem>
-        ):QueueLoadRequest;
+        ): QueueLoadRequest;
 
         customData: Object;
         items: Array<chrome.cast.media.QueueItem>;
@@ -616,10 +619,10 @@ declare namespace chrome.cast.media {
          */
         new(
             itemsToInsert: Array<chrome.cast.media.QueueItem>
-        ):QueueInsertItemsRequest;
+        ): QueueInsertItemsRequest;
 
         customData: Object;
-        insertBefore:number;
+        insertBefore: number;
         items: Array<chrome.cast.media.QueueItem>;
     }
 
@@ -631,7 +634,7 @@ declare namespace chrome.cast.media {
          */
         new(
             itemIdsToRemove: Array<number>
-        ):QueueRemoveItemsRequest;
+        ): QueueRemoveItemsRequest;
 
         customData: Object;
         itemIds: Array<number>;
@@ -645,7 +648,7 @@ declare namespace chrome.cast.media {
          */
         new(
             itemIdsToReorder: Array<number>
-        ):QueueReorderItemsRequest;
+        ): QueueReorderItemsRequest;
 
         customData: Object;
         insertBefore: number;
@@ -660,7 +663,7 @@ declare namespace chrome.cast.media {
          */
         new(
             itemsToUpdate: Array<chrome.cast.media.QueueItem>
-        ):QueueUpdateItemsRequest;
+        ): QueueUpdateItemsRequest;
 
         customData: Object;
         item: Array<chrome.cast.media.QueueItem>;
@@ -670,69 +673,69 @@ declare namespace chrome.cast.media {
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TrackType
      */
-    export interface TrackType {
-        TEXT: string;
-        AUDIO: string;
-        VIDEO: string;
+    export enum TrackType {
+        TEXT = "TEXT",
+        AUDIO = "AUDIO",
+        VIDEO = "VIDEO"
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TextTrackType
      */
-    export interface TextTrackType {
-        SUBTITLES: string;
-        CAPTIONS: string;
-        DESCRIPTIONS: string;
-        CHAPTERS: string;
-        METADATA: string;
+    export enum TextTrackType {
+        SUBTITLES = "SUBTITLES",
+        CAPTIONS = "CAPTIONS",
+        DESCRIPTIONS = "DESCRIPTIONS",
+        CHAPTERS = "CHAPTERS",
+        METADATA = "METADATA"
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TextTrackEdgeType
      */
-    export interface TextTrackEdgeType {
-        NONE: string;
-        OUTLINE: string;
-        DROP_SHADOW: string;
-        RAISED: string;
-        DEPRESSED: string;
+    export enum TextTrackEdgeType {
+        NONE = "NONE",
+        OUTLINE = "OUTLINE",
+        DROP_SHADOW = "DROP_SHADOW",
+        RAISED = "RAISED",
+        DEPRESSED = "DEPRESSED"
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TextTrackWindowType
      */
-    export interface TextTrackWindowType {
-        NONE: string;
-        NORMAL: string;
-        ROUNDED_CORNERS: string;
+    export enum TextTrackWindowType {
+        NONE = "NONE",
+        NORMAL = "NORMAL",
+        ROUNDED_CORNERS = "ROUNDED_CORNERS"
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TextTrackFontGenericFamily
      */
-    export interface TextTrackFontGenericFamily {
-        SANS_SERIF: string;
-        MONOSPACED_SANS_SERIF: string;
-        SERIF: string;
-        MONOSPACED_SERIF: string;
-        CASUAL: string;
-        CURSIVE: string;
-        SMALL_CAPITALS: string;
+    export enum TextTrackFontGenericFamily {
+        SANS_SERIF = "SANS_SERIF",
+        MONOSPACED_SANS_SERIF = "MONOSPACED_SANS_SERIF",
+        SERIF = "SERIF",
+        MONOSPACED_SERIF = "MONOSPACED_SERIF",
+        CASUAL = "CASUAL",
+        CURSIVE = "CURSIVE",
+        SMALL_CAPITALS = "SMALL_CAPITALS"
     }
 
     /**
      * @enum {string}
      * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TextTrackFontStyle
      */
-    export interface TextTrackFontStyle {
-        NORMAL: string;
-        BOLD: string;
-        BOLD_ITALIC: string;
-        ITALIC: string;
+    export enum TextTrackFontStyle {
+        NORMAL = "NORMAL",
+        BOLD = "BOLD",
+        BOLD_ITALIC = "BOLD_ITALIC",
+        ITALIC = "ITALIC"
     }
 
     export interface GetStatusRequest {
@@ -740,7 +743,7 @@ declare namespace chrome.cast.media {
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.GetStatusRequest
          */
-        new():GetStatusRequest;
+        new(): GetStatusRequest;
 
         customData: Object;
     }
@@ -750,7 +753,7 @@ declare namespace chrome.cast.media {
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.PauseRequest
          */
-        new():PauseRequest;
+        new(): PauseRequest;
 
         customData: Object;
     }
@@ -760,7 +763,7 @@ declare namespace chrome.cast.media {
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.PlayRequest
          */
-        new():PlayRequest;
+        new(): PlayRequest;
 
         customData: Object;
     }
@@ -770,7 +773,7 @@ declare namespace chrome.cast.media {
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.SeekRequest
          */
-        new():SeekRequest;
+        new(): SeekRequest;
 
         currentTime: number;
         resumeState: chrome.cast.media.ResumeState;
@@ -782,7 +785,7 @@ declare namespace chrome.cast.media {
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.StopRequest
          */
-        new():StopRequest;
+        new(): StopRequest;
 
         customData: Object;
     }
@@ -795,21 +798,21 @@ declare namespace chrome.cast.media {
          */
         new(
             volume: chrome.cast.Volume
-        ):VolumeRequest;
+        ): VolumeRequest;
 
         volume: chrome.cast.Volume;
         customData: Object;
     }
 
-    export interface LoadRequest {
+    export class LoadRequest {
         /**
          * @param {!chrome.cast.media.MediaInfo} mediaInfo
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.LoadRequest
          */
-        new(
+        constructor(
             mediaInfo: chrome.cast.media.MediaInfo
-        ):LoadRequest;
+        );
 
         activeTrackIds: Array<number>;
         autoplay: boolean;
@@ -828,19 +831,13 @@ declare namespace chrome.cast.media {
         new(
             activeTrackIds?: Array<number>,
             textTrackStyle?: chrome.cast.media.TextTrackStyle
-        ):EditTracksInfoRequest;
+        ): EditTracksInfoRequest;
 
         activeTrackIds: Array<number>;
         textTrackStyle: chrome.cast.media.TextTrackStyle;
     }
 
-    export interface GenericMediaMetadata {
-        /**
-         * @constructor
-         * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.GenericMediaMetadata
-         */
-        new():GenericMediaMetadata;
-
+    export class GenericMediaMetadata {
         images: Array<chrome.cast.Image>;
         metadataType: chrome.cast.media.MetadataType;
         releaseDate: string;
@@ -857,7 +854,7 @@ declare namespace chrome.cast.media {
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.MovieMediaMetadata
          */
-        new():MovieMediaMetadata;
+        new(): MovieMediaMetadata;
 
         images: Array<chrome.cast.Image>;
         metadataType: chrome.cast.media.MetadataType;
@@ -898,7 +895,7 @@ declare namespace chrome.cast.media {
         releaseYear: number;
     }
 
-    export interface MusicTrackMediaMetadata  {
+    export interface MusicTrackMediaMetadata {
         /**
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.MusicTrackMediaMetadata
@@ -947,17 +944,17 @@ declare namespace chrome.cast.media {
         type: chrome.cast.media.MetadataType;
     }
 
-    export interface MediaInfo {
+    export class MediaInfo {
         /**
          * @param {string} contentId
          * @param {string} contentType
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.MediaInfo
          */
-        new(
+        constructor(
             contentId: string,
             contentType: string
-        ): MediaInfo;
+        );
 
         contentId: string;
         streamType: chrome.cast.media.StreamType;
@@ -1089,14 +1086,14 @@ declare namespace chrome.cast.media {
          * @param {function(boolean)} listener
          */
         addUpdateListener(
-            listener: (isAlive:boolean) => void
+            listener: (isAlive: boolean) => void
         ): void
 
         /**
          * @param {function(boolean)} listener
          */
         removeUpdateListener(
-            listener: (isAlive:boolean) => void
+            listener: (isAlive: boolean) => void
         ): void
 
         /**
@@ -1110,7 +1107,7 @@ declare namespace chrome.cast.media {
          * @param {function()} successCallback
          * @param {function(!chrome.cast.Error)} errorCallback
          */
-        queueAppendItem (
+        queueAppendItem(
             item: chrome.cast.media.QueueItem,
             successCallback: Function,
             errorCallback: (error: chrome.cast.Error) => void
@@ -1121,7 +1118,7 @@ declare namespace chrome.cast.media {
          * @param {function()} successCallback
          * @param {function(!chrome.cast.Error)} errorCallback
          */
-        queueInsertItems (
+        queueInsertItems(
             queueInsertItemsRequest: chrome.cast.media.QueueInsertItemsRequest,
             successCallback: Function,
             errorCallback: (error: chrome.cast.Error) => void
@@ -1132,7 +1129,7 @@ declare namespace chrome.cast.media {
          * @param {function()} successCallback
          * @param {function(!chrome.cast.Error)} errorCallback
          */
-        queueJumpToItem (
+        queueJumpToItem(
             itemId: number,
             successCallback: Function,
             errorCallback: (error: chrome.cast.Error) => void
@@ -1144,7 +1141,7 @@ declare namespace chrome.cast.media {
          * @param {function()} successCallback
          * @param {function(!chrome.cast.Error)} errorCallback
          */
-        queueMoveItemToNewIndex (
+        queueMoveItemToNewIndex(
             itemId: number,
             newIndex: number,
             successCallback: Function,
@@ -1155,7 +1152,7 @@ declare namespace chrome.cast.media {
          * @param {function()} successCallback
          * @param {function(!chrome.cast.Error)} errorCallback
          */
-        queueNext (
+        queueNext(
             successCallback: Function,
             errorCallback: (error: chrome.cast.Error) => void
         ): void
@@ -1164,7 +1161,7 @@ declare namespace chrome.cast.media {
          * @param {function()} successCallback
          * @param {function(!chrome.cast.Error)} errorCallback
          */
-        queuePrev (
+        queuePrev(
             successCallback: Function,
             errorCallback: (error: chrome.cast.Error) => void
         ): void
@@ -1174,7 +1171,7 @@ declare namespace chrome.cast.media {
          * @param {function()} successCallback
          * @param {function(!chrome.cast.Error)} errorCallback
          */
-        queueRemoveItem (
+        queueRemoveItem(
             itemId: number,
             successCallback: Function,
             errorCallback: (error: chrome.cast.Error) => void
@@ -1185,7 +1182,7 @@ declare namespace chrome.cast.media {
          * @param {function()} successCallback
          * @param {function(!chrome.cast.Error)} errorCallback
          */
-        queueReorderItems (
+        queueReorderItems(
             queueReorderItemsRequest: chrome.cast.media.QueueReorderItemsRequest,
             successCallback: Function,
             errorCallback: (error: chrome.cast.Error) => void
@@ -1196,7 +1193,7 @@ declare namespace chrome.cast.media {
          * @param {function()} successCallback
          * @param {function(!chrome.cast.Error)} errorCallback
          */
-        queueSetRepeatMode (
+        queueSetRepeatMode(
             repeatMode: chrome.cast.media.RepeatMode,
             successCallback: Function,
             errorCallback: (error: chrome.cast.Error) => void
@@ -1207,7 +1204,7 @@ declare namespace chrome.cast.media {
          * @param {function()} successCallback
          * @param {function(!chrome.cast.Error)} errorCallback
          */
-        queueUpdateItems (
+        queueUpdateItems(
             queueUpdateItemsRequest: chrome.cast.media.QueueUpdateItemsRequest,
             successCallback: Function,
             errorCallback: (error: chrome.cast.Error) => void

From 76e8a03d8d13f2942e2c5fe57dcd8416d1681eff Mon Sep 17 00:00:00 2001
From: Bryce Godfrey <bryce.godfrey@avanade.com>
Date: Fri, 25 May 2018 10:43:27 -0700
Subject: [PATCH 441/575] rename and add add header

---
 .../index.d.ts                                | 486 +++++++++---------
 .../servicenow-tests.ts}                      |   0
 .../tsconfig.json                             |   2 +-
 .../tslint.json                               |   0
 4 files changed, 247 insertions(+), 241 deletions(-)
 rename types/{servicenow-jakarta => servicenow}/index.d.ts (58%)
 rename types/{servicenow-jakarta/servicenow-jakarta-tests.ts => servicenow/servicenow-tests.ts} (100%)
 rename types/{servicenow-jakarta => servicenow}/tsconfig.json (92%)
 rename types/{servicenow-jakarta => servicenow}/tslint.json (100%)

diff --git a/types/servicenow-jakarta/index.d.ts b/types/servicenow/index.d.ts
similarity index 58%
rename from types/servicenow-jakarta/index.d.ts
rename to types/servicenow/index.d.ts
index 8e92fa0ce0..115431c178 100644
--- a/types/servicenow-jakarta/index.d.ts
+++ b/types/servicenow/index.d.ts
@@ -1,3 +1,8 @@
+// Type definitions for ServiceNow Javascript Scoped API 10.x
+// Project: https://docs.servicenow.com/bundle/jakarta-application-development/page/build/applications/concept/api-javascript.html
+// Definitions by: Bryce Godfrey <https://github.com/bryceg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
 declare const email: servicenow.IGlideEmailOutbound;
 declare const g_processor: servicenow.IGlideScriptedProcessor;
 declare const g_request: servicenow.IGlideServletRequest;
@@ -331,265 +336,266 @@ declare namespace servicenow {
         update(reason?: string): string;
         updateMultiple(): void;
     }
-export interface IGlideEmailOutbound {
-    getSubject(): string;
-    setSubject(subject: string): void;
-    setFrom(address: string): void;
-    setReplyTo(address: string): void;
-    addAddress(type: string, address: string, displayName: string): void;
-    setBody(bodyText: string): void;
-}
+    
+    export interface IGlideEmailOutbound {
+        getSubject(): string;
+        setSubject(subject: string): void;
+        setFrom(address: string): void;
+        setReplyTo(address: string): void;
+        addAddress(type: string, address: string, displayName: string): void;
+        setBody(bodyText: string): void;
+    }
 
-export interface IGlideQueryCondition {
-    addCondition(name: string, value: object|string|number): IGlideQueryCondition;
-    addCondition(name: string, oper: QueryOperator, value: object|string|number): IGlideQueryCondition;
-    addOrCondition(name: string, oper: QueryOperator, value: object|string|number): IGlideQueryCondition;
-    addOrCondition(name: string, value: object|string|number): IGlideQueryCondition;
-}
+    export interface IGlideQueryCondition {
+        addCondition(name: string, value: object|string|number): IGlideQueryCondition;
+        addCondition(name: string, oper: QueryOperator, value: object|string|number): IGlideQueryCondition;
+        addOrCondition(name: string, oper: QueryOperator, value: object|string|number): IGlideQueryCondition;
+        addOrCondition(name: string, value: object|string|number): IGlideQueryCondition;
+    }
 
-export interface IGlideElement {
-    changes(): boolean;
-    changesFrom(value: object): boolean;
-    changesTo(value: object): boolean;
-    getChoices(name?: string): Array<any>;
-    getDecryptedValue(): string;
-    getDisplayValue(maxCharacters?: number): string;
-    getED(): IGlideElementDescriptor
-    getReferenceTable(): string;
-    getRefRecord(): IGlideRecord;
-    nil(): boolean;
-    setDisplayValue(value: object): void;
-    setError(value: string): void;
-    setValue(value: object|string): void;
-    toString(): string;
-}
+    export interface IGlideElement {
+        changes(): boolean;
+        changesFrom(value: object): boolean;
+        changesTo(value: object): boolean;
+        getChoices(name?: string): Array<any>;
+        getDecryptedValue(): string;
+        getDisplayValue(maxCharacters?: number): string;
+        getED(): IGlideElementDescriptor
+        getReferenceTable(): string;
+        getRefRecord(): IGlideRecord;
+        nil(): boolean;
+        setDisplayValue(value: object): void;
+        setError(value: string): void;
+        setValue(value: object|string): void;
+        toString(): string;
+    }
 
-export interface IGlideElementDescriptor {
-    getAttachmentEncryptionType(): string;
-    getEncryptionType(): string;
-    getInternalType(): string;
-    getLabel(): string;
-    getLength(): number;
-    getName(): string;
-    getPlural(): boolean;
-    hasAttachmentsEncrypted(): boolean;
-    isAutoOrSysID(): boolean;
-    isChoiceTable(): boolean;
-    isEdgeEncrypted(): boolean;
-    isVirtual(): boolean;
-}
+    export interface IGlideElementDescriptor {
+        getAttachmentEncryptionType(): string;
+        getEncryptionType(): string;
+        getInternalType(): string;
+        getLabel(): string;
+        getLength(): number;
+        getName(): string;
+        getPlural(): boolean;
+        hasAttachmentsEncrypted(): boolean;
+        isAutoOrSysID(): boolean;
+        isChoiceTable(): boolean;
+        isEdgeEncrypted(): boolean;
+        isVirtual(): boolean;
+    }
 
-export interface IGlideScriptedProcessor {
-    redirect(url: string): void;
-    writeOutput(s: string): void;
-    writeOutput(contentType: string, s: string): void;
-    writeJSON(o: object): void;
-}
+    export interface IGlideScriptedProcessor {
+        redirect(url: string): void;
+        writeOutput(s: string): void;
+        writeOutput(contentType: string, s: string): void;
+        writeJSON(o: object): void;
+    }
 
-export interface IGlideServletRequest {
-    getContentType(): string;
-    getHeader(name: string): string;
-    getParameter(name: string): string;
-    writeOutput(mimeType: string, output: string): void;
-    toString(): string;
-}
+    export interface IGlideServletRequest {
+        getContentType(): string;
+        getHeader(name: string): string;
+        getParameter(name: string): string;
+        writeOutput(mimeType: string, output: string): void;
+        toString(): string;
+    }
 
-export interface IGlideServletResponse {
-    setContentType(type: string): void;
-    setHeader(name: string, value: string): void;
-    setStatus(value: number): void;
-}
+    export interface IGlideServletResponse {
+        setContentType(type: string): void;
+        setHeader(name: string, value: string): void;
+        setStatus(value: number): void;
+    }
 
-export interface IGlideSession {
-    isInteractive(): boolean;
-    isLoggedIn(): boolean;
-    getClientData(paramName: string): string;
-    getClientIP(): string;
-    getCurrentApplicationId(): string;
-    getLanguage(): string;
-    getTimeZoneName(): string;
-    getSessionToken(): string;
-    getUrlOnStack(): string;
-    putClientData(paramName: string, paramValue: string): void;
-}
+    export interface IGlideSession {
+        isInteractive(): boolean;
+        isLoggedIn(): boolean;
+        getClientData(paramName: string): string;
+        getClientIP(): string;
+        getCurrentApplicationId(): string;
+        getLanguage(): string;
+        getTimeZoneName(): string;
+        getSessionToken(): string;
+        getUrlOnStack(): string;
+        putClientData(paramName: string, paramValue: string): void;
+    }
 
 
 
-export interface IGlideTime {
-    new (milliseconds: number): IGlideTime;
-    getByFormat(format: string): string;
-    getDisplayValue(): string;
-    getDisplayValueinternal(): string;
-    getValue(): string;
-    setDisplayValue(asDisplayed: string): void;
-    setValue(o: string): void;
-    subtract(start: IGlideTime, end: IGlideTime): GlideDuration;
-}
+    export interface IGlideTime {
+        new (milliseconds: number): IGlideTime;
+        getByFormat(format: string): string;
+        getDisplayValue(): string;
+        getDisplayValueinternal(): string;
+        getValue(): string;
+        setDisplayValue(asDisplayed: string): void;
+        setValue(o: string): void;
+        subtract(start: IGlideTime, end: IGlideTime): GlideDuration;
+    }
 
-export interface IGlideSystem {
-    addErrorMessage(message: string): void;
-    addInfoMessage(message: string): void;
-    base64Decode(source: string): string;
-    base64Encode(source: string): string;
-    beginningOfLastMonth(): string;
-    beginningOfLastWeek(): string;
-    beginningOfNextWeek(): string;
-    beginningOfNextMonth(): string;
-    beginningOfNextYear(): string;
-    beginningOfThisMonth(): string;
-    beginningOfThisQuarter(): string;
-    beginningOfThisWeek(): string;
-    beginningOfThisYear(): string;
-    dateGenerate(date: string): string;
-    daysAgo(days: number): string;
-    daysAgoEnd(days: number): string;
-    daysAgoStart(days: number): string;
-    debug(message: string, parm1?: any, parm2?: any, parm3?: any, parm4?: any, parm5?: any): void;
-    endOfLastMonth(): string;
-    endOfLastWeek(): string;
-    endOfLastYear(): string;
-    endOfNextMonth(): string;
-    endOfNextWeek(): string;
-    endOfNextYear(): string;
-    endOfThisMonth(): string;
-    endOfThisQuarter(): string;
-    endOfThisWeek(): string;
-    endOfThisYear(): string;
-    error(message: string, parm1?: any, parm2?: any, parm3?: any, parm4?: any, parm5?: any): void;
-    eventQueue(eventName: string, gr: IGlideRecord, optionalParam1: string, optionalParam2: string, eventQueue?: string): void;
-    eventQueueScheduled(name: string, instance: IGlideRecord, parm1: string, parm2: string, expiration: object): void;
-    executeNow(job: IGlideRecord): string;
-    generateGUID(): string;
-    getCallerScopeName(): string;
-    getCssCacheVersionString(): string;
-    getCurrentApplicationId(): string;
-    getCurrentScopeName(): string;
-    getErrorMessages(id: string, args?: Array<string>): string;
-    getMessage(id: string, object?: any): string;
-    getProperty<T>(key: string, altobject?: T): T;
-    getSession(): string | IGlideSession;
-    getSessionID(): string;
-    getSessionToken(): string;
-    getTimeZoneName(): string;
-    getUrlOnStack(): string;
-    getUser(): IGlideUser;
-    getUserDisplayName(): string;
-    getUserID(): string;
-    getUserName(): string;
-    getUserNameByUserID(id: string): string;
-    hasRole(roleName: string): boolean;
-    include(include: string): void;
-    info(message: string, parm1?: any, parm2?: any, parm3?: any, parm4?: any, parm5?: any): void;
-    isDebugging(): boolean;
-    isInteractive(): boolean;
-    isLoggedIn(): boolean;
-    isMobile(): boolean;
-    minutesAgoEnd(num: number): string;
-    minutesAgoStart(num: number): string;
-    monthsAgo(num: number): string;
-    monthsAgoEnd(num: number): string;
-    monthsAgoStart(num: number): string;
-    nil(object: any): boolean;
-    quartersAgoEnd(num: number): string;
-    quartersAgoStart(num: number): string;
-    setRedirect(uri: string): void;
-    tableExists(table: string): boolean;
-    warn(message: string, parm1?: any, parm2?: any, parm3?: any, parm4?: any, parm5?: any): void;
-    xmlToJSON(xml: string): any;
-    yearsAgo(years: number): string;
-    yesterday(): string;
-}
+    export interface IGlideSystem {
+        addErrorMessage(message: string): void;
+        addInfoMessage(message: string): void;
+        base64Decode(source: string): string;
+        base64Encode(source: string): string;
+        beginningOfLastMonth(): string;
+        beginningOfLastWeek(): string;
+        beginningOfNextWeek(): string;
+        beginningOfNextMonth(): string;
+        beginningOfNextYear(): string;
+        beginningOfThisMonth(): string;
+        beginningOfThisQuarter(): string;
+        beginningOfThisWeek(): string;
+        beginningOfThisYear(): string;
+        dateGenerate(date: string): string;
+        daysAgo(days: number): string;
+        daysAgoEnd(days: number): string;
+        daysAgoStart(days: number): string;
+        debug(message: string, parm1?: any, parm2?: any, parm3?: any, parm4?: any, parm5?: any): void;
+        endOfLastMonth(): string;
+        endOfLastWeek(): string;
+        endOfLastYear(): string;
+        endOfNextMonth(): string;
+        endOfNextWeek(): string;
+        endOfNextYear(): string;
+        endOfThisMonth(): string;
+        endOfThisQuarter(): string;
+        endOfThisWeek(): string;
+        endOfThisYear(): string;
+        error(message: string, parm1?: any, parm2?: any, parm3?: any, parm4?: any, parm5?: any): void;
+        eventQueue(eventName: string, gr: IGlideRecord, optionalParam1: string, optionalParam2: string, eventQueue?: string): void;
+        eventQueueScheduled(name: string, instance: IGlideRecord, parm1: string, parm2: string, expiration: object): void;
+        executeNow(job: IGlideRecord): string;
+        generateGUID(): string;
+        getCallerScopeName(): string;
+        getCssCacheVersionString(): string;
+        getCurrentApplicationId(): string;
+        getCurrentScopeName(): string;
+        getErrorMessages(id: string, args?: Array<string>): string;
+        getMessage(id: string, object?: any): string;
+        getProperty<T>(key: string, altobject?: T): T;
+        getSession(): string | IGlideSession;
+        getSessionID(): string;
+        getSessionToken(): string;
+        getTimeZoneName(): string;
+        getUrlOnStack(): string;
+        getUser(): IGlideUser;
+        getUserDisplayName(): string;
+        getUserID(): string;
+        getUserName(): string;
+        getUserNameByUserID(id: string): string;
+        hasRole(roleName: string): boolean;
+        include(include: string): void;
+        info(message: string, parm1?: any, parm2?: any, parm3?: any, parm4?: any, parm5?: any): void;
+        isDebugging(): boolean;
+        isInteractive(): boolean;
+        isLoggedIn(): boolean;
+        isMobile(): boolean;
+        minutesAgoEnd(num: number): string;
+        minutesAgoStart(num: number): string;
+        monthsAgo(num: number): string;
+        monthsAgoEnd(num: number): string;
+        monthsAgoStart(num: number): string;
+        nil(object: any): boolean;
+        quartersAgoEnd(num: number): string;
+        quartersAgoStart(num: number): string;
+        setRedirect(uri: string): void;
+        tableExists(table: string): boolean;
+        warn(message: string, parm1?: any, parm2?: any, parm3?: any, parm4?: any, parm5?: any): void;
+        xmlToJSON(xml: string): any;
+        yearsAgo(years: number): string;
+        yesterday(): string;
+    }
 
-export interface IGlideUser {
-    getCompanyID(): string;
-    getDisplayName(): string;
-    getID(): string;
-    getName(): string;
-    getPreference(name: string): string;
-    hasRole(role: string): boolean;
-    isMemberOf(group: string): boolean;
-    savePreference(name: string, value: string): void;
-}
+    export interface IGlideUser {
+        getCompanyID(): string;
+        getDisplayName(): string;
+        getID(): string;
+        getName(): string;
+        getPreference(name: string): string;
+        hasRole(role: string): boolean;
+        isMemberOf(group: string): boolean;
+        savePreference(name: string, value: string): void;
+    }
 
-export interface IXMLNode {
-    getLastChild(): IXMLNode;
-    getFirstChild(): IXMLNode;
-    getNodeValue(): string;
-    getNodeName(): string;
-    hasAttribute(name: string): boolean;
-    getAttribute(attribute: string): string;
-    getChildNodeIterator(): IXMLNodeIterator;
-    getTextContent(): string;
-    toString(): string;
-}
+    export interface IXMLNode {
+        getLastChild(): IXMLNode;
+        getFirstChild(): IXMLNode;
+        getNodeValue(): string;
+        getNodeName(): string;
+        hasAttribute(name: string): boolean;
+        getAttribute(attribute: string): string;
+        getChildNodeIterator(): IXMLNodeIterator;
+        getTextContent(): string;
+        toString(): string;
+    }
 
-export interface IXMLNodeIterator {
-    hasNext(): Boolean;
-    next(): IXMLNode;
-}
+    export interface IXMLNodeIterator {
+        hasNext(): Boolean;
+        next(): IXMLNode;
+    }
 
-export interface ISOAPResponseV2 {
-    waitForResponse(timeoutSecs: number): void;
-    getStatusCode(): number;
-    getHeader(name: string): string;
-    getHeaders(): object;
-    getBody(): string;
-    haveError(): boolean;
-    getErrorCode(): number;
-    getErrorMessage(): string;
-}
+    export interface ISOAPResponseV2 {
+        waitForResponse(timeoutSecs: number): void;
+        getStatusCode(): number;
+        getHeader(name: string): string;
+        getHeaders(): object;
+        getBody(): string;
+        haveError(): boolean;
+        getErrorCode(): number;
+        getErrorMessage(): string;
+    }
 
-export interface IRESTResponseV2 {
-    getBody(): string;
-    getCookies(): {size: ()=>number, get: (index: number)=>string};
-    getErrorCode(): number;
-    getErrorMessage(): string;
-    getHeader(name: string): string;
-    getHeaders(): object;
-    getQueryString(): string;
-    getResponseAttachmentSysid(): string;
-    getStatusCode(): number;
-    haveError(): boolean;
-    waitForResponse(timeoutSecs: number): void;
-}
+    export interface IRESTResponseV2 {
+        getBody(): string;
+        getCookies(): {size: ()=>number, get: (index: number)=>string};
+        getErrorCode(): number;
+        getErrorMessage(): string;
+        getHeader(name: string): string;
+        getHeaders(): object;
+        getQueryString(): string;
+        getResponseAttachmentSysid(): string;
+        getStatusCode(): number;
+        haveError(): boolean;
+        waitForResponse(timeoutSecs: number): void;
+    }
 
-export interface IRESTAPIRequest<T> {
-    body: IRESTAPIRequestBody<T>;
-    pathParams: { [paramName: string]: string };
-    queryParams: { [paramName: string]: Array<string> };
-    queryString: string;
-    uri: string;
-    url: string;
-    headers: { [paramName: string]: string };
-    getHeader(header: string): string;
-    getSupportedResponseContentTypes(): Array<string>;
-}
+    export interface IRESTAPIRequest<T> {
+        body: IRESTAPIRequestBody<T>;
+        pathParams: { [paramName: string]: string };
+        queryParams: { [paramName: string]: Array<string> };
+        queryString: string;
+        uri: string;
+        url: string;
+        headers: { [paramName: string]: string };
+        getHeader(header: string): string;
+        getSupportedResponseContentTypes(): Array<string>;
+    }
 
-export interface IRESTAPIRequestBody<T> {
-    data: T;
-    dataStream: any;
-    dataString: string;
-    hasNext(): boolean;
-    nextEntry(): any;
-}
+    export interface IRESTAPIRequestBody<T> {
+        data: T;
+        dataStream: any;
+        dataString: string;
+        hasNext(): boolean;
+        nextEntry(): any;
+    }
 
-export interface IRESTAPIResponse {
-    getStreamWriter(): IRESTAPIResponseStream;
-    setBody(body: any): void;
-    setHeaders(headers: any): void;
-    setLocation(location: string): void;
-    setStatus(status: number): void;
-    setHeader(header: string, value: string): void;
-    setContentType(contentType: string): void;
-    setError(error: any): void;
-}
+    export interface IRESTAPIResponse {
+        getStreamWriter(): IRESTAPIResponseStream;
+        setBody(body: any): void;
+        setHeaders(headers: any): void;
+        setLocation(location: string): void;
+        setStatus(status: number): void;
+        setHeader(header: string, value: string): void;
+        setContentType(contentType: string): void;
+        setError(error: any): void;
+    }
 
-export interface IRESTAPIResponseStream {
-    writeStream(stream: object): void;
-    writeString(data: string): void;
-}
+    export interface IRESTAPIResponseStream {
+        writeStream(stream: object): void;
+        writeString(data: string): void;
+    }
 
-export type QueryOperator = "="|"!="|">"|">="|"<"|"<="|"IN"|"STARTSWITH"|"ENDSWITH"|"CONTAINS"|"DOESNOTCONTAIN"|"INSTANCEOF"
-export type RestHTTPMethods = "get"|"post"|"delete"|"patch"|"put"|"head"|"delete"|"options";
-export type GlideRecordOperation = "insert"|"update"|"delete";
+    export type QueryOperator = "="|"!="|">"|">="|"<"|"<="|"IN"|"STARTSWITH"|"ENDSWITH"|"CONTAINS"|"DOESNOTCONTAIN"|"INSTANCEOF"
+    export type RestHTTPMethods = "get"|"post"|"delete"|"patch"|"put"|"head"|"delete"|"options";
+    export type GlideRecordOperation = "insert"|"update"|"delete";
 }
\ No newline at end of file
diff --git a/types/servicenow-jakarta/servicenow-jakarta-tests.ts b/types/servicenow/servicenow-tests.ts
similarity index 100%
rename from types/servicenow-jakarta/servicenow-jakarta-tests.ts
rename to types/servicenow/servicenow-tests.ts
diff --git a/types/servicenow-jakarta/tsconfig.json b/types/servicenow/tsconfig.json
similarity index 92%
rename from types/servicenow-jakarta/tsconfig.json
rename to types/servicenow/tsconfig.json
index a2d4b7687b..2d4056dc05 100644
--- a/types/servicenow-jakarta/tsconfig.json
+++ b/types/servicenow/tsconfig.json
@@ -18,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "servicenow-jakarta-tests.ts"
+        "servicenow-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/servicenow-jakarta/tslint.json b/types/servicenow/tslint.json
similarity index 100%
rename from types/servicenow-jakarta/tslint.json
rename to types/servicenow/tslint.json

From 9e99d7f1ab8499226d432a189792c3e60071b130 Mon Sep 17 00:00:00 2001
From: Domino987 <domino051@gmail.com>
Date: Fri, 25 May 2018 21:10:36 +0200
Subject: [PATCH 442/575] Add src to media

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

diff --git a/types/reactstrap/lib/Media.d.ts b/types/reactstrap/lib/Media.d.ts
index f7a9afb2c0..1bca7aaedc 100644
--- a/types/reactstrap/lib/Media.d.ts
+++ b/types/reactstrap/lib/Media.d.ts
@@ -13,6 +13,7 @@ export interface MediaProps extends React.HTMLAttributes<HTMLElement> {
   right?: boolean;
   tag?: React.ReactType;
   top?: boolean;
+  src?: string;
   href?: string;
   alt?: string;
 }

From be6e04361d269f2211517e0fc6ea939995aec788 Mon Sep 17 00:00:00 2001
From: Retsam <Retsam@users.noreply.github.com>
Date: Fri, 25 May 2018 14:51:36 -0400
Subject: [PATCH 443/575] S3rver: Add `declare namespace S3rver`

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

diff --git a/types/s3rver/index.d.ts b/types/s3rver/index.d.ts
index 2ec50a1f84..6b052e9bae 100644
--- a/types/s3rver/index.d.ts
+++ b/types/s3rver/index.d.ts
@@ -28,4 +28,6 @@ interface S3rverOptions {
     directory: string;
 }
 
+declare namespace S3rver {}
+
 export = S3rver;

From c94af5dda9f6222ec9c2961097d1c119b69857e1 Mon Sep 17 00:00:00 2001
From: Bryce Godfrey <bryce.godfrey@avanade.com>
Date: Fri, 25 May 2018 12:17:04 -0700
Subject: [PATCH 444/575] fix linting errors

---
 types/servicenow/index.d.ts          | 384 +++++++++++++--------------
 types/servicenow/servicenow-tests.ts |  12 +-
 types/servicenow/tsconfig.json       |   4 +-
 types/servicenow/tslint.json         |   8 +-
 4 files changed, 200 insertions(+), 208 deletions(-)

diff --git a/types/servicenow/index.d.ts b/types/servicenow/index.d.ts
index 115431c178..abf46bcede 100644
--- a/types/servicenow/index.d.ts
+++ b/types/servicenow/index.d.ts
@@ -2,21 +2,22 @@
 // Project: https://docs.servicenow.com/bundle/jakarta-application-development/page/build/applications/concept/api-javascript.html
 // Definitions by: Bryce Godfrey <https://github.com/bryceg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
 
-declare const email: servicenow.IGlideEmailOutbound;
-declare const g_processor: servicenow.IGlideScriptedProcessor;
-declare const g_request: servicenow.IGlideServletRequest;
-declare const g_response: servicenow.IGlideServletResponse;
-declare const gs: servicenow.IGlideSystem;
-declare const GlideRecordSecure: servicenow.IGlideRecord;
-declare const GlideRecord: servicenow.IGlideRecord;
+declare const email: servicenow.GlideEmailOutbound;
+declare const g_processor: servicenow.GlideScriptedProcessor;
+declare const g_request: servicenow.GlideServletRequest;
+declare const g_response: servicenow.GlideServletResponse;
+declare const gs: servicenow.GlideSystem;
+declare const GlideRecordSecure: servicenow.GlideRecord;
+declare const GlideRecord: servicenow.GlideRecord;
 
 declare namespace sn_ws {
     class RESTMessageV2 {
         constructor();
-        constructor (name: string, methodName: servicenow.RestHTTPMethods);
-        execute(): servicenow.IRESTResponseV2;
-        executeAsync(): servicenow.IRESTResponseV2;
+        constructor(name: string, methodName: servicenow.RestHTTPMethods);
+        execute(): servicenow.RESTResponseV2;
+        executeAsync(): servicenow.RESTResponseV2;
         getEndpoint(): string;
         getRequestBody(): string;
         getRequestHeader(headerName: string): string;
@@ -43,10 +44,10 @@ declare namespace sn_ws {
     }
 
     class SOAPMessageV2 {
-        constructor ();
-        constructor (soapMessage: string, soapFunction: string);
-        execute(): servicenow.ISOAPResponseV2;
-        executeAsync(): servicenow.ISOAPResponseV2;
+        constructor();
+        constructor(soapMessage: string, soapFunction: string);
+        execute(): servicenow.SOAPResponseV2;
+        executeAsync(): servicenow.SOAPResponseV2;
         setHttpMethod(method: string): void;
         setHttpTimeout(timeoutMs: number): void;
         setBasicAuth(userName: string, userPass: string): void;
@@ -68,50 +69,58 @@ declare namespace sn_ws {
 }
 
 declare namespace global {
-    class GlideStringUtil {
-        static base64Decode(value: string): string;
-        static base64DecodeAsBytes(value: string): any;
-        static escapeHTML(value: string): string;
-        static getStringFromStream(stream: object): string;
-    }
+    const GlideStringUtil: {
+        base64Decode(value: string): string,
+        base64DecodeAsBytes(value: string): any,
+        escapeHTML(value: string): string,
+        getStringFromStream(stream: object): string
+    };
 
-    class Class {
-        static create(): any;
-    }
+    const Class: {
+        create(): any;
+    };
 
     class Workflow {
         constructor();
         broadcastEvent(contextId: string, eventName: string): void;
-        cancel(record: servicenow.IGlideRecord): void;
-        cancelContext(context: servicenow.IGlideRecord): void;
-        deleteWorkflow(current: servicenow.IGlideRecord): void;
-        fireEvent(eventRecord: servicenow.IGlideRecord, eventName: string): void;
+        cancel(record: servicenow.GlideRecord): void;
+        cancelContext(context: servicenow.GlideRecord): void;
+        deleteWorkflow(current: servicenow.GlideRecord): void;
+        fireEvent(eventRecord: servicenow.GlideRecord, eventName: string): void;
         fireEventById(eventRecordId: string, eventName: string): void;
-        getContexts(record: servicenow.IGlideRecord): servicenow.IGlideRecord;
+        getContexts(record: servicenow.GlideRecord): servicenow.GlideRecord;
         getEstimatedDeliveryTime(workflowId: string): string;
-        getEstimatedDeliveryTimeFromWFVersion(wfVersion: servicenow.IGlideRecord): string;
-        getReturnValue(workflowID: string, amount: number, result: boolean): any|null;
-        getRunningFlows(record: servicenow.IGlideRecord): servicenow.IGlideRecord;
+        getEstimatedDeliveryTimeFromWFVersion(wfVersion: servicenow.GlideRecord): string;
+        getReturnValue(workflowID: string, amount: number, result: boolean): {};
+        getRunningFlows(record: servicenow.GlideRecord): servicenow.GlideRecord;
         getVersion(workflowId: string): void;
         getVersionFromName(workflowName: string): void;
         getWorkflowFromName(workflowName: string): void;
-        hasWorkflow(record: servicenow.IGlideRecord): boolean;
-        restartWorkflow(record: servicenow.IGlideRecord, maintainStateFlag: boolean): void;
-        runFlows(record: servicenow.IGlideRecord, operation: servicenow.GlideRecordOperation): void;
-        startFlow(workflowId: string, current: servicenow.IGlideRecord|null, operation: servicenow.GlideRecordOperation, vars?: object) : string;
-        startFlowFromContextInsert(context: servicenow.IGlideRecord, operation: servicenow.GlideRecordOperation): void;
-        startFlowRetroactive(workflowID: string, retroactiveMSecs: number, current: servicenow.IGlideRecord, operation: servicenow.GlideRecordOperation, vars?: object, withSchedule?: any): servicenow.IGlideRecord;
-   
+        hasWorkflow(record: servicenow.GlideRecord): boolean;
+        restartWorkflow(record: servicenow.GlideRecord, maintainStateFlag: boolean): void;
+        runFlows(record: servicenow.GlideRecord, operation: servicenow.GlideRecordOperation): void;
+        startFlow(workflowId: string, current: servicenow.GlideRecord|null, operation: servicenow.GlideRecordOperation, vars?: object): string;
+        startFlowFromContextInsert(context: servicenow.GlideRecord, operation: servicenow.GlideRecordOperation): void;
+        startFlowRetroactive(
+            workflowID: string, retroactiveMSecs: number, current: servicenow.GlideRecord, operation: servicenow.GlideRecordOperation, vars?: object, withSchedule?: any): servicenow.GlideRecord;
     }
 }
 
-declare class GlideDateTime {
-    constructor ();
-    constructor (value: string);
-    constructor (g: GlideDateTime);
+declare class GlideTime {
+    constructor(milliseconds: number);
+    getByFormat(format: string): string;
+    getDisplayValue(): string;
+    getDisplayValueinternal(): string;
+    getValue(): string;
+    setDisplayValue(asDisplayed: string): void;
+    setValue(o: string): void;
+    subtract(start: GlideTime, end: GlideTime): GlideDuration;
+}
 
-    add(gd: servicenow.IGlideTime): void;
-    add(milliseconds: number): void;
+declare class GlideDateTime {
+    constructor(value?: string|GlideDateTime);
+
+    add(gd: GlideTime|number): void;
     addDaysLocalTime(amount: number): void;
     addDaysUTC(amount: number): void;
     addMonthsLocalTime(amount: number): void;
@@ -123,8 +132,7 @@ declare class GlideDateTime {
     addYearsUTC(amount: number): void;
     compareTo(o: object): number;
     equals(o: object): boolean;
-    getDSTOffset(): number;
-    getDate(): servicenow.IGlideTime;
+    getDate(): GlideTime;
     getDayOfMonthLocalTime(): number;
     getDayOfMonthUTC(): number;
     getDayOfWeekLocalTime(): number;
@@ -134,13 +142,13 @@ declare class GlideDateTime {
     getDisplayValueInternal(): string;
     getDSTOffset(): number;
     getErrorMsg(): string;
-    getLocalDate(): servicenow.IGlideTime;
-    getLocalTime(): servicenow.IGlideTime;
+    getLocalDate(): GlideTime;
+    getLocalTime(): GlideTime;
     getMonthLocalTime(): number;
     getMonthUTC(): number;
     getNumericValue(): number;
+    getTime(): GlideTime;
     getTZOffset(): number;
-    getTime(): servicenow.IGlideTime;
     getValue(): string;
     getWeekOfYearLocalTime(): number;
     getWeekOfYearUTC(): number;
@@ -151,8 +159,7 @@ declare class GlideDateTime {
     isValid(): boolean;
     setDayOfMonthLocalTime(day: number): void;
     setDayOfMonthUTC(day: number): void;
-    setDisplayValue(asDisplayed: string): void;
-    setDisplayValue(value: string, format: string): void;
+    setDisplayValue(value: string, format?: string): void;
     setDisplayValueInternal(value: string): void;
     setGlideDateTime(g: GlideDateTime): void;
     setMonthLocalTime(month: number): void;
@@ -162,63 +169,58 @@ declare class GlideDateTime {
     setValueUTC(dt: string, format: string): void;
     setYearLocalTime(year: number): void;
     setYearUTC(year: number): void;
-    subtract(gd: servicenow.IGlideTime): void;
-    subtract(start: GlideDateTime, end: GlideDateTime): GlideDuration;
-    subtract(value: number): void;
-    subtract(time: servicenow.IGlideTime): void;
+    subtract(start: GlideDateTime, end?: GlideDateTime): GlideDuration;
+    subtract(time: GlideTime|number): void;
     toString(): string;
 }
 
-declare class RP {
-    static getReferringURL(): string;
-    static isDialog(): boolean;
-    static isHomePage(): boolean;
-    static isPrint(): boolean;
-    static isMobile(): boolean;
-    static getParameterValue(value: string): string;
-    static getParameters(): Array<string>;
-    static getViewID(): string;
-}
+declare const RP: {
+    getParameters(): string[];
+    getParameterValue(value: string): string;
+    getReferringURL(): string;
+    getViewID(): string;
+    isDialog(): boolean;
+    isHomePage(): boolean;
+    isMobile(): boolean;
+    isPrint(): boolean;
+};
 
 declare class XMLDocument2 {
-    constructor ();
-    parseXML(xmlDoc: string): void;
+    constructor();
+    createElement(name: string): servicenow.XMLNode;
+    createElementWithTextValue(name: string, value: string): servicenow.XMLNode;
+    getDocumentElement(): servicenow.XMLNode;
+    getFirstNode(xpath: string): servicenow.XMLNode;
+    getNextNode(prev: object): servicenow.XMLNode;
+    getNode(xpath: string): servicenow.XMLNode;
     getNodeText(xpath: string): string;
-    getNode(xpath: string): servicenow.IXMLNode;
-    getFirstNode(xpath: string): servicenow.IXMLNode;
-    getNextNode(prev: object): servicenow.IXMLNode;
-    createElement(name: string): servicenow.IXMLNode;
-    createElementWithTextValue(name: string, value: string): servicenow.IXMLNode;
-    setCurrentElement(element: servicenow.IXMLNode): void;
-    getDocumentElement(): servicenow.IXMLNode;
+    parseXML(xmlDoc: string): void;
+    setCurrentElement(element: servicenow.XMLNode): void;
     toString(): string;
 }
 
 declare class GlideDuration {
-    constructor ();
-    constructor (another: GlideDuration);
-    constructor (ms: number);
-    constructor (displayValue: string);
+    constructor(value?: GlideDuration|number|string);
     add(value: GlideDuration): GlideDuration;
     getByFormat(format: string): string;
     getDayPart(): number;
-    getRoundedDayPart(): number;
     getDisplayValue(): string;
     getDurationValue(): string;
+    getNumericValue(): number;
+    getRoundedDayPart(): number;
     getValue(): string;
     setDisplayValue(asDisplayed: string): void;
     setValue(o: object): void;
     subtract(value: GlideDuration): GlideDuration;
-    getNumericValue(): number;
 }
 
-declare class GlideFilter {
-    static checkRecord(gr: servicenow.IGlideRecord, filter: string, matchAll?: object): boolean;
-}
+declare const GlideFilter: {
+    checkRecord(gr: servicenow.GlideRecord, filter: string, matchAll?: object): boolean;
+};
 
-declare class GlideGuid {
-    static generate(): string;
-}
+declare const GlideGuid: {
+    generate(): string;
+};
 
 declare class GlideLocale {
     static get(): GlideLocale;
@@ -226,13 +228,13 @@ declare class GlideLocale {
     getDecimalSeparator(): string;
 }
 
-declare class GlidePluginManager {
-    static isActive(pluginId: string): boolean;
-}
+declare const GlidePluginManager: {
+    isActive(pluginId: string): boolean;
+};
 
 declare class GlideSchedule {
-    constructor ();
-    constructor (sysId: string, timeZone: string);
+    constructor();
+    constructor(sysId: string, timeZone: string);
     add(startDate: GlideDateTime, offset: GlideDuration): GlideDateTime;
     duration(startDate: GlideDateTime, endDate: GlideDateTime): GlideDuration;
     getName(): string;
@@ -244,50 +246,47 @@ declare class GlideSchedule {
 }
 
 declare class GlideEvaluator {
-    constructor ();
-    evaluateScript(grObj: servicenow.IGlideRecord, scriptField?: string, variables?: object): object;
-    getVariable<T>(name: string): T;
-    putVariable<T>(name: string, value: T): void;
+    constructor();
+    evaluateScript(grObj: servicenow.GlideRecord, scriptField?: string, variables?: object): object;
+    getVariable(name: string): {};
+    putVariable(name: string, value: {}): void;
 }
 
-declare class GlideSecureRandomUtil {
-    static getSecureRandomInt(): number;
-    static getSecureRandomIntBound(bound: number): number;
-    static getSecureRandomLong(): number;
-    static getSecureRandomString(length: number): string;
-}
+declare const GlideSecureRandomUtil: {
+    getSecureRandomInt(): number,
+    getSecureRandomIntBound(bound: number): number,
+    getSecureRandomLong(): number,
+    getSecureRandomString(length: number): string
+};
 
 declare class GlideSysAttachment {
-    constructor ();
+    constructor();
     copy(sourceTable: string, sourceSysId: string, destinationTable: string, destinationSysId: string): void;
     deleteAttachment(sysId: string): void;
-    getContent(record: servicenow.IGlideRecord): any;
-    getContentBase64(record: servicenow.IGlideRecord): string;
+    getContent(record: servicenow.GlideRecord): any;
+    getContentBase64(record: servicenow.GlideRecord): string;
     getContentStream(sysId: string): object;
-    write(record: servicenow.IGlideRecord, fileName: string, contentType: string, data: any): string;
-    writeBase64(record: servicenow.IGlideRecord, fileName: string, contentType: string, base64Content: string): string;
-    writeContentStream(record: servicenow.IGlideRecord, fileName: string, contentType: string, inputStream: object): string;
+    write(record: servicenow.GlideRecord, fileName: string, contentType: string, data: any): string;
+    writeBase64(record: servicenow.GlideRecord, fileName: string, contentType: string, base64Content: string): string;
+    writeContentStream(record: servicenow.GlideRecord, fileName: string, contentType: string, inputStream: object): string;
 }
 
 declare namespace servicenow {
-    export interface IGlideRecord {
-        readonly sys_created_by: string & IGlideElement;
-        readonly sys_created_on: GlideDateTime & IGlideElement;
+    interface GlideRecord {
+        readonly sys_created_by: string & GlideElement;
+        readonly sys_created_on: GlideDateTime & GlideElement;
         readonly sys_id: string;
-        readonly sys_mod_count: number & IGlideElement;
-        readonly sys_updated_by: string & IGlideElement;
-        readonly sys_updated_on: GlideDateTime & IGlideElement;
-        
-        new (type: string) : IGlideRecord;
-
-        addActiveQuery(): IGlideQueryCondition;
+        readonly sys_mod_count: number & GlideElement;
+        readonly sys_updated_by: string & GlideElement;
+        readonly sys_updated_on: GlideDateTime & GlideElement;
+        new (type: string): GlideRecord;
+        addActiveQuery(): GlideQueryCondition;
         addEncodedQuery(query: string): void;
-        addJoinQuery(joinTable: string, primaryField?: string, joinTableField?: string): IGlideQueryCondition;
-        addNotNullQuery(fieldName: string): IGlideQueryCondition;
-        addNullQuery(fieldName: string): IGlideQueryCondition;
-        addQuery(encodedQuery: string): IGlideQueryCondition;
-        addQuery(fieldName: string, operator: QueryOperator, value: object|string|number): IGlideQueryCondition;
-        addQuery(fieldName: string, value: object|string|number): IGlideQueryCondition;
+        addJoinQuery(joinTable: string, primaryField?: string, joinTableField?: string): GlideQueryCondition;
+        addNotNullQuery(fieldName: string): GlideQueryCondition;
+        addNullQuery(fieldName: string): GlideQueryCondition;
+        addQuery(fieldName: string, operator: QueryOperator, value: object|string|number): GlideQueryCondition;
+        addQuery(fieldName: string, value?: object|string|number): GlideQueryCondition;
         canCreate(): boolean;
         canDelete(): boolean;
         canRead(): boolean;
@@ -299,8 +298,8 @@ declare namespace servicenow {
         getAttribute(fieldName: string): string;
         getClassDisplayValue(): string;
         getDisplayValue(field?: string): string;
-        getED(): IGlideElementDescriptor;
-        getElement(columnName: string): IGlideElement;
+        getED(): GlideElementDescriptor;
+        getElement(columnName: string): GlideElement;
         getEncodedQuery(): string;
         getLabel(): string;
         getLastErrorMessage(): string;
@@ -321,12 +320,10 @@ declare namespace servicenow {
         newRecord(): void;
         next(): boolean;
         _next(): boolean;
-        operation(): servicenow.GlideRecordOperation;
+        operation(): GlideRecordOperation;
         orderBy(name: string): void;
         orderByDesc(name: string): void;
-        query(): void;
-        query(field: string, value: object): void;
-        query(query: string): void;
+        query(field?: string, value?: object): void;
         _query(field: string, value: object): void;
         setAbortAction(b: boolean): void;
         setNewGuidValue(guid: string): void;
@@ -336,8 +333,8 @@ declare namespace servicenow {
         update(reason?: string): string;
         updateMultiple(): void;
     }
-    
-    export interface IGlideEmailOutbound {
+
+    interface GlideEmailOutbound {
         getSubject(): string;
         setSubject(subject: string): void;
         setFrom(address: string): void;
@@ -346,23 +343,27 @@ declare namespace servicenow {
         setBody(bodyText: string): void;
     }
 
-    export interface IGlideQueryCondition {
-        addCondition(name: string, value: object|string|number): IGlideQueryCondition;
-        addCondition(name: string, oper: QueryOperator, value: object|string|number): IGlideQueryCondition;
-        addOrCondition(name: string, oper: QueryOperator, value: object|string|number): IGlideQueryCondition;
-        addOrCondition(name: string, value: object|string|number): IGlideQueryCondition;
+    interface GlideQueryCondition {
+        addCondition(name: string, value: object|string|number): GlideQueryCondition;
+        addCondition(name: string, oper: QueryOperator, value: object|string|number): GlideQueryCondition;
+        addOrCondition(name: string, oper: QueryOperator, value: object|string|number): GlideQueryCondition;
+        addOrCondition(name: string, value: object|string|number): GlideQueryCondition;
     }
 
-    export interface IGlideElement {
+    interface GlideElement {
+        canCreate(): boolean;
+        canRead(): boolean;
+        canWrite(): boolean;
         changes(): boolean;
         changesFrom(value: object): boolean;
         changesTo(value: object): boolean;
-        getChoices(name?: string): Array<any>;
+        getAttribute(attributeName: string): string;
+        getChoices(name?: string): any[];
         getDecryptedValue(): string;
         getDisplayValue(maxCharacters?: number): string;
-        getED(): IGlideElementDescriptor
+        getED(): GlideElementDescriptor;
         getReferenceTable(): string;
-        getRefRecord(): IGlideRecord;
+        getRefRecord(): GlideRecord;
         nil(): boolean;
         setDisplayValue(value: object): void;
         setError(value: string): void;
@@ -370,7 +371,7 @@ declare namespace servicenow {
         toString(): string;
     }
 
-    export interface IGlideElementDescriptor {
+    interface GlideElementDescriptor {
         getAttachmentEncryptionType(): string;
         getEncryptionType(): string;
         getInternalType(): string;
@@ -385,14 +386,13 @@ declare namespace servicenow {
         isVirtual(): boolean;
     }
 
-    export interface IGlideScriptedProcessor {
+    interface GlideScriptedProcessor {
         redirect(url: string): void;
-        writeOutput(s: string): void;
-        writeOutput(contentType: string, s: string): void;
+        writeOutput(contentType: string, s?: string): void;
         writeJSON(o: object): void;
     }
 
-    export interface IGlideServletRequest {
+    interface GlideServletRequest {
         getContentType(): string;
         getHeader(name: string): string;
         getParameter(name: string): string;
@@ -400,13 +400,13 @@ declare namespace servicenow {
         toString(): string;
     }
 
-    export interface IGlideServletResponse {
+    interface GlideServletResponse {
         setContentType(type: string): void;
         setHeader(name: string, value: string): void;
         setStatus(value: number): void;
     }
 
-    export interface IGlideSession {
+    interface GlideSession {
         isInteractive(): boolean;
         isLoggedIn(): boolean;
         getClientData(paramName: string): string;
@@ -419,20 +419,7 @@ declare namespace servicenow {
         putClientData(paramName: string, paramValue: string): void;
     }
 
-
-
-    export interface IGlideTime {
-        new (milliseconds: number): IGlideTime;
-        getByFormat(format: string): string;
-        getDisplayValue(): string;
-        getDisplayValueinternal(): string;
-        getValue(): string;
-        setDisplayValue(asDisplayed: string): void;
-        setValue(o: string): void;
-        subtract(start: IGlideTime, end: IGlideTime): GlideDuration;
-    }
-
-    export interface IGlideSystem {
+    interface GlideSystem {
         addErrorMessage(message: string): void;
         addInfoMessage(message: string): void;
         base64Decode(source: string): string;
@@ -462,23 +449,23 @@ declare namespace servicenow {
         endOfThisWeek(): string;
         endOfThisYear(): string;
         error(message: string, parm1?: any, parm2?: any, parm3?: any, parm4?: any, parm5?: any): void;
-        eventQueue(eventName: string, gr: IGlideRecord, optionalParam1: string, optionalParam2: string, eventQueue?: string): void;
-        eventQueueScheduled(name: string, instance: IGlideRecord, parm1: string, parm2: string, expiration: object): void;
-        executeNow(job: IGlideRecord): string;
+        eventQueue(eventName: string, gr: GlideRecord, optionalParam1: string, optionalParam2: string, eventQueue?: string): void;
+        eventQueueScheduled(name: string, instance: GlideRecord, parm1: string, parm2: string, expiration: object): void;
+        executeNow(job: GlideRecord): string;
         generateGUID(): string;
         getCallerScopeName(): string;
         getCssCacheVersionString(): string;
         getCurrentApplicationId(): string;
         getCurrentScopeName(): string;
-        getErrorMessages(id: string, args?: Array<string>): string;
+        getErrorMessages(id: string, args?: string[]): string;
         getMessage(id: string, object?: any): string;
-        getProperty<T>(key: string, altobject?: T): T;
-        getSession(): string | IGlideSession;
+        getProperty(key: string, altobject?: {}): {};
+        getSession(): string | GlideSession;
         getSessionID(): string;
         getSessionToken(): string;
         getTimeZoneName(): string;
         getUrlOnStack(): string;
-        getUser(): IGlideUser;
+        getUser(): GlideUser;
         getUserDisplayName(): string;
         getUserID(): string;
         getUserName(): string;
@@ -506,7 +493,7 @@ declare namespace servicenow {
         yesterday(): string;
     }
 
-    export interface IGlideUser {
+    interface GlideUser {
         getCompanyID(): string;
         getDisplayName(): string;
         getID(): string;
@@ -517,24 +504,24 @@ declare namespace servicenow {
         savePreference(name: string, value: string): void;
     }
 
-    export interface IXMLNode {
-        getLastChild(): IXMLNode;
-        getFirstChild(): IXMLNode;
+    interface XMLNode {
+        getLastChild(): XMLNode;
+        getFirstChild(): XMLNode;
         getNodeValue(): string;
         getNodeName(): string;
         hasAttribute(name: string): boolean;
         getAttribute(attribute: string): string;
-        getChildNodeIterator(): IXMLNodeIterator;
+        getChildNodeIterator(): XMLNodeIterator;
         getTextContent(): string;
         toString(): string;
     }
 
-    export interface IXMLNodeIterator {
-        hasNext(): Boolean;
-        next(): IXMLNode;
+    interface XMLNodeIterator {
+        hasNext(): boolean;
+        next(): XMLNode;
     }
 
-    export interface ISOAPResponseV2 {
+    interface SOAPResponseV2 {
         waitForResponse(timeoutSecs: number): void;
         getStatusCode(): number;
         getHeader(name: string): string;
@@ -545,9 +532,9 @@ declare namespace servicenow {
         getErrorMessage(): string;
     }
 
-    export interface IRESTResponseV2 {
+    interface RESTResponseV2 {
         getBody(): string;
-        getCookies(): {size: ()=>number, get: (index: number)=>string};
+        getCookies(): { size: () => number, get: (index: number) => string };
         getErrorCode(): number;
         getErrorMessage(): string;
         getHeader(name: string): string;
@@ -559,28 +546,27 @@ declare namespace servicenow {
         waitForResponse(timeoutSecs: number): void;
     }
 
-    export interface IRESTAPIRequest<T> {
-        body: IRESTAPIRequestBody<T>;
-        pathParams: { [paramName: string]: string };
-        queryParams: { [paramName: string]: Array<string> };
-        queryString: string;
-        uri: string;
-        url: string;
-        headers: { [paramName: string]: string };
+    interface RESTAPIRequest<T> {
+        readonly body: RESTAPIRequestBody<T>;
+        readonly pathParams: { [paramName: string]: string };
+        readonly queryParams: { [paramName: string]: string[] };
+        readonly queryString: string;
+        readonly url: string;
+        readonly headers: { [paramName: string]: string };
         getHeader(header: string): string;
-        getSupportedResponseContentTypes(): Array<string>;
+        getSupportedResponseContentTypes(): string[];
     }
 
-    export interface IRESTAPIRequestBody<T> {
-        data: T;
-        dataStream: any;
-        dataString: string;
+    interface RESTAPIRequestBody<T> {
+        readonly data: T;
+        readonly dataStream: object;
+        readonly dataString: string;
         hasNext(): boolean;
         nextEntry(): any;
     }
 
-    export interface IRESTAPIResponse {
-        getStreamWriter(): IRESTAPIResponseStream;
+    interface RESTAPIResponse {
+        getStreamWriter(): RESTAPIResponseStream;
         setBody(body: any): void;
         setHeaders(headers: any): void;
         setLocation(location: string): void;
@@ -590,12 +576,12 @@ declare namespace servicenow {
         setError(error: any): void;
     }
 
-    export interface IRESTAPIResponseStream {
+    interface RESTAPIResponseStream {
         writeStream(stream: object): void;
         writeString(data: string): void;
     }
 
-    export type QueryOperator = "="|"!="|">"|">="|"<"|"<="|"IN"|"STARTSWITH"|"ENDSWITH"|"CONTAINS"|"DOESNOTCONTAIN"|"INSTANCEOF"
-    export type RestHTTPMethods = "get"|"post"|"delete"|"patch"|"put"|"head"|"delete"|"options";
-    export type GlideRecordOperation = "insert"|"update"|"delete";
-}
\ No newline at end of file
+    type QueryOperator = "="|"!="|">"|">="|"<"|"<="|"IN"|"STARTSWITH"|"ENDSWITH"|"CONTAINS"|"DOESNOTCONTAIN"|"INSTANCEOF";
+    type RestHTTPMethods = "get"|"post"|"delete"|"patch"|"put"|"head"|"delete"|"options";
+    type GlideRecordOperation = "insert"|"update"|"delete";
+}
diff --git a/types/servicenow/servicenow-tests.ts b/types/servicenow/servicenow-tests.ts
index 3edecfb841..8835df05b6 100644
--- a/types/servicenow/servicenow-tests.ts
+++ b/types/servicenow/servicenow-tests.ts
@@ -3,7 +3,7 @@ const firstrecord = new GlideRecord("core_company");
 const record = new GlideRecord("core_company");
 record.addQuery('property', '=', firstrecord.sys_id);
 record.addQuery('property2', '!=', 'somevalue');
-if(record.get('somesysid')){
+if (record.get('somesysid')) {
     gs.info('got it');
 }
 
@@ -11,16 +11,16 @@ const wf = new global.Workflow();
 
 const rest = new sn_ws.RESTMessageV2();
 
-//test merging
+// test merging
 declare namespace servicenow {
-    export interface IGlideRecord {
-        new(type: "othertype"): IOtherType
+    interface GlideRecord {
+        new(type: "othertype"): OtherType;
     }
 
-    export interface IOtherType extends IGlideRecord {
+    interface OtherType extends GlideRecord {
         someproperty: string;
     }
 }
 
 const record2 = new GlideRecord("othertype");
-record2.someproperty = "foo";
\ No newline at end of file
+record2.someproperty = "foo";
diff --git a/types/servicenow/tsconfig.json b/types/servicenow/tsconfig.json
index 2d4056dc05..6cb14764c1 100644
--- a/types/servicenow/tsconfig.json
+++ b/types/servicenow/tsconfig.json
@@ -3,6 +3,7 @@
         "lib": [
             "es5"
         ],
+        "module": "commonjs",        
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
@@ -13,8 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "noLib": false
+        "forceConsistentCasingInFileNames": true
     },
     "files": [
         "index.d.ts",
diff --git a/types/servicenow/tslint.json b/types/servicenow/tslint.json
index 2750cc0197..5da5a8c9f1 100644
--- a/types/servicenow/tslint.json
+++ b/types/servicenow/tslint.json
@@ -1 +1,7 @@
-{ "extends": "dtslint/dt.json" }
\ No newline at end of file
+{ 
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // Interface is needed for merging which is not possible on delcared classes
+        "no-misused-new": false
+    }
+}
\ No newline at end of file

From ae8828d2c74491e1b9a49b90816ef7245d3d0fbd Mon Sep 17 00:00:00 2001
From: Sunny Juneja <jr.sunny@gmail.com>
Date: Fri, 25 May 2018 13:11:38 -0700
Subject: [PATCH 445/575] Update Svg definition

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

diff --git a/types/chartist/index.d.ts b/types/chartist/index.d.ts
index 58db5e64ff..a4fb2c832d 100644
--- a/types/chartist/index.d.ts
+++ b/types/chartist/index.d.ts
@@ -519,7 +519,7 @@ declare namespace Chartist {
 
 
     interface ChartistSvgStatic {
-        new (name: HTMLElement | string, attributes: Object, className?: string, parent?: Object, insertFirst?: boolean): IChartistSvg;
+        new (name?: HTMLElement | string, attributes?: Object, className?: string, parent?: Object, insertFirst?: boolean): IChartistSvg;
 
         Easing: ChartistEasingStatic;
 

From 9d696479d73a32a3b3a2e8e799f8575a879e987a Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 25 May 2018 13:54:20 -0700
Subject: [PATCH 446/575] Add type definitions for is-mobile

---
 types/is-mobile/index.d.ts         |  8 ++++++++
 types/is-mobile/is-mobile-tests.ts |  3 +++
 types/is-mobile/tsconfig.json      | 23 +++++++++++++++++++++++
 types/is-mobile/tslint.json        |  1 +
 4 files changed, 35 insertions(+)
 create mode 100644 types/is-mobile/index.d.ts
 create mode 100644 types/is-mobile/is-mobile-tests.ts
 create mode 100644 types/is-mobile/tsconfig.json
 create mode 100644 types/is-mobile/tslint.json

diff --git a/types/is-mobile/index.d.ts b/types/is-mobile/index.d.ts
new file mode 100644
index 0000000000..63fda9670a
--- /dev/null
+++ b/types/is-mobile/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for is-mobile 0.3
+// Project: https://github.com/juliangruber/is-mobile
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function isMobile(): boolean;
+
+export = isMobile;
diff --git a/types/is-mobile/is-mobile-tests.ts b/types/is-mobile/is-mobile-tests.ts
new file mode 100644
index 0000000000..604025812e
--- /dev/null
+++ b/types/is-mobile/is-mobile-tests.ts
@@ -0,0 +1,3 @@
+import isMobile = require('is-mobile');
+
+isMobile();
diff --git a/types/is-mobile/tsconfig.json b/types/is-mobile/tsconfig.json
new file mode 100644
index 0000000000..284baea4b7
--- /dev/null
+++ b/types/is-mobile/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "is-mobile-tests.ts"
+    ]
+}
diff --git a/types/is-mobile/tslint.json b/types/is-mobile/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/is-mobile/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b40637f80b768ae5bcb0f3c99c99af872a542830 Mon Sep 17 00:00:00 2001
From: Andres Kalle <mjomble@gmail.com>
Date: Sat, 26 May 2018 00:48:46 +0300
Subject: [PATCH 447/575] nodegit: fixed Signature instance variable types

See https://github.com/nodegit/nodegit.github.com/issues/52
---
 types/nodegit/signature.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/nodegit/signature.d.ts b/types/nodegit/signature.d.ts
index 3e62110d0c..93e76fd64f 100644
--- a/types/nodegit/signature.d.ts
+++ b/types/nodegit/signature.d.ts
@@ -11,7 +11,7 @@ export class Signature {
 
     free(): void;
     toString(): string;
-    name: string;
-    email: string;
-    when: Time;
+    name(): string;
+    email(): string;
+    when(): Time;
 }

From 76f8fd660d69f8a72ee7dcab83fd0f15ebe4d76c Mon Sep 17 00:00:00 2001
From: Andres Kalle <mjomble@gmail.com>
Date: Sat, 26 May 2018 01:20:51 +0300
Subject: [PATCH 448/575] nodegit: added test code for Signature

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

diff --git a/types/nodegit/nodegit-tests.ts b/types/nodegit/nodegit-tests.ts
index 465b5415b7..00d988d77f 100644
--- a/types/nodegit/nodegit-tests.ts
+++ b/types/nodegit/nodegit-tests.ts
@@ -51,3 +51,8 @@ const blameOptions = new Git.BlameOptions();
 Git.Branch.lookup(repo, "branch_name", Git.Branch.BRANCH.LOCAL).then((reference) => {
     // Use reference
 });
+
+const signature = Git.Signature.now("name", "email");
+signature.name();
+signature.email();
+signature.when();

From 8a2c3012d37a2faddfb6b599ce3c583239b83e1c Mon Sep 17 00:00:00 2001
From: lummish <lummish@gmail.com>
Date: Fri, 25 May 2018 15:32:34 -0700
Subject: [PATCH 449/575] ADD: new stampit definitions for v3

---
 types/stampit/v3/index.d.ts       | 525 ++++++++++++++++++++++++++++++
 types/stampit/v3/stampit-tests.ts | 149 +++++++++
 types/stampit/v3/tsconfig.json    |  28 ++
 types/stampit/v3/tslint.json      |  79 +++++
 4 files changed, 781 insertions(+)
 create mode 100644 types/stampit/v3/index.d.ts
 create mode 100644 types/stampit/v3/stampit-tests.ts
 create mode 100644 types/stampit/v3/tsconfig.json
 create mode 100644 types/stampit/v3/tslint.json

diff --git a/types/stampit/v3/index.d.ts b/types/stampit/v3/index.d.ts
new file mode 100644
index 0000000000..3162d6032b
--- /dev/null
+++ b/types/stampit/v3/index.d.ts
@@ -0,0 +1,525 @@
+// Type definitions for stampit 3.0
+// Project: https://github.com/stampit-org/stampit
+// Definitions by: Vasyl Boroviak <https://github.com/koresar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Function used as .init() argument.
+ */
+interface Init {
+    (factoryArg: any, ctx?: Context): any;
+}
+
+/**
+ * Composer function
+ */
+interface Composer {
+    ({ stamp, composables }: { stamp: Stamp; composables: Composable[] }): any;
+}
+
+/** The stamp Descriptor */
+interface Descriptor {
+    /** Create a new stamp based on this descriptor */
+    (...composables: Composable[]): Stamp;
+    /**
+     * A hash containing methods (functions) of any future created instance.
+     */
+    methods?: {};
+    /**
+     * Initialization function(s) which will be called per each newly created
+     * instance.
+     */
+    initializers?: Init[];
+    /**
+     * Properties which will shallowly copied into any future created instance.
+     */
+    properties?: {};
+    /**
+     * Properties which will be mixed to the new and any other stamp which this stamp will be composed with.
+     */
+    staticProperties?: {};
+    /** Deeply merged properties of object instances */
+    deepProperties?: {};
+    /** ES5 Property Descriptors applied to object instances */
+    propertyDescriptors?: {};
+    /** Deeply merged properties of Stamps */
+    staticDeepProperties?: {};
+    /** ES5 Property Descriptors applied to Stamps */
+    staticPropertyDescriptors?: {};
+    /** A configuration object to be shallowly assigned to Stamps */
+    configuration?: {};
+    /** A configuration object to be deeply merged to Stamps */
+    deepConfiguration?: {};
+}
+
+/** Any composable object (stamp or descriptor) */
+type Composable = Stamp | Descriptor;
+
+/**
+ * The .init() function argument.
+ */
+interface Context {
+    /**
+     * The object which has been just instantiated.
+     */
+    instance: any;
+
+    /**
+     * The stamp the object has been instantiated with.
+     */
+    stamp: Stamp;
+
+    /**
+     * The arguments list passed to the stamp.
+     */
+    args: any[];
+}
+
+interface Options {
+    /**
+     * A hash containing methods (functions) of any future created instance.
+     */
+    methods?: {} | {}[];
+    /**
+     * Initialization function(s) which will be called per each newly created
+     * instance.
+     */
+    init?: Init | Init[];
+    /**
+     * Initialization function(s) which will be called per each newly created
+     * instance.
+     */
+    initializers?: Init | Init[];
+    /**
+     * Properties which will shallowly copied into any future created instance.
+     */
+    props?: {} | {}[];
+    /**
+     * Properties which will shallowly copied into any future created instance.
+     */
+    properties?: {} | {}[];
+    /**
+     * A hash containing references to the object. This hash will be shallow mixed into any future created instance.
+     */
+    refs?: {} | {}[];
+    /**
+     * Properties which will be mixed to the new and any other stamp which this
+     * stamp will be composed with.
+     */
+    staticProperties?: {} | {}[];
+    /**
+     * Properties which will be mixed to the new and any other stamp which this
+     * stamp will be composed with.
+     */
+    statics?: {} | {}[];
+    /** Deeply merged properties of object instances */
+    deepProperties?: {} | {}[];
+    /** Deeply merged properties of object instances */
+    deepProps?: {} | {}[];
+    /** ES5 Property Descriptors applied to object instances */
+    propertyDescriptors?: {} | {}[];
+    /** Deeply merged properties of Stamps */
+    staticDeepProperties?: {} | {}[];
+    /** Deeply merged properties of Stamps */
+    deepStatics?: {} | {}[];
+    /** ES5 Property Descriptors applied to Stamps */
+    staticPropertyDescriptors?: {} | {}[];
+    /** A configuration object to be shallowly assigned to Stamps */
+    configuration?: {} | {}[];
+    /** A configuration object to be shallowly assigned to Stamps */
+    conf?: {} | {}[];
+    /** A configuration object to be deeply merged to Stamps */
+    deepConfiguration?: {} | {}[];
+    /** A configuration object to be deeply merged to Stamps */
+    deepConf?: {} | {}[];
+    /** Callback functions to execute each time a composition occurs */
+    composers?: Composer[];
+}
+
+/**
+ * A factory function that will produce new objects using the
+ * prototypes that are passed in or composed.
+ */
+interface Stamp {
+    /**
+     * Invokes the stamp and returns a new object instance.
+     * @param state Properties you wish to set on the new objects.
+     * @param encloseArgs The remaining arguments are passed to all .enclose() functions.
+     * WARNING Avoid using two different .enclose() functions that expect different arguments.
+     * .enclose() functions that take arguments should not be considered safe to compose
+     * with other .enclose() functions that also take arguments. Taking arguments with
+     * an .enclose() function is an anti-pattern that should be avoided, when possible.
+     * @return A new object composed of the Stamps and prototypes provided.
+     */
+    (state?: {}, ...encloseArgs: any[]): any;
+
+    /**
+     * Just like calling stamp(), stamp.create() invokes the stamp and returns a new instance.
+     * @param state Properties you wish to set on the new objects.
+     * @param encloseArgs The remaining arguments are passed to all .enclose() functions.
+     * WARNING Avoid using two different .enclose() functions that expect different arguments.
+     * .enclose() functions that take arguments should not be considered safe to compose
+     * with other .enclose() functions that also take arguments. Taking arguments with
+     * an .enclose() function is an anti-pattern that should be avoided, when possible.
+     * @return A new object composed of the Stamps and prototypes provided.
+     */
+    create(state?: {}, ...encloseArgs: any[]): any;
+
+    /**
+     * Stamp metadata/composer function
+     */
+    compose: Descriptor;
+
+    /**
+     * Add methods to the methods prototype.  Creates and returns new Stamp. Chainable.
+     * @param methods Object(s) containing map of method names and bodies for delegation.
+     * @return A new Stamp.
+     */
+    methods(...methods: {}[]): Stamp;
+
+    /**
+     * Take n objects and add them to the state prototype. Creates and returns new Stamp. Chainable.
+     * @param states Object(s) containing map of property names and values to clone for each new object.
+     * @return A new Stamp.
+     */
+    refs(...states: {}[]): Stamp;
+
+    /**
+     * Take a variable number of objects and shallow assign them to any future
+     * created instance of the Stamp. Creates and returns new Stamp. Chainable.
+     * @param objects Object(s) to shallow assign for each new object.
+     * @return A new Stamp.
+     */
+    props(...objects: {}[]): Stamp;
+
+    /**
+     * Take a variable number of objects and shallow assign them to any future
+     * created instance of the Stamp. Creates and returns new Stamp. Chainable.
+     * @param objects Object(s) to shallow assign for each new object.
+     * @return A new Stamp.
+     */
+    properties(...objects: {}[]): Stamp;
+
+    /**
+     * Take a variable number of objects and deeply merge them to any future
+     * created instance of the Stamp. Creates and returns a new Stamp.
+     * Chainable.
+     * @param deepObjects The object(s) to deeply merge for each new object
+     * @returns A new Stamp
+     */
+    deepProps(...deepObjects: {}[]): Stamp;
+
+    /**
+     * Take a variable number of objects and deeply merge them to any future
+     * created instance of the Stamp. Creates and returns a new Stamp.
+     * Chainable.
+     * @param deepObjects The object(s) to deeply merge for each new object
+     * @returns A new Stamp
+     */
+    deepProperties(...deepObjects: {}[]): Stamp;
+
+    /**
+     * @deprecated Use .init() instead.
+     */
+    enclose(...functions: Init[]): Stamp;
+
+    /**
+     * @deprecated Use .init() instead.
+     */
+    enclose(...functions: {}[]): Stamp;
+
+    /**
+     * Take in a variable number of functions and add them to the enclose
+     * prototype as initializers. 
+     * @param functions Initializer functions used to create private data and
+     * privileged methods
+     * @returns A new stamp
+     */
+    init(...functions: Init[]): Stamp;
+
+    /**
+     * Take in a variable number of functions and add them to the enclose
+     * prototype as initializers. 
+     * @param functions Initializer functions used to create private data and
+     * privileged methods
+     * @returns A new stamp
+     */
+    init(functions: Init[]): Stamp;
+
+    /**
+     * Take in a variable number of functions and add them to the enclose
+     * prototype as initializers. 
+     * @param functions Initializer functions used to create private data and
+     * privileged methods
+     * @returns A new stamp
+     */
+    initializers(...functions: Init[]): Stamp;
+
+    /**
+     * Take in a variable number of functions and add them to the enclose
+     * prototype as initializers. 
+     * @param functions Initializer functions used to create private data and
+     * privileged methods
+     * @returns A new stamp
+     */
+    initializers(functions: Init[]): Stamp;
+
+    /**
+     * Take n objects and add them to a new stamp and any future stamp it composes with.
+     * Creates and returns new Stamp. Chainable.
+     * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
+     * @return A new Stamp.
+     */
+    statics(...statics: {}[]): Stamp;
+
+    /**
+     * Take n objects and add them to a new stamp and any future stamp it composes with.
+     * Creates and returns new Stamp. Chainable.
+     * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
+     * @return A new Stamp.
+     */
+    staticProperties(...statics: {}[]): Stamp;
+
+    /**
+     * Deeply merge a variable number of objects and add them to a new stamp and
+     * any future stamp it composes. Creates and returns a new Stamp. Chainable.
+     * @param deepStatics The object(s) containing static properties to be
+     * merged
+     * @returns A new stamp
+     */
+    deepStatics(...deepStatics: {}[]): Stamp;
+
+    /**
+     * Deeply merge a variable number of objects and add them to a new stamp and
+     * any future stamp it composes. Creates and returns a new Stamp. Chainable.
+     * @param deepStatics The object(s) containing static properties to be
+     * merged
+     * @returns A new stamp
+     */
+    staticDeepProperties(...deepStatics: {}[]): Stamp;
+
+    /**
+     * Shallowly assign properties of Stamp arbitrary metadata and add them to
+     * a new stamp and any future Stamp it composes. Creates and returns a new
+     * Stamp. Chainable.
+     * @param confs The object(s) containing metadata properties
+     * @returns A new Stamp
+     */
+    conf(...confs: {}[]): Stamp;
+
+    /**
+     * Shallowly assign properties of Stamp arbitrary metadata and add them to
+     * a new stamp and any future Stamp it composes. Creates and returns a new
+     * Stamp. Chainable.
+     * @param confs The object(s) containing metadata properties
+     * @returns A new Stamp
+     */
+    configuration(...confs: {}[]): Stamp;
+
+    /**
+     * Deeply merge properties of Stamp arbitrary metadata and add them to a new
+     * Stamp and any future Stamp it composes. Creates and returns a new Stamp. 
+     * Chainable.
+     * @param deepConfs The object(s) containing metadata properties
+     * @returns A new Stamp
+     */
+    deepConf(...deepConfs: {}[]): Stamp;
+
+    /**
+     * Deeply merge properties of Stamp arbitrary metadata and add them to a new
+     * Stamp and any future Stamp it composes. Creates and returns a new Stamp. 
+     * Chainable.
+     * @param deepConfs The object(s) containing metadata properties
+     * @returns A new Stamp
+     */
+    deepConfiguration(...deepConfs: {}[]): Stamp;
+
+    /**
+     * Apply ES5 property descriptors to object instances created by the new
+     * Stamp returned by the function and any future Stamp it composes. Creates
+     * and returns a new stamp. Chainable.
+     * @param descriptors 
+     * @returns A new Stamp
+     */
+    propertyDescriptors(...descriptors: {}[]): Stamp;
+
+    /**
+     * Apply ES5 property descriptors to a Stamp and any future Stamp it
+     * composes. Creates and returns a new stamp. Chainable.
+     * @param descriptors 
+     * @returns A new Stamp
+     */
+    staticPropertyDescriptors(...descriptors: {}[]): Stamp;
+}
+
+/**
+ * Return a factory (akaStamp) function that will produce new objects using the
+ * prototypes that are passed in or composed.
+ * @param {object} options Stampit options object containing refs, methods, init, props, and static.
+ * @param {object} options.methods A map of method names and bodies for delegation.
+ * @param {object} options.refs A map of property names and values to clone for each new object.
+ * @param {object} options.props A map of property names and values to clone for each new object.
+ * @param {function} options.init A closure(s) (function(s)) used to create private data and privileged methods.
+ * @param {object} options.static A map of properties to mixin into new and other stamp it will compose with.
+ * */
+declare function stampit(options?: Options): Stamp
+
+declare namespace stampit {
+    /**
+     * A shortcut methods for stampit().methods()
+     * @param methods Object(s) containing map of method names and bodies for delegation.
+     * @return A new Stamp.
+     */
+    export function methods(...methods: {}[]): Stamp;
+
+    /**
+     * A shortcut methods for stampit().refs()
+     * @param states Object(s) containing map of property names and values to clone for each new object.
+     * @return A new Stamp.
+     */
+    export function refs(...states: {}[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().props()
+     * @param objects Object(s) to shallow assign for each new object.
+     * @return A new Stamp.
+     */
+    export function props(...objects: {}[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().properties()
+     * @param objects Object(s) to shallow assign for each new object.
+     * @return A new Stamp.
+     */
+    export function properties(...objects: {}[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().deepProps()
+     * @param deepObjects The object(s) to deeply merge for each new object
+     * @returns A new Stamp
+     */
+    export function deepProps(...deepObjects: {}[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().deepProperties()
+     * @param deepObjects The object(s) to deeply merge for each new object
+     * @returns A new Stamp
+     */
+    export function deepProperties(...deepObjects: {}[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().init()
+     * @param functions Initializer functions used to create private data and
+     * privileged methods
+     * @returns A new stamp
+     */
+    export function init(...functions: Init[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().init()
+     * @param functions Initializer functions used to create private data and
+     * privileged methods
+     * @returns A new stamp
+     */
+    export function init(functions: Init[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().initializers()
+     * @param functions Initializer functions used to create private data and
+     * privileged methods
+     * @returns A new stamp
+     */
+    export function initializers(...functions: Init[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().initializers()
+     * @param functions Initializer functions used to create private data and
+     * privileged methods
+     * @returns A new stamp
+     */
+    export function initializers(functions: Init[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().statics()
+     * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
+     * @return A new Stamp.
+     */
+    export function statics(...statics: {}[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().staticProperties()
+     * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
+     * @return A new Stamp.
+     */
+    export function staticProperties(...statics: {}[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().deepStatics()
+     * @param deepStatics The object(s) containing static properties to be
+     * merged
+     * @returns A new stamp
+     */
+    export function deepStatics(...deepStatics: {}[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().staticDeepProperties()
+     * @param deepStatics The object(s) containing static properties to be
+     * merged
+     * @returns A new stamp
+     */
+    export function staticDeepProperties(...deepStatics: {}[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().conf()
+     * @param confs The object(s) containing metadata properties
+     * @returns A new Stamp
+     */
+    export function conf(...confs: {}[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().configuration()
+     * @param confs The object(s) containing metadata properties
+     * @returns A new Stamp
+     */
+    export function configuration(...confs: {}[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().deepConf()
+     * @param deepConfs The object(s) containing metadata properties
+     * @returns A new Stamp
+     */
+    export function deepConf(...deepConfs: {}[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().deepConfiguration()
+     * @param deepConfs The object(s) containing metadata properties
+     * @returns A new Stamp
+     */
+    export function deepConfiguration(...deepConfs: {}[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().propertyDescriptors()
+     * @param descriptors 
+     * @returns A new Stamp
+     */
+    export function propertyDescriptors(...descriptors: {}[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().staticPropertyDescriptors()
+     * @param descriptors 
+     * @returns A new Stamp
+     */
+    export function staticPropertyDescriptors(...descriptors: {}[]): Stamp;
+
+    /**
+     * Take two or more Composables and combine them to produce a new Stamp.
+     * Combining overrides properties with last-in priority.
+     * @param composables Composable objects used to create the stamp.
+     * @return A new Stamp made of all the given composables.
+     */
+    export function compose(...composables: Composable[]): Stamp;
+}
+
+declare module "stampit" {
+    export = stampit;
+}
diff --git a/types/stampit/v3/stampit-tests.ts b/types/stampit/v3/stampit-tests.ts
new file mode 100644
index 0000000000..51ec1ea305
--- /dev/null
+++ b/types/stampit/v3/stampit-tests.ts
@@ -0,0 +1,149 @@
+
+
+import stampit = require('stampit');
+
+var a = stampit().init((options) => {
+    var a = options.args[0];
+    this.getA = () => {
+        return a;
+    };
+});
+a(); // Object -- so far so good.
+a().getA(); // "a"
+
+var b = stampit().init(function () {
+    var a = 'b';
+    this.getB = function () {
+        return a;
+    };
+});
+
+
+var c = stampit.compose(a, b);
+var foo = c(); // we won't throw this one away...
+foo.getA(); // "a"
+foo.getB(); // "b"
+
+// Here's a mixin with public methods, and some refs:
+var membership = stampit({
+    methods: {
+        members: {},
+        add: function (member: any) {
+            this.members[member.name] = member;
+            return this;
+        },
+        getMember: function (name: any) {
+            return this.members[name];
+        }
+    },
+    refs: {
+        members: {}
+    }
+});
+// Let's set some defaults:
+var defaults = stampit().refs({
+    name: 'The Saloon',
+    specials: 'Whisky, Gin, Tequila'
+});
+
+// Classical inheritance has nothing on this. No parent/child coupling. No deep inheritance hierarchies.
+// Just good, clean code reusability.
+var bar = stampit.compose(defaults, membership);
+// Note that you can override refs on instantiation:
+var myBar = bar({ name: 'Moe\'s' });
+// Silly, but proves that everything is as it should be.
+myBar.add({ name: 'Homer' }).open().getMember('Homer');
+
+
+var myStamp = stampit().methods({
+    foo: function () {
+        return 'foo';
+    },
+    methodOverride: function () {
+        return false;
+    }
+}).methods({
+    bar: function () {
+        return 'bar'
+    },
+    methodOverride: function () {
+        return true;
+    }
+});
+
+myStamp.props({
+    foo: { bar: 'bar' },
+    refsOverride: false
+}).refs({
+    bar: 'bar',
+    refsOverride: true
+});
+
+myStamp.init(function () {
+    var secret = 'foo';
+
+    this.getSecret = function () {
+        return secret;
+    };
+}).init(function () {
+    this.a = true;
+}).init(function () {
+    this.b = true;
+}, function () {
+    this.c = true;
+});
+
+var obj = myStamp.create();
+obj.getSecret && obj.a && obj.b && obj.c; // true
+
+var newStamp = stampit({ refs: { defaultNum: 1 } }).compose(myStamp);
+
+
+var obj1 = stampit().methods({
+    a: function () {
+        return 'a';
+    }
+}, {
+        b: function () {
+            return 'b';
+        }
+    }).create();
+
+var obj2 = stampit().refs({
+    a: 'a'
+}, {
+        b: 'b'
+    }).create();
+
+var obj = defaults.compose(newStamp, membership).create();
+
+
+// The old constructor / class thing...
+var Constructor = function Constructor() {
+    this.thing = 'initialized';
+};
+Constructor.prototype.foo = function foo() {
+    return 'foo';
+};
+
+// A new stamp to compose with...
+var newskool = stampit().methods({
+    bar: function bar() {
+        return 'bar';
+    }
+    // your methods here...
+}).init(function () {
+    this.baz = 'baz';
+});
+
+// Now you can compose those old constructors just like you could
+// with any other stamp...
+var myThing = stampit.compose(newskool);
+
+var t = myThing();
+
+t.thing; // 'initialized',
+
+t.foo(); // 'foo',
+
+t.bar(); // 'bar'
diff --git a/types/stampit/v3/tsconfig.json b/types/stampit/v3/tsconfig.json
new file mode 100644
index 0000000000..8b00fbdc80
--- /dev/null
+++ b/types/stampit/v3/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": false,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "stampit": [
+                "stampit/v3"
+            ]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "stampit-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/stampit/v3/tslint.json b/types/stampit/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/stampit/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 cd3fa4c9f258b8422521c158fa4c8971f5dfa813 Mon Sep 17 00:00:00 2001
From: Ozum <ozum@ozum.net>
Date: Sat, 26 May 2018 06:59:39 +0300
Subject: [PATCH 450/575] add shcwifty package.json for external dependency

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

diff --git a/types/schwifty/package.json b/types/schwifty/package.json
new file mode 100644
index 0000000000..01df4a95e3
--- /dev/null
+++ b/types/schwifty/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "objection": "^1.1.9"
+    }
+}

From acdb61a8eebae84ca36d1446759f0ac55b8e1b1f Mon Sep 17 00:00:00 2001
From: kiwi0fruit <peter.zagubisalo@gmail.com>
Date: Sat, 26 May 2018 15:16:28 +0700
Subject: [PATCH 451/575] undefinedFamily bugfix: string[] -> string

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

diff --git a/types/mathjax/index.d.ts b/types/mathjax/index.d.ts
index e90c3aeee8..8c0dc99e1a 100644
--- a/types/mathjax/index.d.ts
+++ b/types/mathjax/index.d.ts
@@ -1018,7 +1018,7 @@ declare namespace MathJax {
         * to look for characters not included in the MathJax TeX fonts). IE will stop looking after the first font that
         * exists on the system (even if it doesn’t contain the needed character), so order these carefully.
         */
-        undefinedFamily?: string[];
+        undefinedFamily?: string;
         /*This setting controls whether <mtext> elements will be typeset using the math fonts or the font of the
         * surrounding text. When false, the font for mathvariant="normal" will be used; when true, the font will be
         * inherited from the surrounding paragraph.

From 9935e7857b28d40105fa945334f8acd167e2a39e Mon Sep 17 00:00:00 2001
From: Agapanthus <eric@skaliks.blue>
Date: Sat, 26 May 2018 10:56:39 +0200
Subject: [PATCH 452/575] Update index.d.ts

Added defaults and getTokenTypeAt
---
 types/codemirror/index.d.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/types/codemirror/index.d.ts b/types/codemirror/index.d.ts
index 06c3b39f96..0aec765065 100644
--- a/types/codemirror/index.d.ts
+++ b/types/codemirror/index.d.ts
@@ -18,8 +18,14 @@ declare namespace CodeMirror {
 
     function fromTextArea(host: HTMLTextAreaElement, options?: EditorConfiguration): CodeMirror.EditorFromTextArea;
 
+    /** It contains a string that indicates the version of the library. This is a triple of integers "major.minor.patch", 
+    where patch is zero for releases, and something else (usually one) for dev snapshots. */
     var version: string;
 
+    /** An object containing default values for all options. 
+    You can assign to its properties to modify defaults (though this won't affect editors that have already been created). */
+    var defaults: any;
+
     /** If you want to define extra methods in terms of the CodeMirror API, it is possible to use defineExtension.
     This will cause the given value(usually a method) to be added to all CodeMirror instances created from then on. */
     function defineExtension(name: string, value: any): void;
@@ -315,8 +321,13 @@ declare namespace CodeMirror {
         /** Retrieves information about the token the current mode found before the given position (a {line, ch} object). */
         getTokenAt(pos: CodeMirror.Position, precise?: boolean): Token;
 
+        /** This is a (much) cheaper version of getTokenAt useful for when you just need the type of the token at a given position, 
+        and no other information. Will return null for unstyled tokens, and a string, 
+        potentially containing multiple space-separated style names, otherwise. */
+        getTokenTypeAt(pos: CodeMirror.Position): string;
+
         /** This is similar to getTokenAt, but collects all tokens for a given line into an array. */
-        getLineTokens(line: number, precise?: boolean): Token[];
+        getLineTokens(line: number, precise?: boolean): Token[]; 
 
         /** Returns the mode's parser state, if any, at the end of the given line number.
         If no line number is given, the state at the end of the document is returned.

From c277bf0c3856a9fbd6da0472177c9040ac1bf5e3 Mon Sep 17 00:00:00 2001
From: Rafael Kraut <rk@suedsolutions.de>
Date: Sat, 26 May 2018 15:02:08 +0200
Subject: [PATCH 453/575] add typings for gtin

---
 types/gtin/gtin-tests.ts | 10 ++++++++++
 types/gtin/index.d.ts    | 19 +++++++++++++++++++
 types/gtin/tsconfig.json | 23 +++++++++++++++++++++++
 types/gtin/tslint.json   |  1 +
 4 files changed, 53 insertions(+)
 create mode 100644 types/gtin/gtin-tests.ts
 create mode 100644 types/gtin/index.d.ts
 create mode 100644 types/gtin/tsconfig.json
 create mode 100644 types/gtin/tslint.json

diff --git a/types/gtin/gtin-tests.ts b/types/gtin/gtin-tests.ts
new file mode 100644
index 0000000000..90d50fdd98
--- /dev/null
+++ b/types/gtin/gtin-tests.ts
@@ -0,0 +1,10 @@
+import * as gtin from 'gtin';
+
+gtin.isGTIN('12341238'); // $ExpectType boolean
+gtin.validate('12341238'); // $ExpectType boolean
+gtin.minify('0000012341238'); // $ExpectType string
+gtin.getFormat('12341238'); // $ExpectType GtinFormat
+gtin.getRealFormat('1234123412344'); // $ExpectType GtinFormat
+
+gtin.upce.compress('1200000789'); // $ExpectType string | null
+gtin.upce.expand('127890'); // $ExpectType string
diff --git a/types/gtin/index.d.ts b/types/gtin/index.d.ts
new file mode 100644
index 0000000000..27e0ec31c8
--- /dev/null
+++ b/types/gtin/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for gtin 0.3
+// Project: https://github.com/xbpf/gtin
+// Definitions by: RafaelKr <https://github.com/RafaelKr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace gtin;
+
+export type GtinFormat = 'GTIN-8' | 'GTIN-12' | 'GTIN-13' | 'GTIN-14';
+
+export function isGTIN(gtin: string): boolean;
+export function validate(gtin: string): boolean;
+export function minify(gtin: string): string;
+export function getFormat(gtin: string): GtinFormat;
+export function getRealFormat(gtin: string): GtinFormat;
+
+export namespace upce {
+    function compress(gtin: string): string | null;
+    function expand(gtin: string): string;
+}
diff --git a/types/gtin/tsconfig.json b/types/gtin/tsconfig.json
new file mode 100644
index 0000000000..1269d22feb
--- /dev/null
+++ b/types/gtin/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "strictFunctionTypes": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gtin-tests.ts"
+    ]
+}
diff --git a/types/gtin/tslint.json b/types/gtin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gtin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 5c9c82cb5186b8453793ff010758fc6fb50a77f2 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Sat, 26 May 2018 14:28:39 +0200
Subject: [PATCH 454/575] Jasmine: Adds negativeCompare to CustomMatcher

Jasmine allows a CustomMatcher to define an optional `negativeCompare` method,
to handle the `.not` assertions.

See https://jasmine.github.io/2.8/custom_matcher.html#section-Custom_negative_comparators
---
 types/jasmine/index.d.ts       |  2 ++
 types/jasmine/jasmine-tests.ts | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/types/jasmine/index.d.ts b/types/jasmine/index.d.ts
index cd1d5de31e..37e1fd2b14 100644
--- a/types/jasmine/index.d.ts
+++ b/types/jasmine/index.d.ts
@@ -221,6 +221,8 @@ declare namespace jasmine {
     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;
diff --git a/types/jasmine/jasmine-tests.ts b/types/jasmine/jasmine-tests.ts
index 54e97ed73e..e96293ced4 100644
--- a/types/jasmine/jasmine-tests.ts
+++ b/types/jasmine/jasmine-tests.ts
@@ -968,7 +968,13 @@ var customMatchers: jasmine.CustomMatcherFactories = {
         return {
             compare: (actual: any, floor: number, ceiling: number): jasmine.CustomMatcherResult => {
                 const pass = actual >= floor && actual <= ceiling;
-                const message = `expected ${actual} ${pass ? 'not ' : ''} to be within range ${floor}-${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 };
             }
         };
@@ -1011,6 +1017,14 @@ describe("Custom matcher: 'toBeGoofy'", () => {
         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'

From ca7d2e92a6319b9c3d5e0c607f061513753f1120 Mon Sep 17 00:00:00 2001
From: Takuya Inagaki <kitunetokirin3@gmail.com>
Date: Sun, 27 May 2018 02:53:23 +0900
Subject: [PATCH 455/575] Add tweet_mode to Params and full_text and
 display_text_range to Status.

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

diff --git a/types/twit/index.d.ts b/types/twit/index.d.ts
index 6b82dd6b65..59c79ca5eb 100644
--- a/types/twit/index.d.ts
+++ b/types/twit/index.d.ts
@@ -192,12 +192,14 @@ declare module 'twit' {
         retweeted: boolean,
         retweeted_status?: Status,
         source?: string,
-        text: string,
+        text?: string,
+        full_text?: string,
         truncated: boolean,
         user: User,
         withheld_copyright?: boolean,
         withheld_in_countries?: string[],
         withheld_scope?: string,
+        display_text_range?: number[],
       }
       export interface Metadata {
         max_id?: number,
@@ -261,6 +263,7 @@ declare module 'twit' {
       follow?: boolean,
       include_email?: boolean,
       cursor?: number,
+      tweet_mode? :string,
     }
     export interface PromiseResponse {
       data: Response,

From 35793341b21ef6d53b6617c5dc6f4e6db7416988 Mon Sep 17 00:00:00 2001
From: takuya inagaki <kitunetokirin3@gmail.com>
Date: Sun, 27 May 2018 03:26:46 +0900
Subject: [PATCH 456/575] Change type of display_text_range

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

diff --git a/types/twit/index.d.ts b/types/twit/index.d.ts
index 59c79ca5eb..89d28766b3 100644
--- a/types/twit/index.d.ts
+++ b/types/twit/index.d.ts
@@ -199,7 +199,7 @@ declare module 'twit' {
         withheld_copyright?: boolean,
         withheld_in_countries?: string[],
         withheld_scope?: string,
-        display_text_range?: number[],
+        display_text_range?: [number, number],
       }
       export interface Metadata {
         max_id?: number,

From 106d45fba7f9ccf098de2314eb34be02e01fe4df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?sebastian=20kr=C3=A4mer?= <sk@dotob.de>
Date: Sat, 26 May 2018 21:28:17 +0200
Subject: [PATCH 457/575] add property attemptsMade

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

diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index 15de8adfde..dd97de15ac 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -95,6 +95,11 @@ declare namespace Bull {
      */
     data: any;
 
+    /**
+     * How many attempts where made to run this job
+     */
+    attemptsMade: number;
+
     /**
      * Report progress on a job
      */

From 4872cc57d439334b44091c2f7b759a2907d66c61 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Sat, 26 May 2018 22:45:11 +0200
Subject: [PATCH 458/575] Small changes

---
 types/d3-dsv/d3-dsv-tests.ts | 26 ++++++++++++++++----------
 types/d3-dsv/index.d.ts      |  2 +-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/types/d3-dsv/d3-dsv-tests.ts b/types/d3-dsv/d3-dsv-tests.ts
index 2221b0d7b2..f3adb34e00 100644
--- a/types/d3-dsv/d3-dsv-tests.ts
+++ b/types/d3-dsv/d3-dsv-tests.ts
@@ -52,7 +52,8 @@ parseArray = d3Dsv.csvParse(csvTestStringWithHeader);
 columns = parseArray.columns;
 
 strMaybe = parseArray[0]['Year'];
-// date = parseArray[0]['Year']; // fails, return value is string
+// $ExpectError
+date = parseArray[0]['Year']; // fails, return value is string
 
 // with row mapper ---------------------------------------------------------------------------
 
@@ -64,7 +65,7 @@ parseMappedArray = d3Dsv.csvParse(csvTestStringWithHeader, (rawRow, index, colum
         year: rr['Year'] ? new Date(+rr['Year']!, 0, 1) : null,
         make: rr['Make'] ? rr['Make']! : "Missing Value",
         model: rr['Model'] ? rr['Model']! : "Missing Value",
-        length: ['Length'] ? +rr['Length']! : NaN
+        length: rr['Length'] ? +rr['Length']! : NaN
     };
     return pr;
 });
@@ -81,7 +82,7 @@ parseMappedArray = d3Dsv.csvParse(csvTestStringWithHeader, (rawRow, index, colum
                     year: new Date(d, 0, 1),
                     make: rr['Make'] ? rr['Make']! : "Missing Value",
                     model: rr['Model'] ? rr['Model']! : "Missing Value",
-                    length: ['Length'] ? +rr['Length']! : NaN
+                    length: rr['Length'] ? +rr['Length']! : NaN
                 }
                 : undefined
         )
@@ -103,7 +104,8 @@ num = parseMappedArray[0].length;
 parseRowsArray = d3Dsv.csvParseRows(csvTestString);
 
 strMaybe = parseRowsArray[0][0]; // 'Year' of first row
-// date = parseRowsArray[0][0]; // fails, return value is string
+// $ExpectError
+date = parseRowsArray[0][0]; // fails, return value is string
 
 // with row mapper ---------------------------------------------------------------------------
 
@@ -158,7 +160,8 @@ parseArray = d3Dsv.tsvParse(tsvTestStringWithHeader);
 columns = parseArray.columns;
 
 strMaybe = parseArray[0]['Year'];
-// date = parseArray[0]['Year']; // fails, return value is string
+// $ExpectError
+date = parseArray[0]['Year']; // fails, return value is string
 
 // with row mapper ---------------------------------------------------------------------------
 
@@ -174,7 +177,7 @@ parseMappedArray = d3Dsv.tsvParse(tsvTestStringWithHeader, (rawRow, index, colum
                     year: new Date(d, 0, 1),
                     make: rr['Make'] ? rr['Make']! : "Missing Value",
                     model: rr['Model'] ? rr['Model']! : "Missing Value",
-                    length: ['Length'] ? +rr['Length']! : NaN
+                    length: rr['Length'] ? +rr['Length']! : NaN
                 }
                 : undefined
         )
@@ -196,7 +199,8 @@ num = parseMappedArray[0].length;
 parseRowsArray = d3Dsv.tsvParseRows(tsvTestString);
 
 strMaybe = parseRowsArray[0][0]; // 'Year' of first row
-// date = parseRowsArray[0][0]; // fails, return value is string
+// $ExpectError
+date = parseRowsArray[0][0]; // fails, return value is string
 
 // with row mapper ---------------------------------------------------------------------------
 
@@ -256,7 +260,8 @@ parseArray = dsv.parse(pipedTestStringWithHeader);
 columns = parseArray.columns;
 
 strMaybe = parseArray[0]['Year'];
-// date = parseArray[0]['Year']; // fails, return value is string
+// $ExpectError
+date = parseArray[0]['Year']; // fails, return value is string
 
 // with row mapper ---------------------------------------------------------------------------
 
@@ -272,7 +277,7 @@ parseMappedArray = dsv.parse(pipedTestStringWithHeader, (rawRow, index, columns)
                     year: new Date(d, 0, 1),
                     make: rr['Make'] ? rr['Make']! : "Missing Value",
                     model: rr['Model'] ? rr['Model']! : "Missing Value",
-                    length: ['Length'] ? +rr['Length']! : NaN
+                    length: rr['Length'] ? +rr['Length']! : NaN
                 }
                 : undefined
         )
@@ -294,7 +299,8 @@ num = parseMappedArray[0].length;
 parseRowsArray = dsv.parseRows(pipedTestString);
 
 strMaybe = parseRowsArray[0][0]; // 'Year' of first row
-// date = parseRowsArray[0][0]; // fails, return value is string
+// $ExpectError
+date = parseRowsArray[0][0]; // fails, return value is string
 
 // with row mapper ---------------------------------------------------------------------------
 
diff --git a/types/d3-dsv/index.d.ts b/types/d3-dsv/index.d.ts
index b07d22edce..228384ed42 100644
--- a/types/d3-dsv/index.d.ts
+++ b/types/d3-dsv/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// Last module patch version validated against: 1.0.30
+// Last module patch version validated against: 1.0.8
 
 // ------------------------------------------------------------------------------------------
 // Shared Types and Interfaces

From 0a08e47064d70d2790152631b0ba635d615e5f82 Mon Sep 17 00:00:00 2001
From: Ethan Resnick <ethan.resnick@gmail.com>
Date: Sun, 27 May 2018 01:45:07 -0400
Subject: [PATCH 459/575] feat(mongoose): Document Connection.then/catch

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

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index 50496fc9da..ec309669bc 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -385,7 +385,7 @@ declare module "mongoose" {
     $format(arg: any): string;
     /** Debug print helper */
     $print(name: any, i: any, args: any[]): void;
-    /** Retreives information about this collections indexes. */
+    /** Retrieves information about this collections indexes. */
     getIndexes(): any;
   }
 
@@ -403,6 +403,9 @@ declare module "mongoose" {
 
     /** Expose the possible connection states. */
     static STATES: any;
+
+    then: Promise<Connection>["then"];
+    catch: Promise<Connection>["catch"];
   }
 
   /*
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index fc43549f8e..3ba415d909 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -37,6 +37,11 @@ const connection3: null = mongoose.connect(connectUri, function (error) {
 var mongooseConnection: mongoose.Connection = mongoose.createConnection();
 mongooseConnection.dropDatabase().then(()=>{});
 mongooseConnection.dropCollection('foo').then(()=>{});
+mongoose.createConnection(connectUri).then((conn)=> {
+  return conn.collections;
+}, () => {
+
+});
 mongoose.createConnection(connectUri).open('');
 mongoose.createConnection(connectUri, {
   db: {

From 9914e7d1550d0bbe00acb13dbd63f13d174623b5 Mon Sep 17 00:00:00 2001
From: Javier Gonzalez <xaviergonz@users.noreply.github.com>
Date: Sun, 27 May 2018 22:01:23 +0200
Subject: [PATCH 460/575] [PIXI.js] invalid powerPreference type

It is invalidly typed as boolean
---
 types/pixi.js/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/pixi.js/index.d.ts b/types/pixi.js/index.d.ts
index d4f1097601..ff2759998b 100644
--- a/types/pixi.js/index.d.ts
+++ b/types/pixi.js/index.d.ts
@@ -787,7 +787,7 @@ declare namespace PIXI {
         /**
          * Parameter passed to webgl context, set to "high-performance" for devices with dual graphics card
          */
-        powerPreference?: boolean;
+        powerPreference?: "high-performance";
     }
     interface ApplicationOptions extends RendererOptions {
         /**

From 2317d90c2a73ff24832b8598e0055b2e9d9f5512 Mon Sep 17 00:00:00 2001
From: Andres Kalle <mjomble@gmail.com>
Date: Mon, 28 May 2018 01:46:06 +0300
Subject: [PATCH 461/575] mongodb: removed extraneous parameter

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index d1c47eff64..98aa2daca8 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -48,7 +48,7 @@ export class MongoClient extends EventEmitter {
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#db */
     db(dbName?: string, options?: MongoClientCommonOption): Db
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#isConnected */
-    isConnected(name: string, options?: MongoClientCommonOption): boolean;
+    isConnected(options?: MongoClientCommonOption): boolean;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#logout */
     logout(callback: MongoCallback<any>): void;
     logout(options?: { dbName?: string }): Promise<any>;

From bb3258459618b7bff477218a193035b9d452bede Mon Sep 17 00:00:00 2001
From: Jeremy Mowery <jermowery@google.com>
Date: Sun, 27 May 2018 16:11:28 -0700
Subject: [PATCH 462/575] Add stream.PassThrough as super interface in unzip

The unzip entry interface actually extends stream.PassThrough as seen here: https://github.com/EvanOxfeld/node-unzip/blob/master/lib/entry.js#L8
---
 types/unzip/index.d.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/types/unzip/index.d.ts b/types/unzip/index.d.ts
index 8971ff28df..877388ae5a 100644
--- a/types/unzip/index.d.ts
+++ b/types/unzip/index.d.ts
@@ -4,6 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /// <reference types="node" />
 
+import stream = require('stream');
+
 export function Extract(options: { path: string }): NodeJS.WritableStream;
 export function Parse(): NodeJS.WritableStream;
 
@@ -24,7 +26,7 @@ export function Parse(): NodeJS.WritableStream;
  *  });
  * ```
  */
-export interface Entry {
+export interface Entry extends stream.PassThrough {
     path: string;
     type: 'Directory' | 'File';
     size: number;

From 8e6c3ead4b1fb0917016d3f38c96f0f3030e491c Mon Sep 17 00:00:00 2001
From: Jeremy Mowery <jermowery@google.com>
Date: Sun, 27 May 2018 16:57:41 -0700
Subject: [PATCH 463/575] Fix incorrect pipe interface

Pipe is more general than the original typings imply.

The original type appears to have been inferred, it does not exist as an override here: https://github.com/EvanOxfeld/node-unzip/blob/master/lib/entry.js
---
 types/unzip/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/unzip/index.d.ts b/types/unzip/index.d.ts
index 877388ae5a..42bfacd973 100644
--- a/types/unzip/index.d.ts
+++ b/types/unzip/index.d.ts
@@ -30,6 +30,5 @@ export interface Entry extends stream.PassThrough {
     path: string;
     type: 'Directory' | 'File';
     size: number;
-    pipe: (stream: NodeJS.WritableStream) => void;
     autodrain: () => void;
 }

From 8ce312b908c3b82d9ad893b0ba0ac93e16837bd6 Mon Sep 17 00:00:00 2001
From: fsubal <fsubal@users.noreply.github.com>
Date: Mon, 28 May 2018 15:23:49 +0900
Subject: [PATCH 464/575] [react-rnd] mistakenly typed enableResizing

---
 types/react-rnd/index.d.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/types/react-rnd/index.d.ts b/types/react-rnd/index.d.ts
index 9164b409ce..2adf0c83fa 100644
--- a/types/react-rnd/index.d.ts
+++ b/types/react-rnd/index.d.ts
@@ -18,6 +18,17 @@ declare namespace Rnd {
         | 'topLeft'
         | 'topRight';
 
+    export type Enable = {
+        bottom?: boolean;
+        bottomLeft?: boolean;
+        bottomRight?: boolean;
+        left?: boolean;
+        right?: boolean;
+        top?: boolean;
+        topLeft?: boolean;
+        topRight?: boolean;
+    }
+    
     interface HandleClasses {
         bottom?: string;
         bottomLeft?: string;
@@ -90,7 +101,7 @@ declare namespace Rnd {
         resizeHandleStyles: HandleStyles;
 
         lockAspectRatio: boolean;
-        enableResizing: boolean;
+        enableResizing?: Enable;
 
         onResizeStart: () => void;
         onResize: () => void;

From 4ed668e5cd3c8febed0532a83e1fa9a9ccf15ecd Mon Sep 17 00:00:00 2001
From: fsubal <fsubal@users.noreply.github.com>
Date: Mon, 28 May 2018 15:33:27 +0900
Subject: [PATCH 465/575] [react-rnd] Added disableDragging?

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

diff --git a/types/react-rnd/index.d.ts b/types/react-rnd/index.d.ts
index 2adf0c83fa..d2e7b6ea8c 100644
--- a/types/react-rnd/index.d.ts
+++ b/types/react-rnd/index.d.ts
@@ -102,6 +102,7 @@ declare namespace Rnd {
 
         lockAspectRatio: boolean;
         enableResizing?: Enable;
+        disableDragging?: boolean
 
         onResizeStart: () => void;
         onResize: () => void;

From d779472585a2f75dfc9d78b404cb02c6d097e776 Mon Sep 17 00:00:00 2001
From: fsubal <fsubal@users.noreply.github.com>
Date: Mon, 28 May 2018 15:49:53 +0900
Subject: [PATCH 466/575] [react-rnd] add "Definitions by"

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

diff --git a/types/react-rnd/index.d.ts b/types/react-rnd/index.d.ts
index d2e7b6ea8c..11af9b121c 100644
--- a/types/react-rnd/index.d.ts
+++ b/types/react-rnd/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for react-rnd 7.3
 // Project: https://github.com/bokuweb/react-rnd
 // Definitions by: Ragg <https://github.com/Ragg->
+//                 fsubal <https://github.com/fsubal>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 import React = require('react');

From e2780102746f457788d298cd0f082541b3472855 Mon Sep 17 00:00:00 2001
From: subal f <subal@pixiv.com>
Date: Mon, 28 May 2018 15:55:05 +0900
Subject: [PATCH 467/575] [react-rnd] fix test

---
 types/react-rnd/react-rnd-tests.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/types/react-rnd/react-rnd-tests.tsx b/types/react-rnd/react-rnd-tests.tsx
index ee434117fe..9f1cbc593c 100644
--- a/types/react-rnd/react-rnd-tests.tsx
+++ b/types/react-rnd/react-rnd-tests.tsx
@@ -13,7 +13,13 @@ const onResize: Rnd.ResizeHandler = (e, direction, ref, delta, position) => {
     className="class"
     lockAspectRatio
     maxWidth={100}
-    enableResizing={false}
+    enableResizing={{
+        bottom: true,
+        bottomLeft: true,
+        bottomRight: false,
+        left: false
+    }}
+    disableDragging={false}
     resizeHandleStyles={{
         top: { background: '#000' }
     }}

From b70cdb2113c06031610f873eb407e009e381c8d7 Mon Sep 17 00:00:00 2001
From: subal f <subal@pixiv.com>
Date: Mon, 28 May 2018 15:57:38 +0900
Subject: [PATCH 468/575] [react-rnd] fix for 'npm run lint react-rnd'

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

diff --git a/types/react-rnd/index.d.ts b/types/react-rnd/index.d.ts
index 11af9b121c..27876914c6 100644
--- a/types/react-rnd/index.d.ts
+++ b/types/react-rnd/index.d.ts
@@ -19,7 +19,7 @@ declare namespace Rnd {
         | 'topLeft'
         | 'topRight';
 
-    export type Enable = {
+    interface Enable {
         bottom?: boolean;
         bottomLeft?: boolean;
         bottomRight?: boolean;
@@ -29,7 +29,7 @@ declare namespace Rnd {
         topLeft?: boolean;
         topRight?: boolean;
     }
-    
+
     interface HandleClasses {
         bottom?: string;
         bottomLeft?: string;
@@ -103,7 +103,7 @@ declare namespace Rnd {
 
         lockAspectRatio: boolean;
         enableResizing?: Enable;
-        disableDragging?: boolean
+        disableDragging?: boolean;
 
         onResizeStart: () => void;
         onResize: () => void;

From 8bd9f3e3cadef5ca1d6726c281fbc374c4297466 Mon Sep 17 00:00:00 2001
From: subal f <subal@pixiv.com>
Date: Mon, 28 May 2018 16:09:02 +0900
Subject: [PATCH 469/575] [react-rnd] now it has 7.4

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

diff --git a/types/react-rnd/index.d.ts b/types/react-rnd/index.d.ts
index 27876914c6..31d477ca5e 100644
--- a/types/react-rnd/index.d.ts
+++ b/types/react-rnd/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-rnd 7.3
+// Type definitions for react-rnd 7.4
 // Project: https://github.com/bokuweb/react-rnd
 // Definitions by: Ragg <https://github.com/Ragg->
 //                 fsubal <https://github.com/fsubal>

From efa93ba024a2dfdff459bb633e1efbaa26d6ba53 Mon Sep 17 00:00:00 2001
From: Thomas Chia <thomas.h.chia@googlemail.com>
Date: Mon, 28 May 2018 15:20:00 +0800
Subject: [PATCH 470/575] Allow options to be passed to StripeProvider.

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

diff --git a/types/react-stripe-elements/index.d.ts b/types/react-stripe-elements/index.d.ts
index d7cea98728..fa68cb1b31 100644
--- a/types/react-stripe-elements/index.d.ts
+++ b/types/react-stripe-elements/index.d.ts
@@ -27,7 +27,10 @@ export namespace ReactStripeElements {
 		error?: { decline_code?: string };
 	};
 
-    type StripeProviderProps = { apiKey: string; stripe?: never; } | { apiKey?: never; stripe: StripeProps | null; };
+	interface StripeProviderOptions {
+		stripeAccount?: string;
+	}
+	type StripeProviderProps = { apiKey: string; stripe?: never; options?: StripeProviderOptions } | { apiKey?: never; stripe: StripeProps | null; options?: StripeProviderOptions; };
 
 	interface StripeProps {
 		createSource(sourceData?: SourceOptions): Promise<SourceResponse>;
diff --git a/types/react-stripe-elements/react-stripe-elements-tests.tsx b/types/react-stripe-elements/react-stripe-elements-tests.tsx
index 93a2a34588..575987a1d9 100644
--- a/types/react-stripe-elements/react-stripe-elements-tests.tsx
+++ b/types/react-stripe-elements/react-stripe-elements-tests.tsx
@@ -195,3 +195,8 @@ const TestStripeProviderProps2: React.SFC<{
 const TestStripeProviderProps3: React.SFC<{
     stripe: StripeProps;
 }> = props => <StripeProvider stripe={null} />;
+
+/**
+ * StripeProvider should be able to accept an `options` prop
+ */
+const TestStripeProviderOptions: React.SFC = () => <StripeProvider apiKey="" options={{stripeAccount: ""}} />;

From 0abb7f4199f9fcf27d5944e850821530226812c1 Mon Sep 17 00:00:00 2001
From: BhaskarM <bhaskar.mandalapu@gmail.com>
Date: Mon, 28 May 2018 16:22:03 +0530
Subject: [PATCH 471/575] adding documentation and tests

---
 types/gapi.calendar/gapi.calendar-tests.ts | 25 ++++++++++++++++++++++
 types/gapi.calendar/index.d.ts             |  4 ++++
 2 files changed, 29 insertions(+)

diff --git a/types/gapi.calendar/gapi.calendar-tests.ts b/types/gapi.calendar/gapi.calendar-tests.ts
index bd42483df5..0b40d30792 100644
--- a/types/gapi.calendar/gapi.calendar-tests.ts
+++ b/types/gapi.calendar/gapi.calendar-tests.ts
@@ -149,4 +149,29 @@
   request.execute(function(event) {
     appendPre('Event created: ' + event.htmlLink);
   });
+
+
+  /*
+  * deleting existing event from calendar https://developers.google.com/calendar/v3/reference/events/delete
+  * pass the Event.id from the existing events list response
+  * refer to https://developers.google.com/calendar/v3/reference/events#resource-representations
+  * input @param {string} calendarEventId that needs to be deleted from the calendar
+  * */
+  function deleteEvent(calendarEventId: any) {
+    var request = gapi.client.calendar.events.delete({
+      calendarId: 'primary',
+      eventId: calendarEventId,
+      sendNotifications: true
+    });
+
+    request.then(
+      (response) => {
+        appendPre('Successfully deleted event ' + calendarEventId);
+      },
+      (error) => {
+        appendPre('Unable to delete event from your calendar' + calendarEventId);
+      }
+    );
+  }
+
 }
diff --git a/types/gapi.calendar/index.d.ts b/types/gapi.calendar/index.d.ts
index a6a0385661..62016a4c33 100644
--- a/types/gapi.calendar/index.d.ts
+++ b/types/gapi.calendar/index.d.ts
@@ -271,6 +271,8 @@ declare namespace gapi.client.calendar {
     static insert(parameters: EventsInsertParameters): HttpRequest<Event>;
     static update(parameters: EventsUpdateParameters): HttpRequest<Event>;
     static get(parameters: EventsGetParameters): HttpRequest<Event>;
+
+    // delete the existing event from calendar
     static delete(parameters: EventsDeleteParameters): HttpRequest<Event>;
   }
 
@@ -307,6 +309,8 @@ declare namespace gapi.client.calendar {
     resource: EventInput;
   }
 
+  // calendarId: 'primary' or the calendar from which the event to be deleted
+  // eventId: the event that need to be deleted from calendar (Event.id from the list/insert response)
   interface EventsDeleteParameters {
     calendarId: string;
     eventId: string;

From 66efd2dfcae34e30069ae285f6b2723208db2e46 Mon Sep 17 00:00:00 2001
From: BhaskarM <bhaskar.mandalapu@gmail.com>
Date: Mon, 28 May 2018 23:06:20 +0530
Subject: [PATCH 472/575] removing documentation from tests

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

diff --git a/types/gapi.calendar/gapi.calendar-tests.ts b/types/gapi.calendar/gapi.calendar-tests.ts
index 0b40d30792..f2d5058ad2 100644
--- a/types/gapi.calendar/gapi.calendar-tests.ts
+++ b/types/gapi.calendar/gapi.calendar-tests.ts
@@ -151,12 +151,7 @@
   });
 
 
-  /*
-  * deleting existing event from calendar https://developers.google.com/calendar/v3/reference/events/delete
-  * pass the Event.id from the existing events list response
-  * refer to https://developers.google.com/calendar/v3/reference/events#resource-representations
-  * input @param {string} calendarEventId that needs to be deleted from the calendar
-  * */
+  
   function deleteEvent(calendarEventId: any) {
     var request = gapi.client.calendar.events.delete({
       calendarId: 'primary',

From 7018c3c6dc16e06b68b7c6e8cb4760ae3cb45b02 Mon Sep 17 00:00:00 2001
From: Alex Plumb <alexplumb@users.noreply.github.com>
Date: Mon, 28 May 2018 15:14:35 -0300
Subject: [PATCH 473/575] fix(add amount_returned to IOrder)

---
 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 991d4a618a..cf7a1e3c02 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -2306,6 +2306,12 @@ declare namespace Stripe {
              * currency) representing the total amount for the order.
              */
             amount: number;
+            
+            /**
+             * A positive integer in the smallest currency unit (that is, 100 cents for $1.00, or 1 for ¥1, Japanese Yen being a 0-decimal
+             * currency) representing the total amount returned for the order thus far.
+             */
+            amount_returned: number;
 
             /**
              * ID of the Connect Application that created the order.

From bd8e2a3d3f7be1c244ec7aaf76d2864f353d31ff Mon Sep 17 00:00:00 2001
From: Gerhard Stoebich <deb2001-github@yahoo.de>
Date: Mon, 28 May 2018 21:41:40 +0200
Subject: [PATCH 474/575] [node] add some ReadLineOptions parameters

---
 types/node/index.d.ts    | 3 +++
 types/node/v6/index.d.ts | 3 +++
 types/node/v8/index.d.ts | 3 +++
 types/node/v9/index.d.ts | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 11fb56d0fe..60c76569e7 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2051,6 +2051,9 @@ declare module "readline" {
         completer?: Completer | AsyncCompleter;
         terminal?: boolean;
         historySize?: number;
+        prompt?: string;
+        crlfDelay?: number;
+        removeHistoryDuplicates?: boolean;
     }
 
     export function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer | AsyncCompleter, terminal?: boolean): ReadLine;
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index 056021841c..570e668c53 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -1681,6 +1681,9 @@ declare module "readline" {
         completer?: Completer;
         terminal?: boolean;
         historySize?: number;
+        prompt?: string;
+        crlfDelay?: number;
+        removeHistoryDuplicates?: boolean;
     }
 
     export function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer, terminal?: boolean): ReadLine;
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index defcda33d8..af966cdb46 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -1960,6 +1960,9 @@ declare module "readline" {
         completer?: Completer | AsyncCompleter;
         terminal?: boolean;
         historySize?: number;
+        prompt?: string;
+        crlfDelay?: number;
+        removeHistoryDuplicates?: boolean;
     }
 
     export function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer | AsyncCompleter, terminal?: boolean): ReadLine;
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index a7fea9c48e..7832afd8a9 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -2040,6 +2040,9 @@ declare module "readline" {
         completer?: Completer | AsyncCompleter;
         terminal?: boolean;
         historySize?: number;
+        prompt?: string;
+        crlfDelay?: number;
+        removeHistoryDuplicates?: boolean;
     }
 
     export function createInterface(input: NodeJS.ReadableStream, output?: NodeJS.WritableStream, completer?: Completer | AsyncCompleter, terminal?: boolean): ReadLine;

From d2059dff562f33f7cfa1a0daea54489357609011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomek=20=C5=81aziuk?= <tlaziuk@gmail.com>
Date: Mon, 28 May 2018 22:35:10 +0200
Subject: [PATCH 475/575] restore ability to reset the session

---
 types/koa-session/index.d.ts           | 2 +-
 types/koa-session/koa-session-tests.ts | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/types/koa-session/index.d.ts b/types/koa-session/index.d.ts
index 75721a5b2d..08e6e66f70 100644
--- a/types/koa-session/index.d.ts
+++ b/types/koa-session/index.d.ts
@@ -213,7 +213,7 @@ declare function session(app: Koa): Koa.Middleware;
 
 declare module "koa" {
     interface Context {
-        session: session.Session | undefined;
+        session: session.Session | null;
         readonly sessionOptions: session.opts | undefined;
     }
 
diff --git a/types/koa-session/koa-session-tests.ts b/types/koa-session/koa-session-tests.ts
index 2844767240..a84d43632d 100644
--- a/types/koa-session/koa-session-tests.ts
+++ b/types/koa-session/koa-session-tests.ts
@@ -39,4 +39,11 @@ app.use(session({
     },
 }, app));
 
+app.use((ctx, next) => {
+    // reset the session
+    ctx.session = null;
+
+    return next();
+})
+
 app.listen(3000);

From ce418d5120e54cf120e2ce13ccb47c096981ce75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomek=20=C5=81aziuk?= <tlaziuk@gmail.com>
Date: Mon, 28 May 2018 22:47:11 +0200
Subject: [PATCH 476/575] add missing semicolon

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

diff --git a/types/koa-session/koa-session-tests.ts b/types/koa-session/koa-session-tests.ts
index a84d43632d..a647b43e42 100644
--- a/types/koa-session/koa-session-tests.ts
+++ b/types/koa-session/koa-session-tests.ts
@@ -44,6 +44,6 @@ app.use((ctx, next) => {
     ctx.session = null;
 
     return next();
-})
+});
 
 app.listen(3000);

From eacae91146844bf264d8b8d340389a2c33660e6e Mon Sep 17 00:00:00 2001
From: rayhaneh <rbanyassady@onist.com>
Date: Mon, 28 May 2018 15:45:40 -0400
Subject: [PATCH 477/575] [ramda] Updated differenceWith typing

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

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 54292f1f7c..6cf29b5e51 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -22,6 +22,7 @@
 //                 Bonggyun Lee <https://github.com/deptno>
 //                 Maciek Blim <https://github.com/blimusiek>
 //                 Marcin Biernat <https://github.com/biern>
+//                 Rayhaneh Banyassady <https://github.com/rayhaneh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -523,6 +524,7 @@ declare namespace R {
          * elements.
          */
         differenceWith<T>(pred: (a: T, b: T) => boolean, list1: ReadonlyArray<T>, list2: ReadonlyArray<T>): T[];
+        differenceWith<T>(pred: (a: T, b: T) => boolean): <T> (list1: ReadonlyArray<T>, list2: ReadonlyArray<T>) => T[];
 
         /*
          * Returns a new object that does not contain a prop property.
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index c9b8cb0841..9d0120b8aa 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -1957,6 +1957,9 @@ class Rectangle {
     const l1 = [{a: 1}, {a: 2}, {a: 3}];
     const l2 = [{a: 3}, {a: 4}];
     R.differenceWith(cmp, l1, l2); // => [{a: 1}, {a: 2}]
+
+    const differenceWithCurried = R.differenceWith(cmp);
+    differenceWithCurried(l1, l2); // =>[{a: 1}, {a: 2}]
 };
 
 () => {

From 1c012ab4f00b236f548506bdba14531ca4be664e Mon Sep 17 00:00:00 2001
From: FaithForHumans <vogel.spencer@gmail.com>
Date: Mon, 28 May 2018 23:29:43 -0500
Subject: [PATCH 478/575] Replacing reactstrap components with generics.

---
 types/reactstrap/lib/Alert.d.ts                | 15 +++++++--------
 types/reactstrap/lib/Badge.d.ts                |  7 ++++---
 types/reactstrap/lib/Breadcrumb.d.ts           |  7 ++++---
 types/reactstrap/lib/BreadcrumbItem.d.ts       |  7 ++++---
 types/reactstrap/lib/Button.d.ts               |  6 +++---
 types/reactstrap/lib/ButtonDropdown.d.ts       | 15 +++++----------
 types/reactstrap/lib/ButtonGroup.d.ts          |  7 ++++---
 types/reactstrap/lib/ButtonToolbar.d.ts        |  7 ++++---
 types/reactstrap/lib/Card.d.ts                 |  7 ++++---
 types/reactstrap/lib/CardBody.d.ts             |  7 ++++---
 types/reactstrap/lib/CardColumns.d.ts          |  7 ++++---
 types/reactstrap/lib/CardDeck.d.ts             |  7 ++++---
 types/reactstrap/lib/CardFooter.d.ts           |  7 ++++---
 types/reactstrap/lib/CardGroup.d.ts            |  7 ++++---
 types/reactstrap/lib/CardHeader.d.ts           |  7 ++++---
 types/reactstrap/lib/CardImg.d.ts              |  7 ++++---
 types/reactstrap/lib/CardImgOverlay.d.ts       |  7 ++++---
 types/reactstrap/lib/CardLink.d.ts             |  7 ++++---
 types/reactstrap/lib/CardSubtitle.d.ts         |  7 ++++---
 types/reactstrap/lib/CardText.d.ts             |  7 ++++---
 types/reactstrap/lib/CardTitle.d.ts            |  7 ++++---
 types/reactstrap/lib/Carousel.d.ts             |  6 +++---
 types/reactstrap/lib/CarouselCaption.d.ts      |  7 ++++---
 types/reactstrap/lib/CarouselControl.d.ts      |  7 ++++---
 types/reactstrap/lib/CarouselIndicators.d.ts   |  7 ++++---
 types/reactstrap/lib/CarouselItem.d.ts         |  2 +-
 types/reactstrap/lib/Col.d.ts                  |  8 +++++---
 types/reactstrap/lib/Collapse.d.ts             |  6 +++---
 types/reactstrap/lib/Container.d.ts            |  7 ++++---
 types/reactstrap/lib/Dropdown.d.ts             | 18 +++++++-----------
 types/reactstrap/lib/DropdownItem.d.ts         |  6 +++---
 types/reactstrap/lib/DropdownMenu.d.ts         |  7 ++++---
 types/reactstrap/lib/DropdownToggle.d.ts       |  6 +++---
 types/reactstrap/lib/Fade.d.ts                 |  7 ++++---
 types/reactstrap/lib/Form.d.ts                 |  6 +++---
 types/reactstrap/lib/FormFeedback.d.ts         |  7 ++++---
 types/reactstrap/lib/FormGroup.d.ts            |  7 ++++---
 types/reactstrap/lib/FormText.d.ts             |  7 ++++---
 types/reactstrap/lib/Input.d.ts                |  6 +++---
 types/reactstrap/lib/InputGroup.d.ts           |  7 ++++---
 types/reactstrap/lib/InputGroupAddon.d.ts      |  7 ++++---
 .../lib/InputGroupButtonDropdown.d.ts          |  7 ++++---
 types/reactstrap/lib/InputGroupText.d.ts       |  7 ++++---
 types/reactstrap/lib/Jumbotron.d.ts            |  7 ++++---
 types/reactstrap/lib/Label.d.ts                | 11 ++++++-----
 types/reactstrap/lib/ListGroup.d.ts            |  7 ++++---
 types/reactstrap/lib/ListGroupItem.d.ts        |  7 ++++---
 types/reactstrap/lib/ListGroupItemHeading.d.ts |  7 ++++---
 types/reactstrap/lib/ListGroupItemText.d.ts    |  7 ++++---
 types/reactstrap/lib/Media.d.ts                |  7 ++++---
 types/reactstrap/lib/Modal.d.ts                |  6 +++---
 types/reactstrap/lib/ModalBody.d.ts            |  7 ++++---
 types/reactstrap/lib/ModalFooter.d.ts          |  7 ++++---
 types/reactstrap/lib/ModalHeader.d.ts          |  7 ++++---
 types/reactstrap/lib/Nav.d.ts                  |  7 ++++---
 types/reactstrap/lib/NavItem.d.ts              |  7 ++++---
 types/reactstrap/lib/NavLink.d.ts              |  6 +++---
 types/reactstrap/lib/Navbar.d.ts               |  7 ++++---
 types/reactstrap/lib/NavbarBrand.d.ts          |  7 ++++---
 types/reactstrap/lib/NavbarToggler.d.ts        |  7 ++++---
 types/reactstrap/lib/Pagination.d.ts           |  7 ++++---
 types/reactstrap/lib/PaginationItem.d.ts       |  7 ++++---
 types/reactstrap/lib/PaginationLink.d.ts       |  7 ++++---
 types/reactstrap/lib/Popover.d.ts              |  6 +++---
 types/reactstrap/lib/PopoverBody.d.ts          |  7 ++++---
 types/reactstrap/lib/PopoverHeader.d.ts        |  7 ++++---
 types/reactstrap/lib/Progress.d.ts             |  6 +++---
 types/reactstrap/lib/Row.d.ts                  |  7 ++++---
 types/reactstrap/lib/TabContent.d.ts           |  6 +++---
 types/reactstrap/lib/TabPane.d.ts              |  7 ++++---
 types/reactstrap/lib/Table.d.ts                |  7 ++++---
 types/reactstrap/lib/Tag.d.ts                  |  7 ++++---
 types/reactstrap/lib/Tooltip.d.ts              | 14 ++++++--------
 types/reactstrap/lib/Uncontrolled.d.ts         |  8 ++++----
 types/reactstrap/reactstrap-tests.tsx          |  2 +-
 75 files changed, 294 insertions(+), 249 deletions(-)

diff --git a/types/reactstrap/lib/Alert.d.ts b/types/reactstrap/lib/Alert.d.ts
index 2a5a0f8dde..73d3469473 100644
--- a/types/reactstrap/lib/Alert.d.ts
+++ b/types/reactstrap/lib/Alert.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface UncontrolledProps extends React.HTMLAttributes<HTMLElement> {
+export type UncontrolledProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   className?: string;
   cssModule?: CSSModule;
   color?: string;
@@ -8,15 +9,13 @@ export interface UncontrolledProps extends React.HTMLAttributes<HTMLElement> {
   transitionAppearTimeout?: number;
   transitionEnterTimeout?: number;
   transitionLeaveTimeout?: number;
-}
-export interface UncontrolledAlertProps extends UncontrolledProps {
-  /* intentionally blank */
-}
+} & T;
+export type UncontrolledAlertProps<T = {}> = UncontrolledProps<T>;
 
-export interface AlertProps extends UncontrolledAlertProps {
+export type AlertProps<T = {}> = UncontrolledAlertProps<T> & {
   isOpen?: boolean;
   toggle?: () => void;
-}
+};
 
-declare const Alert: React.StatelessComponent<AlertProps>;
+declare class Alert<T = {}> extends React.Component<AlertProps<T>> {}
 export default Alert;
diff --git a/types/reactstrap/lib/Badge.d.ts b/types/reactstrap/lib/Badge.d.ts
index f45c418c52..eccd2ea240 100644
--- a/types/reactstrap/lib/Badge.d.ts
+++ b/types/reactstrap/lib/Badge.d.ts
@@ -1,12 +1,13 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface BadgeProps extends React.HTMLAttributes<HTMLElement> {
+export type BadgeProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   color?: string;
   pill?: boolean;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const Badge: React.StatelessComponent<BadgeProps>;
+declare class Badge<T = {}> extends React.Component<BadgeProps<T>> {}
 export default Badge;
diff --git a/types/reactstrap/lib/Breadcrumb.d.ts b/types/reactstrap/lib/Breadcrumb.d.ts
index 74e770de4f..be7c1aab89 100644
--- a/types/reactstrap/lib/Breadcrumb.d.ts
+++ b/types/reactstrap/lib/Breadcrumb.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface BreadcrumbProps extends React.HTMLAttributes<HTMLElement> {
+export type BreadcrumbProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: string;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const Breadcrumb: React.StatelessComponent<BreadcrumbProps>;
+declare class Breadcrumb<T = {}> extends React.Component<BreadcrumbProps<T>> {}
 export default Breadcrumb;
diff --git a/types/reactstrap/lib/BreadcrumbItem.d.ts b/types/reactstrap/lib/BreadcrumbItem.d.ts
index ab2e9cbc4e..614ca34b99 100644
--- a/types/reactstrap/lib/BreadcrumbItem.d.ts
+++ b/types/reactstrap/lib/BreadcrumbItem.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface BreadcrumbItemProps extends React.HTMLAttributes<HTMLElement> {
+export type BreadcrumbItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   active?: boolean;
   className?: string;
@@ -8,7 +9,7 @@ export interface BreadcrumbItemProps extends React.HTMLAttributes<HTMLElement> {
   // if a is passed as a string
   // this could be href
   [others: string]: any;
-}
+} & T;
 
-declare const BreadcrumbItem: React.StatelessComponent<BreadcrumbItemProps>;
+declare class BreadcrumbItem<T = {}> extends React.Component<BreadcrumbItemProps<T>> {}
 export default BreadcrumbItem;
diff --git a/types/reactstrap/lib/Button.d.ts b/types/reactstrap/lib/Button.d.ts
index bf75bcec8e..43075dc3dc 100644
--- a/types/reactstrap/lib/Button.d.ts
+++ b/types/reactstrap/lib/Button.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ButtonProps extends React.HTMLProps<HTMLButtonElement> {
+export type ButtonProps<T = {}> = React.HTMLProps<HTMLButtonElement> & {
   outline?: boolean;
   active?: boolean;
   block?: boolean;
@@ -16,7 +16,7 @@ export interface ButtonProps extends React.HTMLProps<HTMLButtonElement> {
   style?: React.CSSProperties;
 
   cssModule?: CSSModule;
-}
+} & T;
 
-declare class Button extends React.Component<ButtonProps> {}
+declare class Button<T = {}> extends React.Component<ButtonProps<T>> {}
 export default Button;
diff --git a/types/reactstrap/lib/ButtonDropdown.d.ts b/types/reactstrap/lib/ButtonDropdown.d.ts
index fd09d6da8f..ebae860bc7 100644
--- a/types/reactstrap/lib/ButtonDropdown.d.ts
+++ b/types/reactstrap/lib/ButtonDropdown.d.ts
@@ -1,15 +1,10 @@
+import * as React from 'react';
 import { UncontrolledDropdownProps, DropdownProps } from './Dropdown';
 
-export interface UncontrolledProps extends UncontrolledDropdownProps {
-  /* intentionally blank */
-}
-export interface UncontrolledButtonDropdownProps extends UncontrolledProps {
-  /* intentionally blank */
-}
+export type UncontrolledProps<T = {}> = UncontrolledDropdownProps<T>;
+export type UncontrolledButtonDropdownProps<T = {}> = UncontrolledProps<T>;
 
-export interface ButtonDropdownProps extends DropdownProps {
-  /* intentionally blank */
-}
+export type ButtonDropdownProps<T = {}> = DropdownProps<T>;
 
-declare const ButtonDropdown: React.StatelessComponent<ButtonDropdownProps>;
+declare class ButtonDropdown<T = {}> extends React.Component<ButtonDropdownProps<T>> {}
 export default ButtonDropdown;
diff --git a/types/reactstrap/lib/ButtonGroup.d.ts b/types/reactstrap/lib/ButtonGroup.d.ts
index 10549f5347..27053d271c 100644
--- a/types/reactstrap/lib/ButtonGroup.d.ts
+++ b/types/reactstrap/lib/ButtonGroup.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ButtonGroupProps extends React.HTMLAttributes<HTMLElement> {
+export type ButtonGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   'aria-label'?: string;
   className?: string;
@@ -8,7 +9,7 @@ export interface ButtonGroupProps extends React.HTMLAttributes<HTMLElement> {
   role?: string;
   size?: string;
   vertical?: boolean;
-}
+} & T;
 
-declare const ButtonGroup: React.StatelessComponent<ButtonGroupProps>;
+declare class ButtonGroup<T = {}> extends React.Component<ButtonGroupProps<T>> {}
 export default ButtonGroup;
diff --git a/types/reactstrap/lib/ButtonToolbar.d.ts b/types/reactstrap/lib/ButtonToolbar.d.ts
index ebd8733b28..ea258a7c49 100644
--- a/types/reactstrap/lib/ButtonToolbar.d.ts
+++ b/types/reactstrap/lib/ButtonToolbar.d.ts
@@ -1,12 +1,13 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ButtonToolbarProps extends React.HTMLAttributes<HTMLElement> {
+export type ButtonToolbarProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   'aria-label'?: string;
   className?: string;
   cssModule?: CSSModule;
   role?: string;
-}
+} & T;
 
-declare const ButtonToolbar: React.StatelessComponent<ButtonToolbarProps>;
+declare class ButtonToolbar<T = {}> extends React.Component<ButtonToolbarProps<T>> {}
 export default ButtonToolbar;
diff --git a/types/reactstrap/lib/Card.d.ts b/types/reactstrap/lib/Card.d.ts
index 0387ae3e94..269a524087 100644
--- a/types/reactstrap/lib/Card.d.ts
+++ b/types/reactstrap/lib/Card.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardProps extends React.HTMLAttributes<HTMLElement> {
+export type CardProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   inverse?: boolean;
   color?: string;
@@ -10,7 +11,7 @@ export interface CardProps extends React.HTMLAttributes<HTMLElement> {
   className?: string;
   cssModule?: CSSModule;
   style?: React.CSSProperties;
-}
+} & T;
 
-declare const Card: React.StatelessComponent<CardProps>;
+declare class Card<T = {}> extends React.Component<CardProps<T>> {}
 export default Card;
diff --git a/types/reactstrap/lib/CardBody.d.ts b/types/reactstrap/lib/CardBody.d.ts
index d95ac0d31b..3890cf4650 100644
--- a/types/reactstrap/lib/CardBody.d.ts
+++ b/types/reactstrap/lib/CardBody.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardBodyProps extends React.HTMLAttributes<HTMLElement> {
+export type CardBodyProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardBody: React.StatelessComponent<CardBodyProps>;
+declare class CardBody<T = {}> extends React.Component<CardBodyProps<T>> {}
 export default CardBody;
diff --git a/types/reactstrap/lib/CardColumns.d.ts b/types/reactstrap/lib/CardColumns.d.ts
index 19f53cc250..be4688edb3 100644
--- a/types/reactstrap/lib/CardColumns.d.ts
+++ b/types/reactstrap/lib/CardColumns.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardColumnsProps extends React.HTMLAttributes<HTMLElement> {
+export type CardColumnsProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardColumns: React.StatelessComponent<CardColumnsProps>;
+declare class CardColumns<T = {}> extends React.Component<CardColumnsProps<T>> {}
 export default CardColumns;
diff --git a/types/reactstrap/lib/CardDeck.d.ts b/types/reactstrap/lib/CardDeck.d.ts
index 09b3d39c34..28882603b1 100644
--- a/types/reactstrap/lib/CardDeck.d.ts
+++ b/types/reactstrap/lib/CardDeck.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardDeckProps extends React.HTMLAttributes<HTMLElement> {
+export type CardDeckProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardDeck: React.StatelessComponent<CardDeckProps>;
+declare class CardDeck<T = {}> extends React.Component<CardDeckProps<T>> {}
 export default CardDeck;
diff --git a/types/reactstrap/lib/CardFooter.d.ts b/types/reactstrap/lib/CardFooter.d.ts
index f1ee324f03..9268ed4e70 100644
--- a/types/reactstrap/lib/CardFooter.d.ts
+++ b/types/reactstrap/lib/CardFooter.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardFooterProps extends React.HTMLAttributes<HTMLElement> {
+export type CardFooterProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardFooter: React.StatelessComponent<CardFooterProps>;
+declare class CardFooter<T = {}> extends React.Component<CardFooterProps<T>> {}
 export default CardFooter;
diff --git a/types/reactstrap/lib/CardGroup.d.ts b/types/reactstrap/lib/CardGroup.d.ts
index 5bf83900bf..6e0d422656 100644
--- a/types/reactstrap/lib/CardGroup.d.ts
+++ b/types/reactstrap/lib/CardGroup.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardGroupProps extends React.HTMLAttributes<HTMLElement> {
+export type CardGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardGroup: React.StatelessComponent<CardGroupProps>;
+declare class CardGroup<T = {}> extends React.Component<CardGroupProps<T>> {}
 export default CardGroup;
diff --git a/types/reactstrap/lib/CardHeader.d.ts b/types/reactstrap/lib/CardHeader.d.ts
index d630954e78..821b2d809f 100644
--- a/types/reactstrap/lib/CardHeader.d.ts
+++ b/types/reactstrap/lib/CardHeader.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardHeaderProps extends React.HTMLAttributes<HTMLElement> {
+export type CardHeaderProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardHeader: React.StatelessComponent<CardHeaderProps>;
+declare class CardHeader<T = {}> extends React.Component<CardHeaderProps<T>> {}
 export default CardHeader;
diff --git a/types/reactstrap/lib/CardImg.d.ts b/types/reactstrap/lib/CardImg.d.ts
index b4b7021232..e9242704b4 100644
--- a/types/reactstrap/lib/CardImg.d.ts
+++ b/types/reactstrap/lib/CardImg.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardImgProps extends React.HTMLAttributes<HTMLElement> {
+export type CardImgProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   top?: boolean;
   bottom?: boolean;
@@ -10,7 +11,7 @@ export interface CardImgProps extends React.HTMLAttributes<HTMLElement> {
   width?: string;
   height?: string;
   alt?: string;
-}
+} & T;
 
-declare const CardImg: React.StatelessComponent<CardImgProps>;
+declare class CardImg<T = {}> extends React.Component<CardImgProps<T>> {}
 export default CardImg;
diff --git a/types/reactstrap/lib/CardImgOverlay.d.ts b/types/reactstrap/lib/CardImgOverlay.d.ts
index ccc76fa9c9..7e252f6248 100644
--- a/types/reactstrap/lib/CardImgOverlay.d.ts
+++ b/types/reactstrap/lib/CardImgOverlay.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardImgOverlayProps extends React.HTMLAttributes<HTMLElement> {
+export type CardImgOverlayProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardImgOverlay: React.StatelessComponent<CardImgOverlayProps>;
+declare class CardImgOverlay<T = {}> extends React.Component<CardImgOverlayProps<T>> {}
 export default CardImgOverlay;
diff --git a/types/reactstrap/lib/CardLink.d.ts b/types/reactstrap/lib/CardLink.d.ts
index 1a24b55658..256d55d31c 100644
--- a/types/reactstrap/lib/CardLink.d.ts
+++ b/types/reactstrap/lib/CardLink.d.ts
@@ -1,12 +1,13 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardLinkProps extends React.HTMLAttributes<HTMLElement> {
+export type CardLinkProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   innerRef?: React.Ref<HTMLAnchorElement>;
   className?: string;
   cssModule?: CSSModule;
   href?: string;
-}
+} & T;
 
-declare const CardLink: React.StatelessComponent<CardLinkProps>;
+declare class CardLink<T = {}> extends React.Component<CardLinkProps<T>> {}
 export default CardLink;
diff --git a/types/reactstrap/lib/CardSubtitle.d.ts b/types/reactstrap/lib/CardSubtitle.d.ts
index a237c29119..a5285469cd 100644
--- a/types/reactstrap/lib/CardSubtitle.d.ts
+++ b/types/reactstrap/lib/CardSubtitle.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardSubtitleProps extends React.HTMLAttributes<HTMLElement> {
+export type CardSubtitleProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardSubtitle: React.StatelessComponent<CardSubtitleProps>;
+declare class CardSubtitle<T = {}> extends React.Component<CardSubtitleProps<T>> {}
 export default CardSubtitle;
diff --git a/types/reactstrap/lib/CardText.d.ts b/types/reactstrap/lib/CardText.d.ts
index 462c1abef3..b09eea4de7 100644
--- a/types/reactstrap/lib/CardText.d.ts
+++ b/types/reactstrap/lib/CardText.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardTextProps extends React.HTMLAttributes<HTMLElement> {
+export type CardTextProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardText: React.StatelessComponent<CardTextProps>;
+declare class CardText<T = {}> extends React.Component<CardTextProps<T>> {}
 export default CardText;
diff --git a/types/reactstrap/lib/CardTitle.d.ts b/types/reactstrap/lib/CardTitle.d.ts
index 68c5c6120c..6f3e91d26a 100644
--- a/types/reactstrap/lib/CardTitle.d.ts
+++ b/types/reactstrap/lib/CardTitle.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardTitleProps extends React.HTMLAttributes<HTMLElement> {
+export type CardTitleProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardTitle: React.StatelessComponent<CardTitleProps>;
+declare class CardTitle<T = {}> extends React.Component<CardTitleProps<T>> {}
 export default CardTitle;
diff --git a/types/reactstrap/lib/Carousel.d.ts b/types/reactstrap/lib/Carousel.d.ts
index 1f21364cdf..d4c8de35a5 100644
--- a/types/reactstrap/lib/Carousel.d.ts
+++ b/types/reactstrap/lib/Carousel.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CarouselProps extends React.HTMLProps<HTMLElement> {
+export type CarouselProps<T = {}> = React.HTMLProps<HTMLElement> & {
     activeIndex?: number;
     next: () => void;
     previous: () => void;
@@ -13,7 +13,7 @@ export interface CarouselProps extends React.HTMLProps<HTMLElement> {
     mouseExit?: () => void;
     slide?: boolean;
     cssModule?: CSSModule
-}
+} & T;
 
-declare class Carousel extends React.Component<CarouselProps> {}
+declare class Carousel<T = {}> extends React.Component<CarouselProps<T>> {}
 export default Carousel;
diff --git a/types/reactstrap/lib/CarouselCaption.d.ts b/types/reactstrap/lib/CarouselCaption.d.ts
index 58be0e29b3..2d6eea7d7f 100644
--- a/types/reactstrap/lib/CarouselCaption.d.ts
+++ b/types/reactstrap/lib/CarouselCaption.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CarouselCaptionProps extends React.HTMLProps<HTMLElement> {
+export type CarouselCaptionProps<T = {}> = React.HTMLProps<HTMLElement> & {
     captionHeader?: string;
     captionText: string;
     cssModule?: CSSModule;
-}
+} & T;
 
-declare const CarouselCaption: React.StatelessComponent<CarouselCaptionProps>;
+declare class CarouselCaption<T = {}> extends React.Component<CarouselCaptionProps<T>> {}
 export default CarouselCaption;
diff --git a/types/reactstrap/lib/CarouselControl.d.ts b/types/reactstrap/lib/CarouselControl.d.ts
index 0e94fd5c70..1605c84dd0 100644
--- a/types/reactstrap/lib/CarouselControl.d.ts
+++ b/types/reactstrap/lib/CarouselControl.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CarouselControlProps extends React.HTMLProps<HTMLElement> {
+export type CarouselControlProps<T = {}> = React.HTMLProps<HTMLElement> & {
     direction: 'prev' | 'next';
     onClickHandler: () => void;
     cssModule?: CSSModule;
     directionText: string;
-}
+} & T;
 
-declare const CarouselControl: React.StatelessComponent<CarouselControlProps>;
+declare class CarouselControl<T = {}> extends React.Component<CarouselControlProps<T>> {}
 export default CarouselControl;
diff --git a/types/reactstrap/lib/CarouselIndicators.d.ts b/types/reactstrap/lib/CarouselIndicators.d.ts
index 8a8ead6c06..34c8c16eef 100644
--- a/types/reactstrap/lib/CarouselIndicators.d.ts
+++ b/types/reactstrap/lib/CarouselIndicators.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CarouselIndicatorsProps extends React.HTMLProps<HTMLElement> {
+export type CarouselIndicatorsProps<T = {}> = React.HTMLProps<HTMLElement> & {
     items: object[];
     activeIndex: number;
     cssModule?: CSSModule;
     onClickHandler: (idx: number) => void;
-}
+} & T;
 
-declare const CarouselIndicators: React.StatelessComponent<CarouselIndicatorsProps>;
+declare class CarouselIndicators<T = {}> extends React.Component<CarouselIndicatorsProps<T>> {}
 export default CarouselIndicators;
diff --git a/types/reactstrap/lib/CarouselItem.d.ts b/types/reactstrap/lib/CarouselItem.d.ts
index 88e93dfcf1..264d093695 100644
--- a/types/reactstrap/lib/CarouselItem.d.ts
+++ b/types/reactstrap/lib/CarouselItem.d.ts
@@ -17,5 +17,5 @@ export interface CarouselItemProps extends React.HTMLProps<HTMLElement>, Transit
     slide?: boolean;
 }
 
-declare class CarouselItem extends React.Component<CarouselItemProps> {}
+declare class CarouselItem<T = {}> extends React.Component<CarouselItemProps> {}
 export default CarouselItem;
diff --git a/types/reactstrap/lib/Col.d.ts b/types/reactstrap/lib/Col.d.ts
index 57829ac931..5e6a3e8ffa 100644
--- a/types/reactstrap/lib/Col.d.ts
+++ b/types/reactstrap/lib/Col.d.ts
@@ -1,3 +1,5 @@
+import * as React from 'react';
+
 export type ColumnProps
   = string
   | boolean
@@ -10,7 +12,7 @@ export type ColumnProps
     order?: string | number
   };
 
-export interface ColProps extends React.HTMLProps<HTMLDivElement> {
+export type ColProps<T = {}> = React.HTMLProps<HTMLDivElement> & {
   tag?: React.ReactType;
   xs?: ColumnProps;
   sm?: ColumnProps;
@@ -20,7 +22,7 @@ export interface ColProps extends React.HTMLProps<HTMLDivElement> {
 
   //custom widths
   widths?: string[];
-}
+} & T;
 
-declare const Col: React.StatelessComponent<ColProps>;
+declare class Col<T = {}> extends React.Component<ColProps<T>> {}
 export default Col;
diff --git a/types/reactstrap/lib/Collapse.d.ts b/types/reactstrap/lib/Collapse.d.ts
index d83ff45666..8123c29b28 100644
--- a/types/reactstrap/lib/Collapse.d.ts
+++ b/types/reactstrap/lib/Collapse.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CollapseProps extends React.HTMLProps<HTMLElement> {
+export type CollapseProps<T = {}> = React.HTMLProps<HTMLElement> & {
   isOpen?: boolean;
   classNames?: string;
   cssModule?: CSSModule;
@@ -18,7 +18,7 @@ export interface CollapseProps extends React.HTMLProps<HTMLElement> {
   onExit?: () => void;
   onExiting?: () => void;
   onExited?: () => void;
-}
+} & T;
 
-declare class Collapse extends React.Component<CollapseProps> {}
+declare class Collapse<T = {}> extends React.Component<CollapseProps<T>> {}
 export default Collapse;
diff --git a/types/reactstrap/lib/Container.d.ts b/types/reactstrap/lib/Container.d.ts
index df2114e773..5497f3e295 100644
--- a/types/reactstrap/lib/Container.d.ts
+++ b/types/reactstrap/lib/Container.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ContainerProps extends React.HTMLAttributes<HTMLElement> {
+export type ContainerProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   fluid?: boolean;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const Container: React.StatelessComponent<ContainerProps>;
+declare class Container<T = {}> extends React.Component<ContainerProps<T>> {}
 export default Container;
diff --git a/types/reactstrap/lib/Dropdown.d.ts b/types/reactstrap/lib/Dropdown.d.ts
index 4d892fff5c..803ece5bf3 100644
--- a/types/reactstrap/lib/Dropdown.d.ts
+++ b/types/reactstrap/lib/Dropdown.d.ts
@@ -7,29 +7,25 @@ export type Direction =
   | "left"
   | "right"
 
-export interface UncontrolledProps extends React.HTMLAttributes<HTMLElement> {
+export type UncontrolledProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   isOpen?: boolean;
   toggle?: () => void;
   className?: string;
   cssModule?: CSSModule;
   nav?: boolean;
   inNavbar?: boolean;
-}
-export interface UncontrolledDropdownProps extends UncontrolledProps {
-  /* intentionally blank */
-}
+} & T;
+export type UncontrolledDropdownProps<T = {}> = UncontrolledProps<T>;
 
-export interface Props extends UncontrolledProps {
+export type Props<T = {}> = UncontrolledProps<T> & {
   disabled?: boolean;
   direction?: Direction;
   group?: boolean;
   size?: string;
   tag?: React.ReactType;
   addonType?: boolean | 'prepend' | 'append';
-}
-export interface DropdownProps extends Props {
-  /* intentionally blank */
-}
+};
+export type DropdownProps<T = {}> = Props<T>;
 
-declare class Dropdown extends React.Component<DropdownProps> {}
+declare class Dropdown<T = {}> extends React.Component<DropdownProps<T>> {}
 export default Dropdown;
diff --git a/types/reactstrap/lib/DropdownItem.d.ts b/types/reactstrap/lib/DropdownItem.d.ts
index 723e4707d4..d6b4344d59 100644
--- a/types/reactstrap/lib/DropdownItem.d.ts
+++ b/types/reactstrap/lib/DropdownItem.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface DropdownItemProps extends React.HTMLAttributes<HTMLElement> {
+export type DropdownItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   disabled?: boolean;
   divider?: boolean;
   tag?: React.ReactType;
@@ -12,7 +12,7 @@ export interface DropdownItemProps extends React.HTMLAttributes<HTMLElement> {
   href?: string;
   toggle?: boolean;
   active?: boolean;
-}
+} & T;
 
-declare class DropdownItem extends React.Component<DropdownItemProps> {}
+declare class DropdownItem<T> extends React.Component<DropdownItemProps<T>> {}
 export default DropdownItem;
diff --git a/types/reactstrap/lib/DropdownMenu.d.ts b/types/reactstrap/lib/DropdownMenu.d.ts
index 8d3cdb6acd..ffb493faa6 100644
--- a/types/reactstrap/lib/DropdownMenu.d.ts
+++ b/types/reactstrap/lib/DropdownMenu.d.ts
@@ -1,12 +1,13 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface DropdownMenuProps extends React.HTMLAttributes<HTMLElement> {
+export type DropdownMenuProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   right?: boolean;
   className?: string;
   cssModule?: CSSModule;
   flip?: boolean;
-}
+} & T;
 
-declare const DropdownMenu: React.StatelessComponent<DropdownMenuProps>;
+declare class DropdownMenu<T = {}> extends React.Component<DropdownMenuProps<T>> {}
 export default DropdownMenu;
diff --git a/types/reactstrap/lib/DropdownToggle.d.ts b/types/reactstrap/lib/DropdownToggle.d.ts
index d02edd50b2..cdb665c6ce 100644
--- a/types/reactstrap/lib/DropdownToggle.d.ts
+++ b/types/reactstrap/lib/DropdownToggle.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface DropdownToggleProps extends React.HTMLAttributes<HTMLElement> {
+export type DropdownToggleProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   caret?: boolean;
   className?: string;
   cssModule?: CSSModule;
@@ -15,7 +15,7 @@ export interface DropdownToggleProps extends React.HTMLAttributes<HTMLElement> {
   nav?: boolean;
   color?: string;
   size?: string;
-}
+} & T;
 
-declare class DropdownToggle extends React.Component<DropdownToggleProps> {}
+declare class DropdownToggle<T> extends React.Component<DropdownToggleProps<T>> {}
 export default DropdownToggle;
diff --git a/types/reactstrap/lib/Fade.d.ts b/types/reactstrap/lib/Fade.d.ts
index 05a13502e1..7e0d4ec775 100644
--- a/types/reactstrap/lib/Fade.d.ts
+++ b/types/reactstrap/lib/Fade.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface FadeProps extends React.HTMLAttributes<HTMLElement> {
+export type FadeProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   in?: boolean;
   baseClass?: string;
   baseClassIn?: string;
@@ -15,7 +16,7 @@ export interface FadeProps extends React.HTMLAttributes<HTMLElement> {
   transitionLeave?: boolean;
   onLeave?: () => void;
   onEnter?: () => void;
-}
+} & T;
 
-declare const Fade: React.StatelessComponent<FadeProps>;
+declare class Fade<T = {}> extends React.Component<FadeProps<T>> {}
 export default Fade;
diff --git a/types/reactstrap/lib/Form.d.ts b/types/reactstrap/lib/Form.d.ts
index 3b6f846d08..2b6668b631 100644
--- a/types/reactstrap/lib/Form.d.ts
+++ b/types/reactstrap/lib/Form.d.ts
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface FormProps extends React.HTMLProps<HTMLFormElement> {
+export type FormProps<T = {}> = React.HTMLProps<HTMLFormElement> & {
   inline?: boolean;
   tag?: React.ReactType;
   innerRef?: React.Ref<HTMLFormElement>;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare class Form extends React.Component<FormProps> {}
+declare class Form<T> extends React.Component<FormProps<T>> {}
 export default Form;
diff --git a/types/reactstrap/lib/FormFeedback.d.ts b/types/reactstrap/lib/FormFeedback.d.ts
index 946aab01d8..78e6f66676 100644
--- a/types/reactstrap/lib/FormFeedback.d.ts
+++ b/types/reactstrap/lib/FormFeedback.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface FormFeedbackProps extends React.HTMLAttributes<HTMLElement> {
+export type FormFeedbackProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: string;
   className?: string;
   cssModule?: CSSModule;
   valid?: boolean;
-}
+} & T;
 
-declare const FormFeedback: React.StatelessComponent<FormFeedbackProps>;
+declare class FormFeedback<T = {}> extends React.Component<FormFeedbackProps<T>> {}
 export default FormFeedback;
diff --git a/types/reactstrap/lib/FormGroup.d.ts b/types/reactstrap/lib/FormGroup.d.ts
index 52c96f3060..b463487e07 100644
--- a/types/reactstrap/lib/FormGroup.d.ts
+++ b/types/reactstrap/lib/FormGroup.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface FormGroupProps extends React.HTMLProps<HTMLDivElement> {
+export type FormGroupProps<T = {}> = React.HTMLProps<HTMLDivElement> & {
   row?: boolean;
   check?: boolean;
   inline?: boolean;
@@ -8,7 +9,7 @@ export interface FormGroupProps extends React.HTMLProps<HTMLDivElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const FormGroup: React.StatelessComponent<FormGroupProps>;
+declare class FormGroup<T = {}> extends React.Component<FormGroupProps<T>> {}
 export default FormGroup;
diff --git a/types/reactstrap/lib/FormText.d.ts b/types/reactstrap/lib/FormText.d.ts
index 99a3675d6b..378b67d8a8 100644
--- a/types/reactstrap/lib/FormText.d.ts
+++ b/types/reactstrap/lib/FormText.d.ts
@@ -1,12 +1,13 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface FormTextProps extends React.HTMLAttributes<HTMLElement> {
+export type FormTextProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   inline?: boolean;
   tag?: React.ReactType;
   color?: string;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const FormText: React.StatelessComponent<FormTextProps>;
+declare class FormText<T = {}> extends React.Component<FormTextProps<T>> {}
 export default FormText;
diff --git a/types/reactstrap/lib/Input.d.ts b/types/reactstrap/lib/Input.d.ts
index 9d160ec2c4..87415b7e10 100644
--- a/types/reactstrap/lib/Input.d.ts
+++ b/types/reactstrap/lib/Input.d.ts
@@ -28,7 +28,7 @@ export type InputType =
   | 'time'
   | 'color';
 
-export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
+export type InputProps<T = {}> = React.InputHTMLAttributes<HTMLInputElement> & {
   type?: InputType;
   bsSize?: 'lg' | 'sm';
   state?: string;
@@ -40,7 +40,7 @@ export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement>
   addon?: boolean;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare class Input extends React.Component<InputProps> {}
+declare class Input<T> extends React.Component<InputProps<T>> {}
 export default Input;
diff --git a/types/reactstrap/lib/InputGroup.d.ts b/types/reactstrap/lib/InputGroup.d.ts
index 468b46f1c5..3a74adb3d8 100644
--- a/types/reactstrap/lib/InputGroup.d.ts
+++ b/types/reactstrap/lib/InputGroup.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface InputGroupProps extends React.HTMLAttributes<HTMLElement> {
+export type InputGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   size?: string;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const InputGroup: React.StatelessComponent<InputGroupProps>;
+declare class InputGroup<T = {}> extends React.Component<InputGroupProps<T>> {}
 export default InputGroup;
diff --git a/types/reactstrap/lib/InputGroupAddon.d.ts b/types/reactstrap/lib/InputGroupAddon.d.ts
index 88b4f678c7..a76ae81a35 100644
--- a/types/reactstrap/lib/InputGroupAddon.d.ts
+++ b/types/reactstrap/lib/InputGroupAddon.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface InputGroupAddonProps extends React.HTMLAttributes<HTMLElement> {
+export type InputGroupAddonProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
   addonType: 'prepend' | 'append';
-}
+} & T;
 
-declare const InputGroupAddon: React.StatelessComponent<InputGroupAddonProps>;
+declare class InputGroupAddon<T = {}> extends React.Component<InputGroupAddonProps<T>> {}
 export default InputGroupAddon;
diff --git a/types/reactstrap/lib/InputGroupButtonDropdown.d.ts b/types/reactstrap/lib/InputGroupButtonDropdown.d.ts
index 32a129d43d..2bd235f1f0 100644
--- a/types/reactstrap/lib/InputGroupButtonDropdown.d.ts
+++ b/types/reactstrap/lib/InputGroupButtonDropdown.d.ts
@@ -1,8 +1,9 @@
+import * as React from 'react';
 import { DropdownProps } from './Dropdown';
 
-export interface InputGroupButtonDropdownProps extends DropdownProps {
+export type InputGroupButtonDropdownProps<T = {}> = DropdownProps & {
     addonType: 'prepend' | 'append';
-}
+} & T;
 
-declare const InputGroupButtonDropdown: React.StatelessComponent<InputGroupButtonDropdownProps>;
+declare class InputGroupButtonDropdown<T = {}> extends React.Component<InputGroupButtonDropdownProps<T>> {}
 export default InputGroupButtonDropdown;
diff --git a/types/reactstrap/lib/InputGroupText.d.ts b/types/reactstrap/lib/InputGroupText.d.ts
index 356babe8f4..e8b5a7acfc 100644
--- a/types/reactstrap/lib/InputGroupText.d.ts
+++ b/types/reactstrap/lib/InputGroupText.d.ts
@@ -1,9 +1,10 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface InputGroupTextProps extends React.HTMLAttributes<HTMLElement>  {
+export type InputGroupTextProps<T = {}> = React.HTMLAttributes<HTMLElement>  & {
   tag?: React.ReactType;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const InputGroupText: React.StatelessComponent<InputGroupTextProps>;
+declare class InputGroupText<T = {}> extends React.Component<InputGroupTextProps<T>> {}
 export default InputGroupText;
diff --git a/types/reactstrap/lib/Jumbotron.d.ts b/types/reactstrap/lib/Jumbotron.d.ts
index 9145e73223..8b4fc45652 100644
--- a/types/reactstrap/lib/Jumbotron.d.ts
+++ b/types/reactstrap/lib/Jumbotron.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface JumbotronProps extends React.HTMLAttributes<HTMLElement> {
+export type JumbotronProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   fluid?: boolean;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const Jumbotron: React.StatelessComponent<JumbotronProps>;
+declare class Jumbotron<T = {}> extends React.Component<JumbotronProps<T>> {}
 export default Jumbotron;
diff --git a/types/reactstrap/lib/Label.d.ts b/types/reactstrap/lib/Label.d.ts
index ae73e100f4..5669a63bad 100644
--- a/types/reactstrap/lib/Label.d.ts
+++ b/types/reactstrap/lib/Label.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 import { ColumnProps } from './Col';
 
-interface Intermediate extends React.LabelHTMLAttributes<HTMLLabelElement> {
+type Intermediate = React.LabelHTMLAttributes<HTMLLabelElement> & {
   size?: any;
-}
+};
 
-export interface LabelProps extends Intermediate {
+export type LabelProps<T = {}> = Intermediate & {
   hidden?: boolean;
   check?: boolean;
   inline?: boolean;
@@ -20,7 +21,7 @@ export interface LabelProps extends Intermediate {
   md?: ColumnProps;
   lg?: ColumnProps;
   xl?: ColumnProps;
-}
+} & T;
 
-declare const Label: React.StatelessComponent<LabelProps>;
+declare class Label<T = {}> extends React.Component<LabelProps<T>> {}
 export default Label;
diff --git a/types/reactstrap/lib/ListGroup.d.ts b/types/reactstrap/lib/ListGroup.d.ts
index e9cb511cf0..2c69fcf294 100644
--- a/types/reactstrap/lib/ListGroup.d.ts
+++ b/types/reactstrap/lib/ListGroup.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ListGroupProps extends React.HTMLAttributes<HTMLElement> {
+export type ListGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   flush?: boolean;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const ListGroup: React.StatelessComponent<ListGroupProps>;
+declare class ListGroup<T = {}> extends React.Component<ListGroupProps<T>> {}
 export default ListGroup;
diff --git a/types/reactstrap/lib/ListGroupItem.d.ts b/types/reactstrap/lib/ListGroupItem.d.ts
index 045aa9539e..3d4553aa7b 100644
--- a/types/reactstrap/lib/ListGroupItem.d.ts
+++ b/types/reactstrap/lib/ListGroupItem.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ListGroupItemProps extends React.HTMLAttributes<HTMLElement> {
+export type ListGroupItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   active?: boolean;
   disabled?: boolean;
@@ -11,7 +12,7 @@ export interface ListGroupItemProps extends React.HTMLAttributes<HTMLElement> {
   href?: string;
 
   onClick?: React.MouseEventHandler<any>;
-}
+} & T;
 
-declare const ListGroupItem: React.StatelessComponent<ListGroupItemProps>;
+declare class ListGroupItem<T = {}> extends React.Component<ListGroupItemProps<T>> {}
 export default ListGroupItem;
diff --git a/types/reactstrap/lib/ListGroupItemHeading.d.ts b/types/reactstrap/lib/ListGroupItemHeading.d.ts
index 09e29f9434..c4f04e0330 100644
--- a/types/reactstrap/lib/ListGroupItemHeading.d.ts
+++ b/types/reactstrap/lib/ListGroupItemHeading.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ListGroupItemHeadingProps extends React.HTMLAttributes<HTMLElement> {
+export type ListGroupItemHeadingProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const ListGroupItemHeading: React.StatelessComponent<ListGroupItemHeadingProps>;
+declare class ListGroupItemHeading<T = {}> extends React.Component<ListGroupItemHeadingProps<T>> {}
 export default ListGroupItemHeading;
diff --git a/types/reactstrap/lib/ListGroupItemText.d.ts b/types/reactstrap/lib/ListGroupItemText.d.ts
index 947ee4cd7a..6fa1153ae2 100644
--- a/types/reactstrap/lib/ListGroupItemText.d.ts
+++ b/types/reactstrap/lib/ListGroupItemText.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ListGroupItemTextProps extends React.HTMLAttributes<HTMLElement> {
+export type ListGroupItemTextProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const ListGroupItemText: React.StatelessComponent<ListGroupItemTextProps>;
+declare class ListGroupItemText<T = {}> extends React.Component<ListGroupItemTextProps<T>> {}
 export default ListGroupItemText;
diff --git a/types/reactstrap/lib/Media.d.ts b/types/reactstrap/lib/Media.d.ts
index f7a9afb2c0..b64eeffd7f 100644
--- a/types/reactstrap/lib/Media.d.ts
+++ b/types/reactstrap/lib/Media.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface MediaProps extends React.HTMLAttributes<HTMLElement> {
+export type MediaProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   body?: boolean;
   bottom?: boolean;
   className?: string;
@@ -15,7 +16,7 @@ export interface MediaProps extends React.HTMLAttributes<HTMLElement> {
   top?: boolean;
   href?: string;
   alt?: string;
-}
+} & T;
 
-declare const Media: React.StatelessComponent<MediaProps>;
+declare class Media<T = {}> extends React.Component<MediaProps<T>> {}
 export default Media;
diff --git a/types/reactstrap/lib/Modal.d.ts b/types/reactstrap/lib/Modal.d.ts
index 1049ec7918..f2761bbc91 100644
--- a/types/reactstrap/lib/Modal.d.ts
+++ b/types/reactstrap/lib/Modal.d.ts
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 import { FadeProps } from './Fade';
 
-export interface ModalProps extends React.HTMLAttributes<HTMLElement> {
+export type ModalProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   isOpen?: boolean;
   autoFocus?: boolean;
   size?: string;
@@ -27,7 +27,7 @@ export interface ModalProps extends React.HTMLAttributes<HTMLElement> {
   external?: React.ReactNode;
   labelledBy?: string;
   role?: string;
-}
+} & T;
 
-declare class Modal extends React.Component<ModalProps> {}
+declare class Modal<T> extends React.Component<ModalProps<T>> {}
 export default Modal;
diff --git a/types/reactstrap/lib/ModalBody.d.ts b/types/reactstrap/lib/ModalBody.d.ts
index 083ac04186..4817e64bf4 100644
--- a/types/reactstrap/lib/ModalBody.d.ts
+++ b/types/reactstrap/lib/ModalBody.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ModalBodyProps extends React.HTMLAttributes<HTMLElement> {
+export type ModalBodyProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const ModalBody: React.StatelessComponent<ModalBodyProps>;
+declare class ModalBody<T = {}> extends React.Component<ModalBodyProps<T>> {}
 export default ModalBody;
diff --git a/types/reactstrap/lib/ModalFooter.d.ts b/types/reactstrap/lib/ModalFooter.d.ts
index 40ed54f9ae..7997d6931a 100644
--- a/types/reactstrap/lib/ModalFooter.d.ts
+++ b/types/reactstrap/lib/ModalFooter.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ModalFooterProps extends React.HTMLAttributes<HTMLElement> {
+export type ModalFooterProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const ModalFooter: React.StatelessComponent<ModalFooterProps>;
+declare class ModalFooter<T = {}> extends React.Component<ModalFooterProps<T>> {}
 export default ModalFooter;
diff --git a/types/reactstrap/lib/ModalHeader.d.ts b/types/reactstrap/lib/ModalHeader.d.ts
index c1a3e55b7a..9e37201941 100644
--- a/types/reactstrap/lib/ModalHeader.d.ts
+++ b/types/reactstrap/lib/ModalHeader.d.ts
@@ -1,12 +1,13 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ModalHeaderProps extends React.HTMLAttributes<HTMLElement> {
+export type ModalHeaderProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
   wrapTag?: React.ReactType;
   toggle?: () => void;
-}
+} & T;
 
-declare const ModalHeader: React.StatelessComponent<ModalHeaderProps>;
+declare class ModalHeader<T = {}> extends React.Component<ModalHeaderProps<T>> {}
 export default ModalHeader;
diff --git a/types/reactstrap/lib/Nav.d.ts b/types/reactstrap/lib/Nav.d.ts
index d96ab6e5d6..6868b01665 100644
--- a/types/reactstrap/lib/Nav.d.ts
+++ b/types/reactstrap/lib/Nav.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface NavProps extends React.HTMLProps<HTMLUListElement> {
+export type NavProps<T = {}> = React.HTMLProps<HTMLUListElement> & {
   tabs?: boolean;
   pills?: boolean;
   vertical?: boolean | string;
@@ -12,7 +13,7 @@ export interface NavProps extends React.HTMLProps<HTMLUListElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const Nav: React.StatelessComponent<NavProps>;
+declare class Nav<T = {}> extends React.Component<NavProps<T>> {}
 export default Nav;
diff --git a/types/reactstrap/lib/NavItem.d.ts b/types/reactstrap/lib/NavItem.d.ts
index e42e4c8e5e..969369bfee 100644
--- a/types/reactstrap/lib/NavItem.d.ts
+++ b/types/reactstrap/lib/NavItem.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface NavItemProps extends React.HTMLAttributes<HTMLElement> {
+export type NavItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   active?: boolean;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const NavItem: React.StatelessComponent<NavItemProps>;
+declare class NavItem<T = {}> extends React.Component<NavItemProps<T>> {}
 export default NavItem;
diff --git a/types/reactstrap/lib/NavLink.d.ts b/types/reactstrap/lib/NavLink.d.ts
index 0fdfdec641..4e88666c22 100644
--- a/types/reactstrap/lib/NavLink.d.ts
+++ b/types/reactstrap/lib/NavLink.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface NavLinkProps extends React.HTMLProps<HTMLAnchorElement> {
+export type NavLinkProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
   tag?: React.ReactType;
   innerRef?: React.Ref<HTMLAnchorElement>;
   disabled?: boolean;
@@ -10,7 +10,7 @@ export interface NavLinkProps extends React.HTMLProps<HTMLAnchorElement> {
   cssModule?: CSSModule;
   onClick?: React.MouseEventHandler<any>;
   href?: string;
-}
+} & T;
 
-declare class NavLink extends React.Component<NavLinkProps> {}
+declare class NavLink<T> extends React.Component<NavLinkProps<T>> {}
 export default NavLink;
diff --git a/types/reactstrap/lib/Navbar.d.ts b/types/reactstrap/lib/Navbar.d.ts
index 83e720731a..39d7340d79 100644
--- a/types/reactstrap/lib/Navbar.d.ts
+++ b/types/reactstrap/lib/Navbar.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface NavbarProps extends React.HTMLAttributes<HTMLElement> {
+export type NavbarProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   light?: boolean;
   dark?: boolean;
   inverse?: boolean;
@@ -14,7 +15,7 @@ export interface NavbarProps extends React.HTMLAttributes<HTMLElement> {
   cssModule?: CSSModule;
   toggleable?: boolean | string;
   expand?: boolean | string;
-}
+} & T;
 
-declare const Navbar: React.StatelessComponent<NavbarProps>;
+declare class Navbar<T = {}> extends React.Component<NavbarProps<T>> {}
 export default Navbar;
diff --git a/types/reactstrap/lib/NavbarBrand.d.ts b/types/reactstrap/lib/NavbarBrand.d.ts
index 83ac8367b5..f7a814b31b 100644
--- a/types/reactstrap/lib/NavbarBrand.d.ts
+++ b/types/reactstrap/lib/NavbarBrand.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface NavbarBrandProps extends React.HTMLProps<HTMLAnchorElement> {
+export type NavbarBrandProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const NavbarBrand: React.StatelessComponent<NavbarBrandProps>;
+declare class NavbarBrand<T = {}> extends React.Component<NavbarBrandProps<T>> {}
 export default NavbarBrand;
diff --git a/types/reactstrap/lib/NavbarToggler.d.ts b/types/reactstrap/lib/NavbarToggler.d.ts
index 542b671d28..b3dbedb20f 100644
--- a/types/reactstrap/lib/NavbarToggler.d.ts
+++ b/types/reactstrap/lib/NavbarToggler.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface NavbarTogglerProps extends React.HTMLProps<HTMLAnchorElement> {
+export type NavbarTogglerProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
   tag?: React.ReactType;
   type?: string;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const NavbarToggler: React.StatelessComponent<NavbarTogglerProps>;
+declare class NavbarToggler<T = {}> extends React.Component<NavbarTogglerProps<T>> {}
 export default NavbarToggler;
diff --git a/types/reactstrap/lib/Pagination.d.ts b/types/reactstrap/lib/Pagination.d.ts
index 9dabaf8829..15f30547b7 100644
--- a/types/reactstrap/lib/Pagination.d.ts
+++ b/types/reactstrap/lib/Pagination.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface PaginationProps extends React.HTMLAttributes<HTMLElement> {
+export type PaginationProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   className?: string;
   cssModule?: CSSModule;
   size?: string;
-}
+} & T;
 
-declare const Pagination: React.StatelessComponent<PaginationProps>;
+declare class Pagination<T = {}> extends React.Component<PaginationProps<T>> {}
 export default Pagination;
diff --git a/types/reactstrap/lib/PaginationItem.d.ts b/types/reactstrap/lib/PaginationItem.d.ts
index a00fddc413..b555239371 100644
--- a/types/reactstrap/lib/PaginationItem.d.ts
+++ b/types/reactstrap/lib/PaginationItem.d.ts
@@ -1,12 +1,13 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface PaginationItemProps extends React.HTMLAttributes<HTMLElement> {
+export type PaginationItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   className?: string;
   cssModule?: CSSModule;
   active?: boolean;
   disabled?: boolean;
   tag?: React.ReactType;
-}
+} & T;
 
-declare const PaginationItem: React.StatelessComponent<PaginationItemProps>;
+declare class PaginationItem<T = {}> extends React.Component<PaginationItemProps<T>> {}
 export default PaginationItem;
diff --git a/types/reactstrap/lib/PaginationLink.d.ts b/types/reactstrap/lib/PaginationLink.d.ts
index 52fbc6353a..90ea909d4e 100644
--- a/types/reactstrap/lib/PaginationLink.d.ts
+++ b/types/reactstrap/lib/PaginationLink.d.ts
@@ -1,13 +1,14 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface PaginationLinkProps extends React.HTMLProps<HTMLAnchorElement> {
+export type PaginationLinkProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
   'aria-label'?: string;
   className?: string;
   cssModule?: CSSModule;
   next?: boolean;
   previous?: boolean;
   tag?: React.ReactType;
-}
+} & T;
 
-declare const PaginationLink: React.StatelessComponent<PaginationLinkProps>;
+declare class PaginationLink<T = {}> extends React.Component<PaginationLinkProps<T>> {}
 export default PaginationLink;
diff --git a/types/reactstrap/lib/Popover.d.ts b/types/reactstrap/lib/Popover.d.ts
index e1ef254ee2..d1a0d56127 100644
--- a/types/reactstrap/lib/Popover.d.ts
+++ b/types/reactstrap/lib/Popover.d.ts
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 import { Popper } from './Popper';
 
-export interface PopoverProps extends React.HTMLAttributes<HTMLElement> {
+export type PopoverProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   isOpen?: boolean;
   toggle?: () => void;
   target: string | HTMLElement;
@@ -16,7 +16,7 @@ export interface PopoverProps extends React.HTMLAttributes<HTMLElement> {
   delay?: number | {show: number, hide: number};
   modifiers?: Popper.Modifiers;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare class Popover extends React.Component<PopoverProps> {}
+declare class Popover<T> extends React.Component<PopoverProps<T>> {}
 export default Popover;
diff --git a/types/reactstrap/lib/PopoverBody.d.ts b/types/reactstrap/lib/PopoverBody.d.ts
index bf67919e49..d5a3d6732f 100644
--- a/types/reactstrap/lib/PopoverBody.d.ts
+++ b/types/reactstrap/lib/PopoverBody.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface PopoverBodyProps extends React.HTMLAttributes<HTMLElement> {
+export type PopoverBodyProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const PopoverBody: React.StatelessComponent<PopoverBodyProps>;
+declare class PopoverBody<T = {}> extends React.Component<PopoverBodyProps<T>> {}
 export default PopoverBody;
diff --git a/types/reactstrap/lib/PopoverHeader.d.ts b/types/reactstrap/lib/PopoverHeader.d.ts
index caa0847233..7033dc90f8 100644
--- a/types/reactstrap/lib/PopoverHeader.d.ts
+++ b/types/reactstrap/lib/PopoverHeader.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface PopoverHeaderProps extends React.HTMLAttributes<HTMLElement> {
+export type PopoverHeaderProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const PopoverHeader: React.StatelessComponent<PopoverHeaderProps>;
+declare class PopoverHeader<T = {}> extends React.Component<PopoverHeaderProps<T>> {}
 export default PopoverHeader;
diff --git a/types/reactstrap/lib/Progress.d.ts b/types/reactstrap/lib/Progress.d.ts
index 6f252622a1..4bd99ab690 100644
--- a/types/reactstrap/lib/Progress.d.ts
+++ b/types/reactstrap/lib/Progress.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface ProgressProps extends React.HTMLAttributes<HTMLElement> {
+export type ProgressProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   bar?: boolean;
   multi?: boolean;
   tag?: string;
@@ -12,7 +12,7 @@ export interface ProgressProps extends React.HTMLAttributes<HTMLElement> {
   className?: string;
   cssModule?: CSSModule;
   barClassName?: string;
-}
+} & T;
 
-declare const Progress: React.StatelessComponent<ProgressProps>;
+declare class Progress<T = {}> extends React.Component<ProgressProps<T>> {};
 export default Progress;
diff --git a/types/reactstrap/lib/Row.d.ts b/types/reactstrap/lib/Row.d.ts
index 35284a9f70..d430e336e0 100644
--- a/types/reactstrap/lib/Row.d.ts
+++ b/types/reactstrap/lib/Row.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface RowProps extends React.HTMLProps<HTMLElement> {
+export type RowProps<T = {}> = React.HTMLProps<HTMLElement> & {
   className?: string;
   cssModule?: CSSModule;
   tag?: React.ReactType;
   noGutters?: boolean;
-}
+} & T;
 
-declare const Row: React.StatelessComponent<RowProps>;
+declare class Row<T = {}> extends React.Component<RowProps<T>> {}
 export default Row;
diff --git a/types/reactstrap/lib/TabContent.d.ts b/types/reactstrap/lib/TabContent.d.ts
index 46bf48d079..6597484f9e 100644
--- a/types/reactstrap/lib/TabContent.d.ts
+++ b/types/reactstrap/lib/TabContent.d.ts
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface TabContentProps extends React.HTMLAttributes<HTMLElement> {
+export type TabContentProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   activeTab?: number | string;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare class TabContent extends React.Component<TabContentProps> {}
+declare class TabContent<T> extends React.Component<TabContentProps<T>> {}
 export default TabContent;
diff --git a/types/reactstrap/lib/TabPane.d.ts b/types/reactstrap/lib/TabPane.d.ts
index 0bcbfd5d17..1472fe28b7 100644
--- a/types/reactstrap/lib/TabPane.d.ts
+++ b/types/reactstrap/lib/TabPane.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface TabPaneProps extends React.HTMLAttributes<HTMLElement> {
+export type TabPaneProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
   tabId?: number | string;
-}
+} & T;
 
-declare const TabPane: React.StatelessComponent<TabPaneProps>;
+declare class TabPane<T = {}> extends React.Component<TabPaneProps<T>> {}
 export default TabPane;
diff --git a/types/reactstrap/lib/Table.d.ts b/types/reactstrap/lib/Table.d.ts
index 0374d7a0b5..3ad14b8c0a 100644
--- a/types/reactstrap/lib/Table.d.ts
+++ b/types/reactstrap/lib/Table.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface TableProps extends React.HTMLAttributes<HTMLElement> {
+export type TableProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   className?: string;
   cssModule?: CSSModule;
   size?: string;
@@ -12,7 +13,7 @@ export interface TableProps extends React.HTMLAttributes<HTMLElement> {
   responsive?: boolean;
   tag?: React.ReactType;
   responsiveTag?: React.ReactType;
-}
+} & T;
 
-declare const Table: React.StatelessComponent<TableProps>;
+declare class Table<T = {}> extends React.Component<TableProps<T>> {}
 export default Table;
diff --git a/types/reactstrap/lib/Tag.d.ts b/types/reactstrap/lib/Tag.d.ts
index 49df70b240..ea09231942 100644
--- a/types/reactstrap/lib/Tag.d.ts
+++ b/types/reactstrap/lib/Tag.d.ts
@@ -1,12 +1,13 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface TagProps extends React.HTMLAttributes<HTMLElement> {
+export type TagProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   color?: string;
   pill?: boolean;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const Tag: React.StatelessComponent<TagProps>;
+declare class Tag<T = {}> extends React.Component<TagProps<T>> {}
 export default Tag;
diff --git a/types/reactstrap/lib/Tooltip.d.ts b/types/reactstrap/lib/Tooltip.d.ts
index 9c79c8a6d3..5cfcfcab1e 100644
--- a/types/reactstrap/lib/Tooltip.d.ts
+++ b/types/reactstrap/lib/Tooltip.d.ts
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 import {Popper} from './Popper';
 
-export interface UncontrolledProps extends React.HTMLAttributes<HTMLElement> {
+export type UncontrolledProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   target: string | HTMLElement;
   container?: string | HTMLElement;
   delay?: number | {show: number, hide: number};
@@ -12,15 +12,13 @@ export interface UncontrolledProps extends React.HTMLAttributes<HTMLElement> {
   placement?: Popper.Placement;
   modifiers?: Popper.Modifiers;
   cssModule?: CSSModule;
-}
-export interface UncontrolledTooltipProps extends UncontrolledProps {
-  /* intentionally blank */
-}
+} & T;
+export type UncontrolledTooltipProps<T = {}> = UncontrolledProps<T>;
 
-export interface TooltipProps extends UncontrolledTooltipProps {
+export type TooltipProps<T = {}> = UncontrolledTooltipProps<T> & {
   toggle?: () => void;
   isOpen?: boolean;
-}
+};
 
-declare class Tooltip extends React.Component<TooltipProps> {}
+declare class Tooltip<T> extends React.Component<TooltipProps<T>> {}
 export default Tooltip;
diff --git a/types/reactstrap/lib/Uncontrolled.d.ts b/types/reactstrap/lib/Uncontrolled.d.ts
index d7aed3962f..f54652710c 100644
--- a/types/reactstrap/lib/Uncontrolled.d.ts
+++ b/types/reactstrap/lib/Uncontrolled.d.ts
@@ -5,10 +5,10 @@ import { UncontrolledButtonDropdownProps } from './ButtonDropdown';
 import { UncontrolledDropdownProps       } from './Dropdown';
 import { UncontrolledTooltipProps        } from './Tooltip';
 
-export class UncontrolledAlert extends React.Component<UncontrolledAlertProps> {}
-export class UncontrolledButtonDropdown extends React.Component<UncontrolledButtonDropdownProps> {}
-export class UncontrolledDropdown extends React.Component<UncontrolledDropdownProps> {}
-export class UncontrolledTooltip extends React.Component<UncontrolledTooltipProps> {}
+export class UncontrolledAlert<T = {}> extends React.Component<UncontrolledAlertProps<T>> {}
+export class UncontrolledButtonDropdown<T = {}> extends React.Component<UncontrolledButtonDropdownProps<T>> {}
+export class UncontrolledDropdown<T = {}> extends React.Component<UncontrolledDropdownProps<T>> {}
+export class UncontrolledTooltip<T = {}> extends React.Component<UncontrolledTooltipProps<T>> {}
 
 export { UncontrolledAlertProps          } from './Alert';
 export { UncontrolledButtonDropdownProps } from './ButtonDropdown';
diff --git a/types/reactstrap/reactstrap-tests.tsx b/types/reactstrap/reactstrap-tests.tsx
index 959ac2658b..770cb01fa1 100644
--- a/types/reactstrap/reactstrap-tests.tsx
+++ b/types/reactstrap/reactstrap-tests.tsx
@@ -350,7 +350,7 @@ class Example15 extends React.Component<any, any> {
           <DropdownItem disabled>Action</DropdownItem>
           <DropdownItem>Another Action</DropdownItem>
           <DropdownItem divider />
-          <DropdownItem onClick={event => {
+          <DropdownItem onClick={(event: React.MouseEvent<HTMLElement>) => {
             // something happens here
           }}>Another Action</DropdownItem>
         </DropdownMenu>

From f2397a48a68851e73b20c31928c6b028aa3a340c Mon Sep 17 00:00:00 2001
From: Abruzzi <abruzzi.hraig@gmail.com>
Date: Tue, 29 May 2018 14:55:38 +1000
Subject: [PATCH 479/575] Add props to the property 'component' of
 TransitionGroup from itself

---
 .../react-transition-group/TransitionGroup.d.ts  |  1 +
 .../react-transition-group-tests.tsx             | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/types/react-transition-group/TransitionGroup.d.ts b/types/react-transition-group/TransitionGroup.d.ts
index 13e8daf228..d863f0eb34 100644
--- a/types/react-transition-group/TransitionGroup.d.ts
+++ b/types/react-transition-group/TransitionGroup.d.ts
@@ -14,6 +14,7 @@ declare namespace TransitionGroup {
         (IntrinsicTransitionGroupProps<T> & JSX.IntrinsicElements[T]) | (ComponentTransitionGroupProps<V>) & {
         children?: ReactElement<TransitionProps> | Array<ReactElement<TransitionProps>>;
         childFactory?(child: ReactElement<any>): ReactElement<any>;
+        [prop: string]: any;
     };
 }
 
diff --git a/types/react-transition-group/react-transition-group-tests.tsx b/types/react-transition-group/react-transition-group-tests.tsx
index 32d4168e83..95a86ce5b4 100644
--- a/types/react-transition-group/react-transition-group-tests.tsx
+++ b/types/react-transition-group/react-transition-group-tests.tsx
@@ -4,6 +4,19 @@ import Transition, { UNMOUNTED, EXITED, ENTERING, ENTERED, EXITING } from "react
 import TransitionGroup = require("react-transition-group/TransitionGroup");
 import Components = require("react-transition-group");
 
+interface IContainerProps {
+    theme: string;
+    children?: Element[];
+}
+
+const Container: React.StatelessComponent<IContainerProps> = (props: IContainerProps) => {
+    return (
+        <div data-theme={props.theme}>
+            {props.children}
+        </div>
+    );
+}
+
 const Test: React.StatelessComponent = () => {
     function handleEnter(node: HTMLElement, isAppearing: boolean) {}
 
@@ -15,7 +28,8 @@ const Test: React.StatelessComponent = () => {
 
     return (
         <TransitionGroup
-            component="ul"
+            component={Container}
+            theme="test"
             className="animated-list"
             childFactory={ (child: React.ReactElement<any>) => child }
         >

From 1a53ccde52a67d23f2975e29983e3814bbd6068f Mon Sep 17 00:00:00 2001
From: Jeremy Nagel <jnagel@cozero.com.au>
Date: Tue, 29 May 2018 15:22:15 +1000
Subject: [PATCH 480/575] [BUGFIX] Lambda callbacks support string errors

 As per https://docs.aws.amazon.com/apigateway/latest/developerguide/handle-errors-in-lambda-integration.html
---
 types/aws-lambda/aws-lambda-tests.ts | 1 +
 types/aws-lambda/index.d.ts          | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/types/aws-lambda/aws-lambda-tests.ts b/types/aws-lambda/aws-lambda-tests.ts
index ea51d25770..d3e630ddf1 100644
--- a/types/aws-lambda/aws-lambda-tests.ts
+++ b/types/aws-lambda/aws-lambda-tests.ts
@@ -504,6 +504,7 @@ function callback(cb: AWSLambda.Callback) {
     cb();
     cb(null);
     cb(error);
+    cb(str); // https://docs.aws.amazon.com/apigateway/latest/developerguide/handle-errors-in-lambda-integration.html
     cb(null, anyObj);
     cb(null, bool);
     cb(null, str);
diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index 4b62269902..dd3fd3bd4e 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -18,6 +18,7 @@
 //                 David Hayden <https://github.com/Haydabase>
 //                 Chris Redekop <https://github.com/repl-chris>
 //                 Aneil Mallavarapu <https://github.com/aneilbaboo>
+//                 Jeremy Nagel <https://github.com/jeznag>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -661,9 +662,11 @@ export type Handler<TEvent = any, TResult = any> = (
  * http://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-handler.html
  *
  * @param error – an optional parameter that you can use to provide results of the failed Lambda function execution.
+ *                It can be a string for Lambda Proxy Integrations
+ *                https://docs.aws.amazon.com/apigateway/latest/developerguide/handle-errors-in-lambda-integration.html
  * @param result – an optional parameter that you can use to provide the result of a successful function execution. The result provided must be JSON.stringify compatible.
  */
-export type Callback<TResult = any> = (error?: Error | null, result?: TResult) => void;
+export type Callback<TResult = any> = (error?: Error | null | string, result?: TResult) => void;
 
 // Begin defining Handler and Callback types for each API trigger type.
 // Ordered by https://docs.aws.amazon.com/lambda/latest/dg/invoking-lambda-function.html

From 2ead492827f52a33a28df07f1db4912a92a5ae5c Mon Sep 17 00:00:00 2001
From: Abruzzi <abruzzi.hraig@gmail.com>
Date: Tue, 29 May 2018 16:26:59 +1000
Subject: [PATCH 481/575] [react-transition-group]: fix as the require of
 tslint

---
 .../react-transition-group/react-transition-group-tests.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/react-transition-group/react-transition-group-tests.tsx b/types/react-transition-group/react-transition-group-tests.tsx
index 95a86ce5b4..1441027481 100644
--- a/types/react-transition-group/react-transition-group-tests.tsx
+++ b/types/react-transition-group/react-transition-group-tests.tsx
@@ -4,18 +4,18 @@ import Transition, { UNMOUNTED, EXITED, ENTERING, ENTERED, EXITING } from "react
 import TransitionGroup = require("react-transition-group/TransitionGroup");
 import Components = require("react-transition-group");
 
-interface IContainerProps {
+interface ContainerProps {
     theme: string;
     children?: Element[];
 }
 
-const Container: React.StatelessComponent<IContainerProps> = (props: IContainerProps) => {
+const Container: React.StatelessComponent<ContainerProps> = (props: ContainerProps) => {
     return (
         <div data-theme={props.theme}>
             {props.children}
         </div>
     );
-}
+};
 
 const Test: React.StatelessComponent = () => {
     function handleEnter(node: HTMLElement, isAppearing: boolean) {}

From 06d4fb008df172db161f1f262eebb723bd3c2af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Wachter?= <hello@andrewachter.de>
Date: Tue, 22 May 2018 11:02:22 +0200
Subject: [PATCH 482/575] [node]: Improve Buffer/Uint8Array interoperability

---
 types/node/index.d.ts    | 16 ++++++++--------
 types/node/v9/index.d.ts | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 9a9fc544e2..eb8a180685 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -263,9 +263,9 @@ interface Buffer extends Uint8Array {
     write(string: string, offset?: number, length?: number, encoding?: string): number;
     toString(encoding?: string, start?: number, end?: number): string;
     toJSON(): { type: 'Buffer', data: any[] };
-    equals(otherBuffer: Buffer): boolean;
-    compare(otherBuffer: Buffer, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
-    copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
+    equals(otherBuffer: Uint8Array): boolean;
+    compare(otherBuffer: Uint8Array, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
+    copy(targetBuffer: Uint8Array, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
     slice(start?: number, end?: number): Buffer;
     writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
     writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
@@ -307,8 +307,8 @@ interface Buffer extends Uint8Array {
     writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
     writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
     fill(value: any, offset?: number, end?: number): this;
-    indexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
-    lastIndexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
+    indexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: string): number;
+    lastIndexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: string): number;
     entries(): IterableIterator<[number, number]>;
     includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean;
     keys(): IterableIterator<number>;
@@ -380,7 +380,7 @@ declare var Buffer: {
      * Creates a new Buffer using the passed {data}
      * @param data data to create a new Buffer
      */
-    from(data: any[] | string | Buffer | ArrayBuffer | Uint8Array /*| TypedArray*/): Buffer;
+    from(data: any[] | string | ArrayBuffer | Uint8Array /*| TypedArray*/): Buffer;
     /**
      * Creates a new Buffer containing the given JavaScript string {str}.
      * If provided, the {encoding} parameter identifies the character encoding.
@@ -419,11 +419,11 @@ declare var Buffer: {
      * @param totalLength Total length of the buffers when concatenated.
      *   If totalLength is not provided, it is read from the buffers in the list. However, this adds an additional loop to the function, so it is faster to provide the length explicitly.
      */
-    concat(list: Buffer[], totalLength?: number): Buffer;
+    concat(list: Uint8Array[], totalLength?: number): Buffer;
     /**
      * The same as buf1.compare(buf2).
      */
-    compare(buf1: Buffer, buf2: Buffer): number;
+    compare(buf1: Uint8Array, buf2: Uint8Array): number;
     /**
      * Allocates a new buffer of {size} octets.
      *
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index a7fea9c48e..62cf6b568c 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -262,9 +262,9 @@ interface Buffer extends Uint8Array {
     write(string: string, offset?: number, length?: number, encoding?: string): number;
     toString(encoding?: string, start?: number, end?: number): string;
     toJSON(): { type: 'Buffer', data: any[] };
-    equals(otherBuffer: Buffer): boolean;
-    compare(otherBuffer: Buffer, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
-    copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
+    equals(otherBuffer: Uint8Array): boolean;
+    compare(otherBuffer: Uint8Array, targetStart?: number, targetEnd?: number, sourceStart?: number, sourceEnd?: number): number;
+    copy(targetBuffer: Uint8Array, targetStart?: number, sourceStart?: number, sourceEnd?: number): number;
     slice(start?: number, end?: number): Buffer;
     writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
     writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number;
@@ -306,8 +306,8 @@ interface Buffer extends Uint8Array {
     writeDoubleLE(value: number, offset: number, noAssert?: boolean): number;
     writeDoubleBE(value: number, offset: number, noAssert?: boolean): number;
     fill(value: any, offset?: number, end?: number): this;
-    indexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
-    lastIndexOf(value: string | number | Buffer, byteOffset?: number, encoding?: string): number;
+    indexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: string): number;
+    lastIndexOf(value: string | number | Uint8Array, byteOffset?: number, encoding?: string): number;
     entries(): IterableIterator<[number, number]>;
     includes(value: string | number | Buffer, byteOffset?: number, encoding?: string): boolean;
     keys(): IterableIterator<number>;
@@ -412,11 +412,11 @@ declare var Buffer: {
      * @param totalLength Total length of the buffers when concatenated.
      *   If totalLength is not provided, it is read from the buffers in the list. However, this adds an additional loop to the function, so it is faster to provide the length explicitly.
      */
-    concat(list: Buffer[], totalLength?: number): Buffer;
+    concat(list: Uint8Array[], totalLength?: number): Buffer;
     /**
      * The same as buf1.compare(buf2).
      */
-    compare(buf1: Buffer, buf2: Buffer): number;
+    compare(buf1: Uint8Array, buf2: Uint8Array): number;
     /**
      * Allocates a new buffer of {size} octets.
      *

From 518692b1e446c853587e94735fae7a8225ece027 Mon Sep 17 00:00:00 2001
From: Trev Cobbett <trevor.cobbett@madgex.com>
Date: Tue, 29 May 2018 12:56:15 +0100
Subject: [PATCH 483/575] Adding in generic arguments into promise-retry

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

diff --git a/types/promise-retry/index.d.ts b/types/promise-retry/index.d.ts
index e31fe3a657..9257c08404 100644
--- a/types/promise-retry/index.d.ts
+++ b/types/promise-retry/index.d.ts
@@ -14,7 +14,7 @@ import { WrapOptions } from "retry";
  * @param attempt The number of the attempt.
  * @returns A Promise for anything (eg. a HTTP response).
  */
-type RetryableFn = ((retry: (error: any) => never, attempt: number) => Promise<any>);
+type RetryableFn<ResponseType> = ((retry: (error: any) => never, attempt: number) => Promise<ResponseType>);
 /**
  * Wrap all functions of the object with retry. The params can be entered in either order, just like in the original library.
  *
@@ -22,6 +22,6 @@ type RetryableFn = ((retry: (error: any) => never, attempt: number) => Promise<a
  * @param options The options for how long/often to retry the function for.
  * @returns The Promise resolved by the input retryableFn, or rejected (if not retried) from its catch block.
  */
-declare function promiseRetry(retryableFn: RetryableFn, options?: WrapOptions): Promise<any>;
-declare function promiseRetry(options: WrapOptions, retryableFn: RetryableFn): Promise<any>;
+declare function promiseRetry<ResponseType>(retryableFn: RetryableFn<ResponseType>, options?: WrapOptions): Promise<ResponseType>;
+declare function promiseRetry<ResponseType>(options: WrapOptions, retryableFn: RetryableFn<ResponseType>): Promise<ResponseType>;
 export = promiseRetry;

From 0acfb18ec6005883836951e1b4d88a7b1edd6773 Mon Sep 17 00:00:00 2001
From: Alex Plumb <alex@sidedooraccess.com>
Date: Tue, 29 May 2018 10:53:10 -0300
Subject: [PATCH 484/575] Add test for amount_returned

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

diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index 91cfa0f50c..306ab0442a 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -798,7 +798,10 @@ stripe.accounts.createExternalAccount("", { external_account: "tok_15V2YhEe31JkL
 
 //#region Orders tests
 // ##################################################################################
-
+stripe.orders.retrieve("or_1C8XKwEe31JkLCeQHg0jcisf", function (err, order) {
+    // asynchronously called
+    var amount_returned: number = order.amount_returned;
+});
 
 
 //#endregion

From 14e4edf065a8917887ec32c5f6c6e24b6e2c9dcc Mon Sep 17 00:00:00 2001
From: Samuel Maddock <samuel.maddock@gmail.com>
Date: Tue, 29 May 2018 10:33:13 -0400
Subject: [PATCH 485/575] Fix chrome.cast enum documentation links

---
 types/chrome/chrome-cast.d.ts | 42 +++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/types/chrome/chrome-cast.d.ts b/types/chrome/chrome-cast.d.ts
index 397037a23e..ffca43ea5a 100644
--- a/types/chrome/chrome-cast.d.ts
+++ b/types/chrome/chrome-cast.d.ts
@@ -10,7 +10,7 @@
 declare namespace chrome.cast {
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.AutoJoinPolicy
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast#.AutoJoinPolicy
      */
     export enum AutoJoinPolicy {
         CUSTOM_CONTROLLER_SCOPED = "custom_controller_scoped",
@@ -21,7 +21,7 @@ declare namespace chrome.cast {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.DefaultActionPolicy
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast#.DefaultActionPolicy
      */
     export enum DefaultActionPolicy {
         CREATE_SESSION = "create_session",
@@ -30,7 +30,7 @@ declare namespace chrome.cast {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.Capability
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast#.Capability
      */
     export enum Capability {
         VIDEO_OUT = "video_out",
@@ -42,7 +42,7 @@ declare namespace chrome.cast {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.ErrorCode
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast#.ErrorCode
      */
     export enum ErrorCode {
         CANCEL = "cancel",
@@ -59,7 +59,7 @@ declare namespace chrome.cast {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.ReceiverAvailability
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast#.ReceiverAvailability
      */
     export enum ReceiverAvailability {
         AVAILABLE = "available",
@@ -68,7 +68,7 @@ declare namespace chrome.cast {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.SenderPlatform
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast#.SenderPlatform
      */
     export enum SenderPlatform {
         CHROME = "chrome",
@@ -78,7 +78,7 @@ declare namespace chrome.cast {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.ReceiverType
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast#.ReceiverType
      */
     export enum ReceiverType {
         CAST = "cast",
@@ -89,7 +89,7 @@ declare namespace chrome.cast {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.ReceiverAction
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast#.ReceiverAction
      */
     export enum ReceiverAction {
         CAST = "cast",
@@ -100,7 +100,7 @@ declare namespace chrome.cast {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.SessionStatus
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast#.SessionStatus
      */
     export enum SessionStatus {
         CONNECTED = "connected",
@@ -503,7 +503,7 @@ declare namespace chrome.cast.media {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.MediaCommand
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media#.MediaCommand
      */
     export enum MediaCommand {
         PAUSE = "pause",
@@ -514,7 +514,7 @@ declare namespace chrome.cast.media {
 
     /**
      * @enum {number}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.MetadataType
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media#.MetadataType
      */
     export enum MetadataType {
         GENERIC,
@@ -526,7 +526,7 @@ declare namespace chrome.cast.media {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.PlayerState
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media#.PlayerState
      */
     export enum PlayerState {
         IDLE = "IDLE",
@@ -537,7 +537,7 @@ declare namespace chrome.cast.media {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.ResumeState
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media#.ResumeState
      */
     export enum ResumeState {
         PLAYBACK_START = "PLAYBACK_START",
@@ -546,7 +546,7 @@ declare namespace chrome.cast.media {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.StreamType
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media#.StreamType
      */
     export enum StreamType {
         BUFFERED = "BUFFERED",
@@ -556,7 +556,7 @@ declare namespace chrome.cast.media {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.IdleReason
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media#.IdleReason
      */
     export enum IdleReason {
         CANCELLED = "CANCELLED",
@@ -671,7 +671,7 @@ declare namespace chrome.cast.media {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TrackType
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media#.TrackType
      */
     export enum TrackType {
         TEXT = "TEXT",
@@ -681,7 +681,7 @@ declare namespace chrome.cast.media {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TextTrackType
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media#.TextTrackType
      */
     export enum TextTrackType {
         SUBTITLES = "SUBTITLES",
@@ -693,7 +693,7 @@ declare namespace chrome.cast.media {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TextTrackEdgeType
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media#.TextTrackEdgeType
      */
     export enum TextTrackEdgeType {
         NONE = "NONE",
@@ -705,7 +705,7 @@ declare namespace chrome.cast.media {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TextTrackWindowType
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media#.TextTrackWindowType
      */
     export enum TextTrackWindowType {
         NONE = "NONE",
@@ -715,7 +715,7 @@ declare namespace chrome.cast.media {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TextTrackFontGenericFamily
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media#.TextTrackFontGenericFamily
      */
     export enum TextTrackFontGenericFamily {
         SANS_SERIF = "SANS_SERIF",
@@ -729,7 +729,7 @@ declare namespace chrome.cast.media {
 
     /**
      * @enum {string}
-     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media.TextTrackFontStyle
+     * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.media#.TextTrackFontStyle
      */
     export enum TextTrackFontStyle {
         NORMAL = "NORMAL",

From 9d707398248660cce08f5413195a9e012152d25d Mon Sep 17 00:00:00 2001
From: lummish <lummish@gmail.com>
Date: Tue, 29 May 2018 09:37:52 -0700
Subject: [PATCH 486/575] UPDATE: changed types according to review, removed
 module declaration in favor of top level export, removed extra newlines in
 tests, enabled all standard rules and modified definitions to pass linter

---
 types/stampit/index.d.ts                  | 512 +++++++++++++++------
 types/stampit/stampit-tests.ts            | 120 ++---
 types/stampit/tslint.json                 |  80 +---
 types/stampit/v2/index.d.ts               | 295 ++++++++++++
 types/stampit/{v3 => v2}/stampit-tests.ts |  69 ++-
 types/stampit/{v3 => v2}/tsconfig.json    |   2 +-
 types/stampit/{v3 => v2}/tslint.json      |   0
 types/stampit/v3/index.d.ts               | 525 ----------------------
 8 files changed, 756 insertions(+), 847 deletions(-)
 create mode 100644 types/stampit/v2/index.d.ts
 rename types/stampit/{v3 => v2}/stampit-tests.ts (66%)
 rename types/stampit/{v3 => v2}/tsconfig.json (95%)
 rename types/stampit/{v3 => v2}/tslint.json (100%)
 delete mode 100644 types/stampit/v3/index.d.ts

diff --git a/types/stampit/index.d.ts b/types/stampit/index.d.ts
index e852b96409..def08b887d 100644
--- a/types/stampit/index.d.ts
+++ b/types/stampit/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for stampit 2.1
+// Type definitions for stampit 3.0
 // Project: https://github.com/stampit-org/stampit
 // Definitions by: Vasyl Boroviak <https://github.com/koresar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,10 +6,51 @@
 /**
  * Function used as .init() argument.
  */
-interface Init {
-    (ctx:Context): any | Promise<any>;
+type Init = (factoryArg: any, ctx?: Context) => any;
+
+/**
+ * Composer function
+ */
+type Composer = ({ stamp, composables }: { stamp: Stamp; composables: Composable[] }) => any;
+
+/** The stamp Descriptor */
+interface Descriptor {
+    /** Create a new stamp based on this descriptor */
+    (...composables: Composable[]): Stamp;
+    /**
+     * A hash containing methods (functions) of any future created instance.
+     */
+    methods?: {};
+    /**
+     * Initialization function(s) which will be called per each newly created
+     * instance.
+     */
+    initializers?: Init[];
+    /**
+     * Properties which will shallowly copied into any future created instance.
+     */
+    properties?: {};
+    /**
+     * Properties which will be mixed to the new and any other stamp which this stamp will be composed with.
+     */
+    staticProperties?: {};
+    /** Deeply merged properties of object instances */
+    deepProperties?: {};
+    /** ES5 Property Descriptors applied to object instances */
+    propertyDescriptors?: {};
+    /** Deeply merged properties of Stamps */
+    staticDeepProperties?: {};
+    /** ES5 Property Descriptors applied to Stamps */
+    staticPropertyDescriptors?: {};
+    /** A configuration object to be shallowly assigned to Stamps */
+    configuration?: {};
+    /** A configuration object to be deeply merged to Stamps */
+    deepConfiguration?: {};
 }
 
+/** Any composable object (stamp or descriptor) */
+type Composable = Stamp | Descriptor;
+
 /**
  * The .init() function argument.
  */
@@ -30,56 +71,65 @@ interface Context {
     args: any[];
 }
 
-/**
- * An object map containing the fixed prototypes.
- */
-interface Fixed {
-    methods: {};
-
-    /**
-     * @deprecated Use .refs() instead.
-     */
-    state: {};
-
-    refs: {};
-
-    /**
-     * @deprecated Use .init() instead.
-     */
-    enclose: Init[];
-
-    init: Init[];
-
-    props: {};
-
-    static: {};
-}
-
 interface Options {
     /**
      * A hash containing methods (functions) of any future created instance.
      */
-    methods?: {} | {}[];
-
+    methods?: {};
+    /**
+     * Initialization function(s) which will be called per each newly created
+     * instance.
+     */
+    init?: Init | Init[];
+    /**
+     * Initialization function(s) which will be called per each newly created
+     * instance.
+     */
+    initializers?: Init | Init[];
+    /**
+     * Properties which will shallowly copied into any future created instance.
+     */
+    props?: {};
+    /**
+     * Properties which will shallowly copied into any future created instance.
+     */
+    properties?: {};
     /**
      * A hash containing references to the object. This hash will be shallow mixed into any future created instance.
      */
-    refs?: {} | {}[];
-
+    refs?: {};
     /**
-     * Initialization function which will be called per each newly created instance.
+     * Properties which will be mixed to the new and any other stamp which this
+     * stamp will be composed with.
      */
-    init?: Init | Init[];
-
+    staticProperties?: {};
     /**
-     * Properties which will be deeply (but safely, no data override) merged into any future created instance.
+     * Properties which will be mixed to the new and any other stamp which this
+     * stamp will be composed with.
      */
-    props?: {} | {}[];
-
-    /**
-     * Properties which will be mixed to the new and any other stamp which this stamp will be composed with.
-     */
-    static?: {} | {}[];
+    statics?: {};
+    /** Deeply merged properties of object instances */
+    deepProperties?: {};
+    /** Deeply merged properties of object instances */
+    deepProps?: {};
+    /** ES5 Property Descriptors applied to object instances */
+    propertyDescriptors?: {};
+    /** Deeply merged properties of Stamps */
+    staticDeepProperties?: {};
+    /** Deeply merged properties of Stamps */
+    deepStatics?: {};
+    /** ES5 Property Descriptors applied to Stamps */
+    staticPropertyDescriptors?: {};
+    /** A configuration object to be shallowly assigned to Stamps */
+    configuration?: {};
+    /** A configuration object to be shallowly assigned to Stamps */
+    conf?: {};
+    /** A configuration object to be deeply merged to Stamps */
+    deepConfiguration?: {};
+    /** A configuration object to be deeply merged to Stamps */
+    deepConf?: {};
+    /** Callback functions to execute each time a composition occurs */
+    composers?: Composer[];
 }
 
 /**
@@ -97,7 +147,7 @@ interface Stamp {
      * an .enclose() function is an anti-pattern that should be avoided, when possible.
      * @return A new object composed of the Stamps and prototypes provided.
      */
-    (state?:{}, ...encloseArgs:any[]): any | Promise<any>;
+    (state?: {}, ...encloseArgs: any[]): any;
 
     /**
      * Just like calling stamp(), stamp.create() invokes the stamp and returns a new instance.
@@ -109,69 +159,106 @@ interface Stamp {
      * an .enclose() function is an anti-pattern that should be avoided, when possible.
      * @return A new object composed of the Stamps and prototypes provided.
      */
-    create(state?:{}, ...encloseArgs:any[]): any | Promise<any>;
+    create(state?: {}, ...encloseArgs: any[]): any;
 
     /**
-     * An object map containing the fixed prototypes.
+     * Stamp metadata/composer function
      */
-    fixed: Fixed;
+    compose: Descriptor;
 
     /**
      * Add methods to the methods prototype.  Creates and returns new Stamp. Chainable.
      * @param methods Object(s) containing map of method names and bodies for delegation.
      * @return A new Stamp.
      */
-    methods(...methods:{}[]): Stamp;
+    methods(...methods: Array<{}>): Stamp;
 
     /**
      * Take n objects and add them to the state prototype. Creates and returns new Stamp. Chainable.
      * @param states Object(s) containing map of property names and values to clone for each new object.
      * @return A new Stamp.
      */
-    refs(...states:{}[]): Stamp;
+    refs(...states: Array<{}>): Stamp;
 
     /**
-     * Take n objects and merge them (but safely, no data override) to the of any future created instance.
-     * Creates and returns new Stamp. Chainable.
-     * @param objects Object(s) to merge for each new object.
+     * Take a variable number of objects and shallow assign them to any future
+     * created instance of the Stamp. Creates and returns new Stamp. Chainable.
+     * @param objects Object(s) to shallow assign for each new object.
      * @return A new Stamp.
      */
-    props(...objects:{}[]): Stamp;
+    props(...objects: Array<{}>): Stamp;
 
     /**
-     * @deprecated Use .refs() instead.
+     * Take a variable number of objects and shallow assign them to any future
+     * created instance of the Stamp. Creates and returns new Stamp. Chainable.
+     * @param objects Object(s) to shallow assign for each new object.
+     * @return A new Stamp.
      */
-    state(...states:{}[]): Stamp;
+    properties(...objects: Array<{}>): Stamp;
+
+    /**
+     * Take a variable number of objects and deeply merge them to any future
+     * created instance of the Stamp. Creates and returns a new Stamp.
+     * Chainable.
+     * @param deepObjects The object(s) to deeply merge for each new object
+     * @returns A new Stamp
+     */
+    deepProps(...deepObjects: Array<{}>): Stamp;
+
+    /**
+     * Take a variable number of objects and deeply merge them to any future
+     * created instance of the Stamp. Creates and returns a new Stamp.
+     * Chainable.
+     * @param deepObjects The object(s) to deeply merge for each new object
+     * @returns A new Stamp
+     */
+    deepProperties(...deepObjects: Array<{}>): Stamp;
 
     /**
      * @deprecated Use .init() instead.
      */
-    enclose(...functions:Init[]): Stamp;
+    enclose(...functions: Init[]): Stamp;
 
     /**
      * @deprecated Use .init() instead.
      */
-    enclose(...functions:{}[]): Stamp;
+    enclose(...functions: Array<{}>): Stamp;
 
     /**
-     * Take n functions, an array of functions, or n objects and add the functions to the enclose prototype.
-     * Functions passed into .enclose() are called any time an object is instantiated.
-     * That happens when the stamp function is invoked, or when the .create() method is called.
-     * Creates and returns new Stamp. Chainable.
-     * @param functions Closures (functions) used to create private data and privileged methods.
-     * @return A new Stamp.
+     * Take in a variable number of functions and add them to the enclose
+     * prototype as initializers.
+     * @param functions Initializer functions used to create private data and
+     * privileged methods
+     * @returns A new stamp
      */
-    init(...functions:Init[]): Stamp;
+    init(...functions: Init[]): Stamp;
 
     /**
-     * Take n functions, an array of functions, or n objects and add the functions to the enclose prototype.
-     * Functions passed into .enclose() are called any time an object is instantiated.
-     * That happens when the stamp function is invoked, or when the .create() method is called.
-     * Creates and returns new Stamp. Chainable.
-     * @param functions Function properties of these objects will be treated as closure functions.
-     * @return A new Stamp.
+     * Take in a variable number of functions and add them to the enclose
+     * prototype as initializers.
+     * @param functions Initializer functions used to create private data and
+     * privileged methods
+     * @returns A new stamp
      */
-    init(...functions:{}[]): Stamp;
+    init(functions: Init[]): Stamp;
+
+    /**
+     * Take in a variable number of functions and add them to the enclose
+     * prototype as initializers.
+     * @param functions Initializer functions used to create private data and
+     * privileged methods
+     * @returns A new stamp
+     */
+    initializers(...functions: Init[]): Stamp;
+
+    /**
+     * Take in a variable number of functions and add them to the enclose
+     * prototype as initializers.
+     * @param functions Initializer functions used to create private data and
+     * privileged methods
+     * @returns A new stamp
+     */
+    initializers(functions: Init[]): Stamp;
 
     /**
      * Take n objects and add them to a new stamp and any future stamp it composes with.
@@ -179,117 +266,250 @@ interface Stamp {
      * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
      * @return A new Stamp.
      */
-    static(...statics:{}[]): Stamp;
+    statics(...statics: Array<{}>): Stamp;
 
     /**
-     * Take one or more Stamps and
-     * combine them with `this` to produce and return a new Stamp.
-     * Combining overrides properties with last-in priority.
-     * NOT chainable.
-     * @param stamps Stampit factories, aka Stamps.
-     * @return A new Stamp composed from arguments and `this`.
+     * Take n objects and add them to a new stamp and any future stamp it composes with.
+     * Creates and returns new Stamp. Chainable.
+     * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
+     * @return A new Stamp.
      */
-    compose(...stamps:Stamp[]): Stamp;
+    staticProperties(...statics: Array<{}>): Stamp;
+
+    /**
+     * Deeply merge a variable number of objects and add them to a new stamp and
+     * any future stamp it composes. Creates and returns a new Stamp. Chainable.
+     * @param deepStatics The object(s) containing static properties to be
+     * merged
+     * @returns A new stamp
+     */
+    deepStatics(...deepStatics: Array<{}>): Stamp;
+
+    /**
+     * Deeply merge a variable number of objects and add them to a new stamp and
+     * any future stamp it composes. Creates and returns a new Stamp. Chainable.
+     * @param deepStatics The object(s) containing static properties to be
+     * merged
+     * @returns A new stamp
+     */
+    staticDeepProperties(...deepStatics: Array<{}>): Stamp;
+
+    /**
+     * Shallowly assign properties of Stamp arbitrary metadata and add them to
+     * a new stamp and any future Stamp it composes. Creates and returns a new
+     * Stamp. Chainable.
+     * @param confs The object(s) containing metadata properties
+     * @returns A new Stamp
+     */
+    conf(...confs: Array<{}>): Stamp;
+
+    /**
+     * Shallowly assign properties of Stamp arbitrary metadata and add them to
+     * a new stamp and any future Stamp it composes. Creates and returns a new
+     * Stamp. Chainable.
+     * @param confs The object(s) containing metadata properties
+     * @returns A new Stamp
+     */
+    configuration(...confs: Array<{}>): Stamp;
+
+    /**
+     * Deeply merge properties of Stamp arbitrary metadata and add them to a new
+     * Stamp and any future Stamp it composes. Creates and returns a new Stamp.
+     * Chainable.
+     * @param deepConfs The object(s) containing metadata properties
+     * @returns A new Stamp
+     */
+    deepConf(...deepConfs: Array<{}>): Stamp;
+
+    /**
+     * Deeply merge properties of Stamp arbitrary metadata and add them to a new
+     * Stamp and any future Stamp it composes. Creates and returns a new Stamp.
+     * Chainable.
+     * @param deepConfs The object(s) containing metadata properties
+     * @returns A new Stamp
+     */
+    deepConfiguration(...deepConfs: Array<{}>): Stamp;
+
+    /**
+     * Apply ES5 property descriptors to object instances created by the new
+     * Stamp returned by the function and any future Stamp it composes. Creates
+     * and returns a new stamp. Chainable.
+     * @param descriptors
+     * @returns A new Stamp
+     */
+    propertyDescriptors(...descriptors: Array<{}>): Stamp;
+
+    /**
+     * Apply ES5 property descriptors to a Stamp and any future Stamp it
+     * composes. Creates and returns a new stamp. Chainable.
+     * @param descriptors
+     * @returns A new Stamp
+     */
+    staticPropertyDescriptors(...descriptors: Array<{}>): Stamp;
 }
 
 /**
- * Return a factory (akaStamp) function that will produce new objects using the
+ * Return a factory (aka Stamp) function that will produce new objects using the
  * prototypes that are passed in or composed.
- * @param {object} options Stampit options object containing refs, methods, init, props, and static.
- * @param {object} options.methods A map of method names and bodies for delegation.
- * @param {object} options.refs A map of property names and values to clone for each new object.
- * @param {object} options.props A map of property names and values to clone for each new object.
- * @param {function} options.init A closure(s) (function(s)) used to create private data and privileged methods.
- * @param {object} options.static A map of properties to mixin into new and other stamp it will compose with.
- * */
-declare function stampit(options?: Options): Stamp
+ * @param options Stampit options object containing refs, methods,
+ * init, props, statics, configurations, and property descriptors.
+ */
+declare function stampit(options?: Options): Stamp;
 
 declare namespace stampit {
-
     /**
      * A shortcut methods for stampit().methods()
      * @param methods Object(s) containing map of method names and bodies for delegation.
      * @return A new Stamp.
      */
-    export function methods(...methods:{}[]): Stamp;
+    function methods(...methods: Array<{}>): Stamp;
 
     /**
      * A shortcut methods for stampit().refs()
      * @param states Object(s) containing map of property names and values to clone for each new object.
      * @return A new Stamp.
      */
-    export function refs(...states:{}[]): Stamp;
+    function refs(...states: Array<{}>): Stamp;
 
     /**
-     * A shortcut methods for stampit().props()
-     * @param states Object(s) to merge for each new object.
+     * A shortcut method for stampit().props()
+     * @param objects Object(s) to shallow assign for each new object.
      * @return A new Stamp.
      */
-    export function props(...states:{}[]): Stamp;
+    function props(...objects: Array<{}>): Stamp;
 
     /**
-     * A shortcut methods for stampit().init()
-     * @param functions Closures (functions) used to create private data and privileged methods.
+     * A shortcut method for stampit().properties()
+     * @param objects Object(s) to shallow assign for each new object.
      * @return A new Stamp.
      */
-    export function init(...functions:Init[]): Stamp;
+    function properties(...objects: Array<{}>): Stamp;
 
     /**
-     * A shortcut methods for stampit().static()
-     * @param statics Object(s) containing map of property names and values to mixin into each new stamp (NOT OBJECT).
+     * A shortcut method for stampit().deepProps()
+     * @param deepObjects The object(s) to deeply merge for each new object
+     * @returns A new Stamp
+     */
+    function deepProps(...deepObjects: Array<{}>): Stamp;
+
+    /**
+     * A shortcut method for stampit().deepProperties()
+     * @param deepObjects The object(s) to deeply merge for each new object
+     * @returns A new Stamp
+     */
+    function deepProperties(...deepObjects: Array<{}>): Stamp;
+
+    /**
+     * A shortcut method for stampit().init()
+     * @param functions Initializer functions used to create private data and
+     * privileged methods
+     * @returns A new stamp
+     */
+    function init(...functions: Init[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().init()
+     * @param functions Initializer functions used to create private data and
+     * privileged methods
+     * @returns A new stamp
+     */
+    function init(functions: Init[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().initializers()
+     * @param functions Initializer functions used to create private data and
+     * privileged methods
+     * @returns A new stamp
+     */
+    function initializers(...functions: Init[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().initializers()
+     * @param functions Initializer functions used to create private data and
+     * privileged methods
+     * @returns A new stamp
+     */
+    function initializers(functions: Init[]): Stamp;
+
+    /**
+     * A shortcut method for stampit().statics()
+     * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
      * @return A new Stamp.
      */
-    export function static(...statics:{}[]): Stamp;
+    function statics(...statics: Array<{}>): Stamp;
 
     /**
-     * Take two or more Stamps and combine them to produce a new Stamp.
+     * A shortcut method for stampit().staticProperties()
+     * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
+     * @return A new Stamp.
+     */
+    function staticProperties(...statics: Array<{}>): Stamp;
+
+    /**
+     * A shortcut method for stampit().deepStatics()
+     * @param deepStatics The object(s) containing static properties to be
+     * merged
+     * @returns A new stamp
+     */
+    function deepStatics(...deepStatics: Array<{}>): Stamp;
+
+    /**
+     * A shortcut method for stampit().staticDeepProperties()
+     * @param deepStatics The object(s) containing static properties to be
+     * merged
+     * @returns A new stamp
+     */
+    function staticDeepProperties(...deepStatics: Array<{}>): Stamp;
+
+    /**
+     * A shortcut method for stampit().conf()
+     * @param confs The object(s) containing metadata properties
+     * @returns A new Stamp
+     */
+    function conf(...confs: Array<{}>): Stamp;
+
+    /**
+     * A shortcut method for stampit().configuration()
+     * @param confs The object(s) containing metadata properties
+     * @returns A new Stamp
+     */
+    function configuration(...confs: Array<{}>): Stamp;
+
+    /**
+     * A shortcut method for stampit().deepConf()
+     * @param deepConfs The object(s) containing metadata properties
+     * @returns A new Stamp
+     */
+    function deepConf(...deepConfs: Array<{}>): Stamp;
+
+    /**
+     * A shortcut method for stampit().deepConfiguration()
+     * @param deepConfs The object(s) containing metadata properties
+     * @returns A new Stamp
+     */
+    function deepConfiguration(...deepConfs: Array<{}>): Stamp;
+
+    /**
+     * A shortcut method for stampit().propertyDescriptors()
+     * @param descriptors
+     * @returns A new Stamp
+     */
+    function propertyDescriptors(...descriptors: Array<{}>): Stamp;
+
+    /**
+     * A shortcut method for stampit().staticPropertyDescriptors()
+     * @param descriptors
+     * @returns A new Stamp
+     */
+    function staticPropertyDescriptors(...descriptors: Array<{}>): Stamp;
+
+    /**
+     * Take two or more Composables and combine them to produce a new Stamp.
      * Combining overrides properties with last-in priority.
-     * @param stamps Stamps produced by stampit.
-     * @return A new Stamp made of all the given.
+     * @param composables Composable objects used to create the stamp.
+     * @return A new Stamp made of all the given composables.
      */
-    export function compose(...stamps:Stamp[]): Stamp;
-
-    /**
-     * Take a destination object followed by one or more source objects,
-     * and copy the source object properties to the destination object,
-     * with last in priority overrides.
-     * @param destination An object to copy properties to.
-     * @param source Objects to copy properties from.
-     * @return The destination object.
-     */
-    export function mixin(destination:any, ...source:any[]): any;
-
-    /**
-     * Alias for mixin()
-     */
-    export function mixIn(destination:any, ...source:any[]): any;
-
-    /**
-     * Alias for mixin()
-     */
-    export function extend(destination:any, ...source:any[]): any;
-
-    /**
-     * Alias for mixin()
-     */
-    export function assign(destination:any, ...source:any[]): any;
-
-    /**
-     * Check if an object is a Stamp.
-     * @param obj An object to check.
-     * @return true if the object is a Stamp; otherwise - false.
-     */
-    export function isStamp(obj:any): boolean;
-
-    /**
-     * Take an old-fashioned JS constructor and return a Stamp
-     * that you can freely compose with other Stamps.
-     * @param Constructor Old-fashioned constructor function.
-     * @return A new Stamp based on the given constructor.
-     */
-    export function convertConstructor(Constructor:any): Stamp;
+    function compose(...composables: Composable[]): Stamp;
 }
 
-declare module "stampit" {
-    export = stampit;
-}
+export = stampit;
diff --git a/types/stampit/stampit-tests.ts b/types/stampit/stampit-tests.ts
index 259c3ccd5a..410e2d2218 100644
--- a/types/stampit/stampit-tests.ts
+++ b/types/stampit/stampit-tests.ts
@@ -1,9 +1,7 @@
-
-
 import stampit = require('stampit');
 
-var a = stampit().init((options) => {
-    var a = options.args[0];
+const a = stampit().init((options) => {
+    const a = options.args[0];
     this.getA = () => {
         return a;
     };
@@ -11,50 +9,27 @@ var a = stampit().init((options) => {
 a(); // Object -- so far so good.
 a().getA(); // "a"
 
-
-var b = stampit().init(function () {
-    var a = 'b';
-    this.getB = function () {
+const b = stampit().init(function() {
+    const a = 'b';
+    this.getB = () => {
         return a;
     };
 });
 
-
-var c = stampit.compose(a, b);
-var foo = c(); // we won't throw this one away...
+const c = stampit.compose(a, b);
+const foo = c(); // we won't throw this one away...
 foo.getA(); // "a"
 foo.getB(); // "b"
 
-
-// Some more privileged methods, with some private data.
-// Use stampit.mixIn() to make this feel declarative:
-var availability = stampit().init(function () {
-    var isOpen = false; // private
-
-    return stampit.mixIn(this, {
-        open: function open() {
-            isOpen = true;
-            return this;
-        },
-        close: function close() {
-            isOpen = false;
-            return this;
-        },
-        isOpen: function isOpenMethod() {
-            return isOpen;
-        }
-    });
-});
-
 // Here's a mixin with public methods, and some refs:
-var membership = stampit({
+const membership = stampit({
     methods: {
         members: {},
-        add: function (member:any) {
+        add(member: any) {
             this.members[member.name] = member;
             return this;
         },
-        getMember: function (name:any) {
+        getMember(name: any) {
             return this.members[name];
         }
     },
@@ -62,114 +37,105 @@ var membership = stampit({
         members: {}
     }
 });
+
 // Let's set some defaults:
-var defaults = stampit().refs({
+const defaults = stampit().refs({
     name: 'The Saloon',
     specials: 'Whisky, Gin, Tequila'
 });
 
 // Classical inheritance has nothing on this. No parent/child coupling. No deep inheritance hierarchies.
 // Just good, clean code reusability.
-var bar = stampit.compose(defaults, availability, membership);
+const bar = stampit.compose(defaults, membership);
 // Note that you can override refs on instantiation:
-var myBar = bar({name: 'Moe\'s'});
+const myBar = bar({ name: 'Moe\'s' });
 // Silly, but proves that everything is as it should be.
-myBar.add({name: 'Homer'}).open().getMember('Homer');
+myBar.add({ name: 'Homer' }).open().getMember('Homer');
 
-
-var myStamp = stampit().methods({
-    foo: function () {
+const myStamp = stampit().methods({
+    foo() {
         return 'foo';
     },
-    methodOverride: function () {
+    methodOverride() {
         return false;
     }
 }).methods({
-    bar: function () {
-        return 'bar'
+    bar() {
+        return 'bar';
     },
-    methodOverride: function () {
+    methodOverride() {
         return true;
     }
 });
 
-myStamp.refs({
-    foo: {bar: 'bar'},
+myStamp.props({
+    foo: { bar: 'bar' },
     refsOverride: false
 }).refs({
     bar: 'bar',
     refsOverride: true
 });
 
-myStamp.init(function () {
-    var secret = 'foo';
+myStamp.init(function() {
+    const secret = 'foo';
 
-    this.getSecret = function () {
+    this.getSecret = () => {
         return secret;
     };
-}).init(function () {
+}).init(function() {
     this.a = true;
-}).init({
-    bar: function bar() {
-        this.b = true;
-    }
-}, {
-    baz: function baz() {
-        this.c = true;
-    }
+}).init(function() {
+    this.b = true;
+}, function() {
+    this.c = true;
 });
 
-var obj = myStamp.create();
+let obj = myStamp.create();
 obj.getSecret && obj.a && obj.b && obj.c; // true
 
-var newStamp = stampit({refs: {defaultNum: 1}}).compose(myStamp);
+const newStamp = stampit({ refs: { defaultNum: 1 } }).compose(myStamp);
 
-
-var obj1 = stampit().methods({
-    a: function () {
+const obj1 = stampit().methods({
+    a() {
         return 'a';
     }
 }, {
-    b: function () {
+    b() {
         return 'b';
     }
 }).create();
 
-var obj2 = stampit().refs({
+const obj2 = stampit().refs({
     a: 'a'
 }, {
     b: 'b'
 }).create();
 
-var obj = defaults.compose(newStamp, membership, availability).create();
-
+obj = defaults.compose(newStamp, membership).create();
 
 // The old constructor / class thing...
-var Constructor = function Constructor() {
+const Constructor = function Constructor() {
     this.thing = 'initialized';
 };
 Constructor.prototype.foo = function foo() {
     return 'foo';
 };
 
-// The conversion
-var oldskool = stampit.convertConstructor(Constructor);
-
 // A new stamp to compose with...
-var newskool = stampit().methods({
+const newskool = stampit().methods({
     bar: function bar() {
         return 'bar';
     }
     // your methods here...
-}).init(function () {
+}).init(function() {
     this.baz = 'baz';
 });
 
 // Now you can compose those old constructors just like you could
 // with any other stamp...
-var myThing = stampit.compose(oldskool, newskool);
+const myThing = stampit.compose(newskool);
 
-var t = myThing();
+const t = myThing();
 
 t.thing; // 'initialized',
 
diff --git a/types/stampit/tslint.json b/types/stampit/tslint.json
index a41bf5d19a..e60c15844f 100644
--- a/types/stampit/tslint.json
+++ b/types/stampit/tslint.json
@@ -1,79 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
-}
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/stampit/v2/index.d.ts b/types/stampit/v2/index.d.ts
new file mode 100644
index 0000000000..e852b96409
--- /dev/null
+++ b/types/stampit/v2/index.d.ts
@@ -0,0 +1,295 @@
+// Type definitions for stampit 2.1
+// Project: https://github.com/stampit-org/stampit
+// Definitions by: Vasyl Boroviak <https://github.com/koresar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Function used as .init() argument.
+ */
+interface Init {
+    (ctx:Context): any | Promise<any>;
+}
+
+/**
+ * The .init() function argument.
+ */
+interface Context {
+    /**
+     * The object which has been just instantiated.
+     */
+    instance: any;
+
+    /**
+     * The stamp the object has been instantiated with.
+     */
+    stamp: Stamp;
+
+    /**
+     * The arguments list passed to the stamp.
+     */
+    args: any[];
+}
+
+/**
+ * An object map containing the fixed prototypes.
+ */
+interface Fixed {
+    methods: {};
+
+    /**
+     * @deprecated Use .refs() instead.
+     */
+    state: {};
+
+    refs: {};
+
+    /**
+     * @deprecated Use .init() instead.
+     */
+    enclose: Init[];
+
+    init: Init[];
+
+    props: {};
+
+    static: {};
+}
+
+interface Options {
+    /**
+     * A hash containing methods (functions) of any future created instance.
+     */
+    methods?: {} | {}[];
+
+    /**
+     * A hash containing references to the object. This hash will be shallow mixed into any future created instance.
+     */
+    refs?: {} | {}[];
+
+    /**
+     * Initialization function which will be called per each newly created instance.
+     */
+    init?: Init | Init[];
+
+    /**
+     * Properties which will be deeply (but safely, no data override) merged into any future created instance.
+     */
+    props?: {} | {}[];
+
+    /**
+     * Properties which will be mixed to the new and any other stamp which this stamp will be composed with.
+     */
+    static?: {} | {}[];
+}
+
+/**
+ * A factory function that will produce new objects using the
+ * prototypes that are passed in or composed.
+ */
+interface Stamp {
+    /**
+     * Invokes the stamp and returns a new object instance.
+     * @param state Properties you wish to set on the new objects.
+     * @param encloseArgs The remaining arguments are passed to all .enclose() functions.
+     * WARNING Avoid using two different .enclose() functions that expect different arguments.
+     * .enclose() functions that take arguments should not be considered safe to compose
+     * with other .enclose() functions that also take arguments. Taking arguments with
+     * an .enclose() function is an anti-pattern that should be avoided, when possible.
+     * @return A new object composed of the Stamps and prototypes provided.
+     */
+    (state?:{}, ...encloseArgs:any[]): any | Promise<any>;
+
+    /**
+     * Just like calling stamp(), stamp.create() invokes the stamp and returns a new instance.
+     * @param state Properties you wish to set on the new objects.
+     * @param encloseArgs The remaining arguments are passed to all .enclose() functions.
+     * WARNING Avoid using two different .enclose() functions that expect different arguments.
+     * .enclose() functions that take arguments should not be considered safe to compose
+     * with other .enclose() functions that also take arguments. Taking arguments with
+     * an .enclose() function is an anti-pattern that should be avoided, when possible.
+     * @return A new object composed of the Stamps and prototypes provided.
+     */
+    create(state?:{}, ...encloseArgs:any[]): any | Promise<any>;
+
+    /**
+     * An object map containing the fixed prototypes.
+     */
+    fixed: Fixed;
+
+    /**
+     * Add methods to the methods prototype.  Creates and returns new Stamp. Chainable.
+     * @param methods Object(s) containing map of method names and bodies for delegation.
+     * @return A new Stamp.
+     */
+    methods(...methods:{}[]): Stamp;
+
+    /**
+     * Take n objects and add them to the state prototype. Creates and returns new Stamp. Chainable.
+     * @param states Object(s) containing map of property names and values to clone for each new object.
+     * @return A new Stamp.
+     */
+    refs(...states:{}[]): Stamp;
+
+    /**
+     * Take n objects and merge them (but safely, no data override) to the of any future created instance.
+     * Creates and returns new Stamp. Chainable.
+     * @param objects Object(s) to merge for each new object.
+     * @return A new Stamp.
+     */
+    props(...objects:{}[]): Stamp;
+
+    /**
+     * @deprecated Use .refs() instead.
+     */
+    state(...states:{}[]): Stamp;
+
+    /**
+     * @deprecated Use .init() instead.
+     */
+    enclose(...functions:Init[]): Stamp;
+
+    /**
+     * @deprecated Use .init() instead.
+     */
+    enclose(...functions:{}[]): Stamp;
+
+    /**
+     * Take n functions, an array of functions, or n objects and add the functions to the enclose prototype.
+     * Functions passed into .enclose() are called any time an object is instantiated.
+     * That happens when the stamp function is invoked, or when the .create() method is called.
+     * Creates and returns new Stamp. Chainable.
+     * @param functions Closures (functions) used to create private data and privileged methods.
+     * @return A new Stamp.
+     */
+    init(...functions:Init[]): Stamp;
+
+    /**
+     * Take n functions, an array of functions, or n objects and add the functions to the enclose prototype.
+     * Functions passed into .enclose() are called any time an object is instantiated.
+     * That happens when the stamp function is invoked, or when the .create() method is called.
+     * Creates and returns new Stamp. Chainable.
+     * @param functions Function properties of these objects will be treated as closure functions.
+     * @return A new Stamp.
+     */
+    init(...functions:{}[]): Stamp;
+
+    /**
+     * Take n objects and add them to a new stamp and any future stamp it composes with.
+     * Creates and returns new Stamp. Chainable.
+     * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
+     * @return A new Stamp.
+     */
+    static(...statics:{}[]): Stamp;
+
+    /**
+     * Take one or more Stamps and
+     * combine them with `this` to produce and return a new Stamp.
+     * Combining overrides properties with last-in priority.
+     * NOT chainable.
+     * @param stamps Stampit factories, aka Stamps.
+     * @return A new Stamp composed from arguments and `this`.
+     */
+    compose(...stamps:Stamp[]): Stamp;
+}
+
+/**
+ * Return a factory (akaStamp) function that will produce new objects using the
+ * prototypes that are passed in or composed.
+ * @param {object} options Stampit options object containing refs, methods, init, props, and static.
+ * @param {object} options.methods A map of method names and bodies for delegation.
+ * @param {object} options.refs A map of property names and values to clone for each new object.
+ * @param {object} options.props A map of property names and values to clone for each new object.
+ * @param {function} options.init A closure(s) (function(s)) used to create private data and privileged methods.
+ * @param {object} options.static A map of properties to mixin into new and other stamp it will compose with.
+ * */
+declare function stampit(options?: Options): Stamp
+
+declare namespace stampit {
+
+    /**
+     * A shortcut methods for stampit().methods()
+     * @param methods Object(s) containing map of method names and bodies for delegation.
+     * @return A new Stamp.
+     */
+    export function methods(...methods:{}[]): Stamp;
+
+    /**
+     * A shortcut methods for stampit().refs()
+     * @param states Object(s) containing map of property names and values to clone for each new object.
+     * @return A new Stamp.
+     */
+    export function refs(...states:{}[]): Stamp;
+
+    /**
+     * A shortcut methods for stampit().props()
+     * @param states Object(s) to merge for each new object.
+     * @return A new Stamp.
+     */
+    export function props(...states:{}[]): Stamp;
+
+    /**
+     * A shortcut methods for stampit().init()
+     * @param functions Closures (functions) used to create private data and privileged methods.
+     * @return A new Stamp.
+     */
+    export function init(...functions:Init[]): Stamp;
+
+    /**
+     * A shortcut methods for stampit().static()
+     * @param statics Object(s) containing map of property names and values to mixin into each new stamp (NOT OBJECT).
+     * @return A new Stamp.
+     */
+    export function static(...statics:{}[]): Stamp;
+
+    /**
+     * Take two or more Stamps and combine them to produce a new Stamp.
+     * Combining overrides properties with last-in priority.
+     * @param stamps Stamps produced by stampit.
+     * @return A new Stamp made of all the given.
+     */
+    export function compose(...stamps:Stamp[]): Stamp;
+
+    /**
+     * Take a destination object followed by one or more source objects,
+     * and copy the source object properties to the destination object,
+     * with last in priority overrides.
+     * @param destination An object to copy properties to.
+     * @param source Objects to copy properties from.
+     * @return The destination object.
+     */
+    export function mixin(destination:any, ...source:any[]): any;
+
+    /**
+     * Alias for mixin()
+     */
+    export function mixIn(destination:any, ...source:any[]): any;
+
+    /**
+     * Alias for mixin()
+     */
+    export function extend(destination:any, ...source:any[]): any;
+
+    /**
+     * Alias for mixin()
+     */
+    export function assign(destination:any, ...source:any[]): any;
+
+    /**
+     * Check if an object is a Stamp.
+     * @param obj An object to check.
+     * @return true if the object is a Stamp; otherwise - false.
+     */
+    export function isStamp(obj:any): boolean;
+
+    /**
+     * Take an old-fashioned JS constructor and return a Stamp
+     * that you can freely compose with other Stamps.
+     * @param Constructor Old-fashioned constructor function.
+     * @return A new Stamp based on the given constructor.
+     */
+    export function convertConstructor(Constructor:any): Stamp;
+}
+
+declare module "stampit" {
+    export = stampit;
+}
diff --git a/types/stampit/v3/stampit-tests.ts b/types/stampit/v2/stampit-tests.ts
similarity index 66%
rename from types/stampit/v3/stampit-tests.ts
rename to types/stampit/v2/stampit-tests.ts
index 51ec1ea305..259c3ccd5a 100644
--- a/types/stampit/v3/stampit-tests.ts
+++ b/types/stampit/v2/stampit-tests.ts
@@ -11,6 +11,7 @@ var a = stampit().init((options) => {
 a(); // Object -- so far so good.
 a().getA(); // "a"
 
+
 var b = stampit().init(function () {
     var a = 'b';
     this.getB = function () {
@@ -24,15 +25,36 @@ var foo = c(); // we won't throw this one away...
 foo.getA(); // "a"
 foo.getB(); // "b"
 
+
+// Some more privileged methods, with some private data.
+// Use stampit.mixIn() to make this feel declarative:
+var availability = stampit().init(function () {
+    var isOpen = false; // private
+
+    return stampit.mixIn(this, {
+        open: function open() {
+            isOpen = true;
+            return this;
+        },
+        close: function close() {
+            isOpen = false;
+            return this;
+        },
+        isOpen: function isOpenMethod() {
+            return isOpen;
+        }
+    });
+});
+
 // Here's a mixin with public methods, and some refs:
 var membership = stampit({
     methods: {
         members: {},
-        add: function (member: any) {
+        add: function (member:any) {
             this.members[member.name] = member;
             return this;
         },
-        getMember: function (name: any) {
+        getMember: function (name:any) {
             return this.members[name];
         }
     },
@@ -48,11 +70,11 @@ var defaults = stampit().refs({
 
 // Classical inheritance has nothing on this. No parent/child coupling. No deep inheritance hierarchies.
 // Just good, clean code reusability.
-var bar = stampit.compose(defaults, membership);
+var bar = stampit.compose(defaults, availability, membership);
 // Note that you can override refs on instantiation:
-var myBar = bar({ name: 'Moe\'s' });
+var myBar = bar({name: 'Moe\'s'});
 // Silly, but proves that everything is as it should be.
-myBar.add({ name: 'Homer' }).open().getMember('Homer');
+myBar.add({name: 'Homer'}).open().getMember('Homer');
 
 
 var myStamp = stampit().methods({
@@ -71,8 +93,8 @@ var myStamp = stampit().methods({
     }
 });
 
-myStamp.props({
-    foo: { bar: 'bar' },
+myStamp.refs({
+    foo: {bar: 'bar'},
     refsOverride: false
 }).refs({
     bar: 'bar',
@@ -87,16 +109,20 @@ myStamp.init(function () {
     };
 }).init(function () {
     this.a = true;
-}).init(function () {
-    this.b = true;
-}, function () {
-    this.c = true;
+}).init({
+    bar: function bar() {
+        this.b = true;
+    }
+}, {
+    baz: function baz() {
+        this.c = true;
+    }
 });
 
 var obj = myStamp.create();
 obj.getSecret && obj.a && obj.b && obj.c; // true
 
-var newStamp = stampit({ refs: { defaultNum: 1 } }).compose(myStamp);
+var newStamp = stampit({refs: {defaultNum: 1}}).compose(myStamp);
 
 
 var obj1 = stampit().methods({
@@ -104,18 +130,18 @@ var obj1 = stampit().methods({
         return 'a';
     }
 }, {
-        b: function () {
-            return 'b';
-        }
-    }).create();
+    b: function () {
+        return 'b';
+    }
+}).create();
 
 var obj2 = stampit().refs({
     a: 'a'
 }, {
-        b: 'b'
-    }).create();
+    b: 'b'
+}).create();
 
-var obj = defaults.compose(newStamp, membership).create();
+var obj = defaults.compose(newStamp, membership, availability).create();
 
 
 // The old constructor / class thing...
@@ -126,6 +152,9 @@ Constructor.prototype.foo = function foo() {
     return 'foo';
 };
 
+// The conversion
+var oldskool = stampit.convertConstructor(Constructor);
+
 // A new stamp to compose with...
 var newskool = stampit().methods({
     bar: function bar() {
@@ -138,7 +167,7 @@ var newskool = stampit().methods({
 
 // Now you can compose those old constructors just like you could
 // with any other stamp...
-var myThing = stampit.compose(newskool);
+var myThing = stampit.compose(oldskool, newskool);
 
 var t = myThing();
 
diff --git a/types/stampit/v3/tsconfig.json b/types/stampit/v2/tsconfig.json
similarity index 95%
rename from types/stampit/v3/tsconfig.json
rename to types/stampit/v2/tsconfig.json
index 8b00fbdc80..a3edc4788a 100644
--- a/types/stampit/v3/tsconfig.json
+++ b/types/stampit/v2/tsconfig.json
@@ -17,7 +17,7 @@
         "forceConsistentCasingInFileNames": true,
         "paths": {
             "stampit": [
-                "stampit/v3"
+                "stampit/v2"
             ]
         }
     },
diff --git a/types/stampit/v3/tslint.json b/types/stampit/v2/tslint.json
similarity index 100%
rename from types/stampit/v3/tslint.json
rename to types/stampit/v2/tslint.json
diff --git a/types/stampit/v3/index.d.ts b/types/stampit/v3/index.d.ts
deleted file mode 100644
index 3162d6032b..0000000000
--- a/types/stampit/v3/index.d.ts
+++ /dev/null
@@ -1,525 +0,0 @@
-// Type definitions for stampit 3.0
-// Project: https://github.com/stampit-org/stampit
-// Definitions by: Vasyl Boroviak <https://github.com/koresar>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/**
- * Function used as .init() argument.
- */
-interface Init {
-    (factoryArg: any, ctx?: Context): any;
-}
-
-/**
- * Composer function
- */
-interface Composer {
-    ({ stamp, composables }: { stamp: Stamp; composables: Composable[] }): any;
-}
-
-/** The stamp Descriptor */
-interface Descriptor {
-    /** Create a new stamp based on this descriptor */
-    (...composables: Composable[]): Stamp;
-    /**
-     * A hash containing methods (functions) of any future created instance.
-     */
-    methods?: {};
-    /**
-     * Initialization function(s) which will be called per each newly created
-     * instance.
-     */
-    initializers?: Init[];
-    /**
-     * Properties which will shallowly copied into any future created instance.
-     */
-    properties?: {};
-    /**
-     * Properties which will be mixed to the new and any other stamp which this stamp will be composed with.
-     */
-    staticProperties?: {};
-    /** Deeply merged properties of object instances */
-    deepProperties?: {};
-    /** ES5 Property Descriptors applied to object instances */
-    propertyDescriptors?: {};
-    /** Deeply merged properties of Stamps */
-    staticDeepProperties?: {};
-    /** ES5 Property Descriptors applied to Stamps */
-    staticPropertyDescriptors?: {};
-    /** A configuration object to be shallowly assigned to Stamps */
-    configuration?: {};
-    /** A configuration object to be deeply merged to Stamps */
-    deepConfiguration?: {};
-}
-
-/** Any composable object (stamp or descriptor) */
-type Composable = Stamp | Descriptor;
-
-/**
- * The .init() function argument.
- */
-interface Context {
-    /**
-     * The object which has been just instantiated.
-     */
-    instance: any;
-
-    /**
-     * The stamp the object has been instantiated with.
-     */
-    stamp: Stamp;
-
-    /**
-     * The arguments list passed to the stamp.
-     */
-    args: any[];
-}
-
-interface Options {
-    /**
-     * A hash containing methods (functions) of any future created instance.
-     */
-    methods?: {} | {}[];
-    /**
-     * Initialization function(s) which will be called per each newly created
-     * instance.
-     */
-    init?: Init | Init[];
-    /**
-     * Initialization function(s) which will be called per each newly created
-     * instance.
-     */
-    initializers?: Init | Init[];
-    /**
-     * Properties which will shallowly copied into any future created instance.
-     */
-    props?: {} | {}[];
-    /**
-     * Properties which will shallowly copied into any future created instance.
-     */
-    properties?: {} | {}[];
-    /**
-     * A hash containing references to the object. This hash will be shallow mixed into any future created instance.
-     */
-    refs?: {} | {}[];
-    /**
-     * Properties which will be mixed to the new and any other stamp which this
-     * stamp will be composed with.
-     */
-    staticProperties?: {} | {}[];
-    /**
-     * Properties which will be mixed to the new and any other stamp which this
-     * stamp will be composed with.
-     */
-    statics?: {} | {}[];
-    /** Deeply merged properties of object instances */
-    deepProperties?: {} | {}[];
-    /** Deeply merged properties of object instances */
-    deepProps?: {} | {}[];
-    /** ES5 Property Descriptors applied to object instances */
-    propertyDescriptors?: {} | {}[];
-    /** Deeply merged properties of Stamps */
-    staticDeepProperties?: {} | {}[];
-    /** Deeply merged properties of Stamps */
-    deepStatics?: {} | {}[];
-    /** ES5 Property Descriptors applied to Stamps */
-    staticPropertyDescriptors?: {} | {}[];
-    /** A configuration object to be shallowly assigned to Stamps */
-    configuration?: {} | {}[];
-    /** A configuration object to be shallowly assigned to Stamps */
-    conf?: {} | {}[];
-    /** A configuration object to be deeply merged to Stamps */
-    deepConfiguration?: {} | {}[];
-    /** A configuration object to be deeply merged to Stamps */
-    deepConf?: {} | {}[];
-    /** Callback functions to execute each time a composition occurs */
-    composers?: Composer[];
-}
-
-/**
- * A factory function that will produce new objects using the
- * prototypes that are passed in or composed.
- */
-interface Stamp {
-    /**
-     * Invokes the stamp and returns a new object instance.
-     * @param state Properties you wish to set on the new objects.
-     * @param encloseArgs The remaining arguments are passed to all .enclose() functions.
-     * WARNING Avoid using two different .enclose() functions that expect different arguments.
-     * .enclose() functions that take arguments should not be considered safe to compose
-     * with other .enclose() functions that also take arguments. Taking arguments with
-     * an .enclose() function is an anti-pattern that should be avoided, when possible.
-     * @return A new object composed of the Stamps and prototypes provided.
-     */
-    (state?: {}, ...encloseArgs: any[]): any;
-
-    /**
-     * Just like calling stamp(), stamp.create() invokes the stamp and returns a new instance.
-     * @param state Properties you wish to set on the new objects.
-     * @param encloseArgs The remaining arguments are passed to all .enclose() functions.
-     * WARNING Avoid using two different .enclose() functions that expect different arguments.
-     * .enclose() functions that take arguments should not be considered safe to compose
-     * with other .enclose() functions that also take arguments. Taking arguments with
-     * an .enclose() function is an anti-pattern that should be avoided, when possible.
-     * @return A new object composed of the Stamps and prototypes provided.
-     */
-    create(state?: {}, ...encloseArgs: any[]): any;
-
-    /**
-     * Stamp metadata/composer function
-     */
-    compose: Descriptor;
-
-    /**
-     * Add methods to the methods prototype.  Creates and returns new Stamp. Chainable.
-     * @param methods Object(s) containing map of method names and bodies for delegation.
-     * @return A new Stamp.
-     */
-    methods(...methods: {}[]): Stamp;
-
-    /**
-     * Take n objects and add them to the state prototype. Creates and returns new Stamp. Chainable.
-     * @param states Object(s) containing map of property names and values to clone for each new object.
-     * @return A new Stamp.
-     */
-    refs(...states: {}[]): Stamp;
-
-    /**
-     * Take a variable number of objects and shallow assign them to any future
-     * created instance of the Stamp. Creates and returns new Stamp. Chainable.
-     * @param objects Object(s) to shallow assign for each new object.
-     * @return A new Stamp.
-     */
-    props(...objects: {}[]): Stamp;
-
-    /**
-     * Take a variable number of objects and shallow assign them to any future
-     * created instance of the Stamp. Creates and returns new Stamp. Chainable.
-     * @param objects Object(s) to shallow assign for each new object.
-     * @return A new Stamp.
-     */
-    properties(...objects: {}[]): Stamp;
-
-    /**
-     * Take a variable number of objects and deeply merge them to any future
-     * created instance of the Stamp. Creates and returns a new Stamp.
-     * Chainable.
-     * @param deepObjects The object(s) to deeply merge for each new object
-     * @returns A new Stamp
-     */
-    deepProps(...deepObjects: {}[]): Stamp;
-
-    /**
-     * Take a variable number of objects and deeply merge them to any future
-     * created instance of the Stamp. Creates and returns a new Stamp.
-     * Chainable.
-     * @param deepObjects The object(s) to deeply merge for each new object
-     * @returns A new Stamp
-     */
-    deepProperties(...deepObjects: {}[]): Stamp;
-
-    /**
-     * @deprecated Use .init() instead.
-     */
-    enclose(...functions: Init[]): Stamp;
-
-    /**
-     * @deprecated Use .init() instead.
-     */
-    enclose(...functions: {}[]): Stamp;
-
-    /**
-     * Take in a variable number of functions and add them to the enclose
-     * prototype as initializers. 
-     * @param functions Initializer functions used to create private data and
-     * privileged methods
-     * @returns A new stamp
-     */
-    init(...functions: Init[]): Stamp;
-
-    /**
-     * Take in a variable number of functions and add them to the enclose
-     * prototype as initializers. 
-     * @param functions Initializer functions used to create private data and
-     * privileged methods
-     * @returns A new stamp
-     */
-    init(functions: Init[]): Stamp;
-
-    /**
-     * Take in a variable number of functions and add them to the enclose
-     * prototype as initializers. 
-     * @param functions Initializer functions used to create private data and
-     * privileged methods
-     * @returns A new stamp
-     */
-    initializers(...functions: Init[]): Stamp;
-
-    /**
-     * Take in a variable number of functions and add them to the enclose
-     * prototype as initializers. 
-     * @param functions Initializer functions used to create private data and
-     * privileged methods
-     * @returns A new stamp
-     */
-    initializers(functions: Init[]): Stamp;
-
-    /**
-     * Take n objects and add them to a new stamp and any future stamp it composes with.
-     * Creates and returns new Stamp. Chainable.
-     * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
-     * @return A new Stamp.
-     */
-    statics(...statics: {}[]): Stamp;
-
-    /**
-     * Take n objects and add them to a new stamp and any future stamp it composes with.
-     * Creates and returns new Stamp. Chainable.
-     * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
-     * @return A new Stamp.
-     */
-    staticProperties(...statics: {}[]): Stamp;
-
-    /**
-     * Deeply merge a variable number of objects and add them to a new stamp and
-     * any future stamp it composes. Creates and returns a new Stamp. Chainable.
-     * @param deepStatics The object(s) containing static properties to be
-     * merged
-     * @returns A new stamp
-     */
-    deepStatics(...deepStatics: {}[]): Stamp;
-
-    /**
-     * Deeply merge a variable number of objects and add them to a new stamp and
-     * any future stamp it composes. Creates and returns a new Stamp. Chainable.
-     * @param deepStatics The object(s) containing static properties to be
-     * merged
-     * @returns A new stamp
-     */
-    staticDeepProperties(...deepStatics: {}[]): Stamp;
-
-    /**
-     * Shallowly assign properties of Stamp arbitrary metadata and add them to
-     * a new stamp and any future Stamp it composes. Creates and returns a new
-     * Stamp. Chainable.
-     * @param confs The object(s) containing metadata properties
-     * @returns A new Stamp
-     */
-    conf(...confs: {}[]): Stamp;
-
-    /**
-     * Shallowly assign properties of Stamp arbitrary metadata and add them to
-     * a new stamp and any future Stamp it composes. Creates and returns a new
-     * Stamp. Chainable.
-     * @param confs The object(s) containing metadata properties
-     * @returns A new Stamp
-     */
-    configuration(...confs: {}[]): Stamp;
-
-    /**
-     * Deeply merge properties of Stamp arbitrary metadata and add them to a new
-     * Stamp and any future Stamp it composes. Creates and returns a new Stamp. 
-     * Chainable.
-     * @param deepConfs The object(s) containing metadata properties
-     * @returns A new Stamp
-     */
-    deepConf(...deepConfs: {}[]): Stamp;
-
-    /**
-     * Deeply merge properties of Stamp arbitrary metadata and add them to a new
-     * Stamp and any future Stamp it composes. Creates and returns a new Stamp. 
-     * Chainable.
-     * @param deepConfs The object(s) containing metadata properties
-     * @returns A new Stamp
-     */
-    deepConfiguration(...deepConfs: {}[]): Stamp;
-
-    /**
-     * Apply ES5 property descriptors to object instances created by the new
-     * Stamp returned by the function and any future Stamp it composes. Creates
-     * and returns a new stamp. Chainable.
-     * @param descriptors 
-     * @returns A new Stamp
-     */
-    propertyDescriptors(...descriptors: {}[]): Stamp;
-
-    /**
-     * Apply ES5 property descriptors to a Stamp and any future Stamp it
-     * composes. Creates and returns a new stamp. Chainable.
-     * @param descriptors 
-     * @returns A new Stamp
-     */
-    staticPropertyDescriptors(...descriptors: {}[]): Stamp;
-}
-
-/**
- * Return a factory (akaStamp) function that will produce new objects using the
- * prototypes that are passed in or composed.
- * @param {object} options Stampit options object containing refs, methods, init, props, and static.
- * @param {object} options.methods A map of method names and bodies for delegation.
- * @param {object} options.refs A map of property names and values to clone for each new object.
- * @param {object} options.props A map of property names and values to clone for each new object.
- * @param {function} options.init A closure(s) (function(s)) used to create private data and privileged methods.
- * @param {object} options.static A map of properties to mixin into new and other stamp it will compose with.
- * */
-declare function stampit(options?: Options): Stamp
-
-declare namespace stampit {
-    /**
-     * A shortcut methods for stampit().methods()
-     * @param methods Object(s) containing map of method names and bodies for delegation.
-     * @return A new Stamp.
-     */
-    export function methods(...methods: {}[]): Stamp;
-
-    /**
-     * A shortcut methods for stampit().refs()
-     * @param states Object(s) containing map of property names and values to clone for each new object.
-     * @return A new Stamp.
-     */
-    export function refs(...states: {}[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().props()
-     * @param objects Object(s) to shallow assign for each new object.
-     * @return A new Stamp.
-     */
-    export function props(...objects: {}[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().properties()
-     * @param objects Object(s) to shallow assign for each new object.
-     * @return A new Stamp.
-     */
-    export function properties(...objects: {}[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().deepProps()
-     * @param deepObjects The object(s) to deeply merge for each new object
-     * @returns A new Stamp
-     */
-    export function deepProps(...deepObjects: {}[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().deepProperties()
-     * @param deepObjects The object(s) to deeply merge for each new object
-     * @returns A new Stamp
-     */
-    export function deepProperties(...deepObjects: {}[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().init()
-     * @param functions Initializer functions used to create private data and
-     * privileged methods
-     * @returns A new stamp
-     */
-    export function init(...functions: Init[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().init()
-     * @param functions Initializer functions used to create private data and
-     * privileged methods
-     * @returns A new stamp
-     */
-    export function init(functions: Init[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().initializers()
-     * @param functions Initializer functions used to create private data and
-     * privileged methods
-     * @returns A new stamp
-     */
-    export function initializers(...functions: Init[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().initializers()
-     * @param functions Initializer functions used to create private data and
-     * privileged methods
-     * @returns A new stamp
-     */
-    export function initializers(functions: Init[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().statics()
-     * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
-     * @return A new Stamp.
-     */
-    export function statics(...statics: {}[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().staticProperties()
-     * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
-     * @return A new Stamp.
-     */
-    export function staticProperties(...statics: {}[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().deepStatics()
-     * @param deepStatics The object(s) containing static properties to be
-     * merged
-     * @returns A new stamp
-     */
-    export function deepStatics(...deepStatics: {}[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().staticDeepProperties()
-     * @param deepStatics The object(s) containing static properties to be
-     * merged
-     * @returns A new stamp
-     */
-    export function staticDeepProperties(...deepStatics: {}[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().conf()
-     * @param confs The object(s) containing metadata properties
-     * @returns A new Stamp
-     */
-    export function conf(...confs: {}[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().configuration()
-     * @param confs The object(s) containing metadata properties
-     * @returns A new Stamp
-     */
-    export function configuration(...confs: {}[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().deepConf()
-     * @param deepConfs The object(s) containing metadata properties
-     * @returns A new Stamp
-     */
-    export function deepConf(...deepConfs: {}[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().deepConfiguration()
-     * @param deepConfs The object(s) containing metadata properties
-     * @returns A new Stamp
-     */
-    export function deepConfiguration(...deepConfs: {}[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().propertyDescriptors()
-     * @param descriptors 
-     * @returns A new Stamp
-     */
-    export function propertyDescriptors(...descriptors: {}[]): Stamp;
-
-    /**
-     * A shortcut method for stampit().staticPropertyDescriptors()
-     * @param descriptors 
-     * @returns A new Stamp
-     */
-    export function staticPropertyDescriptors(...descriptors: {}[]): Stamp;
-
-    /**
-     * Take two or more Composables and combine them to produce a new Stamp.
-     * Combining overrides properties with last-in priority.
-     * @param composables Composable objects used to create the stamp.
-     * @return A new Stamp made of all the given composables.
-     */
-    export function compose(...composables: Composable[]): Stamp;
-}
-
-declare module "stampit" {
-    export = stampit;
-}

From f855b0ed2274abaa1abee14c7a6996047889b702 Mon Sep 17 00:00:00 2001
From: Dan Freeman <dfreeman@salsify.com>
Date: Tue, 29 May 2018 12:41:34 -0400
Subject: [PATCH 487/575] [ember] `initializer` and `instanceInitializer` are
 static methods

---
 types/ember/index.d.ts          |  4 ++--
 types/ember/test/application.ts | 20 +++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 0cae10cd24..91c45b94e7 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -1075,14 +1075,14 @@ declare module 'ember' {
              * after all initializers and therefore after all code is loaded and the app is
              * ready.
              */
-            initializer(initializer: Initializer<Engine>): void;
+            static initializer(initializer: Initializer<Engine>): void;
             /**
              * Instance initializers run after all initializers have run. Because
              * instance initializers run after the app is fully set up. We have access
              * to the store, container, and other items. However, these initializers run
              * after code has loaded and are not allowed to defer readiness.
              */
-            instanceInitializer(instanceInitializer: Initializer<EngineInstance>): void;
+            static instanceInitializer(instanceInitializer: Initializer<EngineInstance>): void;
             /**
              * Set this to provide an alternate class to `Ember.DefaultResolver`
              */
diff --git a/types/ember/test/application.ts b/types/ember/test/application.ts
index c2df458214..d0fc2e9c44 100755
--- a/types/ember/test/application.ts
+++ b/types/ember/test/application.ts
@@ -1,27 +1,33 @@
 import Ember from 'ember';
 import { assertType } from "./lib/assert";
 
-let App = Ember.Application.create({
-    customEvents: {
-        paste: 'paste'
-    }
+let BaseApp = Ember.Application.extend({
+    modulePrefix: 'my-app'
 });
 
-App.initializer({
+BaseApp.initializer({
     name: 'my-initializer',
     initialize(app) {
         app.register('foo:bar', Ember.Object.extend({ foo: 'bar' }));
     }
 });
 
-App.instanceInitializer({
+BaseApp.instanceInitializer({
     name: 'my-instance-initializer',
     initialize(app) {
         app.lookup('foo:bar').get('foo');
     }
 });
 
-let App2 = Ember.Application.create({
+let App1 = BaseApp.create({
+    rootElement: '#app-one',
+    customEvents: {
+        paste: 'paste'
+    }
+});
+
+let App2 = BaseApp.create({
+    rootElement: '#app-two',
     customEvents: {
         mouseenter: null,
         mouseleave: null

From 5946e58de118eccc7e252ba96c33bfbe8b56f90c Mon Sep 17 00:00:00 2001
From: Samuel Maddock <samuel.maddock@gmail.com>
Date: Tue, 29 May 2018 14:39:51 -0400
Subject: [PATCH 488/575] Change chrome.cast.Image to class type

---
 types/chrome/chrome-cast.d.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/types/chrome/chrome-cast.d.ts b/types/chrome/chrome-cast.d.ts
index ffca43ea5a..29bfbebf81 100644
--- a/types/chrome/chrome-cast.d.ts
+++ b/types/chrome/chrome-cast.d.ts
@@ -240,15 +240,13 @@ declare namespace chrome.cast {
 
     }
 
-    export interface Image {
+    export class Image {
         /**
          * @param {string} url
          * @constructor
          * @see https://developers.google.com/cast/docs/reference/chrome/chrome.cast.Image
          */
-        new(
-            url: string
-        ): Image;
+        constructor(url: string);
 
         url: string;
         height?: number;

From 65a7c854fe8e3549cc2c96345a2c4a58dfc1b1e9 Mon Sep 17 00:00:00 2001
From: Oleksii Kachura <alex.kachura@gmail.com>
Date: Tue, 29 May 2018 20:50:32 +0200
Subject: [PATCH 489/575] vis: update network nodes image option (v4.21)

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

diff --git a/types/vis/index.d.ts b/types/vis/index.d.ts
index ed1c235061..caa0ab945a 100644
--- a/types/vis/index.d.ts
+++ b/types/vis/index.d.ts
@@ -8,6 +8,7 @@
 //                 Matthieu Maitre <https://github.com/mmaitre314>
 //                 Adam Lewis <https://github.com/supercargo>
 //                 Alex Soh <https://github.com/takato1314>
+//                 Oleksii Kachura <https://github.com/alex-kachura>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import { MomentInput, MomentFormatSpecification, Moment } from 'moment';
@@ -1691,7 +1692,7 @@ export interface Node {
   x?: number;
   y?: number;
   fixed?: boolean;
-  image?: string;
+  image?: string | Image;
   shape?: string;
   color?: string | Color;
 }
@@ -1760,6 +1761,11 @@ export interface Options {
   physics?: any; // http://visjs.org/docs/network/physics.html#
 }
 
+export interface Image {
+  unselected?: string;
+  selected?: string;
+}
+
 export interface Color {
   border?: string;
 
@@ -1819,7 +1825,7 @@ export interface NodeOptions {
 
   id?: string;
 
-  image?: string;
+  image?: string | Image;
 
   label?: string;
 

From 6e6519e66d21285c6acb74b3a5a6bea7c1dbc10e Mon Sep 17 00:00:00 2001
From: Anton Myzenkov <amyzenkov@gmail.com>
Date: Tue, 29 May 2018 22:07:01 +0300
Subject: [PATCH 490/575] [node] Update net.Server ListenOptions

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 11fb56d0fe..8651c6bfc9 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2822,6 +2822,8 @@ declare module "net" {
         backlog?: number;
         path?: string;
         exclusive?: boolean;
+        readableAll?: boolean;
+        writableAll?: boolean;
     }
 
     // https://github.com/nodejs/node/blob/master/lib/net.js

From 00f9711ca24c7596423b156c525b94005f87c443 Mon Sep 17 00:00:00 2001
From: mgdodge <mgdodge@hotmail.com>
Date: Tue, 29 May 2018 13:27:50 -0600
Subject: [PATCH 491/575] Add definitions for okta-vue (#25851)

* Add definitions for okta-vue

* Update to include install function
---
 types/okta__okta-vue/index.d.ts              | 38 +++++++++++++++
 types/okta__okta-vue/okta__okta-vue-tests.ts | 50 ++++++++++++++++++++
 types/okta__okta-vue/package.json            |  7 +++
 types/okta__okta-vue/tsconfig.json           | 23 +++++++++
 types/okta__okta-vue/tslint.json             |  1 +
 5 files changed, 119 insertions(+)
 create mode 100644 types/okta__okta-vue/index.d.ts
 create mode 100644 types/okta__okta-vue/okta__okta-vue-tests.ts
 create mode 100644 types/okta__okta-vue/package.json
 create mode 100644 types/okta__okta-vue/tsconfig.json
 create mode 100644 types/okta__okta-vue/tslint.json

diff --git a/types/okta__okta-vue/index.d.ts b/types/okta__okta-vue/index.d.ts
new file mode 100644
index 0000000000..5f67b78fc2
--- /dev/null
+++ b/types/okta__okta-vue/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for okta-vue 1.0
+// Project: https://github.com/okta/okta-oidc-js/tree/master/packages/okta-vue
+// Definitions by: Mike Dodge <https://github.com/innovation-team>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { VueConstructor, PluginFunction } from 'vue';
+import { NavigationGuard } from 'vue-router';
+
+declare namespace OktaVuePlugin {
+	interface OktaVueOptions {
+		issuer: string;
+		client_id: string;
+		redirect_uri: string;
+		scope: string;
+	}
+
+	function install(vm: VueConstructor, options: OktaVueOptions): PluginFunction<VueConstructor>;
+    function handleCallback(): VueConstructor;
+}
+declare function OktaVuePlugin(): PluginFunction<VueConstructor>;
+export default OktaVuePlugin;
+
+declare module 'vue/types/vue' {
+    interface Vue {
+        $auth: {
+            loginRedirect(): void;
+            logout(): Promise<void>;
+            isAuthenticated(): Promise<boolean>;
+            handleAuthentication(): Promise<void>;
+            getFromUri(): string;
+            getIdToken(): Promise<string>;
+            getAccessToken(): Promise<string>;
+            getUser(): Promise<any>;
+            authRedirectGuardd(): Promise<NavigationGuard>;
+        };
+    }
+}
diff --git a/types/okta__okta-vue/okta__okta-vue-tests.ts b/types/okta__okta-vue/okta__okta-vue-tests.ts
new file mode 100644
index 0000000000..881726a9f0
--- /dev/null
+++ b/types/okta__okta-vue/okta__okta-vue-tests.ts
@@ -0,0 +1,50 @@
+import Vue from 'vue';
+import Router from 'vue-router';
+import Auth from 'okta__okta-vue';
+
+Vue.use(Auth, {
+  issuer: 'https://{yourOktaDomain}.com/oauth2/default',
+  client_id: '{client_id}',
+  redirect_uri: 'http://localhost:{port}/implicit/callback',
+  scope: 'openid profile email'
+});
+
+Vue.use(Router);
+const router = new Router({
+    mode: 'history',
+    routes: [
+        { path: '/implicit/callback', component: Auth.handleCallback() },
+        {
+            path: '/protected',
+            component: {
+                name: 'protected',
+                template: '<div>Protected Route</div>'
+            },
+            meta: {
+                requiresAuth: true
+            }
+        },
+    ]
+});
+
+const redirectGuard = Vue.prototype.$auth.authRedirectGuard();
+router.beforeEach(redirectGuard);
+
+const component = Vue.extend({
+    mounted() {
+        const authd = this.$auth.isAuthenticated();
+        const userInfo = this.$auth.getUser();
+        const handleAuth = this.$auth.handleAuthentication();
+        const path = this.$auth.getFromUri();
+        const idToken = this.$auth.getIdToken();
+        const accessToken = this.$auth.getAccessToken();
+    },
+    methods: {
+        logout() {
+            const logoutPromise = this.$auth.logout();
+        },
+        redirect() {
+            this.$auth.loginRedirect();
+        },
+    },
+});
diff --git a/types/okta__okta-vue/package.json b/types/okta__okta-vue/package.json
new file mode 100644
index 0000000000..fe98511c31
--- /dev/null
+++ b/types/okta__okta-vue/package.json
@@ -0,0 +1,7 @@
+{
+    "private": true,
+    "dependencies": {
+        "vue": "^2.5.9",
+        "vue-router": "^3.0.1"
+    }
+}
diff --git a/types/okta__okta-vue/tsconfig.json b/types/okta__okta-vue/tsconfig.json
new file mode 100644
index 0000000000..f114dc0fe8
--- /dev/null
+++ b/types/okta__okta-vue/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",
+        "okta__okta-vue-tests.ts"
+    ]
+}
diff --git a/types/okta__okta-vue/tslint.json b/types/okta__okta-vue/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/okta__okta-vue/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 1909641bb09f32fdb71bbf6c4b6ba77ac0eb7ec4 Mon Sep 17 00:00:00 2001
From: Anton Myzenkov <amyzenkov@gmail.com>
Date: Tue, 29 May 2018 22:57:59 +0300
Subject: [PATCH 492/575] update node version to 10.3.x

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

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 8651c6bfc9..eec0aad774 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Node.js 10.1.x
+// Type definitions for Node.js 10.3.x
 // Project: http://nodejs.org/
 // Definitions by: Microsoft TypeScript <http://typescriptlang.org>
 //                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>

From ea78901bc65d7db0c706cc2c7b0bcb95f3399093 Mon Sep 17 00:00:00 2001
From: FaithForHumans <vogel.spencer@gmail.com>
Date: Tue, 29 May 2018 15:57:01 -0500
Subject: [PATCH 493/575] Changing individual file to export as allowing any by
 extra prop by default.

---
 types/reactstrap/lib/Alert.d.ts                    | 2 +-
 types/reactstrap/lib/Badge.d.ts                    | 2 +-
 types/reactstrap/lib/Breadcrumb.d.ts               | 2 +-
 types/reactstrap/lib/BreadcrumbItem.d.ts           | 2 +-
 types/reactstrap/lib/Button.d.ts                   | 2 +-
 types/reactstrap/lib/ButtonDropdown.d.ts           | 2 +-
 types/reactstrap/lib/ButtonGroup.d.ts              | 2 +-
 types/reactstrap/lib/ButtonToolbar.d.ts            | 2 +-
 types/reactstrap/lib/Card.d.ts                     | 2 +-
 types/reactstrap/lib/CardBody.d.ts                 | 2 +-
 types/reactstrap/lib/CardColumns.d.ts              | 2 +-
 types/reactstrap/lib/CardDeck.d.ts                 | 2 +-
 types/reactstrap/lib/CardFooter.d.ts               | 2 +-
 types/reactstrap/lib/CardGroup.d.ts                | 2 +-
 types/reactstrap/lib/CardHeader.d.ts               | 2 +-
 types/reactstrap/lib/CardImg.d.ts                  | 2 +-
 types/reactstrap/lib/CardImgOverlay.d.ts           | 2 +-
 types/reactstrap/lib/CardLink.d.ts                 | 2 +-
 types/reactstrap/lib/CardSubtitle.d.ts             | 2 +-
 types/reactstrap/lib/CardText.d.ts                 | 2 +-
 types/reactstrap/lib/CardTitle.d.ts                | 2 +-
 types/reactstrap/lib/Carousel.d.ts                 | 2 +-
 types/reactstrap/lib/CarouselCaption.d.ts          | 2 +-
 types/reactstrap/lib/CarouselControl.d.ts          | 2 +-
 types/reactstrap/lib/CarouselIndicators.d.ts       | 2 +-
 types/reactstrap/lib/CarouselItem.d.ts             | 6 +++---
 types/reactstrap/lib/Col.d.ts                      | 2 +-
 types/reactstrap/lib/Collapse.d.ts                 | 2 +-
 types/reactstrap/lib/Container.d.ts                | 2 +-
 types/reactstrap/lib/Dropdown.d.ts                 | 2 +-
 types/reactstrap/lib/DropdownMenu.d.ts             | 2 +-
 types/reactstrap/lib/Fade.d.ts                     | 2 +-
 types/reactstrap/lib/FormFeedback.d.ts             | 2 +-
 types/reactstrap/lib/FormGroup.d.ts                | 2 +-
 types/reactstrap/lib/FormText.d.ts                 | 2 +-
 types/reactstrap/lib/InputGroup.d.ts               | 2 +-
 types/reactstrap/lib/InputGroupAddon.d.ts          | 2 +-
 types/reactstrap/lib/InputGroupButtonDropdown.d.ts | 2 +-
 types/reactstrap/lib/InputGroupText.d.ts           | 2 +-
 types/reactstrap/lib/Jumbotron.d.ts                | 2 +-
 types/reactstrap/lib/Label.d.ts                    | 2 +-
 types/reactstrap/lib/ListGroup.d.ts                | 2 +-
 types/reactstrap/lib/ListGroupItem.d.ts            | 2 +-
 types/reactstrap/lib/ListGroupItemHeading.d.ts     | 2 +-
 types/reactstrap/lib/ListGroupItemText.d.ts        | 2 +-
 types/reactstrap/lib/Media.d.ts                    | 2 +-
 types/reactstrap/lib/ModalBody.d.ts                | 2 +-
 types/reactstrap/lib/ModalFooter.d.ts              | 2 +-
 types/reactstrap/lib/ModalHeader.d.ts              | 2 +-
 types/reactstrap/lib/Nav.d.ts                      | 2 +-
 types/reactstrap/lib/NavItem.d.ts                  | 2 +-
 types/reactstrap/lib/Navbar.d.ts                   | 2 +-
 types/reactstrap/lib/NavbarBrand.d.ts              | 2 +-
 types/reactstrap/lib/NavbarToggler.d.ts            | 2 +-
 types/reactstrap/lib/Pagination.d.ts               | 2 +-
 types/reactstrap/lib/PaginationItem.d.ts           | 2 +-
 types/reactstrap/lib/PaginationLink.d.ts           | 2 +-
 types/reactstrap/lib/PopoverBody.d.ts              | 2 +-
 types/reactstrap/lib/PopoverHeader.d.ts            | 2 +-
 types/reactstrap/lib/Progress.d.ts                 | 2 +-
 types/reactstrap/lib/Row.d.ts                      | 2 +-
 types/reactstrap/lib/TabPane.d.ts                  | 2 +-
 types/reactstrap/lib/Table.d.ts                    | 2 +-
 types/reactstrap/lib/Tag.d.ts                      | 2 +-
 64 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/types/reactstrap/lib/Alert.d.ts b/types/reactstrap/lib/Alert.d.ts
index 73d3469473..edfd5303e0 100644
--- a/types/reactstrap/lib/Alert.d.ts
+++ b/types/reactstrap/lib/Alert.d.ts
@@ -17,5 +17,5 @@ export type AlertProps<T = {}> = UncontrolledAlertProps<T> & {
   toggle?: () => void;
 };
 
-declare class Alert<T = {}> extends React.Component<AlertProps<T>> {}
+declare class Alert<T = {[key: string]: any}> extends React.Component<AlertProps<T>> {}
 export default Alert;
diff --git a/types/reactstrap/lib/Badge.d.ts b/types/reactstrap/lib/Badge.d.ts
index eccd2ea240..651521ac67 100644
--- a/types/reactstrap/lib/Badge.d.ts
+++ b/types/reactstrap/lib/Badge.d.ts
@@ -9,5 +9,5 @@ export type BadgeProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class Badge<T = {}> extends React.Component<BadgeProps<T>> {}
+declare class Badge<T = {[key: string]: any}> extends React.Component<BadgeProps<T>> {}
 export default Badge;
diff --git a/types/reactstrap/lib/Breadcrumb.d.ts b/types/reactstrap/lib/Breadcrumb.d.ts
index be7c1aab89..8cef634a53 100644
--- a/types/reactstrap/lib/Breadcrumb.d.ts
+++ b/types/reactstrap/lib/Breadcrumb.d.ts
@@ -7,5 +7,5 @@ export type BreadcrumbProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class Breadcrumb<T = {}> extends React.Component<BreadcrumbProps<T>> {}
+declare class Breadcrumb<T = {[key: string]: any}> extends React.Component<BreadcrumbProps<T>> {}
 export default Breadcrumb;
diff --git a/types/reactstrap/lib/BreadcrumbItem.d.ts b/types/reactstrap/lib/BreadcrumbItem.d.ts
index 614ca34b99..a3ce8156bf 100644
--- a/types/reactstrap/lib/BreadcrumbItem.d.ts
+++ b/types/reactstrap/lib/BreadcrumbItem.d.ts
@@ -11,5 +11,5 @@ export type BreadcrumbItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   [others: string]: any;
 } & T;
 
-declare class BreadcrumbItem<T = {}> extends React.Component<BreadcrumbItemProps<T>> {}
+declare class BreadcrumbItem<T = {[key: string]: any}> extends React.Component<BreadcrumbItemProps<T>> {}
 export default BreadcrumbItem;
diff --git a/types/reactstrap/lib/Button.d.ts b/types/reactstrap/lib/Button.d.ts
index 43075dc3dc..326e5f88de 100644
--- a/types/reactstrap/lib/Button.d.ts
+++ b/types/reactstrap/lib/Button.d.ts
@@ -18,5 +18,5 @@ export type ButtonProps<T = {}> = React.HTMLProps<HTMLButtonElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class Button<T = {}> extends React.Component<ButtonProps<T>> {}
+declare class Button<T = {[key: string]: any}> extends React.Component<ButtonProps<T>> {}
 export default Button;
diff --git a/types/reactstrap/lib/ButtonDropdown.d.ts b/types/reactstrap/lib/ButtonDropdown.d.ts
index ebae860bc7..92f16ce5ce 100644
--- a/types/reactstrap/lib/ButtonDropdown.d.ts
+++ b/types/reactstrap/lib/ButtonDropdown.d.ts
@@ -6,5 +6,5 @@ export type UncontrolledButtonDropdownProps<T = {}> = UncontrolledProps<T>;
 
 export type ButtonDropdownProps<T = {}> = DropdownProps<T>;
 
-declare class ButtonDropdown<T = {}> extends React.Component<ButtonDropdownProps<T>> {}
+declare class ButtonDropdown<T = {[key: string]: any}> extends React.Component<ButtonDropdownProps<T>> {}
 export default ButtonDropdown;
diff --git a/types/reactstrap/lib/ButtonGroup.d.ts b/types/reactstrap/lib/ButtonGroup.d.ts
index 27053d271c..736f894165 100644
--- a/types/reactstrap/lib/ButtonGroup.d.ts
+++ b/types/reactstrap/lib/ButtonGroup.d.ts
@@ -11,5 +11,5 @@ export type ButtonGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   vertical?: boolean;
 } & T;
 
-declare class ButtonGroup<T = {}> extends React.Component<ButtonGroupProps<T>> {}
+declare class ButtonGroup<T = {[key: string]: any}> extends React.Component<ButtonGroupProps<T>> {}
 export default ButtonGroup;
diff --git a/types/reactstrap/lib/ButtonToolbar.d.ts b/types/reactstrap/lib/ButtonToolbar.d.ts
index ea258a7c49..b19fff3274 100644
--- a/types/reactstrap/lib/ButtonToolbar.d.ts
+++ b/types/reactstrap/lib/ButtonToolbar.d.ts
@@ -9,5 +9,5 @@ export type ButtonToolbarProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   role?: string;
 } & T;
 
-declare class ButtonToolbar<T = {}> extends React.Component<ButtonToolbarProps<T>> {}
+declare class ButtonToolbar<T = {[key: string]: any}> extends React.Component<ButtonToolbarProps<T>> {}
 export default ButtonToolbar;
diff --git a/types/reactstrap/lib/Card.d.ts b/types/reactstrap/lib/Card.d.ts
index 269a524087..772cad5a89 100644
--- a/types/reactstrap/lib/Card.d.ts
+++ b/types/reactstrap/lib/Card.d.ts
@@ -13,5 +13,5 @@ export type CardProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   style?: React.CSSProperties;
 } & T;
 
-declare class Card<T = {}> extends React.Component<CardProps<T>> {}
+declare class Card<T = {[key: string]: any}> extends React.Component<CardProps<T>> {}
 export default Card;
diff --git a/types/reactstrap/lib/CardBody.d.ts b/types/reactstrap/lib/CardBody.d.ts
index 3890cf4650..d8bcac515b 100644
--- a/types/reactstrap/lib/CardBody.d.ts
+++ b/types/reactstrap/lib/CardBody.d.ts
@@ -7,5 +7,5 @@ export type CardBodyProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class CardBody<T = {}> extends React.Component<CardBodyProps<T>> {}
+declare class CardBody<T = {[key: string]: any}> extends React.Component<CardBodyProps<T>> {}
 export default CardBody;
diff --git a/types/reactstrap/lib/CardColumns.d.ts b/types/reactstrap/lib/CardColumns.d.ts
index be4688edb3..ccce622907 100644
--- a/types/reactstrap/lib/CardColumns.d.ts
+++ b/types/reactstrap/lib/CardColumns.d.ts
@@ -7,5 +7,5 @@ export type CardColumnsProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class CardColumns<T = {}> extends React.Component<CardColumnsProps<T>> {}
+declare class CardColumns<T = {[key: string]: any}> extends React.Component<CardColumnsProps<T>> {}
 export default CardColumns;
diff --git a/types/reactstrap/lib/CardDeck.d.ts b/types/reactstrap/lib/CardDeck.d.ts
index 28882603b1..88f1166339 100644
--- a/types/reactstrap/lib/CardDeck.d.ts
+++ b/types/reactstrap/lib/CardDeck.d.ts
@@ -7,5 +7,5 @@ export type CardDeckProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class CardDeck<T = {}> extends React.Component<CardDeckProps<T>> {}
+declare class CardDeck<T = {[key: string]: any}> extends React.Component<CardDeckProps<T>> {}
 export default CardDeck;
diff --git a/types/reactstrap/lib/CardFooter.d.ts b/types/reactstrap/lib/CardFooter.d.ts
index 9268ed4e70..c65ba5f8cf 100644
--- a/types/reactstrap/lib/CardFooter.d.ts
+++ b/types/reactstrap/lib/CardFooter.d.ts
@@ -7,5 +7,5 @@ export type CardFooterProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class CardFooter<T = {}> extends React.Component<CardFooterProps<T>> {}
+declare class CardFooter<T = {[key: string]: any}> extends React.Component<CardFooterProps<T>> {}
 export default CardFooter;
diff --git a/types/reactstrap/lib/CardGroup.d.ts b/types/reactstrap/lib/CardGroup.d.ts
index 6e0d422656..be33a187d5 100644
--- a/types/reactstrap/lib/CardGroup.d.ts
+++ b/types/reactstrap/lib/CardGroup.d.ts
@@ -7,5 +7,5 @@ export type CardGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class CardGroup<T = {}> extends React.Component<CardGroupProps<T>> {}
+declare class CardGroup<T = {[key: string]: any}> extends React.Component<CardGroupProps<T>> {}
 export default CardGroup;
diff --git a/types/reactstrap/lib/CardHeader.d.ts b/types/reactstrap/lib/CardHeader.d.ts
index 821b2d809f..ac46ca37ba 100644
--- a/types/reactstrap/lib/CardHeader.d.ts
+++ b/types/reactstrap/lib/CardHeader.d.ts
@@ -7,5 +7,5 @@ export type CardHeaderProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class CardHeader<T = {}> extends React.Component<CardHeaderProps<T>> {}
+declare class CardHeader<T = {[key: string]: any}> extends React.Component<CardHeaderProps<T>> {}
 export default CardHeader;
diff --git a/types/reactstrap/lib/CardImg.d.ts b/types/reactstrap/lib/CardImg.d.ts
index e9242704b4..6c77d88257 100644
--- a/types/reactstrap/lib/CardImg.d.ts
+++ b/types/reactstrap/lib/CardImg.d.ts
@@ -13,5 +13,5 @@ export type CardImgProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   alt?: string;
 } & T;
 
-declare class CardImg<T = {}> extends React.Component<CardImgProps<T>> {}
+declare class CardImg<T = {[key: string]: any}> extends React.Component<CardImgProps<T>> {}
 export default CardImg;
diff --git a/types/reactstrap/lib/CardImgOverlay.d.ts b/types/reactstrap/lib/CardImgOverlay.d.ts
index 7e252f6248..f4da865ae7 100644
--- a/types/reactstrap/lib/CardImgOverlay.d.ts
+++ b/types/reactstrap/lib/CardImgOverlay.d.ts
@@ -7,5 +7,5 @@ export type CardImgOverlayProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class CardImgOverlay<T = {}> extends React.Component<CardImgOverlayProps<T>> {}
+declare class CardImgOverlay<T = {[key: string]: any}> extends React.Component<CardImgOverlayProps<T>> {}
 export default CardImgOverlay;
diff --git a/types/reactstrap/lib/CardLink.d.ts b/types/reactstrap/lib/CardLink.d.ts
index 256d55d31c..359cb6e32a 100644
--- a/types/reactstrap/lib/CardLink.d.ts
+++ b/types/reactstrap/lib/CardLink.d.ts
@@ -9,5 +9,5 @@ export type CardLinkProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   href?: string;
 } & T;
 
-declare class CardLink<T = {}> extends React.Component<CardLinkProps<T>> {}
+declare class CardLink<T = {[key: string]: any}> extends React.Component<CardLinkProps<T>> {}
 export default CardLink;
diff --git a/types/reactstrap/lib/CardSubtitle.d.ts b/types/reactstrap/lib/CardSubtitle.d.ts
index a5285469cd..8e379ceaa1 100644
--- a/types/reactstrap/lib/CardSubtitle.d.ts
+++ b/types/reactstrap/lib/CardSubtitle.d.ts
@@ -7,5 +7,5 @@ export type CardSubtitleProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class CardSubtitle<T = {}> extends React.Component<CardSubtitleProps<T>> {}
+declare class CardSubtitle<T = {[key: string]: any}> extends React.Component<CardSubtitleProps<T>> {}
 export default CardSubtitle;
diff --git a/types/reactstrap/lib/CardText.d.ts b/types/reactstrap/lib/CardText.d.ts
index b09eea4de7..fd3fb8eba9 100644
--- a/types/reactstrap/lib/CardText.d.ts
+++ b/types/reactstrap/lib/CardText.d.ts
@@ -7,5 +7,5 @@ export type CardTextProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class CardText<T = {}> extends React.Component<CardTextProps<T>> {}
+declare class CardText<T = {[key: string]: any}> extends React.Component<CardTextProps<T>> {}
 export default CardText;
diff --git a/types/reactstrap/lib/CardTitle.d.ts b/types/reactstrap/lib/CardTitle.d.ts
index 6f3e91d26a..0d6bad3c89 100644
--- a/types/reactstrap/lib/CardTitle.d.ts
+++ b/types/reactstrap/lib/CardTitle.d.ts
@@ -7,5 +7,5 @@ export type CardTitleProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class CardTitle<T = {}> extends React.Component<CardTitleProps<T>> {}
+declare class CardTitle<T = {[key: string]: any}> extends React.Component<CardTitleProps<T>> {}
 export default CardTitle;
diff --git a/types/reactstrap/lib/Carousel.d.ts b/types/reactstrap/lib/Carousel.d.ts
index d4c8de35a5..0f59105f77 100644
--- a/types/reactstrap/lib/Carousel.d.ts
+++ b/types/reactstrap/lib/Carousel.d.ts
@@ -15,5 +15,5 @@ export type CarouselProps<T = {}> = React.HTMLProps<HTMLElement> & {
     cssModule?: CSSModule
 } & T;
 
-declare class Carousel<T = {}> extends React.Component<CarouselProps<T>> {}
+declare class Carousel<T = {[key: string]: any}> extends React.Component<CarouselProps<T>> {}
 export default Carousel;
diff --git a/types/reactstrap/lib/CarouselCaption.d.ts b/types/reactstrap/lib/CarouselCaption.d.ts
index 2d6eea7d7f..047505f318 100644
--- a/types/reactstrap/lib/CarouselCaption.d.ts
+++ b/types/reactstrap/lib/CarouselCaption.d.ts
@@ -7,5 +7,5 @@ export type CarouselCaptionProps<T = {}> = React.HTMLProps<HTMLElement> & {
     cssModule?: CSSModule;
 } & T;
 
-declare class CarouselCaption<T = {}> extends React.Component<CarouselCaptionProps<T>> {}
+declare class CarouselCaption<T = {[key: string]: any}> extends React.Component<CarouselCaptionProps<T>> {}
 export default CarouselCaption;
diff --git a/types/reactstrap/lib/CarouselControl.d.ts b/types/reactstrap/lib/CarouselControl.d.ts
index 1605c84dd0..fb309f4cb1 100644
--- a/types/reactstrap/lib/CarouselControl.d.ts
+++ b/types/reactstrap/lib/CarouselControl.d.ts
@@ -8,5 +8,5 @@ export type CarouselControlProps<T = {}> = React.HTMLProps<HTMLElement> & {
     directionText: string;
 } & T;
 
-declare class CarouselControl<T = {}> extends React.Component<CarouselControlProps<T>> {}
+declare class CarouselControl<T = {[key: string]: any}> extends React.Component<CarouselControlProps<T>> {}
 export default CarouselControl;
diff --git a/types/reactstrap/lib/CarouselIndicators.d.ts b/types/reactstrap/lib/CarouselIndicators.d.ts
index 34c8c16eef..761ab8d1cf 100644
--- a/types/reactstrap/lib/CarouselIndicators.d.ts
+++ b/types/reactstrap/lib/CarouselIndicators.d.ts
@@ -8,5 +8,5 @@ export type CarouselIndicatorsProps<T = {}> = React.HTMLProps<HTMLElement> & {
     onClickHandler: (idx: number) => void;
 } & T;
 
-declare class CarouselIndicators<T = {}> extends React.Component<CarouselIndicatorsProps<T>> {}
+declare class CarouselIndicators<T = {[key: string]: any}> extends React.Component<CarouselIndicatorsProps<T>> {}
 export default CarouselIndicators;
diff --git a/types/reactstrap/lib/CarouselItem.d.ts b/types/reactstrap/lib/CarouselItem.d.ts
index 264d093695..8eb6bb325d 100644
--- a/types/reactstrap/lib/CarouselItem.d.ts
+++ b/types/reactstrap/lib/CarouselItem.d.ts
@@ -10,12 +10,12 @@ export interface Transition {
     onExited?: () => void;
 }
 
-export interface CarouselItemProps extends React.HTMLProps<HTMLElement>, Transition {
+export type CarouselItemProps<T = {}> = React.HTMLProps<HTMLElement> & Transition & {
     tag?: React.ReactType;
     in?: boolean;
     cssModule?: CSSModule;
     slide?: boolean;
-}
+} & T;
 
-declare class CarouselItem<T = {}> extends React.Component<CarouselItemProps> {}
+declare class CarouselItem<T = {[key: string]: any}> extends React.Component<CarouselItemProps<T>> {}
 export default CarouselItem;
diff --git a/types/reactstrap/lib/Col.d.ts b/types/reactstrap/lib/Col.d.ts
index 5e6a3e8ffa..0d1bac535d 100644
--- a/types/reactstrap/lib/Col.d.ts
+++ b/types/reactstrap/lib/Col.d.ts
@@ -24,5 +24,5 @@ export type ColProps<T = {}> = React.HTMLProps<HTMLDivElement> & {
   widths?: string[];
 } & T;
 
-declare class Col<T = {}> extends React.Component<ColProps<T>> {}
+declare class Col<T = {[key: string]: any}> extends React.Component<ColProps<T>> {}
 export default Col;
diff --git a/types/reactstrap/lib/Collapse.d.ts b/types/reactstrap/lib/Collapse.d.ts
index 8123c29b28..c3d6572ec9 100644
--- a/types/reactstrap/lib/Collapse.d.ts
+++ b/types/reactstrap/lib/Collapse.d.ts
@@ -20,5 +20,5 @@ export type CollapseProps<T = {}> = React.HTMLProps<HTMLElement> & {
   onExited?: () => void;
 } & T;
 
-declare class Collapse<T = {}> extends React.Component<CollapseProps<T>> {}
+declare class Collapse<T = {[key: string]: any}> extends React.Component<CollapseProps<T>> {}
 export default Collapse;
diff --git a/types/reactstrap/lib/Container.d.ts b/types/reactstrap/lib/Container.d.ts
index 5497f3e295..a39db466bb 100644
--- a/types/reactstrap/lib/Container.d.ts
+++ b/types/reactstrap/lib/Container.d.ts
@@ -8,5 +8,5 @@ export type ContainerProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class Container<T = {}> extends React.Component<ContainerProps<T>> {}
+declare class Container<T = {[key: string]: any}> extends React.Component<ContainerProps<T>> {}
 export default Container;
diff --git a/types/reactstrap/lib/Dropdown.d.ts b/types/reactstrap/lib/Dropdown.d.ts
index 803ece5bf3..59f827744e 100644
--- a/types/reactstrap/lib/Dropdown.d.ts
+++ b/types/reactstrap/lib/Dropdown.d.ts
@@ -27,5 +27,5 @@ export type Props<T = {}> = UncontrolledProps<T> & {
 };
 export type DropdownProps<T = {}> = Props<T>;
 
-declare class Dropdown<T = {}> extends React.Component<DropdownProps<T>> {}
+declare class Dropdown<T = {[key: string]: any}> extends React.Component<DropdownProps<T>> {}
 export default Dropdown;
diff --git a/types/reactstrap/lib/DropdownMenu.d.ts b/types/reactstrap/lib/DropdownMenu.d.ts
index ffb493faa6..e485fad076 100644
--- a/types/reactstrap/lib/DropdownMenu.d.ts
+++ b/types/reactstrap/lib/DropdownMenu.d.ts
@@ -9,5 +9,5 @@ export type DropdownMenuProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   flip?: boolean;
 } & T;
 
-declare class DropdownMenu<T = {}> extends React.Component<DropdownMenuProps<T>> {}
+declare class DropdownMenu<T = {[key: string]: any}> extends React.Component<DropdownMenuProps<T>> {}
 export default DropdownMenu;
diff --git a/types/reactstrap/lib/Fade.d.ts b/types/reactstrap/lib/Fade.d.ts
index 7e0d4ec775..97fe421e7d 100644
--- a/types/reactstrap/lib/Fade.d.ts
+++ b/types/reactstrap/lib/Fade.d.ts
@@ -18,5 +18,5 @@ export type FadeProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   onEnter?: () => void;
 } & T;
 
-declare class Fade<T = {}> extends React.Component<FadeProps<T>> {}
+declare class Fade<T = {[key: string]: any}> extends React.Component<FadeProps<T>> {}
 export default Fade;
diff --git a/types/reactstrap/lib/FormFeedback.d.ts b/types/reactstrap/lib/FormFeedback.d.ts
index 78e6f66676..e221c9809b 100644
--- a/types/reactstrap/lib/FormFeedback.d.ts
+++ b/types/reactstrap/lib/FormFeedback.d.ts
@@ -8,5 +8,5 @@ export type FormFeedbackProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   valid?: boolean;
 } & T;
 
-declare class FormFeedback<T = {}> extends React.Component<FormFeedbackProps<T>> {}
+declare class FormFeedback<T = {[key: string]: any}> extends React.Component<FormFeedbackProps<T>> {}
 export default FormFeedback;
diff --git a/types/reactstrap/lib/FormGroup.d.ts b/types/reactstrap/lib/FormGroup.d.ts
index b463487e07..f0369ff7d9 100644
--- a/types/reactstrap/lib/FormGroup.d.ts
+++ b/types/reactstrap/lib/FormGroup.d.ts
@@ -11,5 +11,5 @@ export type FormGroupProps<T = {}> = React.HTMLProps<HTMLDivElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class FormGroup<T = {}> extends React.Component<FormGroupProps<T>> {}
+declare class FormGroup<T = {[key: string]: any}> extends React.Component<FormGroupProps<T>> {}
 export default FormGroup;
diff --git a/types/reactstrap/lib/FormText.d.ts b/types/reactstrap/lib/FormText.d.ts
index 378b67d8a8..f2fc6f30a6 100644
--- a/types/reactstrap/lib/FormText.d.ts
+++ b/types/reactstrap/lib/FormText.d.ts
@@ -9,5 +9,5 @@ export type FormTextProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class FormText<T = {}> extends React.Component<FormTextProps<T>> {}
+declare class FormText<T = {[key: string]: any}> extends React.Component<FormTextProps<T>> {}
 export default FormText;
diff --git a/types/reactstrap/lib/InputGroup.d.ts b/types/reactstrap/lib/InputGroup.d.ts
index 3a74adb3d8..e95b6c5539 100644
--- a/types/reactstrap/lib/InputGroup.d.ts
+++ b/types/reactstrap/lib/InputGroup.d.ts
@@ -8,5 +8,5 @@ export type InputGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class InputGroup<T = {}> extends React.Component<InputGroupProps<T>> {}
+declare class InputGroup<T = {[key: string]: any}> extends React.Component<InputGroupProps<T>> {}
 export default InputGroup;
diff --git a/types/reactstrap/lib/InputGroupAddon.d.ts b/types/reactstrap/lib/InputGroupAddon.d.ts
index a76ae81a35..eec8a6727a 100644
--- a/types/reactstrap/lib/InputGroupAddon.d.ts
+++ b/types/reactstrap/lib/InputGroupAddon.d.ts
@@ -8,5 +8,5 @@ export type InputGroupAddonProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   addonType: 'prepend' | 'append';
 } & T;
 
-declare class InputGroupAddon<T = {}> extends React.Component<InputGroupAddonProps<T>> {}
+declare class InputGroupAddon<T = {[key: string]: any}> extends React.Component<InputGroupAddonProps<T>> {}
 export default InputGroupAddon;
diff --git a/types/reactstrap/lib/InputGroupButtonDropdown.d.ts b/types/reactstrap/lib/InputGroupButtonDropdown.d.ts
index 2bd235f1f0..888364df14 100644
--- a/types/reactstrap/lib/InputGroupButtonDropdown.d.ts
+++ b/types/reactstrap/lib/InputGroupButtonDropdown.d.ts
@@ -5,5 +5,5 @@ export type InputGroupButtonDropdownProps<T = {}> = DropdownProps & {
     addonType: 'prepend' | 'append';
 } & T;
 
-declare class InputGroupButtonDropdown<T = {}> extends React.Component<InputGroupButtonDropdownProps<T>> {}
+declare class InputGroupButtonDropdown<T = {[key: string]: any}> extends React.Component<InputGroupButtonDropdownProps<T>> {}
 export default InputGroupButtonDropdown;
diff --git a/types/reactstrap/lib/InputGroupText.d.ts b/types/reactstrap/lib/InputGroupText.d.ts
index e8b5a7acfc..9e352ea9d8 100644
--- a/types/reactstrap/lib/InputGroupText.d.ts
+++ b/types/reactstrap/lib/InputGroupText.d.ts
@@ -6,5 +6,5 @@ export type InputGroupTextProps<T = {}> = React.HTMLAttributes<HTMLElement>  & {
   cssModule?: CSSModule;
 } & T;
 
-declare class InputGroupText<T = {}> extends React.Component<InputGroupTextProps<T>> {}
+declare class InputGroupText<T = {[key: string]: any}> extends React.Component<InputGroupTextProps<T>> {}
 export default InputGroupText;
diff --git a/types/reactstrap/lib/Jumbotron.d.ts b/types/reactstrap/lib/Jumbotron.d.ts
index 8b4fc45652..d271b63960 100644
--- a/types/reactstrap/lib/Jumbotron.d.ts
+++ b/types/reactstrap/lib/Jumbotron.d.ts
@@ -8,5 +8,5 @@ export type JumbotronProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class Jumbotron<T = {}> extends React.Component<JumbotronProps<T>> {}
+declare class Jumbotron<T = {[key: string]: any}> extends React.Component<JumbotronProps<T>> {}
 export default Jumbotron;
diff --git a/types/reactstrap/lib/Label.d.ts b/types/reactstrap/lib/Label.d.ts
index 5669a63bad..89d9a96e48 100644
--- a/types/reactstrap/lib/Label.d.ts
+++ b/types/reactstrap/lib/Label.d.ts
@@ -23,5 +23,5 @@ export type LabelProps<T = {}> = Intermediate & {
   xl?: ColumnProps;
 } & T;
 
-declare class Label<T = {}> extends React.Component<LabelProps<T>> {}
+declare class Label<T = {[key: string]: any}> extends React.Component<LabelProps<T>> {}
 export default Label;
diff --git a/types/reactstrap/lib/ListGroup.d.ts b/types/reactstrap/lib/ListGroup.d.ts
index 2c69fcf294..1c2f6739e6 100644
--- a/types/reactstrap/lib/ListGroup.d.ts
+++ b/types/reactstrap/lib/ListGroup.d.ts
@@ -8,5 +8,5 @@ export type ListGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class ListGroup<T = {}> extends React.Component<ListGroupProps<T>> {}
+declare class ListGroup<T = {[key: string]: any}> extends React.Component<ListGroupProps<T>> {}
 export default ListGroup;
diff --git a/types/reactstrap/lib/ListGroupItem.d.ts b/types/reactstrap/lib/ListGroupItem.d.ts
index 3d4553aa7b..54ae820290 100644
--- a/types/reactstrap/lib/ListGroupItem.d.ts
+++ b/types/reactstrap/lib/ListGroupItem.d.ts
@@ -14,5 +14,5 @@ export type ListGroupItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   onClick?: React.MouseEventHandler<any>;
 } & T;
 
-declare class ListGroupItem<T = {}> extends React.Component<ListGroupItemProps<T>> {}
+declare class ListGroupItem<T = {[key: string]: any}> extends React.Component<ListGroupItemProps<T>> {}
 export default ListGroupItem;
diff --git a/types/reactstrap/lib/ListGroupItemHeading.d.ts b/types/reactstrap/lib/ListGroupItemHeading.d.ts
index c4f04e0330..6748aaa04c 100644
--- a/types/reactstrap/lib/ListGroupItemHeading.d.ts
+++ b/types/reactstrap/lib/ListGroupItemHeading.d.ts
@@ -7,5 +7,5 @@ export type ListGroupItemHeadingProps<T = {}> = React.HTMLAttributes<HTMLElement
   cssModule?: CSSModule;
 } & T;
 
-declare class ListGroupItemHeading<T = {}> extends React.Component<ListGroupItemHeadingProps<T>> {}
+declare class ListGroupItemHeading<T = {[key: string]: any}> extends React.Component<ListGroupItemHeadingProps<T>> {}
 export default ListGroupItemHeading;
diff --git a/types/reactstrap/lib/ListGroupItemText.d.ts b/types/reactstrap/lib/ListGroupItemText.d.ts
index 6fa1153ae2..667f2cad70 100644
--- a/types/reactstrap/lib/ListGroupItemText.d.ts
+++ b/types/reactstrap/lib/ListGroupItemText.d.ts
@@ -7,5 +7,5 @@ export type ListGroupItemTextProps<T = {}> = React.HTMLAttributes<HTMLElement> &
   cssModule?: CSSModule;
 } & T;
 
-declare class ListGroupItemText<T = {}> extends React.Component<ListGroupItemTextProps<T>> {}
+declare class ListGroupItemText<T = {[key: string]: any}> extends React.Component<ListGroupItemTextProps<T>> {}
 export default ListGroupItemText;
diff --git a/types/reactstrap/lib/Media.d.ts b/types/reactstrap/lib/Media.d.ts
index b64eeffd7f..0c82de93d0 100644
--- a/types/reactstrap/lib/Media.d.ts
+++ b/types/reactstrap/lib/Media.d.ts
@@ -18,5 +18,5 @@ export type MediaProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   alt?: string;
 } & T;
 
-declare class Media<T = {}> extends React.Component<MediaProps<T>> {}
+declare class Media<T = {[key: string]: any}> extends React.Component<MediaProps<T>> {}
 export default Media;
diff --git a/types/reactstrap/lib/ModalBody.d.ts b/types/reactstrap/lib/ModalBody.d.ts
index 4817e64bf4..a7c38a1914 100644
--- a/types/reactstrap/lib/ModalBody.d.ts
+++ b/types/reactstrap/lib/ModalBody.d.ts
@@ -7,5 +7,5 @@ export type ModalBodyProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class ModalBody<T = {}> extends React.Component<ModalBodyProps<T>> {}
+declare class ModalBody<T = {[key: string]: any}> extends React.Component<ModalBodyProps<T>> {}
 export default ModalBody;
diff --git a/types/reactstrap/lib/ModalFooter.d.ts b/types/reactstrap/lib/ModalFooter.d.ts
index 7997d6931a..8ce9b23cf2 100644
--- a/types/reactstrap/lib/ModalFooter.d.ts
+++ b/types/reactstrap/lib/ModalFooter.d.ts
@@ -7,5 +7,5 @@ export type ModalFooterProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class ModalFooter<T = {}> extends React.Component<ModalFooterProps<T>> {}
+declare class ModalFooter<T = {[key: string]: any}> extends React.Component<ModalFooterProps<T>> {}
 export default ModalFooter;
diff --git a/types/reactstrap/lib/ModalHeader.d.ts b/types/reactstrap/lib/ModalHeader.d.ts
index 9e37201941..4ef33e16ad 100644
--- a/types/reactstrap/lib/ModalHeader.d.ts
+++ b/types/reactstrap/lib/ModalHeader.d.ts
@@ -9,5 +9,5 @@ export type ModalHeaderProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   toggle?: () => void;
 } & T;
 
-declare class ModalHeader<T = {}> extends React.Component<ModalHeaderProps<T>> {}
+declare class ModalHeader<T = {[key: string]: any}> extends React.Component<ModalHeaderProps<T>> {}
 export default ModalHeader;
diff --git a/types/reactstrap/lib/Nav.d.ts b/types/reactstrap/lib/Nav.d.ts
index 6868b01665..bc5fbdb6b9 100644
--- a/types/reactstrap/lib/Nav.d.ts
+++ b/types/reactstrap/lib/Nav.d.ts
@@ -15,5 +15,5 @@ export type NavProps<T = {}> = React.HTMLProps<HTMLUListElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class Nav<T = {}> extends React.Component<NavProps<T>> {}
+declare class Nav<T = {[key: string]: any}> extends React.Component<NavProps<T>> {}
 export default Nav;
diff --git a/types/reactstrap/lib/NavItem.d.ts b/types/reactstrap/lib/NavItem.d.ts
index 969369bfee..ff2ad879c3 100644
--- a/types/reactstrap/lib/NavItem.d.ts
+++ b/types/reactstrap/lib/NavItem.d.ts
@@ -8,5 +8,5 @@ export type NavItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class NavItem<T = {}> extends React.Component<NavItemProps<T>> {}
+declare class NavItem<T = {[key: string]: any}> extends React.Component<NavItemProps<T>> {}
 export default NavItem;
diff --git a/types/reactstrap/lib/Navbar.d.ts b/types/reactstrap/lib/Navbar.d.ts
index 39d7340d79..a0f721835a 100644
--- a/types/reactstrap/lib/Navbar.d.ts
+++ b/types/reactstrap/lib/Navbar.d.ts
@@ -17,5 +17,5 @@ export type NavbarProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   expand?: boolean | string;
 } & T;
 
-declare class Navbar<T = {}> extends React.Component<NavbarProps<T>> {}
+declare class Navbar<T = {[key: string]: any}> extends React.Component<NavbarProps<T>> {}
 export default Navbar;
diff --git a/types/reactstrap/lib/NavbarBrand.d.ts b/types/reactstrap/lib/NavbarBrand.d.ts
index f7a814b31b..eea7ba15e4 100644
--- a/types/reactstrap/lib/NavbarBrand.d.ts
+++ b/types/reactstrap/lib/NavbarBrand.d.ts
@@ -7,5 +7,5 @@ export type NavbarBrandProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class NavbarBrand<T = {}> extends React.Component<NavbarBrandProps<T>> {}
+declare class NavbarBrand<T = {[key: string]: any}> extends React.Component<NavbarBrandProps<T>> {}
 export default NavbarBrand;
diff --git a/types/reactstrap/lib/NavbarToggler.d.ts b/types/reactstrap/lib/NavbarToggler.d.ts
index b3dbedb20f..f4e1e212e5 100644
--- a/types/reactstrap/lib/NavbarToggler.d.ts
+++ b/types/reactstrap/lib/NavbarToggler.d.ts
@@ -8,5 +8,5 @@ export type NavbarTogglerProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class NavbarToggler<T = {}> extends React.Component<NavbarTogglerProps<T>> {}
+declare class NavbarToggler<T = {[key: string]: any}> extends React.Component<NavbarTogglerProps<T>> {}
 export default NavbarToggler;
diff --git a/types/reactstrap/lib/Pagination.d.ts b/types/reactstrap/lib/Pagination.d.ts
index 15f30547b7..d31895d31d 100644
--- a/types/reactstrap/lib/Pagination.d.ts
+++ b/types/reactstrap/lib/Pagination.d.ts
@@ -7,5 +7,5 @@ export type PaginationProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   size?: string;
 } & T;
 
-declare class Pagination<T = {}> extends React.Component<PaginationProps<T>> {}
+declare class Pagination<T = {[key: string]: any}> extends React.Component<PaginationProps<T>> {}
 export default Pagination;
diff --git a/types/reactstrap/lib/PaginationItem.d.ts b/types/reactstrap/lib/PaginationItem.d.ts
index b555239371..b2567f5402 100644
--- a/types/reactstrap/lib/PaginationItem.d.ts
+++ b/types/reactstrap/lib/PaginationItem.d.ts
@@ -9,5 +9,5 @@ export type PaginationItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
 } & T;
 
-declare class PaginationItem<T = {}> extends React.Component<PaginationItemProps<T>> {}
+declare class PaginationItem<T = {[key: string]: any}> extends React.Component<PaginationItemProps<T>> {}
 export default PaginationItem;
diff --git a/types/reactstrap/lib/PaginationLink.d.ts b/types/reactstrap/lib/PaginationLink.d.ts
index 90ea909d4e..5e1db2d2b7 100644
--- a/types/reactstrap/lib/PaginationLink.d.ts
+++ b/types/reactstrap/lib/PaginationLink.d.ts
@@ -10,5 +10,5 @@ export type PaginationLinkProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
   tag?: React.ReactType;
 } & T;
 
-declare class PaginationLink<T = {}> extends React.Component<PaginationLinkProps<T>> {}
+declare class PaginationLink<T = {[key: string]: any}> extends React.Component<PaginationLinkProps<T>> {}
 export default PaginationLink;
diff --git a/types/reactstrap/lib/PopoverBody.d.ts b/types/reactstrap/lib/PopoverBody.d.ts
index d5a3d6732f..ef274a0558 100644
--- a/types/reactstrap/lib/PopoverBody.d.ts
+++ b/types/reactstrap/lib/PopoverBody.d.ts
@@ -7,5 +7,5 @@ export type PopoverBodyProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class PopoverBody<T = {}> extends React.Component<PopoverBodyProps<T>> {}
+declare class PopoverBody<T = {[key: string]: any}> extends React.Component<PopoverBodyProps<T>> {}
 export default PopoverBody;
diff --git a/types/reactstrap/lib/PopoverHeader.d.ts b/types/reactstrap/lib/PopoverHeader.d.ts
index 7033dc90f8..2ee7d5665e 100644
--- a/types/reactstrap/lib/PopoverHeader.d.ts
+++ b/types/reactstrap/lib/PopoverHeader.d.ts
@@ -7,5 +7,5 @@ export type PopoverHeaderProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class PopoverHeader<T = {}> extends React.Component<PopoverHeaderProps<T>> {}
+declare class PopoverHeader<T = {[key: string]: any}> extends React.Component<PopoverHeaderProps<T>> {}
 export default PopoverHeader;
diff --git a/types/reactstrap/lib/Progress.d.ts b/types/reactstrap/lib/Progress.d.ts
index 4bd99ab690..9edeed0807 100644
--- a/types/reactstrap/lib/Progress.d.ts
+++ b/types/reactstrap/lib/Progress.d.ts
@@ -14,5 +14,5 @@ export type ProgressProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   barClassName?: string;
 } & T;
 
-declare class Progress<T = {}> extends React.Component<ProgressProps<T>> {};
+declare class Progress<T = {[key: string]: any}> extends React.Component<ProgressProps<T>> {};
 export default Progress;
diff --git a/types/reactstrap/lib/Row.d.ts b/types/reactstrap/lib/Row.d.ts
index d430e336e0..c8887e3e12 100644
--- a/types/reactstrap/lib/Row.d.ts
+++ b/types/reactstrap/lib/Row.d.ts
@@ -8,5 +8,5 @@ export type RowProps<T = {}> = React.HTMLProps<HTMLElement> & {
   noGutters?: boolean;
 } & T;
 
-declare class Row<T = {}> extends React.Component<RowProps<T>> {}
+declare class Row<T = {[key: string]: any}> extends React.Component<RowProps<T>> {}
 export default Row;
diff --git a/types/reactstrap/lib/TabPane.d.ts b/types/reactstrap/lib/TabPane.d.ts
index 1472fe28b7..7f4624e23a 100644
--- a/types/reactstrap/lib/TabPane.d.ts
+++ b/types/reactstrap/lib/TabPane.d.ts
@@ -8,5 +8,5 @@ export type TabPaneProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tabId?: number | string;
 } & T;
 
-declare class TabPane<T = {}> extends React.Component<TabPaneProps<T>> {}
+declare class TabPane<T = {[key: string]: any}> extends React.Component<TabPaneProps<T>> {}
 export default TabPane;
diff --git a/types/reactstrap/lib/Table.d.ts b/types/reactstrap/lib/Table.d.ts
index 3ad14b8c0a..394a1f3f40 100644
--- a/types/reactstrap/lib/Table.d.ts
+++ b/types/reactstrap/lib/Table.d.ts
@@ -15,5 +15,5 @@ export type TableProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   responsiveTag?: React.ReactType;
 } & T;
 
-declare class Table<T = {}> extends React.Component<TableProps<T>> {}
+declare class Table<T = {[key: string]: any}> extends React.Component<TableProps<T>> {}
 export default Table;
diff --git a/types/reactstrap/lib/Tag.d.ts b/types/reactstrap/lib/Tag.d.ts
index ea09231942..dbec4c3516 100644
--- a/types/reactstrap/lib/Tag.d.ts
+++ b/types/reactstrap/lib/Tag.d.ts
@@ -9,5 +9,5 @@ export type TagProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
 } & T;
 
-declare class Tag<T = {}> extends React.Component<TagProps<T>> {}
+declare class Tag<T = {[key: string]: any}> extends React.Component<TagProps<T>> {}
 export default Tag;

From d9ce205b5753eeb8124052b967733c062f4210a9 Mon Sep 17 00:00:00 2001
From: FaithForHumans <vogel.spencer@gmail.com>
Date: Tue, 29 May 2018 15:57:55 -0500
Subject: [PATCH 494/575] Updating index file to export generics.

---
 types/reactstrap/index.d.ts | 312 +++++++++++++++++++++++++++---------
 1 file changed, 235 insertions(+), 77 deletions(-)

diff --git a/types/reactstrap/index.d.ts b/types/reactstrap/index.d.ts
index 2cf1ce6c86..b7c408183b 100644
--- a/types/reactstrap/index.d.ts
+++ b/types/reactstrap/index.d.ts
@@ -14,80 +14,238 @@ export interface CSSModule {
   [className: string]: string;
 }
 
-export { default as Alert,                    AlertProps                      } from './lib/Alert';
-export { default as Badge,                    BadgeProps                      } from './lib/Badge';
-export { default as Breadcrumb,               BreadcrumbProps                 } from './lib/Breadcrumb';
-export { default as BreadcrumbItem,           BreadcrumbItemProps             } from './lib/BreadcrumbItem';
-export { default as Button,                   ButtonProps                     } from './lib/Button';
-export { default as ButtonDropdown,           ButtonDropdownProps             } from './lib/ButtonDropdown';
-export { default as ButtonGroup,              ButtonGroupProps                } from './lib/ButtonGroup';
-export { default as ButtonToolbar,            ButtonToolbarProps              } from './lib/ButtonToolbar';
-export { default as Card,                     CardProps                       } from './lib/Card';
-export { default as CardBody,                 CardBodyProps                   } from './lib/CardBody';
-export { default as CardColumns,              CardColumnsProps                } from './lib/CardColumns';
-export { default as CardDeck,                 CardDeckProps                   } from './lib/CardDeck';
-export { default as CardFooter,               CardFooterProps                 } from './lib/CardFooter';
-export { default as CardGroup,                CardGroupProps                  } from './lib/CardGroup';
-export { default as CardHeader,               CardHeaderProps                 } from './lib/CardHeader';
-export { default as CardImg,                  CardImgProps                    } from './lib/CardImg';
-export { default as CardImgOverlay,           CardImgOverlayProps             } from './lib/CardImgOverlay';
-export { default as CardLink,                 CardLinkProps                   } from './lib/CardLink';
-export { default as CardSubtitle,             CardSubtitleProps               } from './lib/CardSubtitle';
-export { default as CardText,                 CardTextProps                   } from './lib/CardText';
-export { default as CardTitle,                CardTitleProps                  } from './lib/CardTitle';
-export { default as Carousel,                 CarouselProps                   } from './lib/Carousel';
-export { default as CarouselItem,             CarouselItemProps               } from './lib/CarouselItem';
-export { default as CarouselControl,          CarouselControlProps            } from './lib/CarouselControl';
-export { default as CarouselIndicators,       CarouselIndicatorsProps         } from './lib/CarouselIndicators';
-export { default as CarouselCaption,          CarouselCaptionProps            } from './lib/CarouselCaption';
-export { default as Col,                      ColProps                        } from './lib/Col';
-export { default as Collapse,                 CollapseProps                   } from './lib/Collapse';
-export { default as Container,                ContainerProps                  } from './lib/Container';
-export { default as Dropdown,                 DropdownProps                   } from './lib/Dropdown';
-export { default as DropdownItem,             DropdownItemProps               } from './lib/DropdownItem';
-export { default as DropdownMenu,             DropdownMenuProps               } from './lib/DropdownMenu';
-export { default as DropdownToggle,           DropdownToggleProps             } from './lib/DropdownToggle';
-export { default as Fade,                     FadeProps                       } from './lib/Fade';
-export { default as Form,                     FormProps                       } from './lib/Form';
-export { default as FormFeedback,             FormFeedbackProps               } from './lib/FormFeedback';
-export { default as FormGroup,                FormGroupProps                  } from './lib/FormGroup';
-export { default as FormText,                 FormTextProps                   } from './lib/FormText';
-export { default as Input,                    InputProps                      } from './lib/Input';
-export { default as InputGroup,               InputGroupProps                 } from './lib/InputGroup';
-export { default as InputGroupAddon,          InputGroupAddonProps            } from './lib/InputGroupAddon';
-export { default as InputGroupButtonDropdown, InputGroupButtonDropdownProps   } from './lib/InputGroupButtonDropdown';
-export { default as InputGroupText,           InputGroupTextProps             } from './lib/InputGroupText';
-export { default as Jumbotron,                JumbotronProps                  } from './lib/Jumbotron';
-export { default as Label,                    LabelProps                      } from './lib/Label';
-export { default as ListGroup,                ListGroupProps                  } from './lib/ListGroup';
-export { default as ListGroupItem,            ListGroupItemProps              } from './lib/ListGroupItem';
-export { default as ListGroupItemHeading,     ListGroupItemHeadingProps       } from './lib/ListGroupItemHeading';
-export { default as ListGroupItemText,        ListGroupItemTextProps          } from './lib/ListGroupItemText';
-export { default as Media,                    MediaProps                      } from './lib/Media';
-export { default as Modal,                    ModalProps                      } from './lib/Modal';
-export { default as ModalBody,                ModalBodyProps                  } from './lib/ModalBody';
-export { default as ModalFooter,              ModalFooterProps                } from './lib/ModalFooter';
-export { default as ModalHeader,              ModalHeaderProps                } from './lib/ModalHeader';
-export { default as Nav,                      NavProps                        } from './lib/Nav';
-export { default as Navbar,                   NavbarProps                     } from './lib/Navbar';
-export { default as NavbarBrand,              NavbarBrandProps                } from './lib/NavbarBrand';
-export { default as NavbarToggler,            NavbarTogglerProps              } from './lib/NavbarToggler';
-export { default as NavItem,                  NavItemProps                    } from './lib/NavItem';
-export { default as NavLink,                  NavLinkProps                    } from './lib/NavLink';
-export { default as Pagination,               PaginationProps                 } from './lib/Pagination';
-export { default as PaginationItem,           PaginationItemProps             } from './lib/PaginationItem';
-export { default as PaginationLink,           PaginationLinkProps             } from './lib/PaginationLink';
-export { default as Popover,                  PopoverProps                    } from './lib/Popover';
-export { default as PopoverBody,              PopoverBodyProps                } from './lib/PopoverBody';
-export { default as PopoverHeader,            PopoverHeaderProps              } from './lib/PopoverHeader';
-export { default as Progress,                 ProgressProps                   } from './lib/Progress';
-export { default as Row,                      RowProps                        } from './lib/Row';
-export { default as TabContent,               TabContentProps                 } from './lib/TabContent';
-export { default as Table,                    TableProps                      } from './lib/Table';
-export { default as TabPane,                  TabPaneProps                    } from './lib/TabPane';
-export { default as Tag,                      TagProps                        } from './lib/Tag';
-export { default as Tooltip,                  TooltipProps                    } from './lib/Tooltip';
-export { UncontrolledAlert,                   UncontrolledAlertProps          } from './lib/Uncontrolled';
-export { UncontrolledButtonDropdown,          UncontrolledButtonDropdownProps } from './lib/Uncontrolled';
-export { UncontrolledDropdown,                UncontrolledDropdownProps       } from './lib/Uncontrolled';
-export { UncontrolledTooltip,                 UncontrolledTooltipProps        } from './lib/Uncontrolled';
+import { default as Alert_ } from './lib/Alert';
+export class Alert<T = {}> extends Alert_<T> {}
+export { AlertProps } from './lib/Alert';
+import { default as Badge_ } from './lib/Badge';
+export class Badge<T = {}> extends Badge_<T> {}
+export { BadgeProps } from './lib/Badge';
+import { default as Breadcrumb_ } from './lib/Breadcrumb';
+export class Breadcrumb<T = {}> extends Breadcrumb_<T> {}
+export { BreadcrumbProps } from './lib/Breadcrumb';
+import { default as BreadcrumbItem_ } from './lib/BreadcrumbItem';
+export class BreadcrumbItem<T = {}> extends BreadcrumbItem_<T> {}
+export { BreadcrumbItemProps } from './lib/BreadcrumbItem';
+import { default as Button_ } from './lib/Button';
+export class Button<T = {}> extends Button_<T> {}
+export { ButtonProps } from './lib/Button';
+import { default as ButtonDropdown_ } from './lib/ButtonDropdown';
+export class ButtonDropdown<T = {}> extends ButtonDropdown_<T> {}
+export { ButtonDropdownProps } from './lib/ButtonDropdown';
+import { default as ButtonGroup_ } from './lib/ButtonGroup';
+export class ButtonGroup<T = {}> extends ButtonGroup_<T> {}
+export { ButtonGroupProps } from './lib/ButtonGroup';
+import { default as ButtonToolbar_ } from './lib/ButtonToolbar';
+export class ButtonToolbar<T = {}> extends ButtonToolbar_<T> {}
+export { ButtonToolbarProps } from './lib/ButtonToolbar';
+import { default as Card_ } from './lib/Card';
+export class Card<T = {}> extends Card_<T> {}
+export { CardProps } from './lib/Card';
+import { default as CardBody_ } from './lib/CardBody';
+export class CardBody<T = {}> extends CardBody_<T> {}
+export { CardBodyProps } from './lib/CardBody';
+import { default as CardColumns_ } from './lib/CardColumns';
+export class CardColumns<T = {}> extends CardColumns_<T> {}
+export { CardColumnsProps } from './lib/CardColumns';
+import { default as CardDeck_ } from './lib/CardDeck';
+export class CardDeck<T = {}> extends CardDeck_<T> {}
+export { CardDeckProps } from './lib/CardDeck';
+import { default as CardFooter_ } from './lib/CardFooter';
+export class CardFooter<T = {}> extends CardFooter_<T> {}
+export { CardFooterProps } from './lib/CardFooter';
+import { default as CardGroup_ } from './lib/CardGroup';
+export class CardGroup<T = {}> extends CardGroup_<T> {}
+export { CardGroupProps } from './lib/CardGroup';
+import { default as CardHeader_ } from './lib/CardHeader';
+export class CardHeader<T = {}> extends CardHeader_<T> {}
+export { CardHeaderProps } from './lib/CardHeader';
+import { default as CardImg_ } from './lib/CardImg';
+export class CardImg<T = {}> extends CardImg_<T> {}
+export { CardImgProps } from './lib/CardImg';
+import { default as CardImgOverlay_ } from './lib/CardImgOverlay';
+export class CardImgOverlay<T = {}> extends CardImgOverlay_<T> {}
+export { CardImgOverlayProps } from './lib/CardImgOverlay';
+import { default as CardLink_ } from './lib/CardLink';
+export class CardLink<T = {}> extends CardLink_<T> {}
+export { CardLinkProps } from './lib/CardLink';
+import { default as CardSubtitle_ } from './lib/CardSubtitle';
+export class CardSubtitle<T = {}> extends CardSubtitle_<T> {}
+export { CardSubtitleProps } from './lib/CardSubtitle';
+import { default as CardText_ } from './lib/CardText';
+export class CardText<T = {}> extends CardText_<T> {}
+export { CardTextProps } from './lib/CardText';
+import { default as CardTitle_ } from './lib/CardTitle';
+export class CardTitle<T = {}> extends CardTitle_<T> {}
+export { CardTitleProps } from './lib/CardTitle';
+import { default as Carousel_ } from './lib/Carousel';
+export class Carousel<T = {}> extends Carousel_<T> {}
+export { CarouselProps } from './lib/Carousel';
+import { default as CarouselItem_ } from './lib/CarouselItem';
+export class CarouselItem<T = {}> extends CarouselItem_<T> {}
+export { CarouselItemProps } from './lib/CarouselItem';
+import { default as CarouselControl_ } from './lib/CarouselControl';
+export class CarouselControl<T = {}> extends CarouselControl_<T> {}
+export { CarouselControlProps } from './lib/CarouselControl';
+import { default as CarouselIndicators_ } from './lib/CarouselIndicators';
+export class CarouselIndicators<T = {}> extends CarouselIndicators_<T> {}
+export { CarouselIndicatorsProps } from './lib/CarouselIndicators';
+import { default as CarouselCaption_ } from './lib/CarouselCaption';
+export class CarouselCaption<T = {}> extends CarouselCaption_<T> {}
+export { CarouselCaptionProps } from './lib/CarouselCaption';
+import { default as Col_ } from './lib/Col';
+export class Col<T = {}> extends Col_<T> {}
+export { ColProps } from './lib/Col';
+import { default as Collapse_ } from './lib/Collapse';
+export class Collapse<T = {}> extends Collapse_<T> {}
+export { CollapseProps } from './lib/Collapse';
+import { default as Container_ } from './lib/Container';
+export class Container<T = {}> extends Container_<T> {}
+export { ContainerProps } from './lib/Container';
+import { default as Dropdown_ } from './lib/Dropdown';
+export class Dropdown<T = {}> extends Dropdown_<T> {}
+export { DropdownProps } from './lib/Dropdown';
+import { default as DropdownItem_ } from './lib/DropdownItem';
+export class DropdownItem<T = {}> extends DropdownItem_<T> {}
+export { DropdownItemProps } from './lib/DropdownItem';
+import { default as DropdownMenu_ } from './lib/DropdownMenu';
+export class DropdownMenu<T = {}> extends DropdownMenu_<T> {}
+export { DropdownMenuProps } from './lib/DropdownMenu';
+import { default as DropdownToggle_ } from './lib/DropdownToggle';
+export class DropdownToggle<T = {}> extends DropdownToggle_<T> {}
+export { DropdownToggleProps } from './lib/DropdownToggle';
+import { default as Fade_ } from './lib/Fade';
+export class Fade<T = {}> extends Fade_<T> {}
+export { FadeProps } from './lib/Fade';
+import { default as Form_ } from './lib/Form';
+export class Form<T = {}> extends Form_<T> {}
+export { FormProps } from './lib/Form';
+import { default as FormFeedback_ } from './lib/FormFeedback';
+export class FormFeedback<T = {}> extends FormFeedback_<T> {}
+export { FormFeedbackProps } from './lib/FormFeedback';
+import { default as FormGroup_ } from './lib/FormGroup';
+export class FormGroup<T = {}> extends FormGroup_<T> {}
+export { FormGroupProps } from './lib/FormGroup';
+import { default as FormText_ } from './lib/FormText';
+export class FormText<T = {}> extends FormText_<T> {}
+export { FormTextProps } from './lib/FormText';
+import { default as Input_ } from './lib/Input';
+export class Input<T = {}> extends Input_<T> {}
+export { InputProps } from './lib/Input';
+import { default as InputGroup_ } from './lib/InputGroup';
+export class InputGroup<T = {}> extends InputGroup_<T> {}
+export { InputGroupProps } from './lib/InputGroup';
+import { default as InputGroupAddon_ } from './lib/InputGroupAddon';
+export class InputGroupAddon<T = {}> extends InputGroupAddon_<T> {}
+export { InputGroupAddonProps } from './lib/InputGroupAddon';
+import { default as InputGroupButtonDropdown_ } from './lib/InputGroupButtonDropdown';
+export class InputGroupButtonDropdown<T = {}> extends InputGroupButtonDropdown_<T> {}
+export { InputGroupButtonDropdownProps } from './lib/InputGroupButtonDropdown';
+import { default as InputGroupText_ } from './lib/InputGroupText';
+export class InputGroupText<T = {}> extends InputGroupText_<T> {}
+export { InputGroupTextProps } from './lib/InputGroupText';
+import { default as Jumbotron_ } from './lib/Jumbotron';
+export class Jumbotron<T = {}> extends Jumbotron_<T> {}
+export { JumbotronProps } from './lib/Jumbotron';
+import { default as Label_ } from './lib/Label';
+export class Label<T = {}> extends Label_<T> {}
+export { LabelProps } from './lib/Label';
+import { default as ListGroup_ } from './lib/ListGroup';
+export class ListGroup<T = {}> extends ListGroup_<T> {}
+export { ListGroupProps } from './lib/ListGroup';
+import { default as ListGroupItem_ } from './lib/ListGroupItem';
+export class ListGroupItem<T = {}> extends ListGroupItem_<T> {}
+export { ListGroupItemProps } from './lib/ListGroupItem';
+import { default as ListGroupItemHeading_ } from './lib/ListGroupItemHeading';
+export class ListGroupItemHeading<T = {}> extends ListGroupItemHeading_<T> {}
+export { ListGroupItemHeadingProps } from './lib/ListGroupItemHeading';
+import { default as ListGroupItemText_ } from './lib/ListGroupItemText';
+export class ListGroupItemText<T = {}> extends ListGroupItemText_<T> {}
+export { ListGroupItemTextProps } from './lib/ListGroupItemText';
+import { default as Media_ } from './lib/Media';
+export class Media<T = {}> extends Media_<T> {}
+export { MediaProps } from './lib/Media';
+import { default as Modal_ } from './lib/Modal';
+export class Modal<T = {}> extends Modal_<T> {}
+export { ModalProps } from './lib/Modal';
+import { default as ModalBody_ } from './lib/ModalBody';
+export class ModalBody<T = {}> extends ModalBody_<T> {}
+export { ModalBodyProps } from './lib/ModalBody';
+import { default as ModalFooter_ } from './lib/ModalFooter';
+export class ModalFooter<T = {}> extends ModalFooter_<T> {}
+export { ModalFooterProps } from './lib/ModalFooter';
+import { default as ModalHeader_ } from './lib/ModalHeader';
+export class ModalHeader<T = {}> extends ModalHeader_<T> {}
+export { ModalHeaderProps } from './lib/ModalHeader';
+import { default as Nav_ } from './lib/Nav';
+export class Nav<T = {}> extends Nav_<T> {}
+export { NavProps } from './lib/Nav';
+import { default as Navbar_ } from './lib/Navbar';
+export class Navbar<T = {}> extends Navbar_<T> {}
+export { NavbarProps } from './lib/Navbar';
+import { default as NavbarBrand_ } from './lib/NavbarBrand';
+export class NavbarBrand<T = {}> extends NavbarBrand_<T> {}
+export { NavbarBrandProps } from './lib/NavbarBrand';
+import { default as NavbarToggler_ } from './lib/NavbarToggler';
+export class NavbarToggler<T = {}> extends NavbarToggler_<T> {}
+export { NavbarTogglerProps } from './lib/NavbarToggler';
+import { default as NavItem_ } from './lib/NavItem';
+export class NavItem<T = {}> extends NavItem_<T> {}
+export { NavItemProps } from './lib/NavItem';
+import { default as NavLink_ } from './lib/NavLink';
+export class NavLink<T = {}> extends NavLink_<T> {}
+export { NavLinkProps } from './lib/NavLink';
+import { default as Pagination_ } from './lib/Pagination';
+export class Pagination<T = {}> extends Pagination_<T> {}
+export { PaginationProps } from './lib/Pagination';
+import { default as PaginationItem_ } from './lib/PaginationItem';
+export class PaginationItem<T = {}> extends PaginationItem_<T> {}
+export { PaginationItemProps } from './lib/PaginationItem';
+import { default as PaginationLink_ } from './lib/PaginationLink';
+export class PaginationLink<T = {}> extends PaginationLink_<T> {}
+export { PaginationLinkProps } from './lib/PaginationLink';
+import { default as Popover_ } from './lib/Popover';
+export class Popover<T = {}> extends Popover_<T> {}
+export { PopoverProps } from './lib/Popover';
+import { default as PopoverBody_ } from './lib/PopoverBody';
+export class PopoverBody<T = {}> extends PopoverBody_<T> {}
+export { PopoverBodyProps } from './lib/PopoverBody';
+import { default as PopoverHeader_ } from './lib/PopoverHeader';
+export class PopoverHeader<T = {}> extends PopoverHeader_<T> {}
+export { PopoverHeaderProps } from './lib/PopoverHeader';
+import { default as Progress_ } from './lib/Progress';
+export class Progress<T = {}> extends Progress_<T> {}
+export { ProgressProps } from './lib/Progress';
+import { default as Row_ } from './lib/Row';
+export class Row<T = {}> extends Row_<T> {}
+export { RowProps } from './lib/Row';
+import { default as TabContent_ } from './lib/TabContent';
+export class TabContent<T = {}> extends TabContent_<T> {}
+export { TabContentProps } from './lib/TabContent';
+import { default as Table_ } from './lib/Table';
+export class Table<T = {}> extends Table_<T> {}
+export { TableProps } from './lib/Table';
+import { default as TabPane_ } from './lib/TabPane';
+export class TabPane<T = {}> extends TabPane_<T> {}
+export { TabPaneProps } from './lib/TabPane';
+import { default as Tag_ } from './lib/Tag';
+export class Tag<T = {}> extends Tag_<T> {}
+export { TagProps } from './lib/Tag';
+import { default as Tooltip_ } from './lib/Tooltip';
+export class Tooltip<T = {}> extends Tooltip_<T> {}
+export { TooltipProps } from './lib/Tooltip';
+import {
+  UncontrolledAlert as UncontrolledAlert_,
+  UncontrolledButtonDropdown as UncontrolledButtonDropdown_,
+  UncontrolledDropdown as UncontrolledDropdown_,
+  UncontrolledTooltip as UncontrolledTooltip_
+} from './lib/Uncontrolled';
+export class UncontrolledAlert<T = {}> extends UncontrolledAlert_<T> {}
+export class UncontrolledButtonDropdown<T = {}> extends UncontrolledButtonDropdown_<T> {}
+export class UncontrolledDropdown<T = {}> extends UncontrolledDropdown_<T> {}
+export class UncontrolledTooltip<T = {}> extends UncontrolledTooltip_<T> {}
+export {
+  UncontrolledButtonDropdownProps,
+  UncontrolledAlertProps,
+  UncontrolledDropdownProps,
+  UncontrolledTooltipProps
+} from './lib/Uncontrolled';

From be6be65e15fd5fbab17c9cb0c7a41cc970435bab Mon Sep 17 00:00:00 2001
From: FaithForHumans <vogel.spencer@gmail.com>
Date: Tue, 29 May 2018 15:58:05 -0500
Subject: [PATCH 495/575] Updating tests

---
 types/reactstrap/reactstrap-tests.tsx | 329 ++++++++++++++++++++++++++
 1 file changed, 329 insertions(+)

diff --git a/types/reactstrap/reactstrap-tests.tsx b/types/reactstrap/reactstrap-tests.tsx
index 770cb01fa1..550a1242a8 100644
--- a/types/reactstrap/reactstrap-tests.tsx
+++ b/types/reactstrap/reactstrap-tests.tsx
@@ -3722,3 +3722,332 @@ function Example118() {
     <Input innerRef={ref}/>;
     <NavLink innerRef={ref}/>;
 }
+
+import { default as Alert_ } from './lib/Alert'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Badge_ } from './lib/Badge'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Breadcrumb_ } from './lib/Breadcrumb'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as BreadcrumbItem_ } from './lib/BreadcrumbItem'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Button_ } from './lib/Button'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as ButtonDropdown_ } from './lib/ButtonDropdown'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as ButtonGroup_ } from './lib/ButtonGroup'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as ButtonToolbar_ } from './lib/ButtonToolbar'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Card_ } from './lib/Card'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as CardBody_ } from './lib/CardBody'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as CardColumns_ } from './lib/CardColumns'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as CardDeck_ } from './lib/CardDeck'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as CardFooter_ } from './lib/CardFooter'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as CardGroup_ } from './lib/CardGroup'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as CardHeader_ } from './lib/CardHeader'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as CardImg_ } from './lib/CardImg'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as CardImgOverlay_ } from './lib/CardImgOverlay'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as CardLink_ } from './lib/CardLink'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as CardSubtitle_ } from './lib/CardSubtitle'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as CardText_ } from './lib/CardText'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as CardTitle_ } from './lib/CardTitle'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Carousel_ } from './lib/Carousel'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as CarouselItem_ } from './lib/CarouselItem'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as CarouselControl_ } from './lib/CarouselControl'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as CarouselIndicators_ } from './lib/CarouselIndicators'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as CarouselCaption_ } from './lib/CarouselCaption'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Col_ } from './lib/Col'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Collapse_ } from './lib/Collapse'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Container_ } from './lib/Container'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Dropdown_ } from './lib/Dropdown'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as DropdownItem_ } from './lib/DropdownItem'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as DropdownMenu_ } from './lib/DropdownMenu'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as DropdownToggle_ } from './lib/DropdownToggle'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Fade_ } from './lib/Fade'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Form_ } from './lib/Form'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as FormFeedback_ } from './lib/FormFeedback'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as FormGroup_ } from './lib/FormGroup'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as FormText_ } from './lib/FormText'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Input_ } from './lib/Input'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as InputGroup_ } from './lib/InputGroup'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as InputGroupAddon_ } from './lib/InputGroupAddon'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as InputGroupButtonDropdown_ } from './lib/InputGroupButtonDropdown'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as InputGroupText_ } from './lib/InputGroupText'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Jumbotron_ } from './lib/Jumbotron'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Label_ } from './lib/Label'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as ListGroup_ } from './lib/ListGroup'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as ListGroupItem_ } from './lib/ListGroupItem'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as ListGroupItemHeading_ } from './lib/ListGroupItemHeading'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as ListGroupItemText_ } from './lib/ListGroupItemText'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Media_ } from './lib/Media'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Modal_ } from './lib/Modal'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as ModalBody_ } from './lib/ModalBody'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as ModalFooter_ } from './lib/ModalFooter'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as ModalHeader_ } from './lib/ModalHeader'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Nav_ } from './lib/Nav'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Navbar_ } from './lib/Navbar'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as NavbarBrand_ } from './lib/NavbarBrand'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as NavbarToggler_ } from './lib/NavbarToggler'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as NavItem_ } from './lib/NavItem'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as NavLink_ } from './lib/NavLink'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Pagination_ } from './lib/Pagination'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as PaginationItem_ } from './lib/PaginationItem'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as PaginationLink_ } from './lib/PaginationLink'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Popover_ } from './lib/Popover'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as PopoverBody_ } from './lib/PopoverBody'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as PopoverHeader_ } from './lib/PopoverHeader'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Progress_ } from './lib/Progress'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Row_ } from './lib/Row'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as TabContent_ } from './lib/TabContent'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Table_ } from './lib/Table'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as TabPane_ } from './lib/TabPane'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Tag_ } from './lib/Tag'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Tooltip_ } from './lib/Tooltip'; /* tslint:disable-line: no-relative-import-in-test */
+import { UncontrolledAlert as UncontrolledAlert_ } from './lib/Uncontrolled'; /* tslint:disable-line: no-relative-import-in-test no-duplicate-imports */
+import { UncontrolledButtonDropdown as UncontrolledButtonDropdown_ } from './lib/Uncontrolled'; /* tslint:disable-line: no-relative-import-in-test no-duplicate-imports */
+import { UncontrolledDropdown as UncontrolledDropdown_ } from './lib/Uncontrolled'; /* tslint:disable-line: no-relative-import-in-test no-duplicate-imports */
+import { UncontrolledTooltip as UncontrolledTooltip_ } from './lib/Uncontrolled'; /* tslint:disable-line: no-relative-import-in-test no-duplicate-imports */
+
+function AnyPropExample() {
+  return (
+    <React.Fragment >
+      <Alert_ foo={1} bar={false} foobar="example" />
+      <Badge_ foo={1} bar={false} foobar="example" />
+      <Breadcrumb_ foo={1} bar={false} foobar="example" />
+      <BreadcrumbItem_ foo={1} bar={false} foobar="example" />
+      <Button_ foo={1} bar={false} foobar="example" />
+      <ButtonDropdown_ foo={1} bar={false} foobar="example" />
+      <ButtonGroup_ foo={1} bar={false} foobar="example" />
+      <ButtonToolbar_ foo={1} bar={false} foobar="example" />
+      <Card_ foo={1} bar={false} foobar="example" />
+      <CardBody_ foo={1} bar={false} foobar="example" />
+      <CardColumns_ foo={1} bar={false} foobar="example" />
+      <CardDeck_ foo={1} bar={false} foobar="example" />
+      <CardFooter_ foo={1} bar={false} foobar="example" />
+      <CardGroup_ foo={1} bar={false} foobar="example" />
+      <CardHeader_ foo={1} bar={false} foobar="example" />
+      <CardImg_ foo={1} bar={false} foobar="example" />
+      <CardImgOverlay_ foo={1} bar={false} foobar="example" />
+      <CardLink_ foo={1} bar={false} foobar="example" />
+      <CardSubtitle_ foo={1} bar={false} foobar="example" />
+      <CardText_ foo={1} bar={false} foobar="example" />
+      <CardTitle_ foo={1} bar={false} foobar="example" />
+      <Carousel_ foo={1} bar={false} foobar="example" next={() => {}} previous={() => {}}/>
+      <CarouselItem_ foo={1} bar={false} foobar="example" />
+      <CarouselControl_ foo={1} bar={false} foobar="example" direction="next" onClickHandler={() => {}} directionText="" />
+      <CarouselIndicators_ foo={1} bar={false} foobar="example" items={[]} activeIndex={-1} onClickHandler={() => {}} />
+      <CarouselCaption_ foo={1} bar={false} foobar="example" captionText="" />
+      <Col_ foo={1} bar={false} foobar="example" />
+      <Collapse_ foo={1} bar={false} foobar="example" />
+      <Container_ foo={1} bar={false} foobar="example" />
+      <Dropdown_ foo={1} bar={false} foobar="example" />
+      <DropdownItem_ foo={1} bar={false} foobar="example" />
+      <DropdownMenu_ foo={1} bar={false} foobar="example" />
+      <DropdownToggle_ foo={1} bar={false} foobar="example" />
+      <Fade_ foo={1} bar={false} foobar="example" />
+      <Form_ foo={1} bar={false} foobar="example" />
+      <FormFeedback_ foo={1} bar={false} foobar="example" />
+      <FormGroup_ foo={1} bar={false} foobar="example" />
+      <FormText_ foo={1} bar={false} foobar="example" />
+      <Input_ foo={1} bar={false} foobar="example" />
+      <InputGroup_ foo={1} bar={false} foobar="example" />
+      <InputGroupAddon_ foo={1} bar={false} foobar="example" addonType="prepend" />
+      <InputGroupButtonDropdown_ foo={1} bar={false} foobar="example" addonType="prepend" />
+      <InputGroupText_ foo={1} bar={false} foobar="example" />
+      <Jumbotron_ foo={1} bar={false} foobar="example" />
+      <Label_ foo={1} bar={false} foobar="example" />
+      <ListGroup_ foo={1} bar={false} foobar="example" />
+      <ListGroupItem_ foo={1} bar={false} foobar="example" />
+      <ListGroupItemHeading_ foo={1} bar={false} foobar="example" />
+      <ListGroupItemText_ foo={1} bar={false} foobar="example" />
+      <Media_ foo={1} bar={false} foobar="example" />
+      <Modal_ foo={1} bar={false} foobar="example" />
+      <ModalBody_ foo={1} bar={false} foobar="example" />
+      <ModalFooter_ foo={1} bar={false} foobar="example" />
+      <ModalHeader_ foo={1} bar={false} foobar="example" />
+      <Nav_ foo={1} bar={false} foobar="example" />
+      <Navbar_ foo={1} bar={false} foobar="example" />
+      <NavbarBrand_ foo={1} bar={false} foobar="example" />
+      <NavbarToggler_ foo={1} bar={false} foobar="example" />
+      <NavItem_ foo={1} bar={false} foobar="example" />
+      <NavLink_ foo={1} bar={false} foobar="example" />
+      <Pagination_ foo={1} bar={false} foobar="example" />
+      <PaginationItem_ foo={1} bar={false} foobar="example" />
+      <PaginationLink_ foo={1} bar={false} foobar="example" />
+      <Popover_ foo={1} bar={false} foobar="example" target="" />
+      <PopoverBody_ foo={1} bar={false} foobar="example" />
+      <PopoverHeader_ foo={1} bar={false} foobar="example" />
+      <Progress_ foo={1} bar={false} foobar="example" />
+      <Row_ foo={1} bar={false} foobar="example" />
+      <TabContent_ foo={1} bar={false} foobar="example" />
+      <Table_ foo={1} bar={false} foobar="example" />
+      <TabPane_ foo={1} bar={false} foobar="example" />
+      <Tag_ foo={1} bar={false} foobar="example" />
+      <Tooltip_ foo={1} bar={false} foobar="example" target="" />
+      <UncontrolledAlert_ foo={1} bar={false} foobar="example" />
+      <UncontrolledButtonDropdown_ foo={1} bar={false} foobar="example" />
+      <UncontrolledDropdown_ foo={1} bar={false} foobar="example" />
+      <UncontrolledTooltip_ foo={1} bar={false} foobar="example" target="" />
+    </React.Fragment >
+  );
+}
+
+interface GenericInterface {
+  foo: number;
+  bar: boolean;
+  foobar?: string;
+}
+class AlertGeneric extends Alert<GenericInterface> {}
+class BadgeGeneric extends Badge<GenericInterface> {}
+class BreadcrumbGeneric extends Breadcrumb<GenericInterface> {}
+class BreadcrumbItemGeneric extends BreadcrumbItem<GenericInterface> {}
+class ButtonGeneric extends Button<GenericInterface> {}
+class ButtonDropdownGeneric extends ButtonDropdown<GenericInterface> {}
+class ButtonGroupGeneric extends ButtonGroup<GenericInterface> {}
+class ButtonToolbarGeneric extends ButtonToolbar<GenericInterface> {}
+class CardGeneric extends Card<GenericInterface> {}
+class CardBodyGeneric extends CardBody<GenericInterface> {}
+class CardColumnsGeneric extends CardColumns<GenericInterface> {}
+class CardDeckGeneric extends CardDeck<GenericInterface> {}
+class CardFooterGeneric extends CardFooter<GenericInterface> {}
+class CardGroupGeneric extends CardGroup<GenericInterface> {}
+class CardHeaderGeneric extends CardHeader<GenericInterface> {}
+class CardImgGeneric extends CardImg<GenericInterface> {}
+class CardImgOverlayGeneric extends CardImgOverlay<GenericInterface> {}
+class CardLinkGeneric extends CardLink<GenericInterface> {}
+class CardSubtitleGeneric extends CardSubtitle<GenericInterface> {}
+class CardTextGeneric extends CardText<GenericInterface> {}
+class CardTitleGeneric extends CardTitle<GenericInterface> {}
+class CarouselGeneric extends Carousel<GenericInterface> {}
+class CarouselItemGeneric extends CarouselItem<GenericInterface> {}
+class CarouselControlGeneric extends CarouselControl<GenericInterface> {}
+class CarouselIndicatorsGeneric extends CarouselIndicators<GenericInterface> {}
+class CarouselCaptionGeneric extends CarouselCaption<GenericInterface> {}
+class ColGeneric extends Col<GenericInterface> {}
+class CollapseGeneric extends Collapse<GenericInterface> {}
+class ContainerGeneric extends Container<GenericInterface> {}
+class DropdownGeneric extends Dropdown<GenericInterface> {}
+class DropdownItemGeneric extends DropdownItem<GenericInterface> {}
+class DropdownMenuGeneric extends DropdownMenu<GenericInterface> {}
+class DropdownToggleGeneric extends DropdownToggle<GenericInterface> {}
+class FadeGeneric extends Fade<GenericInterface> {}
+class FormGeneric extends Form<GenericInterface> {}
+class FormFeedbackGeneric extends FormFeedback<GenericInterface> {}
+class FormGroupGeneric extends FormGroup<GenericInterface> {}
+class FormTextGeneric extends FormText<GenericInterface> {}
+class InputGeneric extends Input<GenericInterface> {}
+class InputGroupGeneric extends InputGroup<GenericInterface> {}
+class InputGroupAddonGeneric extends InputGroupAddon<GenericInterface> {}
+class InputGroupButtonDropdownGeneric extends InputGroupButtonDropdown<GenericInterface> {}
+class InputGroupTextGeneric extends InputGroupText<GenericInterface> {}
+class JumbotronGeneric extends Jumbotron<GenericInterface> {}
+class LabelGeneric extends Label<GenericInterface> {}
+class ListGroupGeneric extends ListGroup<GenericInterface> {}
+class ListGroupItemGeneric extends ListGroupItem<GenericInterface> {}
+class ListGroupItemHeadingGeneric extends ListGroupItemHeading<GenericInterface> {}
+class ListGroupItemTextGeneric extends ListGroupItemText<GenericInterface> {}
+class MediaGeneric extends Media<GenericInterface> {}
+class ModalGeneric extends Modal<GenericInterface> {}
+class ModalBodyGeneric extends ModalBody<GenericInterface> {}
+class ModalFooterGeneric extends ModalFooter<GenericInterface> {}
+class ModalHeaderGeneric extends ModalHeader<GenericInterface> {}
+class NavGeneric extends Nav<GenericInterface> {}
+class NavbarGeneric extends Navbar<GenericInterface> {}
+class NavbarBrandGeneric extends NavbarBrand<GenericInterface> {}
+class NavbarTogglerGeneric extends NavbarToggler<GenericInterface> {}
+class NavItemGeneric extends NavItem<GenericInterface> {}
+class NavLinkGeneric extends NavLink<GenericInterface> {}
+class PaginationGeneric extends Pagination<GenericInterface> {}
+class PaginationItemGeneric extends PaginationItem<GenericInterface> {}
+class PaginationLinkGeneric extends PaginationLink<GenericInterface> {}
+class PopoverGeneric extends Popover<GenericInterface> {}
+class PopoverBodyGeneric extends PopoverBody<GenericInterface> {}
+class PopoverHeaderGeneric extends PopoverHeader<GenericInterface> {}
+class ProgressGeneric extends Progress<GenericInterface> {}
+class RowGeneric extends Row<GenericInterface> {}
+class TabContentGeneric extends TabContent<GenericInterface> {}
+class TableGeneric extends Table<GenericInterface> {}
+class TabPaneGeneric extends TabPane<GenericInterface> {}
+class TagGeneric extends Tag<GenericInterface> {}
+class TooltipGeneric extends Tooltip<GenericInterface> {}
+class UncontrolledAlertGeneric extends UncontrolledAlert<GenericInterface> {}
+class UncontrolledButtonDropdownGeneric extends UncontrolledButtonDropdown<GenericInterface> {}
+class UncontrolledDropdownGeneric extends UncontrolledDropdown<GenericInterface> {}
+class UncontrolledTooltipGeneric extends UncontrolledTooltip<GenericInterface> {}
+
+function GenericPropExample() {
+  return (
+    <React.Fragment >
+      <AlertGeneric foo={1} bar={false} foobar="example" />
+      <BadgeGeneric foo={1} bar={false} foobar="example" />
+      <BreadcrumbGeneric foo={1} bar={false} foobar="example" />
+      <BreadcrumbItemGeneric foo={1} bar={false} foobar="example" />
+      <ButtonGeneric foo={1} bar={false} foobar="example" />
+      <ButtonDropdownGeneric foo={1} bar={false} foobar="example" />
+      <ButtonGroupGeneric foo={1} bar={false} foobar="example" />
+      <ButtonToolbarGeneric foo={1} bar={false} foobar="example" />
+      <CardGeneric foo={1} bar={false} foobar="example" />
+      <CardBodyGeneric foo={1} bar={false} foobar="example" />
+      <CardColumnsGeneric foo={1} bar={false} foobar="example" />
+      <CardDeckGeneric foo={1} bar={false} foobar="example" />
+      <CardFooterGeneric foo={1} bar={false} foobar="example" />
+      <CardGroupGeneric foo={1} bar={false} foobar="example" />
+      <CardHeaderGeneric foo={1} bar={false} foobar="example" />
+      <CardImgGeneric foo={1} bar={false} foobar="example" />
+      <CardImgOverlayGeneric foo={1} bar={false} foobar="example" />
+      <CardLinkGeneric foo={1} bar={false} foobar="example" />
+      <CardSubtitleGeneric foo={1} bar={false} foobar="example" />
+      <CardTextGeneric foo={1} bar={false} foobar="example" />
+      <CardTitleGeneric foo={1} bar={false} foobar="example" />
+      <CarouselGeneric foo={1} bar={false} foobar="example" next={() => {}} previous={() => {}}/>
+      <CarouselItemGeneric foo={1} bar={false} foobar="example" />
+      <CarouselControlGeneric foo={1} bar={false} foobar="example" direction="next" onClickHandler={() => {}} directionText="" />
+      <CarouselIndicatorsGeneric foo={1} bar={false} foobar="example" items={[]} activeIndex={-1} onClickHandler={() => {}} />
+      <CarouselCaptionGeneric foo={1} bar={false} foobar="example" captionText="" />
+      <ColGeneric foo={1} bar={false} foobar="example" />
+      <CollapseGeneric foo={1} bar={false} foobar="example" />
+      <ContainerGeneric foo={1} bar={false} foobar="example" />
+      <DropdownGeneric foo={1} bar={false} foobar="example" />
+      <DropdownItemGeneric foo={1} bar={false} foobar="example" />
+      <DropdownMenuGeneric foo={1} bar={false} foobar="example" />
+      <DropdownToggleGeneric foo={1} bar={false} foobar="example" />
+      <FadeGeneric foo={1} bar={false} foobar="example" />
+      <FormGeneric foo={1} bar={false} foobar="example" />
+      <FormFeedbackGeneric foo={1} bar={false} foobar="example" />
+      <FormGroupGeneric foo={1} bar={false} foobar="example" />
+      <FormTextGeneric foo={1} bar={false} foobar="example" />
+      <InputGeneric foo={1} bar={false} foobar="example" />
+      <InputGroupGeneric foo={1} bar={false} foobar="example" />
+      <InputGroupAddonGeneric foo={1} bar={false} foobar="example" addonType="prepend" />
+      <InputGroupButtonDropdownGeneric foo={1} bar={false} foobar="example" addonType="prepend" />
+      <InputGroupTextGeneric foo={1} bar={false} foobar="example" />
+      <JumbotronGeneric foo={1} bar={false} foobar="example" />
+      <LabelGeneric foo={1} bar={false} foobar="example" />
+      <ListGroupGeneric foo={1} bar={false} foobar="example" />
+      <ListGroupItemGeneric foo={1} bar={false} foobar="example" />
+      <ListGroupItemHeadingGeneric foo={1} bar={false} foobar="example" />
+      <ListGroupItemTextGeneric foo={1} bar={false} foobar="example" />
+      <MediaGeneric foo={1} bar={false} foobar="example" />
+      <ModalGeneric foo={1} bar={false} foobar="example" />
+      <ModalBodyGeneric foo={1} bar={false} foobar="example" />
+      <ModalFooterGeneric foo={1} bar={false} foobar="example" />
+      <ModalHeaderGeneric foo={1} bar={false} foobar="example" />
+      <NavGeneric foo={1} bar={false} foobar="example" />
+      <NavbarGeneric foo={1} bar={false} foobar="example" />
+      <NavbarBrandGeneric foo={1} bar={false} foobar="example" />
+      <NavbarTogglerGeneric foo={1} bar={false} foobar="example" />
+      <NavItemGeneric foo={1} bar={false} foobar="example" />
+      <NavLinkGeneric foo={1} bar={false} foobar="example" />
+      <PaginationGeneric foo={1} bar={false} foobar="example" />
+      <PaginationItemGeneric foo={1} bar={false} foobar="example" />
+      <PaginationLinkGeneric foo={1} bar={false} foobar="example" />
+      <PopoverGeneric foo={1} bar={false} foobar="example" target="" />
+      <PopoverBodyGeneric foo={1} bar={false} foobar="example" />
+      <PopoverHeaderGeneric foo={1} bar={false} foobar="example" />
+      <ProgressGeneric foo={1} bar={false} foobar="example" />
+      <RowGeneric foo={1} bar={false} foobar="example" />
+      <TabContentGeneric foo={1} bar={false} foobar="example" />
+      <TableGeneric foo={1} bar={false} foobar="example" />
+      <TabPaneGeneric foo={1} bar={false} foobar="example" />
+      <TagGeneric foo={1} bar={false} foobar="example" />
+      <TooltipGeneric foo={1} bar={false} foobar="example" target="" />
+      <UncontrolledAlertGeneric foo={1} bar={false} foobar="example" />
+      <UncontrolledButtonDropdownGeneric foo={1} bar={false} foobar="example" />
+      <UncontrolledDropdownGeneric foo={1} bar={false} foobar="example" />
+      <UncontrolledTooltipGeneric foo={1} bar={false} foobar="example" target="" />
+    </React.Fragment >
+  );
+}

From 52a23c8c36784c3e53690c536366fed75d38dc17 Mon Sep 17 00:00:00 2001
From: FaithForHumans <vogel.spencer@gmail.com>
Date: Tue, 29 May 2018 16:04:53 -0500
Subject: [PATCH 496/575] Errors missed by tslint

---
 types/reactstrap/lib/Progress.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/reactstrap/lib/Progress.d.ts b/types/reactstrap/lib/Progress.d.ts
index 9edeed0807..3a6b8178fa 100644
--- a/types/reactstrap/lib/Progress.d.ts
+++ b/types/reactstrap/lib/Progress.d.ts
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
 export type ProgressProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
@@ -14,5 +15,5 @@ export type ProgressProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   barClassName?: string;
 } & T;
 
-declare class Progress<T = {[key: string]: any}> extends React.Component<ProgressProps<T>> {};
+declare class Progress<T = {[key: string]: any}> extends React.Component<ProgressProps<T>> {}
 export default Progress;

From fd7b55866ab88acbf67c9fed0c885ff5c4255b46 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 29 May 2018 15:22:57 -0700
Subject: [PATCH 497/575] Add types for hdkey

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

diff --git a/types/hdkey/hdkey-tests.ts b/types/hdkey/hdkey-tests.ts
new file mode 100644
index 0000000000..eda1e9e995
--- /dev/null
+++ b/types/hdkey/hdkey-tests.ts
@@ -0,0 +1,6 @@
+import HDKey = require('hdkey');
+const hdKey = new HDKey();
+hdKey.derive('m/1/42');
+hdKey.privateKey;
+hdKey.publicKey;
+hdKey.chainCode;
diff --git a/types/hdkey/index.d.ts b/types/hdkey/index.d.ts
new file mode 100644
index 0000000000..3cf798c15b
--- /dev/null
+++ b/types/hdkey/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for hdkey 0.7
+// Project: https://github.com/cryptocoinjs/hdkey
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+declare class HDNode {
+    static fromMasterSeed(seed: Buffer): HDNode;
+    publicKey: Buffer;
+    privateKey: Buffer;
+    chainCode: Buffer;
+    constructor();
+    derive(path: string): HDNode;
+}
+export = HDNode;
diff --git a/types/hdkey/tsconfig.json b/types/hdkey/tsconfig.json
new file mode 100644
index 0000000000..f078912fe8
--- /dev/null
+++ b/types/hdkey/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "hdkey-tests.ts"]
+}
diff --git a/types/hdkey/tslint.json b/types/hdkey/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/hdkey/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 02193e40500e64df175c89b9ff18f356d2543a72 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 29 May 2018 15:31:34 -0700
Subject: [PATCH 498/575] Add types for find-versions

---
 types/find-versions/find-versions-tests.ts |  3 +++
 types/find-versions/index.d.ts             |  7 +++++++
 types/find-versions/tsconfig.json          | 16 ++++++++++++++++
 types/find-versions/tslint.json            |  1 +
 4 files changed, 27 insertions(+)
 create mode 100644 types/find-versions/find-versions-tests.ts
 create mode 100644 types/find-versions/index.d.ts
 create mode 100644 types/find-versions/tsconfig.json
 create mode 100644 types/find-versions/tslint.json

diff --git a/types/find-versions/find-versions-tests.ts b/types/find-versions/find-versions-tests.ts
new file mode 100644
index 0000000000..81ea6ca974
--- /dev/null
+++ b/types/find-versions/find-versions-tests.ts
@@ -0,0 +1,3 @@
+import findVersions = require('find-versions');
+
+findVersions('node v1.0.0');
diff --git a/types/find-versions/index.d.ts b/types/find-versions/index.d.ts
new file mode 100644
index 0000000000..449c5a45c3
--- /dev/null
+++ b/types/find-versions/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for find-versions 2.0
+// Project: https://github.com/sindresorhus/find-versions
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function findVersions(version: string): string[];
+export = findVersions;
diff --git a/types/find-versions/tsconfig.json b/types/find-versions/tsconfig.json
new file mode 100644
index 0000000000..19c09a9df8
--- /dev/null
+++ b/types/find-versions/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "find-versions-tests.ts"]
+}
diff --git a/types/find-versions/tslint.json b/types/find-versions/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/find-versions/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From cb3a40f3e4096cc2fb64e3453e203ed78dddf2e2 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 29 May 2018 15:36:16 -0700
Subject: [PATCH 499/575] Add types for compare-versions

---
 types/compare-versions/compare-versions-tests.ts |  3 +++
 types/compare-versions/index.d.ts                |  7 +++++++
 types/compare-versions/tsconfig.json             | 16 ++++++++++++++++
 types/compare-versions/tslint.json               |  1 +
 4 files changed, 27 insertions(+)
 create mode 100644 types/compare-versions/compare-versions-tests.ts
 create mode 100644 types/compare-versions/index.d.ts
 create mode 100644 types/compare-versions/tsconfig.json
 create mode 100644 types/compare-versions/tslint.json

diff --git a/types/compare-versions/compare-versions-tests.ts b/types/compare-versions/compare-versions-tests.ts
new file mode 100644
index 0000000000..c9b5641f5b
--- /dev/null
+++ b/types/compare-versions/compare-versions-tests.ts
@@ -0,0 +1,3 @@
+import compareVersions = require('compare-versions');
+
+compareVersions('1.0.0', '2.0.0');
diff --git a/types/compare-versions/index.d.ts b/types/compare-versions/index.d.ts
new file mode 100644
index 0000000000..15a78ef08a
--- /dev/null
+++ b/types/compare-versions/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for compare-versions 3.0
+// Project: https://github.com/omichelsen/compare-versions
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function compareVersions(firstVersion: string, secondVersion: string): number;
+export = compareVersions;
diff --git a/types/compare-versions/tsconfig.json b/types/compare-versions/tsconfig.json
new file mode 100644
index 0000000000..851777ad22
--- /dev/null
+++ b/types/compare-versions/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "compare-versions-tests.ts"]
+}
diff --git a/types/compare-versions/tslint.json b/types/compare-versions/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/compare-versions/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9b31f5b577b453c4aa0f1a3db0a5549fa5ac7ad9 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Tue, 29 May 2018 15:36:19 -0700
Subject: [PATCH 500/575] Adding class and method descriptions for Exchange API

---
 types/office-js/index.d.ts | 2980 +++++++++++++++++++++++++++++-------
 1 file changed, 2401 insertions(+), 579 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index a6d4375fb2..3f3d653fca 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -4315,6 +4315,14 @@ declare namespace Office {
 
 declare namespace Office {
     namespace MailboxEnums {
+        /**
+         * Specifies an attachment's type.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Applicable Outlook mode: Compose or read
+         */
         export enum AttachmentType {
             /**
              * The attachment is a file
@@ -4323,38 +4331,58 @@ declare namespace Office {
             /**
              * The attachment is an Exchange item
              */
-            Item
+            Item,
+            /**
+             * The attachment is stored in a cloud location, such as OneDrive. The id property of the attachment contains a URL to the file.
+             */
+            Cloud
         }
+        /**
+         * Specifies an entity's type.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Applicable Outlook mode: Compose or read
+         */
         export enum EntityType {
             /**
-             * Specifies that the entity is a meeting suggestion
+             * Specifies that the entity is a meeting suggestion.
              */
             MeetingSuggestion,
             /**
-             * Specifies that the entity is a task suggestion
+             * Specifies that the entity is a task suggestion.
              */
             TaskSuggestion,
             /**
-             * Specifies that the entity is a postal address
+             * Specifies that the entity is a postal address.
              */
             Address,
             /**
-             * Specifies that the entity is SMTP email address
+             * Specifies that the entity is a SMTP email address.
              */
             EmailAddress,
             /**
-             * Specifies that the entity is an Internet URL
+             * Specifies that the entity is an Internet URL.
              */
             Url,
             /**
-             * Specifies that the entity is US phone number
+             * Specifies that the entity is a US phone number.
              */
             PhoneNumber,
             /**
-             * Specifies that the entity is a contact
+             * Specifies that the entity is a contact.
              */
             Contact
         }
+        /**
+         * Specifies the notification message type for an appointment or message.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Applicable Outlook mode: Compose or read
+         */
         export enum ItemNotificationMessageType {
             /**
              * The notificationMessage is a progress indicator.
@@ -4369,59 +4397,100 @@ declare namespace Office {
              */
             ErrorMessage
         }
+        /**
+         * Specifies an item's type.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Applicable Outlook mode: Compose or read
+         */
         export enum ItemType {
             /**
-             * An email, meeting request, meeting response, or meeting cancellation
+             * An email, meeting request, meeting response, or meeting cancellation.
              */
             Message,
             /**
-             * An appointment item
+             * An appointment item.
              */
             Appointment
         }
-        export enum ResponseType {
-            /**
-             * There has been no response from the attendee
-             */
-            None,
-            /**
-             * The attendee is the meeting organizer
-             */
-            Organizer,
-            /**
-             * The meeting request was tentatively accepted by the attendee
-             */
-            Tentative,
-            /**
-             * The meeting request was accepted by the attendee
-             */
-            Accepted,
-            /**
-             * The meeting request was declined by the attendee
-             */
-            Declined
-        }
+        /**
+         * Specifies the type of recipient for an appointment.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Applicable Outlook mode: Compose or read
+         */
         export enum RecipientType {
             /**
-             * Specifies that the recipient is a distribution list containing a list of email addresses
+             * Specifies that the recipient is a distribution list containing a list of email addresses.
              */
             DistributionList,
             /**
-             * Specifies that the recipient is an SMTP email address that is on the Exchange server
+             * Specifies that the recipient is an SMTP email address that is on the Exchange server.
              */
             User,
             /**
-             * Specifies that the recipient is an SMTP email address that is not on the Exchange server
+             * Specifies that the recipient is an SMTP email address that is not on the Exchange server.
              */
             ExternalUser,
             /**
-             * Specifies that the recipient is not one of the other recipient types
+             * Specifies that the recipient is not one of the other recipient types.
              */
             Other
         }
+        /**
+         * Specifies the type of response to a meeting invitation.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Applicable Outlook mode: Compose or read
+         */
+        export enum ResponseType {
+            /**
+             * There has been no response from the attendee.
+             */
+            None,
+            /**
+             * The attendee is the meeting organizer.
+             */
+            Organizer,
+            /**
+             * The meeting request was tentatively accepted by the attendee.
+             */
+            Tentative,
+            /**
+             * The meeting request was accepted by the attendee.
+             */
+            Accepted,
+            /**
+             * The meeting request was declined by the attendee.
+             */
+            Declined
+        }
+        /**
+         * Specifies the version of the REST API that corresponds to a REST-formatted item ID. 
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Applicable Outlook mode: Compose or read
+         */
         export enum RestVersion {
+            /**
+             * Version 1.0.
+             */
             v1_0,
+            /**
+             * Version 2.0.
+             */
             v2_0,
+            /**
+             * Beta.
+             */
             Beta
         }
     }
@@ -4441,24 +4510,6 @@ declare namespace Office {
          */
         Subject
     }
-    export interface Appointment extends Item {
-    }
-    export interface AppointmentCompose extends Appointment, ItemCompose {
-        end: Time;
-        location: Location;
-        optionalAttendees: Recipients;
-        requiredAttendees: Recipients;
-        start: Time;
-    }
-    export interface AppointmentRead extends Appointment, ItemRead {
-        end: Date;
-        location: string;
-        optionalAttendees: Array<EmailAddressDetails>;
-        organizer: EmailAddressDetails;
-        requiredAttendees: Array<EmailAddressDetails>;
-        resources: EmailAddressDetails;
-        start: Date;
-    }
     export interface AppointmentForm {
         requiredAttendees: Array<string> | Array<EmailAddressDetails>;
         optionalAttendees: Array<string> | Array<EmailAddressDetails>;
@@ -4469,253 +4520,982 @@ declare namespace Office {
         subject: string;
         body: string;
     }
+    /**
+     * Represents an attachment on an item from the server. Read mode only.
+     * 
+     * An array of AttachmentDetail objects is returned as the attachments property of an Appointment or Message object.
+     * 
+     * [Api set: Mailbox 1.0]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Read
+     */
     export interface AttachmentDetails {
+        /**
+         * Gets a value that indicates the type of an attachment.
+         */
         attachmentType: Office.MailboxEnums.AttachmentType;
+        /**
+         * Gets the MIME content type of the attachment.
+         */
         contentType: string;
+        /**
+         * Gets the Exchange attachment ID of the attachment.
+         */
         id: string;
+        /**
+         * Gets a value that indicates whether the attachment should be displayed in the body of the item.
+         */
         isInline: boolean;
+        /**
+         * Gets the name of the attachment.
+         */
         name: string;
+        /**
+         * Gets the size of the attachment in bytes.
+         */
         size: number;
     }
+    /**
+     * The body object provides methods for adding and updating the content of the message or appointment. It is returned in the body property of the selected item.
+     * 
+     * [Api set: Mailbox 1.1]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Compose or read
+     */
     export interface Body {
         /**
-         * Returns the current body in a specified format
-         * @param coercionType The format of the returned body
-         * @param callback optional method to call when the getAsync method returns
+         * Returns the current body in a specified format.
+         * 
+         * This method returns the entire current body in the format specified by coercionType.
+         * 
+         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param coercionType The format for the returned body.
+         * @param options Optional. An object literal that contains one or more of the following properties:
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. The body is provided in the requested format in the asyncResult.value property.
          */
-        getAsync(coercionType: CoercionType, callback: (result: AsyncResult) => void): void;
-        /**
-         * Returns the current body in a specified format
-         * @param coercionType The format of the returned body
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback optional method to call when the getAsync method returns
-         */
-        getAsync(coercionType: CoercionType, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        getAsync(coercionType: CoercionType, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
 
-        /*
-         * Gets a value that indicates whether the content is in HTML or text format
-         * @param tableData  A TableData object with the headers and rows
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the getTypeAsync method returns
+        /**
+         * Gets a value that indicates whether the content is in HTML or text format.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose
+         * 
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. The content type is returned as one of the CoercionType values in the asyncResult.value property.
          */
         getTypeAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
-         * Adds the specified content to the beginning of the item body
-         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters
+         * Adds the specified content to the beginning of the item body.
+         * 
+         * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to it's original place, relative to the inserted content.
+         * 
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * 
+         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        coercionType: The desired format for the body. The string in the data parameter will be converted to this format.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. Any errors encountered will be provided in the asyncResult.error property.
          */
-        prependAsync(data: string): void;
-        /**
-         * Adds the specified content to the beginning of the item body
-         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters
-         * @param options Any optional parameters or state data passed to the method
-         */
-        prependAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
-        /**
-         * Adds the specified content to the beginning of the item body
-         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters
-         * @param callback The optional method to call when the string is inserted
-         */
-        prependAsync(data: string, callback: (result: AsyncResult) => void): void;
-        /**
-         * Adds the specified content to the beginning of the item body
-         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        prependAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions, callback: (result: AsyncResult) => void): void;
-
+        prependAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Replaces the entire body with the specified text.
-         * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters
+         * 
+         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
+         * 
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * 
+         * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        coercionType: The desired format for the body. The string in the data parameter will be converted to this format.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.  Any errors encountered will be provided in the asyncResult.error property.
          */
-        setAsync(data: string): void;
+        setAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
         /**
-         * Replaces the entire body with the specified text.
-         * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters
-         * @param options Any optional parameters or state data passed to the method
+         * Replaces the selection in the body with the specified text.
+         * 
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
+         * 
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * 
+         * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        coercionType: The desired format for the body. The string in the data parameter will be converted to this format.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.  Any errors encountered will be provided in the asyncResult.error property.
          */
-        setAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
-        /**
-         * Replaces the entire body with the specified text.
-         * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters
-         * @param callback the optional method to call when the body is replaced
-         */
-        setAsync(data: string, callback: (result: AsyncResult) => void): void;
-        /**
-         * Replaces the entire body with the specified text.
-         * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback the optional method to call when the body is replaced
-         */
-        setAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions, callback: (result: AsyncResult) => void): void;
-
-        /**
-         * Replaces the selection in the body with the specified text
-         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters
-         */
-        setSelectedDataAsync(data: string): void;
-        /**
-         * Replaces the selection in the body with the specified text
-         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters
-         * @param options Any optional parameters or state data passed to the method
-         */
-        setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
-        /**
-         * Replaces the selection in the body with the specified text
-         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters
-         * @param callback The optional method to call when the string is inserted
-         */
-        setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
-        /**
-         * Replaces the selection in the body with the specified text
-         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions, callback: (result: AsyncResult) => void): void;
-
+        setSelectedDataAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+     * Represents a contact stored on the server. Read mode only.
+     * 
+     * The list of contacts associated with an email message or appointment is returned in the contacts property of the Entities object that is returned by the getEntities or getEntitiesByType method of the active item.
+     * 
+     * [Api set: Mailbox 1.0]
+     * 
+     * @remarks
+     * Minimum permission level: Restricted
+     * Applicable Outlook mode: Read
+     */
     export interface Contact {
+        /**
+         * An array of strings containing the mailing and street addresses associated with the contact. Nullable.
+         */
         addresses: Array<string>;
+        /**
+         * A string containing the name of the business associated with the contact. Nullable.
+         */
         businessName: string;
+        /**
+         * An array of strings containing the SMTP email addresses associated with the contact. Nullable,
+         */
         emailAddresses: Array<string>;
+        /**
+         * A string containing the name of the person associated with the contact. Nullable.
+         */
         personName: string;
+        /**
+         * An array containing a PhoneNumber object for each phone number associated with the contact. Nullable.
+         */
         phoneNumbers: Array<PhoneNumber>;
+        /**
+         * An array of strings containing the Internet URLs associated with the contact. Nullable.
+         */
         urls: Array<string>;
     }
     /**
-    * Represents the runtime environment of the add-in and provides access to key objects of the API.
-    * 
-    * @remarks
-    * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
-    */
+     * The Office.context namespace provides shared interfaces that are used by add-ins in all of the Office apps. This listing documents only those interfaces that are used by Outlook add-ins. For a full listing of the Office.context namespace, see the <Office.context reference in the Shared API>(https://dev.office.com/reference/add-ins/shared/office.context.htm).
+     * 
+     * [Api set: Mailbox 1.0]
+     * 
+     * @remarks
+     * Applicable Outlook mode: Compose or read
+     */
     export interface Context {
+        /**
+         * Gets the locale (language) in RFC 1766 Language tag format specified by the user for the UI of the Office host application.
+         * 
+         * The displayLanguage value reflects the current Display Language setting specified with File > Options > Language in the Office host application.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Applicable Outlook mode: Compose or read
+         */
+        displayLanguage: string; 
+        /**
+         * Provides access to the Outlook Add-in object model for Microsoft Outlook and Microsoft Outlook on the web.
+         * 
+         * Namespaces:
+         * 
+         * - diagnostics: Provides diagnostic information to an Outlook add-in.
+         * 
+         * - item: Provides methods and properties for accessing a message or appointment in an Outlook add-in.
+         * 
+         * - userProfile: Provides information about the user in an Outlook add-in.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Minimum permission level: Restricted
+         * Applicable Outlook mode: Compose or read
+         */
         mailbox: Mailbox;
         /**
-        * Gets an object that represents the saved custom settings of the add-in.
-        */
+         * Provides access to the properties for Office theme colors.
+         * 
+         * Using Office theme colors let's you coordinate the color scheme of your add-in with the current Office theme selected by the user with File > Office Account > Office Theme UI, which is applied across all Office host applications. Using Office theme colors is appropriate for mail and task pane add-ins.
+         * 
+         * |Name |Type |Description|
+         * |-----|-----|-----------|
+         * |bodyBackgroundColor|String|Gets the Office theme body background color as a hexadecimal color triplet.|
+         * |bodyForegroundColor|String|Gets the Office theme body foreground color as a hexadecimal color triplet.|
+         * |controlBackgroundColor|String|Gets the Office theme control background color as a hexadecimal color triplet.|
+         * |controlForegroundColor|String|Gets the Office theme body control color as a hexadecimal color triplet.|
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Applicable Outlook mode: Compose or read
+         */
+        officeTheme: Object;
+        /**
+         * Gets an object that represents the custom settings or state of a mail add-in saved to a user's mailbox.
+         * 
+         * The RoamingSettings object lets you store and access data for a mail add-in that is stored in a user's mailbox, so that is available to that add-in when it is running from any host client application used to access that mailbox.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Minimum permission level: Restricted
+         * Applicable Outlook mode: Compose or read
+         */
         roamingSettings: RoamingSettings;
     }
+    /**
+     * The CustomProperties object represents custom properties that are specific to a particular item and specific to a mail add-in for Outlook. For example, there might be a need for a mail add-in to save some data that is specific to the current email message that activated the add-in. If the user revisits the same message in the future and activates the mail add-in again, the add-in will be able to retrieve the data that had been saved as custom properties.
+     * 
+     * Because Outlook for Mac doesn’t cache custom properties, if the user’s network goes down, mail add-ins cannot access their custom properties.
+     * 
+     * [Api set: Mailbox 1.0]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Compose or read
+     */
     export interface CustomProperties {
         /**
-         * Returns the value of the specified custom property
-         * @param name The name of the property to be returned
+         * Returns the value of the specified custom property.
+         * @param name The name of the custom property to be returned.
+         * @returns The value of the specified custom property.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
          */
         get(name: string): any;
         /**
-         * Sets the specified property to the specified value
-         * @param name The name of the property to be set
-         * @param value The value of the property to be set
+         * Sets the specified property to the specified value.
+         * 
+         * The set method sets the specified property to the specified value. You must use the saveAsync method to save the property to the server.
+         * 
+         * The set method creates a new property if the specified property does not already exist; otherwise, the existing value is replaced with the new value. The value parameter can be of any type; however, it is always passed to the server as a string.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param name The name of the property to be set.
+         * @param value The value of the property to be set.
          */
         set(name: string, value: string): void;
         /**
          * Removes the specified property from the custom property collection.
-         * @param name The name of the property to be removed
+         * 
+         * To make the removal of the property permanent, you must call the saveAsync method of the CustomProperties object.
+         * @param name The name of the property to be removed.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
          */
         remove(name: string): void;
         /**
-         * Saves the custom property collection to the server
-         * @param callback The optional callback method
-         * @param userContext Optional variable for any state data that is passed to the saveAsync method
+         * Saves item-specific custom properties to the server. 
+         * 
+         * You must call the saveAsync method to persist any changes made with the set method or the remove method of the CustomProperties object. The saving action is asynchronous.
+         * 
+         * It’s a good practice to have your callback function check for and handle errors from saveAsync. In particular, a read add-in can be activated while the user is in a connected state in a read form, and subsequently the user becomes disconnected. If the add-in calls saveAsync while in the disconnected state, saveAsync would return an error. Your callback method should handle this error accordingly.
+         * 
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param asyncContext Optional. Any state data that is passed to the callback method.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
          */
-        saveAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
+        saveAsync(callback?: (result: AsyncResult) => void, asyncContext?: any): void;
     }
+    /**
+     * Provides diagnostic information to an Outlook add-in.
+     * 
+     * [Api set: Mailbox 1.0]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Compose or read
+     */
     export interface Diagnostics {
+        /**
+         * Gets a string that represents the name of the host application.
+         * 
+         * A string that can be one of the following values: Outlook, Mac Outlook, OutlookIOS, or OutlookWebApp.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
         hostName: string;
+        /**
+         * Gets a string that represents the version of either the host application or the Exchange Server.
+         * 
+         * If the mail add-in is running on the Outlook desktop client or Outlook for iOS, the hostVersion property returns the version of the host application, Outlook. In Outlook Web App, the property returns the version of the Exchange Server. An example is the string 15.0.468.0.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
         hostVersion: string;
+        /**
+         * Gets a string that represents the current view of Outlook Web App.
+         * 
+         * The returned string can be one of the following values: OneColumn, TwoColumns, or ThreeColumns.
+         * 
+         * If the host application is not Outlook Web App, then accessing this property results in undefined.
+         * 
+         * Outlook Web App has three views that correspond to the width of the screen and the window, and the number of columns that can be displayed:
+         * 
+         * - OneColumn, which is displayed when the screen is narrow. Outlook Web App uses this single-column layout on the entire screen of a smartphone.
+         * 
+         * - TwoColumns, which is displayed when the screen is wider. Outlook Web App uses this view on most tablets.
+         * 
+         * - ThreeColumns, which is displayed when the screen is wide. For example, Outlook Web App uses this view in a full screen window on a desktop computer.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
         OWAView: string;
     }
+    /**
+     * Provides the email properties of the sender or specified recipients of an email message or appointment.
+     * 
+     * [Api set: Mailbox 1.0]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Compose or read
+     */
     export interface EmailAddressDetails {
+        /**
+         * Gets the SMTP email address.
+         */
         emailAddress: string;
+        /**
+         * Gets the display name associated with an email address.
+         */
         displayName: string;
+        /**
+         * Gets the response that an attendee returned for an appointment. This property applies to only an attendee of an appointment, as represented by the optionalAttendees or requiredAttendees property. This property returns undefined in other scenarios.
+         */
         appointmentResponse: Office.MailboxEnums.ResponseType;
+        /**
+         * Gets the email address type of a recipient.
+         */
         recipientType: Office.MailboxEnums.RecipientType;
     }
+    /**
+     * Represents an email account on an Exchange Server.
+     * 
+     * [Api set: Mailbox 1.0]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Read
+     */
     export interface EmailUser {
+        /**
+         * Gets the display name associated with an email address.
+         */
         displayName: string;
+        /**
+         * Gets the SMTP email address.
+         */
         emailAddress: string;
     }
+    /**
+     * Represents a collection of entities found in an email message or appointment. Read mode only.
+     * 
+     * The Entities object is a container for the entity arrays returned by the getEntities and getEntitiesByType methods when the item (either an email message or an appointment) contains one or more entities that have been found by the server. You can use these entities in your code to provide additional context information to the viewer, such as a map to an address found in the item, or to open a dialer for a phone number found in the item.
+     * 
+     * If no entities of the type specified in the property are present in the item, the property associated with that entity is null. For example, if a message contains a street address and a phone number, the addresses property and phoneNumbers property would contain information, and the other properties would be null.
+     * 
+     * To be recognized as an address, the string must contain a United States postal address that has at least a subset of the elements of a street number, street name, city, state, and zip code.
+     * 
+     * To be recognized as a phone number, the string must contain a North American phone number format.
+     * 
+     * Entity recognition relies on natural language recognition that is based on machine learning of large amounts of data. The recognition of an entity is non-deterministic and success sometimes relies on the particular context in the item.
+     * 
+     * When the property arrays are returned by the getEntitiesByType method, only the property for the specified entity contains data; all other properties are null.
+     * 
+     * [Api set: Mailbox 1.0]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Read
+     */
     export interface Entities {
+        /**
+         * Gets the physical addresses (street or mailing addresses) found in an email message or appointment.
+         */
         addresses: Array<string>;
+        /**
+         * Gets the contacts found in an email address or appointment.
+         */
         contacts: Array<Contact>;
+        /**
+         * Gets the email addresses found in an email message or appointment.
+         */
         emailAddresses: Array<string>;
+        /**
+         * Gets the meeting suggestions found in an email message.
+         */
         meetingSuggestions: Array<MeetingSuggestion>;
+        /**
+         * Gets the phone numbers found in an email message or appointment.
+         */
         phoneNumbers: Array<PhoneNumber>;
+        /**
+         * Gets the task suggestions found in an email message or appointment.
+         */
         taskSuggestions: Array<string>;
+        /**
+         * Gets the Internet URLs present in an email message or appointment.
+         */
         urls: Array<string>;
     }
+
+
+    export interface Appointment extends Item {
+    }
+    export interface AppointmentCompose extends Appointment, ItemCompose {        
+        /**
+         * Gets or sets the date and time that the appointment is to end.
+         * 
+         * The end property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the end property value to the client’s local date and time.
+         * 
+         * *Read mode*
+         * 
+         * The end property returns a Date object.
+         * 
+         * *Compose mode*
+         * 
+         * The end property returns a Time object.
+         * 
+         * When you use the Time.setAsync method to set the end time, you should use the convertToUtcClientTime method to convert the local time on the client to UTC for the server.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        end: Time;
+        /**
+         * Gets or sets the location of an appointment.
+         * 
+         * *Read mode*
+         * 
+         * The location property returns a string that contains the location of the appointment.
+         * 
+         * *Compose mode*
+         * 
+         * The location property returns a Location object that provides methods that are used to get and set the location of the appointment.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        location: Location;
+        /**
+         * Provides access to the optional attendees of an event. The type of object and level of access depends on the mode of the current item.
+         * 
+         * *Read mode*
+         * 
+         * The optionalAttendees property returns an array that contains an EmailAddressDetails object for each optional attendee to the meeting.
+         * 
+         * *Compose mode*
+         * 
+         * The optionalAttendees property returns a Recipients object that provides methods to get or update the optional attendees for a meeting.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        optionalAttendees: Recipients;
+        /**
+         * Provides access to the required attendees of an event. The type of object and level of access depends on the mode of the current item.
+         * 
+         * *Read mode*
+         * 
+         * The requiredAttendees property returns an array that contains an EmailAddressDetails object for each required attendee to the meeting.
+         * 
+         * *Compose mode*
+         * 
+         * The requiredAttendees property returns a Recipients object that provides methods to get or update the required attendees for a meeting.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        requiredAttendees: Recipients;
+        /**
+         * Gets or sets the date and time that the appointment is to begin.
+         * 
+         * The start property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the value to the client’s local date and time.
+         * 
+         * *Read mode*
+         * 
+         * The start property returns a Date object.
+         * 
+         * *Compose mode*
+         * 
+         * The start property returns a Time object.
+         * 
+         * When you use the Time.setAsync method to set the start time, you should use the convertToUtcClientTime method to convert the local time on the client to UTC for the server.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        start: Time;
+    }
+    export interface AppointmentRead extends Appointment, ItemRead {
+        end: Date;
+        /**
+         * Gets or sets the location of an appointment.
+         * 
+         * *Read mode*
+         * 
+         * The location property returns a string that contains the location of the appointment.
+         * 
+         * *Compose mode*
+         * 
+         * The location property returns a Location object that provides methods that are used to get and set the location of the appointment.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        location: string;
+        /**
+         * Provides access to the optional attendees of an event. The type of object and level of access depends on the mode of the current item.
+         * 
+         * *Read mode*
+         * 
+         * The optionalAttendees property returns an array that contains an EmailAddressDetails object for each optional attendee to the meeting.
+         * 
+         * *Compose mode*
+         * 
+         * The optionalAttendees property returns a Recipients object that provides methods to get or update the optional attendees for a meeting.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        optionalAttendees: Array<EmailAddressDetails>;
+        /**
+         * Gets the email address of the meeting organizer for a specified meeting. Read mode only.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         */
+        organizer: EmailAddressDetails;
+        /**
+         * Provides access to the required attendees of an event. The type of object and level of access depends on the mode of the current item.
+         * 
+         * *Read mode*
+         * 
+         * The requiredAttendees property returns an array that contains an EmailAddressDetails object for each required attendee to the meeting.
+         * 
+         * *Compose mode*
+         * 
+         * The requiredAttendees property returns a Recipients object that provides methods to get or update the required attendees for a meeting.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        requiredAttendees: Array<EmailAddressDetails>;
+        /**
+         * Gets or sets the date and time that the appointment is to begin.
+         * 
+         * The start property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the value to the client’s local date and time.
+         * 
+         * *Read mode*
+         * 
+         * The start property returns a Date object.
+         * 
+         * *Compose mode*
+         * 
+         * The start property returns a Time object.
+         * 
+         * When you use the Time.setAsync method to set the start time, you should use the convertToUtcClientTime method to convert the local time on the client to UTC for the server.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        start: Date;
+    }
+    export interface AppointmentForm {
+        /**
+         * Gets or sets the date and time that the appointment is to end.
+         * 
+         * The end property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the end property value to the client’s local date and time.
+         * 
+         * *Read mode*
+         * 
+         * The end property returns a Date object.
+         * 
+         * *Compose mode*
+         * 
+         * The end property returns a Time object.
+         * 
+         * When you use the Time.setAsync method to set the end time, you should use the convertToUtcClientTime method to convert the local time on the client to UTC for the server.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        end: Date; 
+        /**
+        * Gets or sets the location of an appointment.
+        * 
+        * *Read mode*
+        * 
+        * The location property returns a string that contains the location of the appointment.
+        * 
+        * *Compose mode*
+        * 
+        * The location property returns a Location object that provides methods that are used to get and set the location of the appointment.
+        * 
+        * [Api set: Mailbox 1.0]
+        * 
+        * @remarks
+        * 
+        * Minimum permission level: ReadItem
+        * Applicable Outlook mode: Compose or read
+        */
+        location: string;                
+        /**
+        * Provides access to the optional attendees of an event. The type of object and level of access depends on the mode of the current item.
+        * 
+        * *Read mode*
+        * 
+        * The optionalAttendees property returns an array that contains an EmailAddressDetails object for each optional attendee to the meeting.
+        * 
+        * *Compose mode*
+        * 
+        * The optionalAttendees property returns a Recipients object that provides methods to get or update the optional attendees for a meeting.
+        * 
+        * [Api set: Mailbox 1.0]
+        * 
+        * @remarks
+        * 
+        * Minimum permission level: ReadItem
+        * Applicable Outlook mode: Compose or read
+        */
+       optionalAttendees: Array<string> | Array<EmailAddressDetails>;
+        /**
+         * Provides access to the required attendees of an event. The type of object and level of access depends on the mode of the current item.
+         * 
+         * *Read mode*
+         * 
+         * The requiredAttendees property returns an array that contains an EmailAddressDetails object for each required attendee to the meeting.
+         * 
+         * *Compose mode*
+         * 
+         * The requiredAttendees property returns a Recipients object that provides methods to get or update the required attendees for a meeting.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        requiredAttendees: Array<string> | Array<EmailAddressDetails>;
+        /**
+         * Gets or sets the date and time that the appointment is to begin.
+         * 
+         * The start property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the value to the client’s local date and time.
+         * 
+         * *Read mode*
+         * 
+         * The start property returns a Date object.
+         * 
+         * *Compose mode*
+         * 
+         * The start property returns a Time object.
+         * 
+         * When you use the Time.setAsync method to set the start time, you should use the convertToUtcClientTime method to convert the local time on the client to UTC for the server.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        start: Date;    
+        /**
+         * Gets or sets the description that appears in the subject field of an item.
+         * 
+         * The subject property gets or sets the entire subject of the item, as sent by the email server.
+         * 
+         * *Read mode*
+         * 
+         * The subject property returns a string. Use the normalizedSubject property to get the subject minus any leading prefixes such as RE: and FW:.
+         * 
+         * *Compose mode*
+         * 
+         * The subject property returns a Subject object that provides methods to get and set the subject.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */   
+        subject: string;
+    }
+
+    /**
+     * The item namespace is used to access the currently selected message, meeting request, or appointment. You can determine the type of the item by using the itemType property.
+     * 
+     * [Api set: Mailbox 1.0]
+     * 
+     * @remarks
+     * Minimum permission level: Restricted
+     * Applicable Outlook mode: Compose or read
+     */
     export interface Item {
+        /**
+         * Gets an object that provides methods for manipulating the body of an item.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
         body: Body;
-        itemType: Office.MailboxEnums.ItemType;
-        notificationMessages: NotificationMessages;
+        /**
+         * Gets the date and time that an item was created. Read mode only.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         */
         dateTimeCreated: Date;
         /**
-         * Asynchronously loads custom properties that are specific to the item and a app for Office
-         * @param callback The optional callback method
-         * @param userContext Optional variable for any state data that is passed to the asynchronous method
+         * Gets the date and time that an item was last modified. Read mode only.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * [!NOTE] This member is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
          */
-        loadCustomPropertiesAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
+        dateTimeModifed: Date;
+        /**
+         * Gets the type of item that an instance represents.
+         * 
+         * The itemType property returns one of the ItemType enumeration values, indicating whether the item object instance is a message or an appointment.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        itemType: Office.MailboxEnums.ItemType;
+        /**
+         * Gets the notification messages for an item.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        notificationMessages: NotificationMessages;       
+       /**
+        * Asynchronously loads custom properties for this add-in on the selected item.
+        * 
+        * Custom properties are stored as key/value pairs on a per-app, per-item basis. This method returns a CustomProperties object in the callback, which provides methods to access the custom properties specific to the current item and the current add-in. Custom properties are not encrypted on the item, so this should not be used as secure storage.
+        * 
+        * The custom properties are provided as a CustomProperties object in the asyncResult.value property. This object can be used to get, set, and remove custom properties from the item and save changes to the custom property set back to the server.
+        * 
+        * [Api set: Mailbox 1.0]
+        * 
+        * @remarks
+        * 
+        * Minimum permission level: ReadItem
+        * Applicable Outlook mode: Compose or read
+        * 
+        * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+        * @param userContext Optional. Developers can provide any object they wish to access in the callback function. This object can be accessed by the asyncResult.asyncContext property in the callback function.
+        */
+       loadCustomPropertiesAsync(callback: (result: AsyncResult) => void, userContext?: any): void;
     }
     export interface ItemCompose extends Item {
+        /**
+         * Gets or sets the description that appears in the subject field of an item.
+         * 
+         * The subject property gets or sets the entire subject of the item, as sent by the email server.
+         * 
+         * *Read mode*
+         * 
+         * The subject property returns a string. Use the normalizedSubject property to get the subject minus any leading prefixes such as RE: and FW:.
+         * 
+         * *Compose mode*
+         * 
+         * The subject property returns a Subject object that provides methods to get and set the subject.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
         subject: Subject;
         /**
-         * Adds a file to a message as an attachment
-         * @param uri The URI that provides the location of the file to attach to the message. The maximum length is 2048 characters
-         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
+         * Adds a file to a message or appointment as an attachment.
+         * 
+         * The addFileAttachmentAsync method uploads the file at the specified URI and attaches it to the item in the compose form.
+         * 
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: 
+         * 
+         * AttachmentSizeExceeded - The attachment is larger than allowed.
+         * 
+         * FileTypeNotSupported - The attachment has an extension that is not allowed.
+         * 
+         * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * 
+         * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        inInline: If true, indicates that the attachment will be shown inline in the message body, and should not be displayed in the attachment list.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. On success, the attachment identifier will be provided in the asyncResult.value property. If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
          */
-        addFileAttachmentAsync(uri: string, attachmentName: string): void;
+        addFileAttachmentAsync(uri: string, attachmentName: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
-         * Adds a file to a message as an attachment
-         * @param uri The URI that provides the location of the file to attach to the message. The maximum length is 2048 characters
-         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-         * @param options Any optional parameters or state data passed to the method
+         * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
+         * 
+         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the callback method, if needed.
+         * 
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         * 
+         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that you are editing; however, this is not supported and is not recommended.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors:
+         * 
+         * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * 
+         * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. On success, the attachment identifier will be provided in the asyncResult.value property. If adding the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
          */
-        addFileAttachmentAsync(uri: string, attachmentName: string, options: AsyncContextOptions): void;
-        /**
-         * Adds a file to a message as an attachment
-         * @param uri The URI that provides the location of the file to attach to the message. The maximum length is 2048 characters
-         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-         * @param callback The optional callback method
-         */
-        addFileAttachmentAsync(uri: string, attachmentName: string, callback: (result: AsyncResult) => void): void;
-        /**
-         * Adds a file to a message as an attachment
-         * @param uri The URI that provides the location of the file to attach to the message. The maximum length is 2048 characters
-         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional callback method
-         */
-        addFileAttachmentAsync(uri: string, attachmentName: string, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
-
-        /**
-         * Adds an Exchange item, such as a message, as an attachment to the message
-         * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters
-         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-         */
-        addItemAttachmentAsync(itemId: any, attachmentName: string): void;
-        /**
-         * Adds an Exchange item, such as a message, as an attachment to the message
-         * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters
-         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-         * @param options Any optional parameters or state data passed to the method
-         */
-        addItemAttachmentAsync(itemId: any, attachmentName: string, options: AsyncContextOptions): void;
-        /**
-         * Adds an Exchange item, such as a message, as an attachment to the message
-         * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters
-         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-         * @param callback The optional callback method
-         */
-        addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: AsyncResult) => void): void;
-        /**
-         * Adds an Exchange item, such as a message, as an attachment to the message
-         * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters
-         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional callback method
-         */
-        addItemAttachmentAsync(itemId: any, attachmentName: string, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
-
+        addItemAttachmentAsync(itemId: any, attachmentName: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Closes the current item that is being composed
          *
@@ -4723,473 +5503,1345 @@ declare namespace Office {
          * prompts the user to save, discard, or close the action.
          *
          * In the Outlook desktop client, if the message is an inline reply, the close method has no effect.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * [!NOTE] In Outlook on the web, if the item is an appointment and it has previously been saved using saveAsync, the user is prompted to save, discard, or cancel even if no changes have occurred since the item was last saved.
+         * 
+         * Minimum permission level: Restricted
+         * Applicable Outlook mode: Compose
          */
         close(): void;
+        /**
+         * Gets initialization data passed when the add-in is [activated by an actionable message]<https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message>.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * [!NOTE] This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the web for Office 365.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         * 
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. On success, the initialization data is provided in the asyncResult.value property as a string. If there is no initialization context, the asyncResult object will contain an Error object with its code property set to 9020 and its name property set to GenericResponseError.
+         */
+        getInitializationContextAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously returns selected data from the subject or body of a message.
-         *
-         * If there is no selection but the cursor is in the body or the subject, the method returns null for the selected data. If a field other
-         * than the body or subject is selected, the method returns the InvalidSelection error
+         * 
+         * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. If a field other than the body or subject is selected, the method returns the InvalidSelection error.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @returns
+         * The selected data as a string with format determined by coercionType.
+         * 
+         * @remarks
+         * 
+         * To access the selected data from the callback method, call asyncResult.value.data. To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
+         * 
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * 
+         * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string , removing any HTML tags present. If HTML, the method returns the selected text, whether it is plaintext or HTML.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
          */
         getSelectedDataAsync(coercionType: CoercionType, callback: (result: AsyncResult) => void): void;
         /**
          * Asynchronously returns selected data from the subject or body of a message.
+         * 
+         * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. If a field other than the body or subject is selected, the method returns the InvalidSelection error.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @returns
+         * The selected data as a string with format determined by coercionType.
          *
-         * If there is no selection but the cursor is in the body or the subject, the method returns null for the selected data. If a field other
-         * than the body or subject is selected, the method returns the InvalidSelection error
+         * @remarks
+         * 
+         * To access the selected data from the callback method, call asyncResult.value.data. To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
+         * 
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * 
+         * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string , removing any HTML tags present. If HTML, the method returns the selected text, whether it is plaintext or HTML.
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
          */
         getSelectedDataAsync(coercionType: CoercionType, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
-
         /**
-         * Removes an attachment from a message
-         * @param attachmentIndex The index of the attachment to remove. The maximum length of the string is 100 characters
+         * Removes an attachment from a message or appointment.
+         * 
+         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form to continue in a separate window.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * 
+         * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
-        removeAttachmentAsync(attachmentIndex: string): void;
-        /**
-         * Removes an attachment from a message
-         * @param attachmentIndex The index of the attachment to remove. The maximum length of the string is 100 characters
-         * @param options Any optional parameters or state data passed to the method
-         */
-        removeAttachmentAsync(attachmentIndex: string, options: AsyncContextOptions): void;
-        /**
-         * Removes an attachment from a message
-         * @param attachmentIndex The index of the attachment to remove. The maximum length of the string is 100 characters
-         * @param callback The optional callback method
-         */
-        removeAttachmentAsync(attachmentIndex: string, callback: (result: AsyncResult) => void): void;
-        /**
-         * Removes an attachment from a message
-         * @param attachmentIndex The index of the attachment to remove. The maximum length of the string is 100 characters
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional callback method
-         */
-        removeAttachmentAsync(attachmentIndex: string, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
-
-        /**
+        removeAttachmentAsync(attachmentIndex: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+                /**
          * Asynchronously saves an item.
-         *
-         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or
-         * Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
+         * 
+         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
+         * 
+         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. Saving an existing appointment will send an update to added or removed attendees.
+         * 
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * [!NOTE] If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that when Outlook is in cached mode, it may take some time before the item is actually synced to the server. Until the item is synced, using the itemId will return an error.
+         * 
+         * [!NOTE] The following clients have different behavior for saveAsync on appointments in compose mode:
+         * 
+         * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
+         * 
+         * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
+         * 
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * 
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
-        saveAsync(): void;
-        /**
-         * Asynchronously saves an item.
-         *
-         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or
-         * Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
-         */
-        saveAsync(options: AsyncContextOptions): void;
-        /**
-         * Asynchronously saves an item.
-         *
-         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or
-         * Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
-         */
-        saveAsync(callback: (result: AsyncResult) => void): void;
-        /**
-         * Asynchronously saves an item.
-         *
-         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or
-         * Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
-         */
-        saveAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
-
-        /**
-         * Asynchronously inserts data into the body or subject of a message.
-         */
-        setSelectedDataAsync(data: string): void;
-        /**
-         * Asynchronously inserts data into the body or subject of a message.
-         */
-        setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+        saveAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously inserts data into the body or subject of a message.
+         * 
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. After insertion, the cursor is placed at the end of the inserted content.
+         * 
+         * [Api set: Mailbox 1.2]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * 
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
         setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
         /**
          * Asynchronously inserts data into the body or subject of a message.
+         * 
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. After insertion, the cursor is placed at the end of the inserted content.
+         * 
+         * [Api set: Mailbox 1.2]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * 
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        coercionType: If text, the current style is applied in Outlook Web App and Outlook. If the field is an HTML editor, only the text data is inserted, even if the data is HTML. If html and the field supports HTML (the subject doesn't), the current style is applied in Outlook Web App and the default style is applied in Outlook. If the field is a text field, an InvalidDataFormat error is returned. If coercionType is not set, the result depends on the field: if the field is HTML then HTML is used; if the field is text, then plain text is used.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
         setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions, callback: (result: AsyncResult) => void): void;
 
     }
     export interface ItemRead extends Item {
+        /**
+         * Gets an array of attachments for the item. Read mode only.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * [!NOTE] Certain types of files are blocked by Outlook due to potential security issues and are therefore not returned. For more information, see [Blocked attachments in Outlook]<https://support.office.com/article/Blocked-attachments-in-Outlook-434752E1-02D3-4E90-9124-8B81E49A8519>.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         * 
+         */
         attachments: Array<AttachmentDetails>;
+        /**
+         * Gets the Exchange Web Services item class of the selected item. Read mode only.
+         * 
+         * The itemClass property specifies the message class of the selected item. The following are the default message classes for the message or appointment item.
+         * 
+         * [div class="mx-tdBreakAll"|Type|Description|item class|
+         * |-----------|------------|------------|
+         * |Appointment items|These are calendar items of the item class IPM.Appointment or IPM.Appointment.Occurence.|IPM.Appointment,IPM.Appointment.Occurence|
+         * |Message items|These include email messages that have the default message class IPM.Note, and meeting requests, responses, and cancellations, that use IPM.Schedule.Meeting as the base message class.|IPM.Note,IPM.Schedule.Meeting.Request,IPM.Schedule.Meeting.Neg,IPM.Schedule.Meeting.Pos,IPM.Schedule.Meeting.Tent,IPM.Schedule.Meeting.Canceled|
+         * 
+         * You can create custom message classes that extends a default message class, for example, a custom appointment message class IPM.Appointment.Contoso.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         */
         itemClass: string;
+        /**
+         * Gets the Exchange Web Services item identifier for the current item. Read mode only.
+         * 
+         * The itemId property is not available in compose mode. If an item identifier is required, the saveAsync method can be used to save the item to the store, which will return the item identifier in the AsyncResult.value parameter in the callback function.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         *  
+         * [!NOTE] The identifier returned by the itemId property is the same as the Exchange Web Services item identifier. The itemId property is not identical to the Outlook Entry ID or the ID used by the Outlook REST API. Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. For more details, see Use the Outlook REST APIs from an Outlook add-in.         * 
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         */
         itemId: string;
+        /**
+         * Gets the subject of an item, with all prefixes removed (including RE: and FWD:). Read mode only.
+         * 
+         * The normalizedSubject property gets the subject of the item, with any standard prefixes (such as RE: and FW:) that are added by email programs. To get the subject of the item with the prefixes intact, use the subject property.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         */
         normalizedSubject: string;
+        /**
+         * Gets or sets the description that appears in the subject field of an item.
+         * 
+         * The subject property gets or sets the entire subject of the item, as sent by the email server.
+         * 
+         * *Read mode*
+         * 
+         * The subject property returns a string. Use the normalizedSubject property to get the subject minus any leading prefixes such as RE: and FW:.
+         * 
+         * *Compose mode*
+         * 
+         * The subject property returns a Subject object that provides methods to get and set the subject.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
         subject: string;
         /**
-         * Displays a reply form that includes the sender and all the recipients of the selected message
+         * Displays a reply form that includes the sender and all recipients of the selected message or the organizer and all attendees of the selected appointment.
+         * 
+         * In Outlook Web App, the reply form is displayed as a pop-out form in the 3-column view and a pop-up form in the 2- or 1-column view.
+         * 
+         * If any of the string parameters exceed their limits, displayReplyAllForm throws an exception.
+         * 
+         * When attachments are specified in the formData.attachments parameter, Outlook and Outlook Web App attempt to download all attachments and attach them to the reply form. If any attachments fail to be added, an error is shown in the form UI. If this isn't possible, then no error message is thrown.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         * 
          * @param formData A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
          *  OR
          * An object that contains body or attachment data and a callback function
+         *        htmlBody: A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB.
+         *        attachments: An array of JSON objects that are either file or item attachments.
+         *        attachments.type: Indicates the type of attachment. Must be file for a file attachment or item for an item attachment.
+         *        attachments.name: A string that contains the name of the attachment, up to 255 characters in length.
+         *        attachments.url: Only used if type is set to file. The URI of the location for the file.
+         *        attachments.isLine: Only used if type is set to file. If true, indicates that the attachment will be shown inline in the message body, and should not be displayed in the attachment list.
+         *        attachments.itemId: Only used if type is set to item. The EWS item id of the attachment. This is a string up to 100 characters.
          */
         displayReplyAllForm(formData: string | ReplyFormData): void;
         /**
-         * Displays a reply form that includes only the sender of the selected message
-         * @param formData A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
-         *  OR
-         * An object that contains body or attachment data and a callback function
+         * Displays a reply form that includes only the sender of the selected message or the organizer of the selected appointment.
+         * 
+         * In Outlook Web App, the reply form is displayed as a pop-out form in the 3-column view and a pop-up form in the 2- or 1-column view.
+         * 
+         * If any of the string parameters exceed their limits, displayReplyForm throws an exception.
+         * 
+         * When attachments are specified in the formData.attachments parameter, Outlook and Outlook Web App attempt to download all attachments and attach them to the reply form. If any attachments fail to be added, an error is shown in the form UI. If this isn't possible, then no error message is thrown.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         * 
+         * @param formData A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB.
+         * OR
+         * An object that contains body or attachment data and a callback function. The object is defined as follows.
+         *        htmlBody: A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB.
+         *        attachments: An array of JSON objects that are either file or item attachments.
+         *        attachments.type: Indicates the type of attachment. Must be file for a file attachment or item for an item attachment.
+         *        attachments.name: A string that contains the name of the attachment, up to 255 characters in length.
+         *        attachments.url: Only used if type is set to file. The URI of the location for the file.
+         *        attachments.isLine: Only used if type is set to file. If true, indicates that the attachment will be shown inline in the message body, and should not be displayed in the attachment list.
+         *        attachments.itemId: Only used if type is set to item. The EWS item id of the attachment. This is a string up to 100 characters.
          */
         displayReplyForm(formData: string | ReplyFormData): void;
         /**
-         * Gets the entities found in the selected item
+         * Gets the entities found in the selected item.
+         *  
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
          */
         getEntities(): Entities;
         /**
-         * Gets an array of entities of the specified entity type found in an message
-         * @param entityType One of the EntityType enumeration values
+         * Gets an array of all the entities of the specified entity type found in the selected item.
+         *  
+         * [Api set: Mailbox 1.0]
+         * 
+         * @returns
+         * If the value passed in entityType is not a valid member of the EntityType enumeration, the method returns null. If no entities of the specified type are present on the item, the method returns an empty array. Otherwise, the type of the objects in the returned array depends on the type of entity requested in the entityType parameter.
+         * 
+         * While the minimum permission level to use this method is Restricted, some entity types require ReadItem to access, as specified in the following table.
+         * |Value of entityType|Type of objects in returned array|Required Permission Level|
+         * |-------|-----------|----------|
+         * |Address|String|Restricted|
+         * |Contact|Contact|ReadItem|
+         * |EmailAddress|String|ReadItem|
+         * |MeetingSuggestion|MeetingSuggestion|ReadItem|
+         * |PhoneNumber|PhoneNumber|Restricted|
+         * |TaskSuggestion|TaskSuggestion|ReadItem|
+         * |URL|String|Restricted|
+         * 
+         * @remarks
+         * 
+         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Minimum permission level: Restricted
+         * Applicable Outlook mode: Read
+         * @param entityType One of the EntityType enumeration values.
          */
         getEntitiesByType(entityType: Office.MailboxEnums.EntityType): Array<(string | Contact | MeetingSuggestion | PhoneNumber | TaskSuggestion)>;
         /**
-         * Returns well-known entities that pass the named filter defined in the manifest XML file
-         * @param name The name of the ItemHasKnownEntity rule element that defines the filter to match
+         * Returns well-known entities in the selected item that pass the named filter defined in the manifest XML file.
+         * 
+         * The getFilteredEntitiesByName method returns the entities that match the regular expression defined in the ItemHasKnownEntity rule element in the manifest XML file with the specified FilterName element value.
+         *  
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         * 
+         * @param name The name of the ItemHasKnownEntity rule element that defines the filter to match.
+         * @returns If there is no ItemHasKnownEntity element in the manifest with a FilterName element value that matches the name parameter, the method returns null. If the name parameter does match an ItemHasKnownEntity element in the manifest, but there are no entities in the current item that match, the method return an empty array.
          */
         getFilteredEntitiesByName(name: string): Array<(string | Contact | MeetingSuggestion | PhoneNumber | TaskSuggestion)>;
         /**
-         * Returns string values in the currently selected message object that match the regular expressions defined in the manifest XML file
+         * Returns string values in the selected item that match the regular expressions defined in the manifest XML file.
+         * 
+         * The getRegExMatches method returns the strings that match the regular expression defined in each ItemHasRegularExpressionMatch or ItemHasKnownEntity rule element in the manifest XML file. For an ItemHasRegularExpressionMatch rule, a matching string has to occur in the property of the item that is specified by that rule. The PropertyName simple type defines the supported properties.
+         * 
+         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body and should not attempt to return the entire body of the item. Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results. Instead, use the Body.getAsync method to retrieve the entire body. 
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @returns
+         * An object that contains arrays of strings that match the regular expressions defined in the manifest XML file. The name of each array is equal to the corresponding value of the RegExName attribute of the matching ItemHasRegularExpressionMatch rule or the FilterName attribute of the matching ItemHasKnownEntity rule.
+         * 
+         * @remarks
+         * 
+         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
          */
         getRegExMatches(): any;
         /**
-         * Returns string values that match the named regular expression defined in the manifest XML file
+         * Returns string values in the selected item that match the named regular expression defined in the manifest XML file.
+         * 
+         * The getRegExMatchesByName method returns the strings that match the regular expression defined in the ItemHasRegularExpressionMatch rule element in the manifest XML file with the specified RegExName element value.
+         * 
+         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body and should not attempt to return the entire body of the item. Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @returns
+         * An array that contains the strings that match the regular expression defined in the manifest XML file.
+         * 
+         * @remarks
+         * 
+         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         * 
+         * @param name The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
          */
         getRegExMatchesByName(name: string): Array<string>;
         /**
-        * Gets the entities found in the selected item that are currently selected
-        *
-        * [Api set: Mailbox 1.6]
-        */
+         * Gets the entities found in a highlighted match a user has selected. Highlighted matches apply to contextual add-ins.
+         * 
+         * [Api set: Mailbox 1.6]
+         *  
+         * @remarks
+         * 
+         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         * 
+         * @param name The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
+         */
         getSelectedEntities(): Entities;
         /**
-         * Returns string values in the currently selected message object that match the regular expressions defined in the manifest XML file and
-         * are selected in the current item
-         *
+         * Returns string values in a highlighted match that match the regular expressions defined in the manifest XML file. Highlighted matches apply to contextual add-ins.
+         * 
+         * The getSelectedRegExMatches method returns the strings that match the regular expression defined in each ItemHasRegularExpressionMatch or ItemHasKnownEntity rule element in the manifest XML file. For an ItemHasRegularExpressionMatch rule, a matching string has to occur in the property of the item that is specified by that rule. The PropertyName simple type defines the supported properties.
+         * 
+         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body and should not attempt to return the entire body of the item. Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results. Instead, use the Body.getAsync method to retrieve the entire body.
+         * 
          * [Api set: Mailbox 1.6]
+         * 
+         * @returns
+         * An object that contains arrays of strings that match the regular expressions defined in the manifest XML file. The name of each array is equal to the corresponding value of the RegExName attribute of the matching ItemHasRegularExpressionMatch rule or the FilterName attribute of the matching ItemHasKnownEntity rule.
+         * 
+         * @remarks
+         * 
+         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
          */
         getSelectedRegExMatches(): any;
     }
+    export interface Message extends Item {
+        /**
+         * Gets an identifier for the email conversation that contains a particular message.
+         * 
+         * You can get an integer for this property if your mail app is activated in read forms or responses in compose forms. If subsequently the user changes the subject of the reply message, upon sending the reply, the conversation ID for that message will change and that value you obtained earlier will no longer apply.
+         * 
+         * You get null for this property for a new item in a compose form. If the user sets a subject and saves the item, the conversationId property will return a value.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        conversationId: string;
+    }
+    export interface MessageCompose extends Message, ItemCompose {
+        /**
+         * Gets an object that provides methods to get or update the recipients on the Bcc (blind carbon copy) line of a message. Compose mode only.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose
+         */
+        bcc: Recipients;
+        /**
+         * Provides access to the Cc (carbon copy) recipients of a message. The type of object and level of access depends on the mode of the current item.
+         * 
+         * *Read mode*
+         * 
+         * The cc property returns an array that contains an EmailAddressDetails object for each recipient listed on the Cc line of the message. The collection is limited to a maximum of 100 members.
+         * 
+         * *Compose mode*
+         * 
+         * The cc property returns a Recipients object that provides methods to get or update the recipients on the Cc line of the message.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        cc: Recipients;
+        /**
+         * Provides access to the recipients on the To line of a message. The type of object and level of access depends on the mode of the current item.
+         * 
+         * *Read mode*
+         * 
+         * The to property returns an array that contains an EmailAddressDetails object for each recipient listed on the To line of the message. The collection is limited to a maximum of 100 members.
+         * 
+         * *Compose mode*
+         * 
+         * The to property returns a Recipients object that provides methods to get or update the recipients on the To line of the message.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        to: Recipients;
+    }
+    export interface MessageRead extends Message, ItemRead {
+        /**
+         * Provides access to the Cc (carbon copy) recipients of a message. The type of object and level of access depends on the mode of the current item.
+         * 
+         * *Read mode*
+         * 
+         * The cc property returns an array that contains an EmailAddressDetails object for each recipient listed on the Cc line of the message. The collection is limited to a maximum of 100 members.
+         * 
+         * *Compose mode*
+         * 
+         * The cc property returns a Recipients object that provides methods to get or update the recipients on the Cc line of the message.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        cc: Array<EmailAddressDetails>;
+        /**
+         * Gets the email address of the sender of a message. Read mode only.
+         * 
+         * The from and sender properties represent the same person unless the message is sent by a delegate. In that case, the from property represents the delegator, and the sender property represents the delegate.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * [!NOTE] The recipientType property of the EmailAddressDetails object in the from property is undefined.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         */
+        from: EmailAddressDetails;
+        /**
+         * Gets the Internet message identifier for an email message. Read mode only.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         */
+        internetMessageId: string;
+        /**
+         * Gets the email address of the sender of an email message. Read mode only.
+         * 
+         * The from and sender properties represent the same person unless the message is sent by a delegate. In that case, the from property represents the delegator, and the sender property represents the delegate.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * [!NOTE] The recipientType property of the EmailAddressDetails object in the sender property is undefined.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         */
+        sender: EmailAddressDetails;
+        /**
+         * Provides access to the recipients on the To line of a message. The type of object and level of access depends on the mode of the current item.
+         * 
+         * *Read mode*
+         * 
+         * The to property returns an array that contains an EmailAddressDetails object for each recipient listed on the To line of the message. The collection is limited to a maximum of 100 members.
+         * 
+         * *Compose mode*
+         * 
+         * The to property returns a Recipients object that provides methods to get or update the recipients on the To line of the message.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        to: Array<EmailAddressDetails>;
+    }
+
+    /**
+     * Represents a date and time in the local client's time zone. Read mode only.
+     * 
+     * [Api set: Mailbox 1.0]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Read
+     */
     export interface LocalClientTime {
+        /**
+         * Integer value representing the month, beginning with 0 for January to 11 for December.
+         */
         month: number;
+        /**
+         * Integer value representing the day of the month.
+         */
         date: number;
+        /**
+         * Integer value repesenting the year.
+         */
         year: number;
+        /**
+         * Integer value representing the hour on a 24-hour clock.
+         */
         hours: number;
+        /**
+         * Integer value representing the minutes.
+         */
         minutes: number;
+        /**
+         * Integer value representing the seconds.
+         */
         seconds: number;
+        /**
+         * Integer value representing the milliseconds.
+         */
         milliseconds: number;
+        /**
+         * Integer value representing the number of minutes difference between the local time zone and UTC.
+         */
         timezoneOffset: number;
     }
+    /**
+     * Provides methods to get and set the location of a meeting in an Outlook add-in.
+     * 
+     * [Api set: Mailbox 1.1]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Compose
+     */
     export interface Location {
         /**
-         * Begins an asynchronous request for the location of an appointment
-         * @param callback The optional method to call when the string is inserted
+         * Gets the location of an appointment.
+         * 
+         * The getAsync method starts an asynchronous call to the Exchange server to get the location of an appointment. The location of the appointment is provided as a string in the asyncResult.value property.
+         * 
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose
          */
-        getAsync(callback: (result: AsyncResult) => void): void;
+        getAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
-         * Begins an asynchronous request for the location of an appointment
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
+         * Sets the location of an appointment.
+         * 
+         * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. Setting the location of an appointment overwrites the current location.
+         * 
+         * @param data The location of the appointment. The string is limited to 255 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.  If setting the location fails, the asyncResult.error property will contain an error code.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose
+         * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
          */
-        getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
-
-        /**
-         * Begins an asynchronous request to set the location of an appointment
-         * @param data The location of the appointment. The string is limited to 255 characters
-         */
-        setAsync(location: string): void;
-        /**
-         * Begins an asynchronous request to set the location of an appointment
-         * @param data The location of the appointment. The string is limited to 255 characters
-         * @param options Any optional parameters or state data passed to the method
-         */
-        setAsync(location: string, options: AsyncContextOptions): void;
-        /**
-         * Begins an asynchronous request to set the location of an appointment
-         * @param data The location of the appointment. The string is limited to 255 characters
-         * @param callback The optional method to call when the location is set
-         */
-        setAsync(location: string, callback: (result: AsyncResult) => void): void;
-        /**
-         * Begins an asynchronous request to set the location of an appointment
-         * @param data The location of the appointment. The string is limited to 255 characters
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the location is set
-         */
-        setAsync(location: string, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        setAsync(location: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
 
     }
+    /**
+     * Provides access to the Outlook Add-in object model for Microsoft Outlook and Microsoft Outlook on the web.
+     * 
+     * Namespaces:
+     * 
+     * - diagnostics: Provides diagnostic information to an Outlook add-in.
+     * 
+     * - item: Provides methods and properties for accessing a message or appointment in an Outlook add-in.
+     * 
+     * - userProfile: Provides information about the user in an Outlook add-in.
+     * 
+     * [Api set: Mailbox 1.0]
+     * 
+     * @remarks
+     * Minimum permission level: Restricted
+     * Applicable Outlook mode: Compose or read
+     */
     export interface Mailbox {
-        diagnostics: Diagnostics;
+        /**
+         * Gets the URL of the Exchange Web Services (EWS) endpoint for this email account. Read mode only.
+         * 
+         * The ewsUrl value can be used by a remote service to make EWS calls to the user's mailbox. For example, you can create a remote service to [get attachments from the selected item]<https://msdn.microsoft.com/library/office/dn148008.aspx>.
+         * 
+         * Your app must have the ReadItem permission specified in its manifest to call the ewsUrl member in read mode.
+         * 
+         * In compose mode you must call the saveAsync method before you can use the ewsUrl member. Your app must have ReadWriteItem permissions to call the saveAsync method.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * [!NOTE] This member is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
         ewsUrl: string;
-        /** The mailbox item.  Depending on the context in which the add-in opened, the item may be of any number of types.
+        /** 
+         * The mailbox item.  Depending on the context in which the add-in opened, the item may be of any number of types.
          * If you want to see IntelliSense for only a specific type, you should cast this item to one of the following:
          * `ItemCompose`, `ItemRead`, `MessageCompose`, `MessageRead`, `AppointmentCompose`, `AppointmentRead`
-         */
-        item: Item & MessageRead & MessageCompose & AppointmentRead & AppointmentCompose;
-        userProfile: UserProfile;
+         */ 
+        item: Item & MessageRead & MessageCompose & AppointmentRead & AppointmentCompose; 
         /**
-         * Adds an event handler for a supported event
-         * @param eventType The event that should invoke the handler
-         * @param handler The function to handle the event
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the handler is added
+         * Gets the URL of the REST endpoint for this email account.
+         * 
+         * The restUrl value can be used to make [REST API]<https://docs.microsoft.com/outlook/rest/> calls to the user's mailbox.
+         * 
+         * Your app must have the ReadItem permission specified in its manifest to call the restUrl member in read mode.
+         * 
+         * In compose mode you must call the saveAsync method before you can use the restUrl member. Your app must have ReadWriteItem permissions to call the saveAsync method.
+         * 
+         * [Api set: Mailbox 1.5]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */        
+        restUrl: string;
+        /**
+         * Adds an event handler for a supported event.
+         * 
+         * Currently the only supported event type is Office.EventType.ItemChanged, which is invoked when the user selects a new item. This event is used by add-ins that implement a pinnable taskpane, and allows the add-in to refresh the taskpane UI based on the currently selected item.
+         * 
+         * [Api set: Mailbox 1.5]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param eventType The event that should invoke the handler.
+         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
          */
         addHandlerAsync(eventType: Office.EventType, handler: (type: Office.EventType) => void, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Converts an item ID formatted for REST into EWS format.
-         * @param itemId An item ID formatted for the Outlook REST APIs
-         * @param restVersion A value indicating the version of the Outlook REST API used to retrieve the item ID
+         * 
+         * Item IDs retrieved via a REST API (such as the Outlook Mail API or the Microsoft Graph) use a different format than the format used by Exchange Web Services (EWS). The convertToEwsId method converts a REST-formatted ID into the proper format for EWS.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Minimum permission level: Restricted
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param itemId An item ID formatted for the Outlook REST APIs.
+         * @param restVersion A value indicating the version of the Outlook REST API used to retrieve the item ID.
          */
         convertToEwsId(itemId: string, restVersion: Office.MailboxEnums.RestVersion): string;
         /**
-         * Gets a Date object from a dictionary containing time information
-         * @param timeValue A Date object
+         * Gets a dictionary containing time information in local client time.
+         * 
+         * The dates and times used by a mail app for Outlook or Outlook Web App can use different time zones. Outlook uses the client computer time zone; Outlook Web App uses the time zone set on the Exchange Admin Center (EAC). You should handle date and time values so that the values you display on the user interface are always consistent with the time zone that the user expects.
+         * 
+         * If the mail app is running in Outlook, the convertToLocalClientTime method will return a dictionary object with the values set to the client computer time zone. If the mail app is running in Outlook Web App, the convertToLocalClientTime method will return a dictionary object with the values set to the time zone specified in the EAC.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param timeValue A Date object.
          */
         convertToLocalClientTime(timeValue: Date): LocalClientTime;
         /**
          * Converts an item ID formatted for EWS into REST format.
-         * @param itemId An item ID formatted for the Outlook EWS APIs
-         * @param restVersion A value indicating the version of the Outlook REST API that the converted ID will be used with
+         * 
+         * Item IDs retrieved via EWS or via the itemId property use a different format than the format used by REST APIs (such as the [Outlook Mail API]<https://msdn.microsoft.com/office/office365/APi/mail-rest-operations> or the [Microsoft Graph]<http://graph.microsoft.io/>). The convertToRestId method converts an EWS-formatted ID into the proper format for REST.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Minimum permission level: Restricted
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param itemId An item ID formatted for Exchange Web Services (EWS)
+         * @param restVersion A value indicating the version of the Outlook REST API that the converted ID will be used with.
          */
         convertToRestId(itemId: string, restVersion: Office.MailboxEnums.RestVersion): string;
         /**
-         * Gets a dictionary containing time information in local client time
-         * @param input A dictionary containing a date. The dictionary should contain the following fields: year, month, date, hours, minutes, seconds, time zone, time zone offset
+         * Gets a Date object from a dictionary containing time information.
+         * 
+         * The convertToUtcClientTime method converts a dictionary containing a local date and time to a Date object with the correct values for the local date and time.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param input The local time value to convert.
+         * @returns A Date object with the time expressed in UTC.
          */
         convertToUtcClientTime(input: LocalClientTime): Date;
         /**
-         * Displays an existing calendar appointment
-         * @param itemId The Exchange Web Services (EWS) identifier for an existing calendar appointment
+         * Displays an existing calendar appointment.
+         * 
+         * The displayAppointmentForm method opens an existing calendar appointment in a new window on the desktop or in a dialog box on mobile devices.
+         * 
+         * In Outlook for Mac, you can use this method to display a single appointment that is not part of a recurring series, or the master appointment of a recurring series, but you cannot display an instance of the series. This is because in Outlook for Mac, you cannot access the properties (including the item ID) of instances of a recurring series.
+         * 
+         * In Outlook Web App, this method opens the specified form only if the body of the form is less than or equal to 32KB number of characters.
+         * 
+         * If the specified item identifier does not identify an existing appointment, a blank pane opens on the client computer or device, and no error message will be returned.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         * @param itemId The Exchange Web Services (EWS) identifier for an existing calendar appointment.
          */
         displayAppointmentForm(itemId: string): void;
         /**
-         * Displays an existing message
-         * @param itemId The Exchange Web Services (EWS) identifier for an existing message
+         * Displays an existing message.
+         * 
+         * The displayMessageForm method opens an existing message in a new window on the desktop or in a dialog box on mobile devices.
+         * 
+         * In Outlook Web App, this method opens the specified form only if the body of the form is less than or equal to 32 KB number of characters.
+         * 
+         * If the specified item identifier does not identify an existing message, no message will be displayed on the client computer, and no error message will be returned.
+         * 
+         * Do not use the displayMessageForm with an itemId that represents an appointment. Use the displayAppointmentForm method to display an existing appointment, and displayNewAppointmentForm to display a form to create a new appointment.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         * @param itemId The Exchange Web Services (EWS) identifier for an existing message.
          */
         displayMessageForm(itemId: string): void;
         /**
-         * Displays a form for creating a new calendar appointment
-         * @param parameters A dictionary of parameters describing the new appointment.
+         * Displays a form for creating a new calendar appointment.
+         * 
+         * The displayNewAppointmentForm method opens a form that enables the user to create a new appointment or meeting. If parameters are specified, the appointment form fields are automatically populated with the contents of the parameters.
+         * 
+         * In Outlook Web App and OWA for Devices, this method always displays a form with an attendees field. If you do not specify any attendees as input arguments, the method displays a form with a Save button. If you have specified attendees, the form would include the attendees and a Send button.
+         * 
+         * In the Outlook rich client and Outlook RT, if you specify any attendees or resources in the requiredAttendees, optionalAttendees, or resources parameter, this method displays a meeting form with a Send button. If you don't specify any recipients, this method displays an appointment form with a Save & Close button.
+         * 
+         * If any of the parameters exceed the specified size limits, or if an unknown parameter name is specified, an exception is thrown.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         * 
+         * @param parameters A dictionary of parameters describing the new appointment. All parameters are optional.
+         *        requiredAttendees: An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the required attendees for the appointment. The array is limited to a maximum of 100 entries.
+         *        optionalAttendees: An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the optional attendees for the appointment. The array is limited to a maximum of 100 entries.
+         *        start: A Date object specifying the start date and time of the appointment.
+         *        end: A Date object specifying the end date and time of the appointment.
+         *        location: A string containing the location of the appointment. The string is limited to a maximum of 255 characters.
+         *        resources: An array of strings containing the resources required for the appointment. The array is limited to a maximum of 100 entries.
+         *        subject: A string containing the subject of the appointment. The string is limited to a maximum of 255 characters.
+         *        body: The body of the appointment. The body content is limited to a maximum size of 32 KB.
          */
-        displayNewAppointmentForm(parameters?: AppointmentForm): void;
+        displayNewAppointmentForm(parameters: AppointmentForm): void;
         /**
-         * Displays a new message form
-         * WARNING: This api is not officially released, and may not work on all platforms
-         * @param options A dictionary containing all values to be filled in for the user in the new form
+         * Displays a form for creating a new message.
+         * 
+         * The displayNewMessageForm method opens a form that enables the user to create a new message. If parameters are specified, the message form fields are automatically populated with the contents of the parameters.
+         * 
+         * If any of the parameters exceed the specified size limits, or if an unknown parameter name is specified, an exception is thrown.
+         * 
+         * [Api set: Mailbox 1.6]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Read
+         * 
+         * @param parameters A dictionary containing all values to be filled in for the user in the new form. All parameters are optional.
+         *        toRecipients: An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the recipients on the To line. The array is limited to a maximum of 100 entries.
+         *        ccRecipients: An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the recipients on the Cc line. The array is limited to a maximum of 100 entries.
+         *        bccRecipients: An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the recipients on the Bcc line. The array is limited to a maximum of 100 entries.
+         *        subject: A string containing the subject of the message. The string is limited to a maximum of 255 characters.
+         *        htmlBody: The HTML body of the message. The body content is limited to a maximum size of 32 KB.
+         *        attachments: An array of JSON objects that are either file or item attachments.
+         *        attachments.type: Indicates the type of attachment. Must be file for a file attachment or item for an item attachment.
+         *        attachments.name: A string that contains the name of the attachment, up to 255 characters in length.
+         *        attachments.url: Only used if type is set to file. The URI of the location for the file.
+         *        attachments.isInline: Only used if type is set to file. If true, indicates that the attachment will be shown inline in the message body, and should not be displayed in the attachment list.
+         *        attachments.itemId: Only used if type is set to item. The EWS item id of the attachment. This is a string up to 100 characters.
          */
-        displayNewMessageForm(options?: any): void;
+        displayNewMessageForm(parameters: any): void;
         /**
-         * Gets a string that contains a token used to get an attachment or item from an Exchange Server
-         * @param callback The optional method to call when the string is inserted
-         * @param userContext Optional variable for any state data that is passed to the asynchronous method
+         * Gets a string that contains a token used to call REST APIs or Exchange Web Services.
+         * 
+         * The getCallbackTokenAsync method makes an asynchronous call to get an opaque token from the Exchange Server that hosts the user's mailbox. The lifetime of the callback token is 5 minutes.
+         * 
+         * *REST Tokens*
+         * 
+         * When a REST token is requested (options.isRest = true), the resulting token will not work to authenticate Exchange Web Services calls. The token will be limited in scope to read-only access to the current item and its attachments, unless the add-in has specified the ReadWriteMailbox permission in its manifest. If the ReadWriteMailbox permission is specified, the resulting token will grant read/write access to mail, calendar, and contacts, including the ability to send mail.
+         * 
+         * The add-in should use the restUrl property to determine the correct URL to use when making REST API calls.
+         * 
+         * *EWS Tokens*
+         * 
+         * When an EWS token is requested (options.isRest = false), the resulting token will not work to authenticate REST API calls. The token will be limited in scope to accessing the current item.
+         * 
+         * The add-in should use the ewsUrl property to determine the correct URL to use when making EWS calls.
+         * 
+         * [Api set: Mailbox 1.5]
+         * 
+         * @remarks
+         * 
+         * [!NOTE] It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible. 
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose and read
+         * 
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. The token is provided as a string in the asyncResult.value property.
          */
-        getCallbackTokenAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
+        getCallbackTokenAsync(callback: (result: AsyncResult) => void): void;
         /**
-         * Gets a token identifying the user and the app for Office
-         * @param callback The optional method to call when the string is inserted
-         * @param userContext Optional variable for any state data that is passed to the asynchronous method
+         * Gets a string that contains a token used to call REST APIs or Exchange Web Services.
+         * 
+         * The getCallbackTokenAsync method makes an asynchronous call to get an opaque token from the Exchange Server that hosts the user's mailbox. The lifetime of the callback token is 5 minutes.
+         * 
+         * *REST Tokens*
+         * 
+         * When a REST token is requested (options.isRest = true), the resulting token will not work to authenticate Exchange Web Services calls. The token will be limited in scope to read-only access to the current item and its attachments, unless the add-in has specified the ReadWriteMailbox permission in its manifest. If the ReadWriteMailbox permission is specified, the resulting token will grant read/write access to mail, calendar, and contacts, including the ability to send mail.
+         * 
+         * The add-in should use the restUrl property to determine the correct URL to use when making REST API calls.
+         * 
+         * *EWS Tokens*
+         * 
+         * When an EWS token is requested (options.isRest = false), the resulting token will not work to authenticate REST API calls. The token will be limited in scope to accessing the current item.
+         * 
+         * The add-in should use the ewsUrl property to determine the correct URL to use when making EWS calls.
+         * 
+         * [Api set: Mailbox 1.5]
+         * 
+         * @remarks
+         * 
+         * [!NOTE] It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible. 
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose and read
+         * 
+         * @param options An object literal that contains one or more of the following properties.
+         *        isRest: Determines if the token provided will be used for the Outlook REST APIs or Exchange Web Services. Default value is false.
+         *        asyncContext: Any state data that is passed to the asynchronous method.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. The token is provided as a string in the asyncResult.value property.
          */
-        getUserIdentityTokenAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
+        getCallbackTokenAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
         /**
-         * Makes an asynchronous request to an Exchange Web Services (EWS) service on the Exchange server that hosts the user’s mailbox
-         * @param data The EWS request
-         * @param callback The optional method to call when the string is inserted
-         * @param userContext Optional variable for any state data that is passed to the asynchronous method
+         * Gets a string that contains a token used to get an attachment or item from an Exchange Server.
+         * 
+         * The getCallbackTokenAsync method makes an asynchronous call to get an opaque token from the Exchange Server that hosts the user's mailbox. The lifetime of the callback token is 5 minutes.
+         * 
+         * You can pass the token and an attachment identifier or item identifier to a third-party system. The third-party system uses the token as a bearer authorization token to call the Exchange Web Services (EWS) GetAttachment or GetItem operation to return an attachment or item. For example, you can create a remote service to get attachments from the selected item.
+         * 
+         * Your app must have the ReadItem permission specified in its manifest to call the getCallbackTokenAsync method in read mode.
+         * 
+         * In compose mode you must call the saveAsync method to get an item identifier to pass to the getCallbackTokenAsync method. Your app must have ReadWriteItem permissions to call the saveAsync method.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose and read
+         * 
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. The token is provided as a string in the asyncResult.value property.
+         * @param userContext Optional. Any state data that is passed to the asynchronous method.
          */
-        makeEwsRequestAsync(data: any, callback?: (result: AsyncResult) => void, userContext?: any): void;
-    }
-    export interface Message extends Item {
-        conversationId: string;
-    }
-    export interface MessageCompose extends Message, ItemCompose {
-        bcc: Recipients;
-        cc: Recipients;
-        to: Recipients;
-    }
-    export interface MessageRead extends Message, ItemRead {
-        cc: Array<EmailAddressDetails>;
-        from: EmailAddressDetails;
-        internetMessageId: string;
-        sender: EmailAddressDetails;
-        to: Array<EmailAddressDetails>;
+        getCallbackTokenAsync(callback: (result: AsyncResult) => void, userContext?: any): void;
+        /**
+         * Gets a token identifying the user and the Office Add-in.
+         * 
+         * The getUserIdentityTokenAsync method returns a token that you can use to identify and [authenticate the add-in and user with a third-party system]<https://msdn.microsoft.com/library/office/fp179828.aspx>.
+         * 
+         * The token is provided as a string in the asyncResult.value property.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose and read
+         * 
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param userContext Optional. Any state data that is passed to the asynchronous method.|
+         */
+        getUserIdentityTokenAsync(callback: (result: AsyncResult) => void, userContext?: any): void;
+        /**
+         * Makes an asynchronous request to an Exchange Web Services (EWS) service on the Exchange server that hosts the user’s mailbox.
+         * 
+         * 
+         * In these cases, add-ins should use REST APIs to access the user's mailbox instead.
+         * 
+         * The makeEwsRequestAsync method sends an EWS request on behalf of the add-in to Exchange.
+         * 
+         * You cannot request Folder Associated Items with the makeEwsRequestAsync method.
+         * 
+         * The XML request must specify UTF-8 encoding. <?xml version="1.0" encoding="utf-8"?>
+         * 
+         * Your add-in must have the ReadWriteMailbox permission to use the makeEwsRequestAsync method. For information about using the ReadWriteMailbox permission and the EWS operations that you can call with the makeEwsRequestAsync method, see Specify permissions for mail add-in access to the user's mailbox.
+         * 
+         * The XML result of the EWS call is provided as a string in the asyncResult.value property. If the result exceeds 1 MB in size, an error message is returned instead.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * 
+         * [!NOTE] This method is not supported in the following scenarios. - In Outlook for iOS or Outlook for Android - When the add-in is loaded in a Gmail mailbox
+         * 
+         * [!NOTE] The server administrator must set OAuthAuthentication to true on the Client Access Server EWS directory to enable the makeEwsRequestAsync method to make EWS requests.
+         * 
+         * *Version differences*
+         * 
+         * When you use the makeEwsRequestAsync method in mail apps running in Outlook versions earlier than version 15.0.4535.1004, you should set the encoding value to ISO-8859-1.
+         * 
+         * <?xml version="1.0" encoding="iso-8859-1"?>
+         * 
+         * You do not need to set the encoding value when your mail app is running in Outlook on the web. You can determine whether your mail app is running in Outlook or Outlook on the web by using the mailbox.diagnostics.hostName property. You can determine what version of Outlook is running by using the mailbox.diagnostics.hostVersion property.
+         * 
+         * Minimum permission level: ReadWriteMailbox
+         * Applicable Outlook mode: Compose and read
+         * 
+         * @param data The EWS request.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param userContext Optional. Any state data that is passed to the asynchronous method.
+         */
+        makeEwsRequestAsync(data: any, callback: (result: AsyncResult) => void, userContext?: any): void;
     }
+    
+    /**
+     * Represents a suggested meeting found in an item. Read mode only.
+     * 
+     * The list of meetings suggested in an email message is returned in the meetingSuggestions property of the Entities object that is returned when the getEntities or getEntitiesByType method is called on the active item.
+     * 
+     * The start and end values are string representations of a Date object that contains the date and time at which the suggested meeting is to begin and end. The values are in the default time zone specified for the current user.
+     * 
+     * [Api set: Mailbox 1.0]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Read
+     */
     export interface MeetingSuggestion {
+        /**
+         * Gets the attendees for a suggested meeting.
+         */
         attendees: Array<EmailUser>;
+        /**
+         * Gets the date and time that a suggested meeting is to end.
+         */
         end: string;
+        /**
+         * Gets the location of a suggested meeting.
+         */
         location: string;
+        /**
+         * Gets a string that was identified as a meeting suggestion.
+         */
         meetingstring: string;
+        /**
+         * Gets the date and time that a suggested meeting is to begin.
+         */
         start: string;
+        /**
+         * Gets the subject of a suggested meeting.
+         */
         subject: string;
     }
+    /**
+     * An array of NotificationMessageDetails objects are returned by the NotificationMessages.getAllAsync method.
+     * 
+     * [Api set: Mailbox 1.3]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Compose or read
+     */
     export interface NotificationMessageDetails {
+        /**
+         * The identifier for the notification message.
+         */
         key?: string;
+        /**
+         * The type of notification message.
+         */
         type: Office.MailboxEnums.ItemNotificationMessageType;
+        /**
+         * The resource identifier of the icon used for the message. Only applicable when type is InformationalMessage.
+         */
         icon?: string;
+        /**
+         * This is the text of the message. Maximum length is 150 characters.
+         */
         message: string;
+        /**
+         * If true, the message remains until removed by this add-in or dismissed by the user. If false, it is removed when the user navigates to a different item. Only applicable when type is InformationalMessage.
+         */
         persistent?: Boolean;
     }
+    /**
+     * The NotificationMessages object is returned as the notificationMessages property of an item.
+     * 
+     * [Api set: Mailbox 1.3]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Compose or read
+     */
     export interface NotificationMessages {
         /**
-         * Adds a notification to an item
-         * @param key A developer-specified key used to refrence this notification message. Developers can use it to modify this message later.
-         * @param JSONmessage A JSON object that contains the notification message to be added to this item
+         * Adds a notification to an item.
+         * 
+         * There are a maximum of 5 notifications per message. Setting more will return a NumberOfNotificationMessagesExceeded error.
+         * 
+         * @param key  A developer-specified key used to reference this notification message. Developers can use it to modify this message later. It can't be longer than 32 characters.
+         * @param JSONmessage A JSON object that contains the notification message to be added to the item. It consists of the following properties.
+         *        type: Specifies the Office.MailboxEnums.ItemNotificationMessageType of message. If type is ProgressIndicator or ErrorMessage, an icon is automatically supplied and the message is not persistent. Therefore the icon and persistent properties are not valid for these types of messages. Including them will result in an ArgumentException. If type is ProgressIndicator, the developer should remove or replace the progress indicator when the action is complete.
+         *        icon: A reference to an icon that is defined in the manifest in the Resources section. It appears in the infobar area. It is only applicable if the type is InformationalMessage. Specifying this parameter for an unsupported type results in an exception.
+         *        message: The text of the notification message. Maximum length is 150 characters. If the developer passes in a longer string, an ArgumentOutOfRange exception is thrown.
+         *        persistent: Only applicable when type is InformationalMessage. If true, the message remains until removed by this add-in or dismissed by the user. If false, it is removed when the user navigates to a different item. For error notifications, the message persists until the user sees it once. Specifying this parameter for an unsupported type throws an exception.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
          */
-        addAsync(key: string, JSONmessage: NotificationMessageDetails): void;
-        /**
-         * Adds a notification to an item
-         * @param key A developer-specified key used to refrence this notification message. Developers can use it to modify this message later.
-         * @param JSONmessage A JSON object that contains the notification message to be added to this item
-         * @param options Any optional parameters or state data passed to the method
-         */
-        addAsync(key: string, JSONmessage: NotificationMessageDetails, options: AsyncContextOptions): void;
-        /**
-         * Adds a notification to an item
-         * @param key A developer-specified key used to refrence this notification message. Developers can use it to modify this message later.
-         * @param JSONmessage A JSON object that contains the notification message to be added to this item
-         * @param callback The optional callback method
-         */
-        addAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult) => void): void;
-        /**
-         * Adds a notification to an item
-         * @param key A developer-specified key used to refrence this notification message. Developers can use it to modify this message later.
-         * @param JSONmessage A JSON object that contains the notification message to be added to this item
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional callback method
-         */
-        addAsync(key: string, JSONmessage: NotificationMessageDetails, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        addAsync(key: string, JSONmessage: NotificationMessageDetails, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
 
         /**
          * Returns all keys and messages for an item.
-         * @param callback The optional callback method
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
          */
-        getAllAsync(callback: (result: AsyncResult) => void): void;
-        /**
-         * Returns all keys and messages for an item.
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional callback method
-         */
-        getAllAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        getAllAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
 
         /**
          * Removes a notification message for an item.
-         * @param key The key for the notification message to remove
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param key The key for the notification message to remove.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
          */
-        removeAsync(key: string): void;
-        /**
-         * Removes a notification message for an item.
-         * @param key The key for the notification message to remove
-         * @param options Any optional parameters or state data passed to the method
-         */
-        removeAsync(key: string, options: AsyncContextOptions): void;
-        /**
-         * Removes a notification message for an item.
-         * @param key The key for the notification message to remove
-         * @param callback The optional callback method
-         */
-        removeAsync(key: string, callback: (result: AsyncResult) => void): void;
-        /**
-         * Removes a notification message for an item.
-         * @param key The key for the notification message to remove
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional callback method
-         */
-        removeAsync(key: string, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        removeAsync(key: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
 
         /**
-         * Replaces a notification message that has a given key with another message
-         * @param key The key for the notification message to replace.
-         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message
+         * Replaces a notification message that has a given key with another message. 
+         * 
+         * If a notification message with the specified key doesn't exist, replaceAsync will add the notification.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param key The key for the notification message to replace. It can't be longer than 32 characters.
+         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. It consists of the following properties.
+         *        type: Specifies the Office.MailboxEnums.ItemNotificationMessageType of message. If type is ProgressIndicator or ErrorMessage, an icon is automatically supplied and the message is not persistent. Therefore the icon and persistent properties are not valid for these types of messages. Including them will result in an ArgumentException. If type is ProgressIndicator, the developer should remove or replace the progress indicator when the action is complete.
+         *        icon: A reference to an icon that is defined in the manifest in the Resources section. It appears in the infobar area. It is only applicable if the type is InformationalMessage. Specifying this parameter for an unsupported type results in an exception.
+         *        message: The text of the notification message. Maximum length is 150 characters. If the developer passes in a longer string, an ArgumentOutOfRange exception is thrown.
+         *        persistent: Only applicable when type is InformationalMessage. If true, the message remains until removed by this add-in or dismissed by the user. If false, it is removed when the user navigates to a different item. For error notifications, the message persists until the user sees it once. Specifying this parameter for an unsupported type throws an exception.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
          */
-        replaceAsync(key: string, JSONmessage: NotificationMessageDetails): void;
-        /**
-         * Replaces a notification message that has a given key with another message
-         * @param key The key for the notification message to replace.
-         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message
-         * @param options Any optional parameters or state data passed to the method
-         */
-        replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options: AsyncContextOptions): void;
-        /**
-         * Replaces a notification message that has a given key with another message
-         * @param key The key for the notification message to replace.
-         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message
-         * @param callback The optional callback method
-         */
-        replaceAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult) => void): void;
-        /**
-         * Replaces a notification message that has a given key with another message
-         * @param key The key for the notification message to replace.
-         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional callback method
-         */
-        replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
 
     }
+    /**
+     * Represents a phone number identified in an item. Read mode only.
+     * 
+     * An array of PhoneNumber objects containing the phone numbers found in an email message is returned in the phoneNumbers property of the Entities object that is returned when you call the getEntities method on the selected item.
+     * 
+     * [Api set: Mailbox 1.0]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Read
+     */
     export interface PhoneNumber {
+        /**
+         * Gets a string containing a phone number. This string contains only the digits of the telephone number and excludes characters like parentheses and hyphens, if they exist in the original item.
+         */
         phoneString: string;
+        /**
+         * Gets the text that was identified in an item as a phone number.
+         */
         originalPhoneString: string;
+        /**
+         * Gets a string that identifies the type of phone number: Home, Work, Mobile, Unspecified.
+         */
         type: string;
     }
+    /**
+     * [Api set: Mailbox 1.1]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Compose
+     */
     export interface Recipients {
         /**
-         * Begins an asynchronous request to add a recipient list to an appointment or message
-         * @param recipients The recipients to add to the recipients list
+         * Adds a recipient list to the existing recipients for an appointment or message.
+         * 
+         * The recipients parameter can be an array of one of the following:
+         * 
+         * - Strings containing SMTP email addresses
+         * 
+         * - EmailUser objects
+         * 
+         * - EmailAddressDetails objects
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * 
+         * @param recipients The recipients to add to the recipients list.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. If adding the recipients fails, the asyncResult.error property will contain an error code.
          */
-        addAsync(recipients: Array<string | EmailUser | EmailAddressDetails>): void;
+        addAsync(recipients: Array<string | EmailUser | EmailAddressDetails>, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        
         /**
-         * Begins an asynchronous request to add a recipient list to an appointment or message
-         * @param recipients The recipients to add to the recipients list
-         * @param options Any optional parameters or state data passed to the method
-         */
-        addAsync(recipients: Array<string | EmailUser | EmailAddressDetails>, options: AsyncContextOptions): void;
-        /**
-         * Begins an asynchronous request to add a recipient list to an appointment or message
-         * @param recipients The recipients to add to the recipients list
-         * @param callback The optional method to call when the string is inserted
-         */
-        addAsync(recipients: Array<string | EmailUser | EmailAddressDetails>, callback: (result: AsyncResult) => void): void;
-        /**
-         * Begins an asynchronous request to add a recipient list to an appointment or message
-         * @param recipients The recipients to add to the recipients list
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        addAsync(recipients: Array<string | EmailUser | EmailAddressDetails>, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
-        /**
-         * Begins an asynchronous request to get the recipient list for an appointment or message
-         * @param callback The optional method to call when the string is inserted
+         * Gets a recipient list for an appointment or message.
+         * 
+         * When the call completes, the asyncResult.value property will contain an array of EmailAddressDetails objects.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose
+         * 
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
          */
         getAsync(callback: (result: AsyncResult) => void): void;
         /**
-         * Begins an asynchronous request to get the recipient list for an appointment or message
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
+         * Gets a recipient list for an appointment or message.
+         * 
+         * When the call completes, the asyncResult.value property will contain an array of EmailAddressDetails objects.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose
+         * 
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
          */
         getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
 
         /**
-         * Begins an asynchronous request to set the recipient list for an appointment or message
-         * @param recipients The recipients to add to the recipients list
+         * Sets a recipient list for an appointment or message.
+         * 
+         * The setAsync method overwrites the current recipient list.
+         * 
+         * The recipients parameter can be an array of one of the following:
+         * 
+         * - Strings containing SMTP email addresses
+         * 
+         * - EmailUser objects
+         * 
+         * - EmailAddressDetails objects
+         *   
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * 
+         * @param recipients The recipients to add to the recipients list.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.  If setting the recipients fails the asyncResult.error property will contain a code that indicates any error that occurred while adding the data.
          */
-        setAsync(recipients: Array<string | EmailUser | EmailAddressDetails>): void;
-        /**
-         * Begins an asynchronous request to set the recipient list for an appointment or message
-         * @param recipients The recipients to add to the recipients list
-         * @param options Any optional parameters or state data passed to the method
-         */
-        setAsync(recipients: Array<string | EmailUser | EmailAddressDetails>, options: AsyncContextOptions): void;
-        /**
-         * Begins an asynchronous request to set the recipient list for an appointment or message
-         * @param recipients The recipients to add to the recipients list
-         * @param callback The optional method to call when the string is inserted
-         */
-        setAsync(recipients: Array<string | EmailUser | EmailAddressDetails>, callback: (result: AsyncResult) => void): void;
-        /**
-         * Begins an asynchronous request to set the recipient list for an appointment or message
-         * @param recipients The recipients to add to the recipients list
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        setAsync(recipients: Array<string | EmailUser | EmailAddressDetails>, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        setAsync(recipients: Array<string | EmailUser | EmailAddressDetails>, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
 
     }
     export interface ReplyFormAttachment {
@@ -5203,114 +6855,284 @@ declare namespace Office {
         attachments?: Array<ReplyFormAttachment>;
         callback?: (result: AsyncResult) => void;
     }
+    /**
+     * The settings created by using the methods of the RoamingSettings object are saved per add-in and per user. That is, they are available only to the add-in that created them, and only from the user's mail box in which they are saved.
+     * 
+     * While the Outlook Add-in API limits access to these settings to only the add-in that created them, these settings should not be considered secure storage. They can be accessed by Exchange Web Services or Extended MAPI. They should not be used to store sensitive information such as user credentials or security tokens.
+     * 
+     * The name of a setting is a String, while the value can be a String, Number, Boolean, null, Object, or Array.
+     * 
+     * The RoamingSettings object is accessible via the roamingSettings property in the Office.context namespace.
+     * 
+     * [Api set: Mailbox 1.0]
+     * 
+     * @remarks
+     * [!IMPORTANT]: The RoamingSettings object is initialized from the persisted storage only when the add-in is first loaded. For task panes, this means that it is only initialized when the task pane first opens. If the task pane navigates to another page or reloads the current page, the in-memory object is reset to its initial values, even if your add-in has persisted changes. The persisted changes will not be available until the task pane is closed and reopened.
+     * 
+     * Minimum permission level: Restricted
+     * Applicable Outlook mode: Compose or read
+     */
     export interface RoamingSettings {
         /**
-         * Retrieves the specified setting
-         * @param name The case-sensitive name of the setting to retrieve
+         * Retrieves the specified setting.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Minimum permission level: Restricted
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param name The case-sensitive name of the setting to retrieve.
+         * @returns Type: String | Number | Boolean | Object | Array
          */
         get(name: string): any;
         /**
          * Removes the specified setting
-         * @param name The case-sensitive name of the setting to remove
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Minimum permission level: Restricted
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param name The case-sensitive name of the setting to remove.
          */
         remove(name: string): void;
         /**
-         * Saves the settings
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult
+         * Saves the settings.
+         * 
+         * Any settings previously saved by an add-in are loaded when it is initialized, so during the lifetime of the session you can just use the set and get methods to work with the in-memory copy of the settings property bag. When you want to persist the settings so that they are available the next time the add-in is used, use the saveAsync method.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Minimum permission level: Restricted
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param callback Optional? When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
          */
         saveAsync(callback?: (result: AsyncResult) => void): void;
         /**
-         * Sets or creates the specified setting
-         * @param name The case-sensitive name of the setting to set or create
-         * @param value Specifies the value to be stored
+         * Sets or creates the specified setting.
+         * 
+         * The set method creates a new setting of the specified name if it does not already exist, or sets an existing setting of the specified name. The value is stored in the document as the serialized JSON representation of its data type.
+         * 
+         * A maximum of 2MB is available for the settings of each add-in, and each individual setting is limited to 32KB.
+         * 
+         * Any changes made to settings using the set function will not be saved to the server until the saveAsync function is called.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Minimum permission level: Restricted
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param name The case-sensitive name of the setting to set or create.
+         * @param value Specifies the value to be stored.
          */
         set(name: string, value: any): void;
     }
+
+    /**
+     * Provides methods to get and set the subject of an appointment or message in an Outlook add-in.
+     * 
+     * [Api set: Mailbox 1.1]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Compose
+     */
     export interface Subject {
         /**
-         * Begins an asynchronous request to get the subject of an appointment or message
-         * @param callback The optional method to call when the string is inserted
+         * Gets the subject of an appointment or message.
+         * The getAsync method starts an asynchronous call to the Exchange server to get the subject of an appointment or message.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose
+         * 
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
          */
         getAsync(callback: (result: AsyncResult) => void): void;
         /**
-         * Begins an asynchronous request to get the subject of an appointment or message
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
+         * Gets the subject of an appointment or message.
+         * 
+         * The getAsync method starts an asynchronous call to the Exchange server to get the subject of an appointment or message.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose
+         * 
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
          */
         getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
 
         /**
-         * Begins an asynchronous call to set the subject of an appointment or message
-         * @param data The subject of the appointment. The string is limited to 255 characters
+         * Sets the subject of an appointment or message.
+         * 
+         * The setAsync method starts an asynchronous call to the Exchange server to set the subject of an appointment or message. Setting the subject overwrites the current subject, but leaves any prefixes, such as "Fwd:" or "Re:" in place.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose
+         * Errors: DataExceedsMaximumSize - The subject parameter is longer than 255 characters.
+         * 
+         * @param subject The subject of the appointment or message. The string is limited to 255 characters.
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. If setting the subject fails, the asyncResult.error property will contain an error code.
          */
-        setAsync(data: string): void;
-        /**
-         * Begins an asynchronous call to set the subject of an appointment or message
-         * @param data The subject of the appointment. The string is limited to 255 characters
-         * @param options Any optional parameters or state data passed to the method
-         */
-        setAsync(data: string, options: AsyncContextOptions): void;
-        /**
-         * Begins an asynchronous call to set the subject of an appointment or message
-         * @param data The subject of the appointment. The string is limited to 255 characters
-         * @param callback The optional method to call when the string is inserted
-         */
-        setAsync(data: string, callback: (result: AsyncResult) => void): void;
-        /**
-         * Begins an asynchronous call to set the subject of an appointment or message
-         * @param data The subject of the appointment. The string is limited to 255 characters
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        setAsync(data: string, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        setAsync(subject: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
 
     }
+    /**
+     * Represents a suggested task identified in an item. Read mode only.
+     * 
+     * The list of tasks suggested in an email message is returned in the taskSuggestions property of the [Entities]Entities object that is returned when the getEntities or getEntitiesByType method is called on the active item.
+     * 
+     * [Api set: Mailbox 1.0]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Read
+     */
     export interface TaskSuggestion {
+        /**
+         * Gets the users that should be assigned a suggested task.
+         */
         assignees: Array<EmailUser>;
+        /**
+         * Gets the text of an item that was identified as a task suggestion.
+         */
         taskString: string;
     }
+    /**
+     * The Time object is returned as the start or end property of an appointment in compose mode.
+     * 
+     * [Api set: Mailbox 1.1]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Compose
+     */
     export interface Time {
         /**
-         * Begins an asynchronous request to get the start or end time
-         * @param callback The optional method to call when the string is inserted
+         * Gets the start or end time of an appointment.
+         * 
+         * The date and time is provided as a Date object in the asyncResult.value property. The value is in Coordinated Universal Time (UTC). You can convert the UTC time to the local client time by using the convertToLocalClientTime method.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose
+         * 
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
          */
         getAsync(callback: (result: AsyncResult) => void): void;
         /**
-         * Begins an asynchronous request to get the start or end time
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
+         * Gets the start or end time of an appointment.
+         * 
+         * The date and time is provided as a Date object in the asyncResult.value property. The value is in Coordinated Universal Time (UTC). You can convert the UTC time to the local client time by using the convertToLocalClientTime method.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose
+         * 
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
          */
         getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
 
         /**
-         * Begins an asynchronous request to set the start or end time
-         * @param dateTime A date-time object in Coordinated Universal Time (UTC)
+         * Sets the start or end time of an appointment.
+         * 
+         * If the setAsync method is called on the start property, the end property will be adjusted to maintain the duration of the appointment as previously set. If the setAsync method is called on the end property, the duration of the appointment will be extended to the new end time.
+         * 
+         * The time must be in UTC; you can get the correct UTC time by using the convertToUtcClientTime method.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * Errors: InvalidEndTime - The appointment end time is before the appointment start time.
+         * 
+         * @param dateTime A date-time object in Coordinated Universal Time (UTC).
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. If setting the date and time fails, the asyncResult.error property will contain an error code.
          */
-        setAsync(dateTime: Date): void;
-        /**
-         * Begins an asynchronous request to set the start or end time
-         * @param dateTime A date-time object in Coordinated Universal Time (UTC)
-         * @param options Any optional parameters or state data passed to the method
-         */
-        setAsync(dateTime: Date, options: AsyncContextOptions): void;
-        /**
-         * Begins an asynchronous request to set the start or end time
-         * @param dateTime A date-time object in Coordinated Universal Time (UTC)
-         * @param callback The optional method to call when the string is inserted
-         */
-        setAsync(dateTime: Date, callback: (result: AsyncResult) => void): void;
-        /**
-         * Begins an asynchronous request to set the start or end time
-         * @param dateTime A date-time object in Coordinated Universal Time (UTC)
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        setAsync(dateTime: Date, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        setAsync(dateTime: Date, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
 
     }
+    /**
+     * [Api set: Mailbox 1.0]
+     * 
+     * @remarks
+     * Minimum permission level: ReadItem
+     * Applicable Outlook mode: Compose or read
+     */
     export interface UserProfile {
+        /**
+         * Gets the account type of the user associated with the mailbox. The possible values are listed in the following table.
+         * 
+         * [Api set: Mailbox 1.6]
+         * 
+         * @remarks
+         * [!NOTE] This member is currently only supported in Outlook 2016 for Mac, build 16.9.1212 and greater.
+         * 
+         * |Value    |Description   |
+         * |---------|--------------|
+         * |enterprise |The mailbox is on an on-premises Exchange server.|
+         * |gmail |The mailbox is associated with a Gmail account.|
+         * |office365 |The mailbox is associated with an Office 365 work or school account.|
+         * |outlookCom |The mailbox is associated with a personal Outlook.com account.|
+         * 
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
+        accountType: string;
+        /**
+         * Gets the user's display name.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
         displayName: string;
+        /**
+         * Gets the user's display name.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
         emailAddress: string;
+        /**
+         * Gets the user's SMTP email address.
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * Applicable Outlook mode: Compose or read
+         */
         timeZone: string;
     }
 }

From bd72b87b201aea63a782dd20408bdec5fdc58030 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Tue, 29 May 2018 15:40:41 -0700
Subject: [PATCH 501/575] Adding class and method descriptions for Exchange API
 - hyperlink fix

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 3f3d653fca..c52852d6fd 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -4705,7 +4705,7 @@ declare namespace Office {
         urls: Array<string>;
     }
     /**
-     * The Office.context namespace provides shared interfaces that are used by add-ins in all of the Office apps. This listing documents only those interfaces that are used by Outlook add-ins. For a full listing of the Office.context namespace, see the <Office.context reference in the Shared API>(https://dev.office.com/reference/add-ins/shared/office.context.htm).
+     * The Office.context namespace provides shared interfaces that are used by add-ins in all of the Office apps. This listing documents only those interfaces that are used by Outlook add-ins. For a full listing of the Office.context namespace, see the [Office.context reference in the Shared API]<https://dev.office.com/reference/add-ins/shared/office.context.htm>.
      * 
      * [Api set: Mailbox 1.0]
      * 

From 2a260edbdb07615f6563ce607d6b286dd786df52 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 29 May 2018 15:42:43 -0700
Subject: [PATCH 502/575] Add types for ethereumjs-tx (#26118)

---
 types/ethereumjs-tx/ethereumjs-tx-tests.ts |  4 ++++
 types/ethereumjs-tx/index.d.ts             | 19 +++++++++++++++++++
 types/ethereumjs-tx/tsconfig.json          | 16 ++++++++++++++++
 types/ethereumjs-tx/tslint.json            |  1 +
 4 files changed, 40 insertions(+)
 create mode 100644 types/ethereumjs-tx/ethereumjs-tx-tests.ts
 create mode 100644 types/ethereumjs-tx/index.d.ts
 create mode 100644 types/ethereumjs-tx/tsconfig.json
 create mode 100644 types/ethereumjs-tx/tslint.json

diff --git a/types/ethereumjs-tx/ethereumjs-tx-tests.ts b/types/ethereumjs-tx/ethereumjs-tx-tests.ts
new file mode 100644
index 0000000000..393dfd81d7
--- /dev/null
+++ b/types/ethereumjs-tx/ethereumjs-tx-tests.ts
@@ -0,0 +1,4 @@
+import EthereumjsTx = require('ethereumjs-tx');
+
+const txParams = {};
+const tx = new EthereumjsTx(txParams);
diff --git a/types/ethereumjs-tx/index.d.ts b/types/ethereumjs-tx/index.d.ts
new file mode 100644
index 0000000000..1d52f5f8a4
--- /dev/null
+++ b/types/ethereumjs-tx/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for ethereumjs-tx 1.0
+// Project: https://github.com/ethereumjs/ethereumjs-tx
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+declare class EthereumTx {
+    raw: Buffer[];
+    r: Buffer;
+    s: Buffer;
+    v: Buffer;
+    nonce: Buffer;
+    serialize(): Buffer;
+    sign(buffer: Buffer): void;
+    getSenderAddress(): Buffer;
+    constructor(txParams: any);
+}
+export = EthereumTx;
diff --git a/types/ethereumjs-tx/tsconfig.json b/types/ethereumjs-tx/tsconfig.json
new file mode 100644
index 0000000000..8909d40844
--- /dev/null
+++ b/types/ethereumjs-tx/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", "ethereumjs-tx-tests.ts"]
+}
diff --git a/types/ethereumjs-tx/tslint.json b/types/ethereumjs-tx/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ethereumjs-tx/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b3a60ecd4daf671adbbd43a50acbbd67860db1d7 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 29 May 2018 15:43:03 -0700
Subject: [PATCH 503/575] Add types for bn.js (#26120)

---
 types/bn.js/bn.js-tests.ts |  6 ++++
 types/bn.js/index.d.ts     | 60 ++++++++++++++++++++++++++++++++++++++
 types/bn.js/tsconfig.json  | 16 ++++++++++
 types/bn.js/tslint.json    |  1 +
 4 files changed, 83 insertions(+)
 create mode 100644 types/bn.js/bn.js-tests.ts
 create mode 100644 types/bn.js/index.d.ts
 create mode 100644 types/bn.js/tsconfig.json
 create mode 100644 types/bn.js/tslint.json

diff --git a/types/bn.js/bn.js-tests.ts b/types/bn.js/bn.js-tests.ts
new file mode 100644
index 0000000000..670234ecfe
--- /dev/null
+++ b/types/bn.js/bn.js-tests.ts
@@ -0,0 +1,6 @@
+import BN = require('bn.js');
+
+let bn = new BN(42);
+bn = bn.add(bn);
+bn.isZero();
+bn.byteLength;
diff --git a/types/bn.js/index.d.ts b/types/bn.js/index.d.ts
new file mode 100644
index 0000000000..1a3d4f9b70
--- /dev/null
+++ b/types/bn.js/index.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for bn.js 4.11
+// Project: https://github.com/indutny/bn.js
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+type Endianness = 'le' | 'be';
+
+declare class BN {
+    constructor(num: number | string | number[] | Buffer, base?: number, endian?: Endianness);
+    clone(): BN;
+    toString(base?: number, length?: number): string;
+    toNumber(): number;
+    toJSON(): string;
+    toArray(endian?: Endianness, length?: number): number[];
+    toBuffer(endian?: Endianness, length?: number): Buffer;
+    bitLength(): number;
+    zeroBits(): number;
+    byteLength(): number;
+    isNeg(): boolean;
+    isEven(): boolean;
+    isOdd(): boolean;
+    isZero(): boolean;
+    cmp(b: any): number;
+    lt(b: any): boolean;
+    lte(b: any): boolean;
+    gt(b: any): boolean;
+    gte(b: any): boolean;
+    eq(b: any): boolean;
+    isBN(b: any): boolean;
+
+    neg(): BN;
+    abs(): BN;
+    add(b: BN): BN;
+    sub(b: BN): BN;
+    mul(b: BN): BN;
+    sqr(): BN;
+    pow(b: BN): BN;
+    div(b: BN): BN;
+    mod(b: BN): BN;
+    divRound(b: BN): BN;
+
+    or(b: BN): BN;
+    and(b: BN): BN;
+    xor(b: BN): BN;
+    setn(b: number): BN;
+    shln(b: number): BN;
+    shrn(b: number): BN;
+    testn(b: number): boolean;
+    maskn(b: number): BN;
+    bincn(b: number): BN;
+    notn(w: number): BN;
+
+    gcd(b: BN): BN;
+    egcd(b: BN): { a: BN; b: BN; gcd: BN };
+    invm(b: BN): BN;
+}
+
+export = BN;
diff --git a/types/bn.js/tsconfig.json b/types/bn.js/tsconfig.json
new file mode 100644
index 0000000000..932e246886
--- /dev/null
+++ b/types/bn.js/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "bn.js-tests.ts"]
+}
diff --git a/types/bn.js/tslint.json b/types/bn.js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/bn.js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 03f4ecbb33ca47f5e67ecdde176c69e5c4d66bc2 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 29 May 2018 15:43:23 -0700
Subject: [PATCH 504/575] Add types for blockies (#26112)

---
 types/blockies/blockies-tests.ts |  4 ++++
 types/blockies/index.d.ts        | 14 ++++++++++++++
 types/blockies/tsconfig.json     | 16 ++++++++++++++++
 types/blockies/tslint.json       |  1 +
 4 files changed, 35 insertions(+)
 create mode 100644 types/blockies/blockies-tests.ts
 create mode 100644 types/blockies/index.d.ts
 create mode 100644 types/blockies/tsconfig.json
 create mode 100644 types/blockies/tslint.json

diff --git a/types/blockies/blockies-tests.ts b/types/blockies/blockies-tests.ts
new file mode 100644
index 0000000000..31b9dcad48
--- /dev/null
+++ b/types/blockies/blockies-tests.ts
@@ -0,0 +1,4 @@
+import blockies = require('blockies');
+
+const seed = 'seed';
+blockies({ seed });
diff --git a/types/blockies/index.d.ts b/types/blockies/index.d.ts
new file mode 100644
index 0000000000..f2de8b2c53
--- /dev/null
+++ b/types/blockies/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for blockies 0.0
+// Project: https://github.com/goldylucks/blockies-npm
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface BlockiesIcon {
+    toDataURL(): string;
+}
+interface BlockiesConfig {
+    seed: string;
+}
+declare function blockies(config: BlockiesConfig): BlockiesIcon;
+
+export = blockies;
diff --git a/types/blockies/tsconfig.json b/types/blockies/tsconfig.json
new file mode 100644
index 0000000000..f190f0b0c9
--- /dev/null
+++ b/types/blockies/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "blockies-tests.ts"]
+}
diff --git a/types/blockies/tslint.json b/types/blockies/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/blockies/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 4f6c4fd0443349d1d71940ae1d63a865f047f270 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 29 May 2018 15:43:41 -0700
Subject: [PATCH 505/575] Add types for ethereumjs-abi (#26117)

---
 types/ethereumjs-abi/ethereumjs-abi-tests.ts |  5 +++++
 types/ethereumjs-abi/index.d.ts              | 10 ++++++++++
 types/ethereumjs-abi/tsconfig.json           | 16 ++++++++++++++++
 types/ethereumjs-abi/tslint.json             |  1 +
 4 files changed, 32 insertions(+)
 create mode 100644 types/ethereumjs-abi/ethereumjs-abi-tests.ts
 create mode 100644 types/ethereumjs-abi/index.d.ts
 create mode 100644 types/ethereumjs-abi/tsconfig.json
 create mode 100644 types/ethereumjs-abi/tslint.json

diff --git a/types/ethereumjs-abi/ethereumjs-abi-tests.ts b/types/ethereumjs-abi/ethereumjs-abi-tests.ts
new file mode 100644
index 0000000000..f48cdd323c
--- /dev/null
+++ b/types/ethereumjs-abi/ethereumjs-abi-tests.ts
@@ -0,0 +1,5 @@
+import { methodID, soliditySHA256, soliditySHA3 } from 'ethereumjs-abi';
+
+methodID('foo', ['uint256', 'string']);
+soliditySHA3(['uint256', 'string'], [0, 'Alice']);
+soliditySHA256(['uint256', 'string'], [0, 'Alice']);
diff --git a/types/ethereumjs-abi/index.d.ts b/types/ethereumjs-abi/index.d.ts
new file mode 100644
index 0000000000..4314e46cbd
--- /dev/null
+++ b/types/ethereumjs-abi/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for ethereumjs-abi 0.6
+// Project: https://github.com/ethereumjs/ethereumjs-abi
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export function soliditySHA3(argTypes: string[], args: any[]): Buffer;
+export function soliditySHA256(argTypes: string[], args: any[]): Buffer;
+export function methodID(name: string, types: string[]): Buffer;
diff --git a/types/ethereumjs-abi/tsconfig.json b/types/ethereumjs-abi/tsconfig.json
new file mode 100644
index 0000000000..d67d139209
--- /dev/null
+++ b/types/ethereumjs-abi/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", "ethereumjs-abi-tests.ts"]
+}
diff --git a/types/ethereumjs-abi/tslint.json b/types/ethereumjs-abi/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ethereumjs-abi/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 3d0891421262b996d714ecdac74e713aa4737386 Mon Sep 17 00:00:00 2001
From: Rong Shen <rong.shen@gmail.com>
Date: Wed, 30 May 2018 06:44:05 +0800
Subject: [PATCH 506/575] Add types to ansi-escapes (#26108)

---
 types/ansi-escapes/ansi-escapes-tests.ts |  3 ++
 types/ansi-escapes/index.d.ts            | 57 ++++++++++++++++++++++++
 types/ansi-escapes/tsconfig.json         | 16 +++++++
 types/ansi-escapes/tslint.json           |  1 +
 4 files changed, 77 insertions(+)
 create mode 100644 types/ansi-escapes/ansi-escapes-tests.ts
 create mode 100644 types/ansi-escapes/index.d.ts
 create mode 100644 types/ansi-escapes/tsconfig.json
 create mode 100644 types/ansi-escapes/tslint.json

diff --git a/types/ansi-escapes/ansi-escapes-tests.ts b/types/ansi-escapes/ansi-escapes-tests.ts
new file mode 100644
index 0000000000..7de77e797f
--- /dev/null
+++ b/types/ansi-escapes/ansi-escapes-tests.ts
@@ -0,0 +1,3 @@
+import * as ansi from "ansi-escapes";
+
+console.log(ansi.cursorUp(2) + ansi.cursorLeft === "\u001B[2A\u001B[1000D");
diff --git a/types/ansi-escapes/index.d.ts b/types/ansi-escapes/index.d.ts
new file mode 100644
index 0000000000..519d429545
--- /dev/null
+++ b/types/ansi-escapes/index.d.ts
@@ -0,0 +1,57 @@
+// Type definitions for ansi-escapes 3.0
+// Project: https://github.com/sindresorhus/ansi-escapes
+// Definitions by: Rong Shen <https://github.com/jacobbubu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare namespace Ansi {
+    interface ImageOptions {
+        width?: number;
+        height?: number;
+        preserveAspectRatio?: boolean;
+    }
+
+    interface Term {
+        setCwd(cwd: string): string;
+    }
+
+    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;
+
+        cursorLeft: string;
+        cursorSavePosition: string;
+        cursorRestorePosition: string;
+        cursorGetPosition: string;
+        cursorNextLine: string;
+        cursorPrevLine: string;
+        cursorHide: string;
+        cursorShow: string;
+
+        eraseLines(count: number): string;
+
+        eraseEndLine: string;
+        eraseStartLine: string;
+        eraseLine: string;
+        eraseDown: string;
+        eraseUp: string;
+        eraseScreen: string;
+        scrollUp: string;
+        scrollDown: string;
+
+        clearScreen: string;
+        beep: string;
+
+        link(text: string, url: string): string;
+        image(buf: Buffer, opts?: ImageOptions): string;
+        iTerm: Term;
+    }
+}
+
+declare const ansiEscapes: Ansi.AnsiEscapes;
+export = ansiEscapes;
diff --git a/types/ansi-escapes/tsconfig.json b/types/ansi-escapes/tsconfig.json
new file mode 100644
index 0000000000..210be31288
--- /dev/null
+++ b/types/ansi-escapes/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", "ansi-escapes-tests.ts"]
+}
diff --git a/types/ansi-escapes/tslint.json b/types/ansi-escapes/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ansi-escapes/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 187d105f630a07b620cd08f974cc76b58b0a27e0 Mon Sep 17 00:00:00 2001
From: Rong Shen <rong.shen@gmail.com>
Date: Wed, 30 May 2018 06:45:49 +0800
Subject: [PATCH 507/575] add types to @derhuerst/cli-on-key (#26109)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add types to @derhuerst/cli-on-key

* fix lint error `callable-types`

Interface has only a call signature — use `type xxx = (key: Key) => void;` instead.
---
 .../derhuerst__cli-on-key-tests.ts            |  5 ++++
 types/derhuerst__cli-on-key/index.d.ts        | 30 +++++++++++++++++++
 types/derhuerst__cli-on-key/tsconfig.json     | 21 +++++++++++++
 types/derhuerst__cli-on-key/tslint.json       |  1 +
 4 files changed, 57 insertions(+)
 create mode 100644 types/derhuerst__cli-on-key/derhuerst__cli-on-key-tests.ts
 create mode 100644 types/derhuerst__cli-on-key/index.d.ts
 create mode 100644 types/derhuerst__cli-on-key/tsconfig.json
 create mode 100644 types/derhuerst__cli-on-key/tslint.json

diff --git a/types/derhuerst__cli-on-key/derhuerst__cli-on-key-tests.ts b/types/derhuerst__cli-on-key/derhuerst__cli-on-key-tests.ts
new file mode 100644
index 0000000000..eebd24494a
--- /dev/null
+++ b/types/derhuerst__cli-on-key/derhuerst__cli-on-key-tests.ts
@@ -0,0 +1,5 @@
+import onKeypress = require("@derhuerst/cli-on-key");
+import { Key, OffKeyPress } from "@derhuerst/cli-on-key";
+
+const onKey = (key: Key): void => undefined;
+const offKeypress: OffKeyPress = onKeypress(process.stdin, onKey);
diff --git a/types/derhuerst__cli-on-key/index.d.ts b/types/derhuerst__cli-on-key/index.d.ts
new file mode 100644
index 0000000000..59b1c2172a
--- /dev/null
+++ b/types/derhuerst__cli-on-key/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for @derhuerst/cli-on-key 0.1
+// Project: https://github.com/derhuerst/cli-on-key
+// Definitions by: Rong Shen <https://github.com/jacobbubu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import stream = require("stream");
+
+declare namespace listen {
+    interface Key {
+        name?: string;
+        ctrl: boolean;
+        meta: boolean;
+        shift: boolean;
+        sequence: string;
+        code?: string; // ansi code leaving out leading \x1b's
+        raw: string;
+    }
+
+    type Callback = (key: Key) => void;
+    type OffKeyPress = (key: Key) => void;
+}
+
+declare function listen(
+    stream: stream.Readable,
+    callback: listen.Callback
+): listen.OffKeyPress;
+
+export = listen;
diff --git a/types/derhuerst__cli-on-key/tsconfig.json b/types/derhuerst__cli-on-key/tsconfig.json
new file mode 100644
index 0000000000..0331282680
--- /dev/null
+++ b/types/derhuerst__cli-on-key/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,
+        "paths": {
+            "@derhuerst/cli-on-key": [
+                "derhuerst__cli-on-key"
+            ]
+        }
+    },
+    "files": ["index.d.ts", "derhuerst__cli-on-key-tests.ts"]
+}
diff --git a/types/derhuerst__cli-on-key/tslint.json b/types/derhuerst__cli-on-key/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/derhuerst__cli-on-key/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From f546c615208b8ee07f57391abc320f6d9b5e7abd Mon Sep 17 00:00:00 2001
From: Anler <anler@users.noreply.github.com>
Date: Wed, 30 May 2018 00:46:01 +0200
Subject: [PATCH 508/575] Add secp256k1 library typing (#26084)

* Add secp256k1-node library typing

* Add strictFunctionTypes
---
 types/secp256k1/index.d.ts         | 144 +++++++++++++++++++++++++++++
 types/secp256k1/secp256k1-tests.ts |  11 +++
 types/secp256k1/tsconfig.json      |  23 +++++
 types/secp256k1/tslint.json        |   1 +
 4 files changed, 179 insertions(+)
 create mode 100644 types/secp256k1/index.d.ts
 create mode 100644 types/secp256k1/secp256k1-tests.ts
 create mode 100644 types/secp256k1/tsconfig.json
 create mode 100644 types/secp256k1/tslint.json

diff --git a/types/secp256k1/index.d.ts b/types/secp256k1/index.d.ts
new file mode 100644
index 0000000000..686171565b
--- /dev/null
+++ b/types/secp256k1/index.d.ts
@@ -0,0 +1,144 @@
+// Type definitions for secp256k1 3.5
+// Project: https://github.com/cryptocoinjs/secp256k1-node
+// Definitions by: Anler <https://github.com/anler>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+/** Options for the `sign` function */
+export interface SignOptions {
+    /** Nonce generator. By default it is rfc6979 */
+    noncefn?: (message: Buffer, privateKey: Buffer, algo: Buffer | null,
+               data: Buffer | null, attempt: number) => Buffer;
+
+    /**
+     * Additional data for noncefn (RFC 6979 3.6) (32 bytes).
+     *
+     * By default is `null`.
+     */
+    data?: Buffer;
+}
+
+/**
+ * Verify an ECDSA privateKey.
+ */
+export function privateKeyVerify(privateKey: Buffer): boolean;
+
+/**
+ * Export a privateKey in DER format.
+ */
+export function privateKeyExport(privateKey: Buffer, compressed?: boolean): Buffer;
+
+/**
+ * Import a privateKey in DER format.
+ */
+export function privateKeyImport(privateKey: Buffer): Buffer;
+
+/**
+ * Negate a privateKey by subtracting it from the order of the curve's base point.
+ */
+export function privateKeyNegate(privateKey: Buffer): Buffer;
+
+/**
+ * Compute the inverse of a privateKey (modulo the order of the curve's base point).
+ */
+export function privateKeyModInverse(privateKey: Buffer): Buffer;
+
+/**
+ * Tweak a privateKey by adding tweak to it.
+ */
+export function privateKeyTweakAdd(privateKey: Buffer, tweak: Buffer): Buffer;
+
+/**
+ * Tweak a privateKey by multiplying it by a tweak.
+ */
+export function privateKeyTweakMul(privateKey: Buffer, tweak: Buffer): Buffer;
+
+/**
+ * Compute the public key for a privateKey.
+ */
+export function publicKeyCreate(privateKey: Buffer, compressed?: boolean): Buffer;
+
+/**
+ * Convert a publicKey to compressed or uncompressed form.
+ */
+export function publicKeyConvert(publicKey: Buffer, compressed?: boolean): Buffer;
+
+/**
+ * Verify an ECDSA publicKey.
+ */
+export function publicKeyVerify(publicKey: Buffer): boolean;
+
+/**
+ * Tweak a publicKey by adding tweak times the generator to it.
+ */
+export function publicKeyTweakAdd(publicKey: Buffer, tweak: Buffer, compressed?: boolean): Buffer;
+
+/**
+ * Tweak a publicKey by multiplying it by a tweak value.
+ */
+export function publicKeyTweakMul(publicKey: Buffer, tweak: Buffer, compressed?: boolean): Buffer;
+
+/**
+ * Add a given publicKeys together.
+ */
+export function publicKeyCombine(publicKeys: Buffer[], compressed?: boolean): Buffer;
+
+/**
+ * Convert a signature to a normalized lower-S form.
+ */
+export function signatureNormalize(signature: Buffer): Buffer;
+
+/**
+ * Serialize an ECDSA signature in DER format.
+ */
+export function signatureExport(signature: Buffer): Buffer;
+
+/**
+ * Parse a DER ECDSA signature (follow by BIP66).
+ */
+export function signatureImport(signature: Buffer): Buffer;
+
+/**
+ * Same as `signatureImport` but not follow by BIP66.
+ */
+export function signatureImportLax(signature: Buffer): Buffer;
+
+/**
+ * Create an ECDSA signature. Always return low-S signature.
+ *
+ * Inputs: 32-byte message `m`, 32-byte scalar key `d`, 32-byte scalar nonce `k`.
+ * - Compute point `R = k * G`. Reject nonce if R's `x` coordinate is zero.
+ * - Compute 32-byte scalar `r`, the serialization of R's `x` coordinate.
+ * - Compose 32-byte scalar `s = k^-1 * (r * d + m)`. Reject nonce if `s` is zero.
+ * - The signature is `(r, s)`.
+ */
+export function sign(message: Buffer, privateKey: Buffer, options?: SignOptions): {signature: Buffer, recovery: number};
+
+/**
+ * Verify an ECDSA signature.
+ *
+ * Note: return false for high signatures!
+ *
+ * Inputs: 32-byte message `m`, public key point `Q`, signature: (32-byte `r`, scalar `s`).
+ * - Signature is invalid if `r` is zero.
+ * - Signature is invalid if `s` is zero.
+ * - Compute point `R = (s^-1 * m * G + s^-1 * r * Q)`. Reject if `R` is infinity.
+ * - Signature is valid if R's `x` coordinate equals to `r`.
+ */
+export function verify(message: Buffer, signature: Buffer, publicKey: Buffer): boolean;
+
+/**
+ * Recover an ECDSA public key from a signature.
+ */
+export function recover(message: Buffer, signature: Buffer, recovery: number, compressed?: boolean): Buffer;
+
+/**
+ * Compute an EC Diffie-Hellman secret and applied sha256 to compressed public key.
+ */
+export function ecdh(publicKey: Buffer, privateKey: Buffer): Buffer;
+
+/**
+ * Compute an EC Diffie-Hellman secret and return public key as result.
+ */
+export function ecdhUnsafe(publicKey: Buffer, privateKey: Buffer, compressed?: boolean): Buffer;
diff --git a/types/secp256k1/secp256k1-tests.ts b/types/secp256k1/secp256k1-tests.ts
new file mode 100644
index 0000000000..03754354b1
--- /dev/null
+++ b/types/secp256k1/secp256k1-tests.ts
@@ -0,0 +1,11 @@
+import { SignOptions, sign } from "secp256k1";
+
+const opts: SignOptions = {
+    data: Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72])
+};
+
+const message = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
+
+const prvKey = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
+
+sign(message, prvKey, opts);
diff --git a/types/secp256k1/tsconfig.json b/types/secp256k1/tsconfig.json
new file mode 100644
index 0000000000..8d15f80548
--- /dev/null
+++ b/types/secp256k1/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",
+        "secp256k1-tests.ts"
+    ]
+}
diff --git a/types/secp256k1/tslint.json b/types/secp256k1/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/secp256k1/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9004146f8e5fb346903172f4742177a6bd22d43d Mon Sep 17 00:00:00 2001
From: ColinBradley <ColinBradley@users.noreply.github.com>
Date: Tue, 29 May 2018 23:46:24 +0100
Subject: [PATCH 509/575] [dd-trace] Adding definition for tracer (#26078)

* Adding defintion for dd-trace - Datadog APM tracer

* dd-trace - updating spacing

* dd-trace - cleaning up after tslint checks
---
 types/dd-trace/dd-trace-tests.ts |  12 +
 types/dd-trace/index.d.ts        | 407 +++++++++++++++++++++++++++++++
 types/dd-trace/tsconfig.json     |  23 ++
 types/dd-trace/tslint.json       |   1 +
 4 files changed, 443 insertions(+)
 create mode 100644 types/dd-trace/dd-trace-tests.ts
 create mode 100644 types/dd-trace/index.d.ts
 create mode 100644 types/dd-trace/tsconfig.json
 create mode 100644 types/dd-trace/tslint.json

diff --git a/types/dd-trace/dd-trace-tests.ts b/types/dd-trace/dd-trace-tests.ts
new file mode 100644
index 0000000000..d027e714bf
--- /dev/null
+++ b/types/dd-trace/dd-trace-tests.ts
@@ -0,0 +1,12 @@
+import * as ddTrace from 'dd-trace';
+
+const tracer = ddTrace.init();
+
+tracer
+    .trace('web.request', {
+        service: 'my_service'
+    })
+    .then(span => {
+        span.setTag('my_tag', 'my_value');
+        span.finish();
+    });
diff --git a/types/dd-trace/index.d.ts b/types/dd-trace/index.d.ts
new file mode 100644
index 0000000000..a7c1437464
--- /dev/null
+++ b/types/dd-trace/index.d.ts
@@ -0,0 +1,407 @@
+// Type definitions for dd-trace-js 0.2
+// Project: https://github.com/DataDog/dd-trace-js
+// Definitions by: Colin Bradley <https://github.com/ColinBradley>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare var trace: TraceProxy;
+export = trace;
+
+declare class TraceProxy extends Tracer {
+    /**
+     * Initializes the tracer. This should be called before importing other libraries.
+     */
+    init(options?: TracerOptions): this;
+
+    /**
+     * Enable and optionally configure a plugin.
+     * @param plugin The name of a built-in plugin.
+     * @param config Configuration options.
+     */
+    use(plugin: string, config: PluginOptions): this;
+
+    /**
+     * Initiate a trace and creates a new span.
+     * @param operationName The operation name to be used for this span.
+     * @param options Configuration options. These will take precedence over environment variables.
+     */
+    trace(operationName: string, options: TraceOptions): Promise<Span>;
+
+    /**
+     * Initiate a trace and creates a new span.
+     * @param operationName The operation name to be used for this span.
+     * @param options Configuration options. These will take precedence over environment variables.
+     */
+    trace(operationName: string, options: TraceOptions, callback: (span: Span) => void): void;
+
+    /**
+     * Get the span from the current context.
+     * @returns The current span or null if outside a trace context.
+     */
+    currentSpan(): Span | null;
+}
+
+interface SpanOptions {
+    /**
+     * a parent SpanContext (or Span, for convenience) that the newly-started
+     * span will be the child of (per REFERENCE_CHILD_OF). If specified,
+     * `references` must be unspecified.
+     */
+    childOf?: Span | SpanContext;
+
+    /**
+     * an array of Reference instances, each pointing to a causal parent
+     * SpanContext. If specified, `fields.childOf` must be unspecified.
+     */
+    references?: Reference[];
+
+    /**
+     * set of key-value pairs which will be set as tags on the newly created
+     * Span. Ownership of the object is passed to the created span for
+     * efficiency reasons (the caller should not modify this object after
+     * calling startSpan).
+     */
+    tags?: {
+        [key: string]: any;
+    };
+
+    /**
+     * a manually specified start time for the created Span object. The time
+     * should be specified in milliseconds as Unix timestamp. Decimal value are
+     * supported to represent time values with sub-millisecond accuracy.
+     */
+    startTime?: number;
+}
+
+/**
+ * Tracer is the entry-point between the instrumentation API and the tracing
+ * implementation.
+ */
+declare class Tracer {
+    /**
+     * Starts and returns a new Span representing a logical unit of work.
+     *
+     * For example:
+     *
+     *     // Start a new (parentless) root Span:
+     *     var parent = Tracer.startSpan('DoWork');
+     *
+     *     // Start a new (child) Span:
+     *     var child = Tracer.startSpan('load-from-db', {
+     *         childOf: parent.context(),
+     *     });
+     *
+     *     // Start a new async (FollowsFrom) Span:
+     *     var child = Tracer.startSpan('async-cache-write', {
+     *         references: [
+     *             opentracing.followsFrom(parent.context())
+     *         ],
+     *     });
+     *
+     * @param name - the name of the operation (REQUIRED).
+     * @param options - options for the newly created span.
+     * @return A new Span object.
+     */
+    startSpan(name: string, options?: SpanOptions): Span;
+
+    /**
+     * Injects the given SpanContext instance for cross-process propagation
+     * within `carrier`. The expected type of `carrier` depends on the value of
+     * `format.
+     *
+     * OpenTracing defines a common set of `format` values (see
+     * FORMAT_TEXT_MAP, FORMAT_HTTP_HEADERS, and FORMAT_BINARY), and each has
+     * an expected carrier type.
+     *
+     * Consider this pseudocode example:
+     *
+     *     var clientSpan = ...;
+     *     ...
+     *     // Inject clientSpan into a text carrier.
+     *     var headersCarrier = {};
+     *     Tracer.inject(clientSpan.context(), Tracer.FORMAT_HTTP_HEADERS, headersCarrier);
+     *     // Incorporate the textCarrier into the outbound HTTP request header
+     *     // map.
+     *     Object.assign(outboundHTTPReq.headers, headersCarrier);
+     *     // ... send the httpReq
+     *
+     * @param  spanContext - the SpanContext to inject into the
+     *         carrier object. As a convenience, a Span instance may be passed
+     *         in instead (in which case its .context() is used for the
+     *         inject()).
+     * @param  format - the format of the carrier.
+     * @param  carrier - see the documentation for the chosen `format`
+     *         for a description of the carrier object.
+     */
+    inject(spanContext: SpanContext | Span, format: string, carrier: any): void;
+
+    /**
+     * Returns a SpanContext instance extracted from `carrier` in the given
+     * `format`.
+     *
+     * OpenTracing defines a common set of `format` values (see
+     * FORMAT_TEXT_MAP, FORMAT_HTTP_HEADERS, and FORMAT_BINARY), and each has
+     * an expected carrier type.
+     *
+     * Consider this pseudocode example:
+     *
+     *     // Use the inbound HTTP request's headers as a text map carrier.
+     *     var headersCarrier = inboundHTTPReq.headers;
+     *     var wireCtx = Tracer.extract(Tracer.FORMAT_HTTP_HEADERS, headersCarrier);
+     *     var serverSpan = Tracer.startSpan('...', { childOf : wireCtx });
+     *
+     * @param  format - the format of the carrier.
+     * @param  carrier - the type of the carrier object is determined by
+     *         the format.
+     * @return The extracted SpanContext, or null if no such SpanContext could
+     *         be found in `carrier`
+     */
+    extract(format: string, carrier: any): SpanContext | null;
+}
+
+declare class Span {
+    /**
+     * Returns the SpanContext object associated with this Span.
+     */
+    context(): SpanContext;
+
+    /**
+     * Returns the Tracer object used to create this Span.
+     */
+    tracer(): Tracer;
+
+    /**
+     * Sets the string name for the logical operation this span represents.
+     */
+    setOperationName(name: string): this;
+
+    /**
+     * Sets a key:value pair on this Span that also propagates to future
+     * children of the associated Span.
+     *
+     * setBaggageItem() enables powerful functionality given a full-stack
+     * opentracing integration (e.g., arbitrary application data from a web
+     * client can make it, transparently, all the way into the depths of a
+     * storage system), and with it some powerful costs: use this feature with
+     * care.
+     *
+     * IMPORTANT NOTE #1: setBaggageItem() will only propagate baggage items to
+     * *future* causal descendants of the associated Span.
+     *
+     * IMPORTANT NOTE #2: Use this thoughtfully and with care. Every key and
+     * value is copied into every local *and remote* child of the associated
+     * Span, and that can add up to a lot of network and cpu overhead.
+     */
+    setBaggageItem(key: string, value: string): this;
+
+    /**
+     * Returns the value for a baggage item given its key.
+     *
+     * @param  key
+     *         The key for the given trace attribute.
+     * @return String value for the given key, or undefined if the key does not
+     *         correspond to a set trace attribute.
+     */
+    getBaggageItem(key: string): string | undefined;
+
+    /**
+     * Adds a single tag to the span.  See `addTags()` for details.
+     */
+    setTag(key: string, value: any): this;
+
+    /**
+     * Adds the given key value pairs to the set of span tags.
+     *
+     * Multiple calls to addTags() results in the tags being the superset of
+     * all calls.
+     *
+     * The behavior of setting the same key multiple times on the same span
+     * is undefined.
+     *
+     * The supported type of the values is implementation-dependent.
+     * Implementations are expected to safely handle all types of values but
+     * may choose to ignore unrecognized / unhandle-able values (e.g. objects
+     * with cyclic references, function objects).
+     */
+    addTags(keyValueMap: {
+        [key: string]: any;
+    }): this;
+
+    /**
+     * Add a log record to this Span, optionally at a user-provided timestamp.
+     *
+     * For example:
+     *
+     *     span.log({
+     *         size: rpc.size(),  // numeric value
+     *         URI: rpc.URI(),  // string value
+     *         payload: rpc.payload(),  // Object value
+     *         "keys can be arbitrary strings": rpc.foo(),
+     *     });
+     *
+     *     span.log({
+     *         "error.description": someError.description(),
+     *     }, someError.timestampMillis());
+     *
+     * @param keyValuePairs
+     *        An object mapping string keys to arbitrary value types. All
+     *        Tracer implementations should support bool, string, and numeric
+     *        value types, and some may also support Object values.
+     * @param timestamp
+     *        An optional parameter specifying the timestamp in milliseconds
+     *        since the Unix epoch. Fractional values are allowed so that
+     *        timestamps with sub-millisecond accuracy can be represented. If
+     *        not specified, the implementation is expected to use its notion
+     *        of the current time of the call.
+     */
+
+    log(keyValuePairs: {
+        [key: string]: any;
+    }, timestamp?: number): this;
+
+    /**
+     * Sets the end timestamp and finalizes Span state.
+     *
+     * With the exception of calls to Span.context() (which are always allowed),
+     * finish() must be the last call made to any span instance, and to do
+     * otherwise leads to undefined behavior.
+     *
+     * @param  finishTime
+     *         Optional finish time in milliseconds as a Unix timestamp. Decimal
+     *         values are supported for timestamps with sub-millisecond accuracy.
+     *         If not specified, the current time (as defined by the
+     *         implementation) will be used.
+     */
+    finish(finishTime?: number): void;
+}
+
+declare class Reference {
+    /**
+     * @return The Reference type (e.g., REFERENCE_CHILD_OF or
+     *         REFERENCE_FOLLOWS_FROM).
+     */
+    type(): string;
+
+    /**
+     * @return The SpanContext being referred to (e.g., the
+     *         parent in a REFERENCE_CHILD_OF Reference).
+     */
+    referencedContext(): SpanContext;
+
+    /**
+     * Initialize a new Reference instance.
+     *
+     * @param type - the Reference type constant (e.g.,
+     *        REFERENCE_CHILD_OF or REFERENCE_FOLLOWS_FROM).
+     * @param referencedContext - the SpanContext being referred
+     *        to. As a convenience, a Span instance may be passed in instead
+     *        (in which case its .context() is used here).
+     */
+    constructor(type: string, referencedContext: SpanContext | Span);
+}
+
+/**
+ * SpanContext represents Span state that must propagate to descendant Spans
+ * and across process boundaries.
+ *
+ * SpanContext is logically divided into two pieces: the user-level "Baggage"
+ * (see setBaggageItem and getBaggageItem) that propagates across Span
+ * boundaries and any Tracer-implementation-specific fields that are needed to
+ * identify or otherwise contextualize the associated Span instance (e.g., a
+ * <trace_id, span_id, sampled> tuple).
+ */
+declare class SpanContext {
+}
+
+interface TracerOptions {
+    /**
+     * Enable debug logging in the tracer.
+     * @default false
+     */
+    debug?: boolean;
+
+    /**
+     * The service name to be used for this program.
+     */
+    service?: string;
+
+    /**
+     * The address of the trace agent that the tracer will submit to.
+     * @default 'localhost'
+     */
+    hostname?: string;
+
+    /**
+     * The port of the trace agent that the tracer will submit to.
+     * @default 8126
+     */
+    port?: number | string;
+
+    /**
+     * Percentage of spans to sample as a float between 0 and 1.
+     * @default 1
+     */
+    sampleRate?: number;
+
+    /**
+     * Interval in milliseconds at which the tracer will submit traces to the agent.
+     * @default 2000
+     */
+    flushInterval?: number;
+
+    /**
+     * Experimental features can be enabled all at once by using true or individually using key / value pairs.
+     * @default {}
+     */
+    experimental?: ExperimentalOptions | boolean;
+
+    /**
+     * Whether to load all built-in plugins.
+     * @default true
+     */
+    plugins?: boolean;
+}
+
+interface ExperimentalOptions {
+    /**
+     * Whether to use Node's experimental async hooks.
+     * @default false
+     */
+    asyncHooks?: boolean;
+}
+
+interface PluginOptions {
+    /**
+     * The service name to be used for this plugin.
+     */
+    service: string;
+}
+
+interface TraceOptions {
+    /**
+     * The service name to be used for this span.
+     * The service name from the tracer will be used if this is not provided.
+     */
+    service?: string;
+
+    /**
+     * The resource name to be used for this span.
+     * The operation name will be used if this is not provided.
+     */
+    resource?: string;
+
+    /**
+     * The span type to be used for this span.
+     */
+    type?: string;
+
+    /**
+     * The parent span or span context for the new span. Generally this is not needed as it will be
+     * fetched from the current context.
+     */
+    childOf?: Span | SpanContext;
+
+    /**
+     * Global tags that should be assigned to every span.
+     */
+    tags?: { [key: string]: any; } | string;
+}
diff --git a/types/dd-trace/tsconfig.json b/types/dd-trace/tsconfig.json
new file mode 100644
index 0000000000..6e65e3983c
--- /dev/null
+++ b/types/dd-trace/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",
+        "dd-trace-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/dd-trace/tslint.json b/types/dd-trace/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dd-trace/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 09bf36d49df8eda05cc56b7c4b440ed9f4e430b4 Mon Sep 17 00:00:00 2001
From: Anjun Wang <wanganjun1992@hotmail.com>
Date: Wed, 30 May 2018 06:46:43 +0800
Subject: [PATCH 510/575] [float-regex] add definition (#26073)

---
 types/float-regex/float-regex-tests.ts | 12 ++++++++++++
 types/float-regex/index.d.ts           | 17 +++++++++++++++++
 types/float-regex/tsconfig.json        | 23 +++++++++++++++++++++++
 types/float-regex/tslint.json          |  1 +
 4 files changed, 53 insertions(+)
 create mode 100644 types/float-regex/float-regex-tests.ts
 create mode 100644 types/float-regex/index.d.ts
 create mode 100644 types/float-regex/tsconfig.json
 create mode 100644 types/float-regex/tslint.json

diff --git a/types/float-regex/float-regex-tests.ts b/types/float-regex/float-regex-tests.ts
new file mode 100644
index 0000000000..d4a0f36633
--- /dev/null
+++ b/types/float-regex/float-regex-tests.ts
@@ -0,0 +1,12 @@
+import regexp = require('float-regex');
+
+const foo: RegExp = regexp;
+
+const anchor = RegExp(`^${regexp.source}$`);
+anchor.test('1.23e24'); // true
+anchor.test('1.23e24.55'); // false
+
+const freg = regexp.source;
+const capture = RegExp(`\\b(${freg})\\b`, 'g');
+const str = '1.2  555    beep boop 4.2.1.5 66.2e99  22.54e23 qrs2';
+str.match(capture);
diff --git a/types/float-regex/index.d.ts b/types/float-regex/index.d.ts
new file mode 100644
index 0000000000..36d2ff7527
--- /dev/null
+++ b/types/float-regex/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for float-regex 1.0
+// Project: https://github.com/substack/float-regex
+// Definitions by: Anjun Wang <https://github.com/wanganjun>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * regular expression for real floating point values in javascript notation:
+ * ```
+ * /[-+]?(?:\d*\.?\d+|\d+\.?\d*)(?:[eE][-+]?\d+)?/
+ * ```
+ *
+ * does not match:
+ * * +/- Infinity
+ * * NaN
+ */
+declare const regexp: RegExp;
+export = regexp;
diff --git a/types/float-regex/tsconfig.json b/types/float-regex/tsconfig.json
new file mode 100644
index 0000000000..61ea825706
--- /dev/null
+++ b/types/float-regex/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",
+        "float-regex-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/float-regex/tslint.json b/types/float-regex/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/float-regex/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 1ed824d9df5c88de5ebed077fec7a8cdc13bf47f Mon Sep 17 00:00:00 2001
From: Alexandro Libertino <arvitaly@list.ru>
Date: Wed, 30 May 2018 05:47:06 +0700
Subject: [PATCH 511/575] added typings for morphdom (#26059)

* added typings for morphdom

* removed the empty namespace
---
 types/morphdom/index.d.ts        | 24 ++++++++++++++++++++++++
 types/morphdom/morphdom-tests.ts | 20 ++++++++++++++++++++
 types/morphdom/tsconfig.json     | 24 ++++++++++++++++++++++++
 types/morphdom/tslint.json       |  3 +++
 4 files changed, 71 insertions(+)
 create mode 100644 types/morphdom/index.d.ts
 create mode 100644 types/morphdom/morphdom-tests.ts
 create mode 100644 types/morphdom/tsconfig.json
 create mode 100644 types/morphdom/tslint.json

diff --git a/types/morphdom/index.d.ts b/types/morphdom/index.d.ts
new file mode 100644
index 0000000000..61df5a9a78
--- /dev/null
+++ b/types/morphdom/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for morphdom 2.3
+// Project: https://github.com/patrick-steele-idem/morphdom
+// Definitions by: arvitaly <https://github.com/arvitaly>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface MorphDomOptions {
+    getNodeKey?: (node: Node) => any;
+    onBeforeNodeAdded?: (node: Node) => Node;
+    onNodeAdded?: (node: Node) => Node;
+    onBeforeElUpdated?: (fromEl: HTMLElement, toEl: HTMLElement) => boolean;
+    onElUpdated?: (el: HTMLElement) => void;
+    onBeforeNodeDiscarded?: (node: Node) => boolean;
+    onNodeDiscarded?: (node: Node) => void;
+    onBeforeElChildrenUpdated?: (fromEl: HTMLElement, toEl: HTMLElement) => boolean;
+    childrenOnly?: boolean;
+}
+
+declare function morphdom(
+    fromNode: Node,
+    toNode: Node | string,
+    options?: MorphDomOptions,
+): void;
+
+export = morphdom;
diff --git a/types/morphdom/morphdom-tests.ts b/types/morphdom/morphdom-tests.ts
new file mode 100644
index 0000000000..e2c7476561
--- /dev/null
+++ b/types/morphdom/morphdom-tests.ts
@@ -0,0 +1,20 @@
+import morphdom = require("morphdom");
+
+declare var node1: Node;
+declare var node2: Node;
+declare var el1: HTMLElement;
+declare var el2: HTMLElement;
+
+morphdom(node1, node2);
+morphdom(node1, node2, {});
+morphdom(node1, node2, {
+    childrenOnly: true,
+    getNodeKey: (node) => null,
+    onBeforeElChildrenUpdated: (el1, el2) => true,
+    onBeforeElUpdated: (el1, el2) => true,
+    onBeforeNodeAdded: (node) => node1,
+    onBeforeNodeDiscarded: (node) => false,
+    onElUpdated: (el) => null,
+    onNodeAdded: (node) => node2,
+    onNodeDiscarded: (node) => null,
+});
diff --git a/types/morphdom/tsconfig.json b/types/morphdom/tsconfig.json
new file mode 100644
index 0000000000..8fccfdf66e
--- /dev/null
+++ b/types/morphdom/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",
+        "morphdom-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/morphdom/tslint.json b/types/morphdom/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/morphdom/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 742114ea42e64a4d095f3b3f21564d12a1de9355 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Tue, 29 May 2018 15:48:35 -0700
Subject: [PATCH 512/575] Adding class and method descriptions for Exchange API
 - note fixing

---
 types/office-js/index.d.ts | 75 ++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 39 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index c52852d6fd..b360bdf381 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -1724,8 +1724,7 @@ declare namespace Office {
          * @remarks
          * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
          * 
-         * > [!IMPORTANT]
-         * > Your add-in's code can register a handler for the settingsChanged event when the add-in is running with any Excel client, but the event will fire only when the add-in is loaded with a spreadsheet that is opened in Excel Online, and more than one user is editing the spreadsheet (co-authoring). Therefore, effectively the settingsChanged event is supported only in Excel Online in co-authoring scenarios.
+         * Important: Your add-in's code can register a handler for the settingsChanged event when the add-in is running with any Excel client, but the event will fire only when the add-in is loaded with a spreadsheet that is opened in Excel Online, and more than one user is editing the spreadsheet (co-authoring). Therefore, effectively the settingsChanged event is supported only in Excel Online in co-authoring scenarios.
          * 
          * Hosts: Excel
          * 
@@ -1788,8 +1787,7 @@ declare namespace Office {
          * @remarks
          * null is a valid value for a setting. Therefore, assigning null to the setting will not remove it from the settings property bag.
          * 
-         * > [!IMPORTANT]
-         * > Be aware that the Settings.remove method affects only the in-memory copy of the settings property bag. To persist the removal of the specified setting in the document, at some point after calling the Settings.remove method and before the add-in is closed, you must call the Settings.saveAsync method.
+         * Important: Be aware that the Settings.remove method affects only the in-memory copy of the settings property bag. To persist the removal of the specified setting in the document, at some point after calling the Settings.remove method and before the add-in is closed, you must call the Settings.saveAsync method.
          * Hosts: Access, Excel, PowerPoint, Word
          * 
          * Available in Requirement set: Settings
@@ -1822,9 +1820,9 @@ declare namespace Office {
          * @remarks
          * Any settings previously saved by an add-in are loaded when it is initialized, so during the lifetime of the session you can just use the set and get methods to work with the in-memory copy of the settings property bag. When you want to persist the settings so that they are available the next time the add-in is used, use the saveAsync method.
          * 
-         * > [!NOTE]
-         * > The saveAsync method persists the in-memory settings property bag into the document file; however, the changes to the document file itself are saved only when the user (or AutoRecover setting) saves the document to the file system.
-         * > The refreshAsync method is only useful in coauthoring scenarios (which are only supported in Word) when other instances of the same add-in might change the settings and those changes should be made available to all instances.
+         * Note:
+         * The saveAsync method persists the in-memory settings property bag into the document file; however, the changes to the document file itself are saved only when the user (or AutoRecover setting) saves the document to the file system.
+         * The refreshAsync method is only useful in coauthoring scenarios (which are only supported in Word) when other instances of the same add-in might change the settings and those changes should be made available to all instances.
          * 
          * Hosts: Access, Excel, PowerPoint, Word
          * @param options Syntax example: {overwriteIfStale:false}
@@ -1848,8 +1846,7 @@ declare namespace Office {
          * @remarks
          * The set method creates a new setting of the specified name if it does not already exist, or sets an existing setting of the specified name in the in-memory copy of the settings property bag. After you call the Settings.saveAsync method, the value is stored in the document as the serialized JSON representation of its data type. A maximum of 2MB is available for the settings of each add-in.
          * 
-         * > [!IMPORTANT]
-         * > Be aware that the Settings.set method affects only the in-memory copy of the settings property bag. To make sure that additions or changes to settings will be available to your add-in the next time the document is opened, at some point after calling the Settings.set method and before the add-in is closed, you must call the Settings.saveAsync method to persist settings in the document.
+         * Important: Be aware that the Settings.set method affects only the in-memory copy of the settings property bag. To make sure that additions or changes to settings will be available to your add-in the next time the document is opened, at some point after calling the Settings.set method and before the add-in is closed, you must call the Settings.saveAsync method to persist settings in the document.
          * 
          * Hosts: Access, Excel, PowerPoint, Word
          * 
@@ -5370,7 +5367,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] This member is not supported in Outlook for iOS or Outlook for Android.
+         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Read
@@ -5507,7 +5504,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          * 
          * @remarks
-         * [!NOTE] In Outlook on the web, if the item is an appointment and it has previously been saved using saveAsync, the user is prompted to save, discard, or cancel even if no changes have occurred since the item was last saved.
+         * Note: In Outlook on the web, if the item is an appointment and it has previously been saved using saveAsync, the user is prompted to save, discard, or cancel even if no changes have occurred since the item was last saved.
          * 
          * Minimum permission level: Restricted
          * Applicable Outlook mode: Compose
@@ -5520,7 +5517,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the web for Office 365.
+         * Note: This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the web for Office 365.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Read
@@ -5604,9 +5601,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          * 
          * @remarks
-         * [!NOTE] If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that when Outlook is in cached mode, it may take some time before the item is actually synced to the server. Until the item is synced, using the itemId will return an error.
+         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that when Outlook is in cached mode, it may take some time before the item is actually synced to the server. Until the item is synced, using the itemId will return an error.
          * 
-         * [!NOTE] The following clients have different behavior for saveAsync on appointments in compose mode:
+         * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
          * 
          * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
          * 
@@ -5668,7 +5665,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] Certain types of files are blocked by Outlook due to potential security issues and are therefore not returned. For more information, see [Blocked attachments in Outlook]<https://support.office.com/article/Blocked-attachments-in-Outlook-434752E1-02D3-4E90-9124-8B81E49A8519>.
+         * Note: Certain types of files are blocked by Outlook due to potential security issues and are therefore not returned. For more information, see [Blocked attachments in Outlook]<https://support.office.com/article/Blocked-attachments-in-Outlook-434752E1-02D3-4E90-9124-8B81E49A8519>.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Read
@@ -5704,7 +5701,7 @@ declare namespace Office {
          * 
          * @remarks
          *  
-         * [!NOTE] The identifier returned by the itemId property is the same as the Exchange Web Services item identifier. The itemId property is not identical to the Outlook Entry ID or the ID used by the Outlook REST API. Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. For more details, see Use the Outlook REST APIs from an Outlook add-in.         * 
+         * Note: The identifier returned by the itemId property is the same as the Exchange Web Services item identifier. The itemId property is not identical to the Outlook Entry ID or the ID used by the Outlook REST API. Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. For more details, see Use the Outlook REST APIs from an Outlook add-in.         * 
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Read
@@ -5757,7 +5754,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Read
@@ -5787,7 +5784,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Read
@@ -5811,7 +5808,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Read
@@ -5838,7 +5835,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: Restricted
          * Applicable Outlook mode: Read
@@ -5854,7 +5851,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Read
@@ -5877,7 +5874,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Read
@@ -5897,7 +5894,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Read
@@ -5912,7 +5909,7 @@ declare namespace Office {
          *  
          * @remarks
          * 
-         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Read
@@ -5934,7 +5931,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Read
@@ -6038,7 +6035,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] The recipientType property of the EmailAddressDetails object in the from property is undefined.
+         * Note: The recipientType property of the EmailAddressDetails object in the from property is undefined.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Read
@@ -6064,7 +6061,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] The recipientType property of the EmailAddressDetails object in the sender property is undefined.
+         * Note: The recipientType property of the EmailAddressDetails object in the sender property is undefined.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Read
@@ -6211,7 +6208,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] This member is not supported in Outlook for iOS or Outlook for Android.
+         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Compose or read
@@ -6267,7 +6264,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          * 
          * @remarks
-         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: Restricted
          * Applicable Outlook mode: Compose or read
@@ -6301,7 +6298,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          * 
          * @remarks
-         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: Restricted
          * Applicable Outlook mode: Compose or read
@@ -6340,7 +6337,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          * 
          * @remarks
-         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Compose or read
@@ -6361,7 +6358,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          * 
          * @remarks
-         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Compose or read
@@ -6382,7 +6379,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          * 
          * @remarks
-         * [!NOTE] This method is not supported in Outlook for iOS or Outlook for Android.
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Read
@@ -6447,7 +6444,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible. 
+         * Note: It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible. 
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Compose and read
@@ -6476,7 +6473,7 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible. 
+         * Note: It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible. 
          * 
          * Minimum permission level: ReadItem
          * Applicable Outlook mode: Compose and read
@@ -6547,9 +6544,9 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * [!NOTE] This method is not supported in the following scenarios. - In Outlook for iOS or Outlook for Android - When the add-in is loaded in a Gmail mailbox
+         * Note: This method is not supported in the following scenarios. - In Outlook for iOS or Outlook for Android - When the add-in is loaded in a Gmail mailbox
          * 
-         * [!NOTE] The server administrator must set OAuthAuthentication to true on the Client Access Server EWS directory to enable the makeEwsRequestAsync method to make EWS requests.
+         * Note: The server administrator must set OAuthAuthentication to true on the Client Access Server EWS directory to enable the makeEwsRequestAsync method to make EWS requests.
          * 
          * *Version differences*
          * 
@@ -6867,7 +6864,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      * 
      * @remarks
-     * [!IMPORTANT]: The RoamingSettings object is initialized from the persisted storage only when the add-in is first loaded. For task panes, this means that it is only initialized when the task pane first opens. If the task pane navigates to another page or reloads the current page, the in-memory object is reset to its initial values, even if your add-in has persisted changes. The persisted changes will not be available until the task pane is closed and reopened.
+     * Important: The RoamingSettings object is initialized from the persisted storage only when the add-in is first loaded. For task panes, this means that it is only initialized when the task pane first opens. If the task pane navigates to another page or reloads the current page, the in-memory object is reset to its initial values, even if your add-in has persisted changes. The persisted changes will not be available until the task pane is closed and reopened.
      * 
      * Minimum permission level: Restricted
      * Applicable Outlook mode: Compose or read
@@ -7091,7 +7088,7 @@ declare namespace Office {
          * [Api set: Mailbox 1.6]
          * 
          * @remarks
-         * [!NOTE] This member is currently only supported in Outlook 2016 for Mac, build 16.9.1212 and greater.
+         * Note: This member is currently only supported in Outlook 2016 for Mac, build 16.9.1212 and greater.
          * 
          * |Value    |Description   |
          * |---------|--------------|

From 5154127522b3c3e7bb41e9210a3b274f9e75395b Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 29 May 2018 15:50:55 -0700
Subject: [PATCH 513/575] Add types for solidity-parser-antlr (#26113)

* Add types for solidity-parser-antlr

* Specify TypeScript version to be at least 2.1
---
 types/solidity-parser-antlr/index.d.ts        | 318 ++++++++++++++++++
 .../solidity-parser-antlr-tests.ts            |   4 +
 types/solidity-parser-antlr/tsconfig.json     |  16 +
 types/solidity-parser-antlr/tslint.json       |   1 +
 4 files changed, 339 insertions(+)
 create mode 100644 types/solidity-parser-antlr/index.d.ts
 create mode 100644 types/solidity-parser-antlr/solidity-parser-antlr-tests.ts
 create mode 100644 types/solidity-parser-antlr/tsconfig.json
 create mode 100644 types/solidity-parser-antlr/tslint.json

diff --git a/types/solidity-parser-antlr/index.d.ts b/types/solidity-parser-antlr/index.d.ts
new file mode 100644
index 0000000000..8e5a5d369a
--- /dev/null
+++ b/types/solidity-parser-antlr/index.d.ts
@@ -0,0 +1,318 @@
+// Type definitions for solidity-parser-antlr 0.2
+// Project: https://github.com/federicobond/solidity-parser-antlr
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export interface BaseASTNode {
+    range: [number, number];
+}
+export interface SourceUnit extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface PragmaDirective extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface PragmaName extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface PragmaValue extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface Version extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface VersionOperator extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface VersionConstraint extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface ImportDeclaration extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface ImportDirective extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface ContractDefinition extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface InheritanceSpecifier extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface ContractPart extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface StateVariableDeclaration extends BaseASTNode {
+    variables: VariableDeclaration[];
+}
+export interface UsingForDeclaration extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface StructDefinition extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface ModifierDefinition extends BaseASTNode {
+    name: string;
+}
+export interface ModifierInvocation extends BaseASTNode {
+    name: string;
+}
+export interface FunctionDefinition extends BaseASTNode {
+    name: string;
+}
+export interface ReturnParameters extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface ModifierList extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface EventDefinition extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface EnumValue extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface EnumDefinition extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface ParameterList extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface Parameter extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface EventParameterList extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface EventParameter extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface FunctionTypeParameterList extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface FunctionTypeParameter extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface VariableDeclaration extends BaseASTNode {
+    visibility: 'public' | 'private';
+    isStateVar: boolean;
+}
+export interface TypeName extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface UserDefinedTypeName extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface Mapping extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface FunctionTypeName extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface StorageLocation extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface StateMutability extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface Block extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface Statement extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface ExpressionStatement extends BaseASTNode {
+    expression: ASTNode;
+}
+export interface IfStatement extends BaseASTNode {
+    trueBody: ASTNode;
+    falseBody: ASTNode;
+}
+export interface WhileStatement extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface SimpleStatement extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface ForStatement extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface InlineAssemblyStatement extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface DoWhileStatement extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface ContinueStatement extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface BreakStatement extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface ReturnStatement extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface ThrowStatement extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface VariableDeclarationStatement extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface IdentifierList extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface ElementaryTypeName extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface Expression extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface PrimaryExpression extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface ExpressionList extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface NameValueList extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface NameValue extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface FunctionCallArguments extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface AssemblyBlock extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface AssemblyItem extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface AssemblyExpression extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface AssemblyCall extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface AssemblyLocalDefinition extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface AssemblyAssignment extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface AssemblyIdentifierOrList extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface AssemblyIdentifierList extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface AssemblyStackAssignment extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface LabelDefinition extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface AssemblySwitch extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface AssemblyCase extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface AssemblyFunctionDefinition extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface AssemblyFunctionReturns extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface AssemblyFor extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface AssemblyIf extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface AssemblyLiteral extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface SubAssembly extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface TupleExpression extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface ElementaryTypeNameExpression extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface NumberLiteral extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface Identifier extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export type BinOp =
+    | '+'
+    | '-'
+    | '*'
+    | '/'
+    | '**'
+    | '%'
+    | '<<'
+    | '>>'
+    | '&&'
+    | '||'
+    | '&'
+    | '|'
+    | '^'
+    | '<'
+    | '>'
+    | '<='
+    | '>='
+    | '=='
+    | '!='
+    | '='
+    | '|='
+    | '^='
+    | '&='
+    | '<<='
+    | '>>='
+    | '+='
+    | '-='
+    | '*='
+    | '/='
+    | '%=';
+export interface BinaryOperation extends BaseASTNode {
+    left: ASTNode;
+    right: ASTNode;
+    operator: BinOp;
+}
+export interface Conditional extends BaseASTNode {
+    trueExpression: ASTNode;
+    falseExpression: ASTNode;
+}
+
+export type ASTNode =
+    | SourceUnit
+    | PragmaDirective
+    | PragmaName
+    | PragmaValue
+    | Version
+    | VersionOperator
+    | VersionConstraint
+    | ImportDeclaration
+    | ImportDirective
+    | ContractDefinition
+    | InheritanceSpecifier
+    | ContractPart
+    | StateVariableDeclaration
+    | UsingForDeclaration
+    | StructDefinition
+    | ModifierDefinition
+    | ModifierInvocation
+    | FunctionDefinition
+    | ReturnParameters
+    | ModifierList
+    | EventDefinition
+    | EnumValue
+    | EnumDefinition
+    | ParameterList
+    | Parameter
+    | EventParameterList
+    | EventParameter
+    | FunctionTypeParameterList
+    | FunctionTypeParameter
+    | VariableDeclaration
+    | TypeName
+    | UserDefinedTypeName
+    | Mapping
+    | FunctionTypeName
+    | StorageLocation
+    | StateMutability
+    | Block
+    | Statement
+    | ExpressionStatement
+    | IfStatement
+    | WhileStatement
+    | SimpleStatement
+    | ForStatement
+    | InlineAssemblyStatement
+    | DoWhileStatement
+    | ContinueStatement
+    | BreakStatement
+    | ReturnStatement
+    | ThrowStatement
+    | VariableDeclarationStatement
+    | IdentifierList
+    | ElementaryTypeName
+    | Expression
+    | PrimaryExpression
+    | ExpressionList
+    | NameValueList
+    | NameValue
+    | FunctionCallArguments
+    | AssemblyBlock
+    | AssemblyItem
+    | AssemblyExpression
+    | AssemblyCall
+    | AssemblyLocalDefinition
+    | AssemblyAssignment
+    | AssemblyIdentifierOrList
+    | AssemblyIdentifierList
+    | AssemblyStackAssignment
+    | LabelDefinition
+    | AssemblySwitch
+    | AssemblyCase
+    | AssemblyFunctionDefinition
+    | AssemblyFunctionReturns
+    | AssemblyFor
+    | AssemblyIf
+    | AssemblyLiteral
+    | SubAssembly
+    | TupleExpression
+    | ElementaryTypeNameExpression
+    | NumberLiteral
+    | Identifier
+    | BinaryOperation
+    | Conditional;
+export interface Visitor {
+    SourceUnit?: (node: SourceUnit) => void;
+    PragmaDirective?: (node: PragmaDirective) => void;
+    PragmaName?: (node: PragmaName) => void;
+    PragmaValue?: (node: PragmaValue) => void;
+    Version?: (node: Version) => void;
+    VersionOperator?: (node: VersionOperator) => void;
+    VersionConstraint?: (node: VersionConstraint) => void;
+    ImportDeclaration?: (node: ImportDeclaration) => void;
+    ImportDirective?: (node: ImportDirective) => void;
+    ContractDefinition?: (node: ContractDefinition) => void;
+    InheritanceSpecifier?: (node: InheritanceSpecifier) => void;
+    ContractPart?: (node: ContractPart) => void;
+    StateVariableDeclaration?: (node: StateVariableDeclaration) => void;
+    UsingForDeclaration?: (node: UsingForDeclaration) => void;
+    StructDefinition?: (node: StructDefinition) => void;
+    ModifierDefinition?: (node: ModifierDefinition) => void;
+    ModifierInvocation?: (node: ModifierInvocation) => void;
+    FunctionDefinition?: (node: FunctionDefinition) => void;
+    ReturnParameters?: (node: ReturnParameters) => void;
+    ModifierList?: (node: ModifierList) => void;
+    EventDefinition?: (node: EventDefinition) => void;
+    EnumValue?: (node: EnumValue) => void;
+    EnumDefinition?: (node: EnumDefinition) => void;
+    ParameterList?: (node: ParameterList) => void;
+    Parameter?: (node: Parameter) => void;
+    EventParameterList?: (node: EventParameterList) => void;
+    EventParameter?: (node: EventParameter) => void;
+    FunctionTypeParameterList?: (node: FunctionTypeParameterList) => void;
+    FunctionTypeParameter?: (node: FunctionTypeParameter) => void;
+    VariableDeclaration?: (node: VariableDeclaration) => void;
+    TypeName?: (node: TypeName) => void;
+    UserDefinedTypeName?: (node: UserDefinedTypeName) => void;
+    Mapping?: (node: Mapping) => void;
+    FunctionTypeName?: (node: FunctionTypeName) => void;
+    StorageLocation?: (node: StorageLocation) => void;
+    StateMutability?: (node: StateMutability) => void;
+    Block?: (node: Block) => void;
+    Statement?: (node: Statement) => void;
+    ExpressionStatement?: (node: ExpressionStatement) => void;
+    IfStatement?: (node: IfStatement) => void;
+    WhileStatement?: (node: WhileStatement) => void;
+    SimpleStatement?: (node: SimpleStatement) => void;
+    ForStatement?: (node: ForStatement) => void;
+    InlineAssemblyStatement?: (node: InlineAssemblyStatement) => void;
+    DoWhileStatement?: (node: DoWhileStatement) => void;
+    ContinueStatement?: (node: ContinueStatement) => void;
+    BreakStatement?: (node: BreakStatement) => void;
+    ReturnStatement?: (node: ReturnStatement) => void;
+    ThrowStatement?: (node: ThrowStatement) => void;
+    VariableDeclarationStatement?: (node: VariableDeclarationStatement) => void;
+    IdentifierList?: (node: IdentifierList) => void;
+    ElementaryTypeName?: (node: ElementaryTypeName) => void;
+    Expression?: (node: Expression) => void;
+    PrimaryExpression?: (node: PrimaryExpression) => void;
+    ExpressionList?: (node: ExpressionList) => void;
+    NameValueList?: (node: NameValueList) => void;
+    NameValue?: (node: NameValue) => void;
+    FunctionCallArguments?: (node: FunctionCallArguments) => void;
+    AssemblyBlock?: (node: AssemblyBlock) => void;
+    AssemblyItem?: (node: AssemblyItem) => void;
+    AssemblyExpression?: (node: AssemblyExpression) => void;
+    AssemblyCall?: (node: AssemblyCall) => void;
+    AssemblyLocalDefinition?: (node: AssemblyLocalDefinition) => void;
+    AssemblyAssignment?: (node: AssemblyAssignment) => void;
+    AssemblyIdentifierOrList?: (node: AssemblyIdentifierOrList) => void;
+    AssemblyIdentifierList?: (node: AssemblyIdentifierList) => void;
+    AssemblyStackAssignment?: (node: AssemblyStackAssignment) => void;
+    LabelDefinition?: (node: LabelDefinition) => void;
+    AssemblySwitch?: (node: AssemblySwitch) => void;
+    AssemblyCase?: (node: AssemblyCase) => void;
+    AssemblyFunctionDefinition?: (node: AssemblyFunctionDefinition) => void;
+    AssemblyFunctionReturns?: (node: AssemblyFunctionReturns) => void;
+    AssemblyFor?: (node: AssemblyFor) => void;
+    AssemblyIf?: (node: AssemblyIf) => void;
+    AssemblyLiteral?: (node: AssemblyLiteral) => void;
+    SubAssembly?: (node: SubAssembly) => void;
+    TupleExpression?: (node: TupleExpression) => void;
+    ElementaryTypeNameExpression?: (node: ElementaryTypeNameExpression) => void;
+    NumberLiteral?: (node: NumberLiteral) => void;
+    Identifier?: (node: Identifier) => void;
+    BinaryOperation?: (node: BinaryOperation) => void;
+    Conditional?: (node: Conditional) => void;
+}
+export interface ParserOpts {
+    range?: boolean;
+}
+export function parse(sourceCode: string, parserOpts: ParserOpts): ASTNode;
+export function visit(ast: ASTNode, visitor: Visitor): void;
diff --git a/types/solidity-parser-antlr/solidity-parser-antlr-tests.ts b/types/solidity-parser-antlr/solidity-parser-antlr-tests.ts
new file mode 100644
index 0000000000..28a7d847b8
--- /dev/null
+++ b/types/solidity-parser-antlr/solidity-parser-antlr-tests.ts
@@ -0,0 +1,4 @@
+import { parse } from 'solidity-parser-antlr';
+
+const parserOpts = { range: true };
+parse('contract A {}', parserOpts);
diff --git a/types/solidity-parser-antlr/tsconfig.json b/types/solidity-parser-antlr/tsconfig.json
new file mode 100644
index 0000000000..c9e84eb367
--- /dev/null
+++ b/types/solidity-parser-antlr/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "strictFunctionTypes": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "solidity-parser-antlr-tests.ts"]
+}
diff --git a/types/solidity-parser-antlr/tslint.json b/types/solidity-parser-antlr/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/solidity-parser-antlr/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 26a4f6c201cd7baa1c109b783691efa451d8849d Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <Slessi@users.noreply.github.com>
Date: Wed, 30 May 2018 00:51:41 +0200
Subject: [PATCH 514/575] Typings for @ptomasroos/react-native-multi-slider
 (#25969)

* Typings for RN multi slider by ptomasroos

* Add other exports

* Fixes

* Undo removing tests from files

* Fix TS version
---
 .../index.d.ts                                | 66 +++++++++++++++++++
 ...sroos__react-native-multi-slider-tests.tsx | 29 ++++++++
 .../tsconfig.json                             | 27 ++++++++
 .../tslint.json                               |  1 +
 4 files changed, 123 insertions(+)
 create mode 100644 types/ptomasroos__react-native-multi-slider/index.d.ts
 create mode 100644 types/ptomasroos__react-native-multi-slider/ptomasroos__react-native-multi-slider-tests.tsx
 create mode 100644 types/ptomasroos__react-native-multi-slider/tsconfig.json
 create mode 100644 types/ptomasroos__react-native-multi-slider/tslint.json

diff --git a/types/ptomasroos__react-native-multi-slider/index.d.ts b/types/ptomasroos__react-native-multi-slider/index.d.ts
new file mode 100644
index 0000000000..572307b219
--- /dev/null
+++ b/types/ptomasroos__react-native-multi-slider/index.d.ts
@@ -0,0 +1,66 @@
+// Type definitions for @ptomasroos/react-native-multi-slider 0.0
+// Project: https://github.com/ptomasroos/react-native-multi-slider#readme
+// Definitions by: Edward Sammut Alessi <https://github.com/Slessi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from "react";
+import { ViewStyle } from "react-native";
+
+export interface MarkerProps {
+    pressed: boolean;
+    pressedMarkerStyle: ViewStyle;
+    markerStyle: ViewStyle;
+    enabled: boolean;
+    currentValue: number;
+    valuePrefix: string;
+    valueSuffix: string;
+}
+
+export interface MultiSliderProps {
+    values?: number[];
+
+    onValuesChange?: (values: number[]) => void;
+    onValuesChangeStart?: () => void;
+    onValuesChangeFinish?: (values: number[]) => void;
+
+    sliderLength?: number;
+    touchDimensions?: {
+        height: number;
+        width: number;
+        borderRadius: number;
+        slipDisplacement: number;
+    };
+
+    customMarker?: React.ComponentType<MarkerProps>;
+    customMarkerLeft?: React.ComponentType<MarkerProps>;
+    customMarkerRight?: React.ComponentType<MarkerProps>;
+
+    isMarkersSeparated?: boolean;
+
+    min?: number;
+    max?: number;
+    step?: number;
+
+    optionsArray?: number[];
+
+    containerStyle?: ViewStyle;
+    trackStyle?: ViewStyle;
+    selectedStyle?: ViewStyle;
+    unselectedStyle?: ViewStyle;
+    markerContainerStyle?: ViewStyle;
+    markerStyle?: ViewStyle;
+    pressedMarkerStyle?: ViewStyle;
+    valuePrefix?: string;
+    valueSuffix?: string;
+    enabledOne?: boolean;
+    enabledTwo?: boolean;
+    onToggleOne?: () => void;
+    onToggleTwo?: () => void;
+    allowOverlap?: boolean;
+    snapped?: boolean;
+    markerOffsetX?: number;
+    markerOffsetY?: number;
+}
+
+export default class MultiSlider extends React.Component<MultiSliderProps> {}
diff --git a/types/ptomasroos__react-native-multi-slider/ptomasroos__react-native-multi-slider-tests.tsx b/types/ptomasroos__react-native-multi-slider/ptomasroos__react-native-multi-slider-tests.tsx
new file mode 100644
index 0000000000..7cec3ed9c1
--- /dev/null
+++ b/types/ptomasroos__react-native-multi-slider/ptomasroos__react-native-multi-slider-tests.tsx
@@ -0,0 +1,29 @@
+import MultiSlider from "@ptomasroos/react-native-multi-slider";
+import * as React from "react";
+import { Text } from "react-native";
+
+const CustomSliderMarker: React.SFC<{ currentValue: number }> = ({ currentValue }) => <Text>{currentValue}</Text>;
+
+const MultiSliderTest: React.SFC = () => (
+    <MultiSlider
+        min={0}
+        max={10}
+        step={1}
+        values={[ 0, 10 ]}
+        onValuesChange={(a) => console.log(a[0])}
+        onValuesChangeStart={() => console.log("wow")}
+        onValuesChangeFinish={() => console.log("amazing")}
+        containerStyle={{ marginTop: 20 }}
+        selectedStyle={{ backgroundColor: "#FFF" }}
+        unselectedStyle={{ backgroundColor: "#DDD" }}
+        markerStyle={{ backgroundColor: "#FFF" }}
+        pressedMarkerStyle={{ backgroundColor: "silver" }}
+        isMarkersSeparated={true}
+        customMarkerLeft={(e) => {
+            return <CustomSliderMarker currentValue={e.currentValue} />;
+        }}
+        customMarkerRight={(e) => {
+            return <CustomSliderMarker currentValue={e.currentValue} />;
+        }}
+    />
+);
diff --git a/types/ptomasroos__react-native-multi-slider/tsconfig.json b/types/ptomasroos__react-native-multi-slider/tsconfig.json
new file mode 100644
index 0000000000..b1309e4534
--- /dev/null
+++ b/types/ptomasroos__react-native-multi-slider/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "jsx": "react",
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths":{
+            "@ptomasroos/react-native-multi-slider": ["ptomasroos__react-native-multi-slider"]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "ptomasroos__react-native-multi-slider-tests.tsx"
+    ]
+}
diff --git a/types/ptomasroos__react-native-multi-slider/tslint.json b/types/ptomasroos__react-native-multi-slider/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ptomasroos__react-native-multi-slider/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 32c6c2c3082acd5d123e8f92ae68ef357bb9dad2 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 29 May 2018 15:54:08 -0700
Subject: [PATCH 515/575] Add types for lerna-get-packages

---
 types/lerna-get-packages/index.d.ts           | 19 +++++++++++++++++++
 .../lerna-get-packages-tests.ts               |  4 ++++
 types/lerna-get-packages/tsconfig.json        | 16 ++++++++++++++++
 types/lerna-get-packages/tslint.json          |  1 +
 4 files changed, 40 insertions(+)
 create mode 100644 types/lerna-get-packages/index.d.ts
 create mode 100644 types/lerna-get-packages/lerna-get-packages-tests.ts
 create mode 100644 types/lerna-get-packages/tsconfig.json
 create mode 100644 types/lerna-get-packages/tslint.json

diff --git a/types/lerna-get-packages/index.d.ts b/types/lerna-get-packages/index.d.ts
new file mode 100644
index 0000000000..ad6ce4b02c
--- /dev/null
+++ b/types/lerna-get-packages/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for lerna-get-packages 1.0
+// Project: https://github.com/azz/lerna-get-packages
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface LernaPackage {
+    location: string;
+    package: {
+        private?: boolean;
+        version: string;
+        name: string;
+        main?: string;
+        config?: {
+            additionalTsTypings?: string[];
+        };
+    };
+}
+declare function lernaGetPackages(path: string): LernaPackage[];
+export = lernaGetPackages;
diff --git a/types/lerna-get-packages/lerna-get-packages-tests.ts b/types/lerna-get-packages/lerna-get-packages-tests.ts
new file mode 100644
index 0000000000..746553c6c0
--- /dev/null
+++ b/types/lerna-get-packages/lerna-get-packages-tests.ts
@@ -0,0 +1,4 @@
+import lernaGetPackages = require('lerna-get-packages');
+
+const packages = lernaGetPackages('.');
+packages.map(p => p.location);
diff --git a/types/lerna-get-packages/tsconfig.json b/types/lerna-get-packages/tsconfig.json
new file mode 100644
index 0000000000..d3b4659a45
--- /dev/null
+++ b/types/lerna-get-packages/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "lerna-get-packages-tests.ts"]
+}
diff --git a/types/lerna-get-packages/tslint.json b/types/lerna-get-packages/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/lerna-get-packages/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 33da0daffb4d4f03ec0623e4d31fdd8c387962ae Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@etrog.net.il>
Date: Wed, 30 May 2018 01:54:20 +0300
Subject: [PATCH 516/575] [activex-*] Remove Enumerator overload taking
 SafeArray (#26103)

* Remove enumerator overload that takes SafeArray

* Interop tests depend on activex-scripting; associated version bump

* windows-script-host version bump

* npm test fixes

* Fix comment
---
 types/activex-diskquota/index.d.ts            |  2 +-
 types/activex-excel/activex-excel-tests.ts    |  8 ++-
 .../activex-faxcomexlib-tests.ts              |  4 +-
 .../activex-interop/activex-interop-tests.ts  | 49 ++++---------------
 types/activex-interop/index.d.ts              |  6 +--
 types/activex-iwshruntimelibrary/index.d.ts   |  2 +-
 types/activex-libreoffice/index.d.ts          |  2 +-
 types/activex-mshtml/index.d.ts               |  2 +-
 types/activex-msxml2/index.d.ts               |  2 +-
 types/activex-scripting/index.d.ts            |  6 ++-
 types/windows-script-host/index.d.ts          |  2 +-
 11 files changed, 33 insertions(+), 52 deletions(-)

diff --git a/types/activex-diskquota/index.d.ts b/types/activex-diskquota/index.d.ts
index da7457e066..71b534ee0c 100644
--- a/types/activex-diskquota/index.d.ts
+++ b/types/activex-diskquota/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://msdn.microsoft.com/en-us/library/windows/desktop/bb773938(v=vs.85).aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.5
+// TypeScript Version: 2.6
 
 /// <reference types="activex-interop" />
 
diff --git a/types/activex-excel/activex-excel-tests.ts b/types/activex-excel/activex-excel-tests.ts
index 78291d57b5..4f6fab3aa1 100644
--- a/types/activex-excel/activex-excel-tests.ts
+++ b/types/activex-excel/activex-excel-tests.ts
@@ -296,11 +296,17 @@ const setColumnVisibility = (visible: boolean) => {
 
         const combobox = sheet.OLEObjects('ComboBox1').Object as MSForms.ComboBox;
         combobox.Clear();
-        const enumerator = new Enumerator(dict.Items());
+
+        // iterate over keys using Enumerator
+        const enumerator = new Enumerator(dict);
         enumerator.moveFirst();
         while (!enumerator.atEnd()) {
             combobox.AddItem(enumerator.item());
+            enumerator.moveNext();
         }
+
+        // alternatively, make a JS array out of the keys, and iterate using forEach
+        // new VBArray(dict.Keys()).toArray().forEach(x => combobox.AddItem(x));
     })();
 })();
 
diff --git a/types/activex-faxcomexlib/activex-faxcomexlib-tests.ts b/types/activex-faxcomexlib/activex-faxcomexlib-tests.ts
index 478e816eb7..ae9edbe8c9 100644
--- a/types/activex-faxcomexlib/activex-faxcomexlib-tests.ts
+++ b/types/activex-faxcomexlib/activex-faxcomexlib-tests.ts
@@ -1,7 +1,7 @@
 /// <reference types="windows-script-host" />
 /// <reference types="activex-scripting" />
 
-const collectionToArray = <T>(col: { Item(index: any): T } | SafeArray<T>) => {
+const collectionToArray = <T>(col: { Item(index: any): T }): T[] => {
     const results: T[] = [];
     const enumerator = new Enumerator<T>(col);
     enumerator.moveFirst();
@@ -423,7 +423,7 @@ the job?
     document.GroupBroadcastReceipts = true;
 
     const jobIDs = document.Submit('');
-    collectionToArray(jobIDs).forEach(jobID => WScript.Echo(`The job ID is ${jobID}`));
+    new VBArray(jobIDs).toArray().forEach(jobID => WScript.Echo(`The job ID is ${jobID}`));
 
     while (recipients.Count > 0) {
         recipients.Remove(1);
diff --git a/types/activex-interop/activex-interop-tests.ts b/types/activex-interop/activex-interop-tests.ts
index e2ece7401e..06c73aa952 100644
--- a/types/activex-interop/activex-interop-tests.ts
+++ b/types/activex-interop/activex-interop-tests.ts
@@ -1,49 +1,20 @@
-// copied from the definitions in activex-scripting
-interface Dictionary<TKey = any, TItem = any> {
-    /** Add a new key and item to the dictionary. */
-    Add(Key: TKey, Item: TItem): void;
+/// <reference types="activex-scripting" />
 
-    /** Get the number of items in the dictionary. */
-    readonly Count: number;
-
-    /** Determine if a given key is in the dictionary. */
-    Exists(Key: TKey): boolean;
-    HashVal(Key: TKey): any;
-
-    /** Set or get the item for a given key */
-    Item(Key: TKey): TItem;
-
-    /** Get an array containing all items in the dictionary. */
-    Items(): SafeArray<TItem>;
-
-    /** Change a key to a different key. */
-    Key(Key: TKey): TKey;
-
-    /** Get an array containing all keys in the dictionary. */
-    Keys(): SafeArray<TKey>;
-
-    /** Remove a given key from the dictionary. */
-    Remove(Key: TKey): void;
-
-    /** Remove all information from the dictionary. */
-    RemoveAll(): void;
-
-    /** Set or get the item for a given key */
-    (Key: TKey): TItem;
-}
-
-interface ActiveXObjectNameMap {
-    'Scripting.Dictionary': Dictionary;
-}
-
-const dict: Dictionary<string, number> = new ActiveXObject('Scripting.Dictionary');
+const dict: Scripting.Dictionary<string, number> = new ActiveXObject('Scripting.Dictionary');
 dict.Add('one', 1);
 dict.Add('two', 2);
 dict.Add('three', 3);
 
-const keyEnumerator = new Enumerator(dict.Keys());
+const keyEnumerator = new Enumerator(dict);
 keyEnumerator.moveFirst();
 while (!keyEnumerator.atEnd()) {
     const item = dict(keyEnumerator.item());
     const power = Math.pow(item, 2);
 }
+
+const keysArray = new VBArray(dict.Keys()).toArray();
+const itemsArray = new VBArray(dict.Items()).toArray();
+for (let i = 0; i < keysArray.length; i++) {
+    const key = keysArray[i];
+    const item = itemsArray[i];
+}
diff --git a/types/activex-interop/index.d.ts b/types/activex-interop/index.d.ts
index caa74fff38..3bb13a5351 100644
--- a/types/activex-interop/index.d.ts
+++ b/types/activex-interop/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://msdn.microsoft.com/en-us/library/ff521046(v=vs.85).aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 // tslint:disable-next-line no-empty-interface
 interface ActiveXObjectNameMap { }
@@ -50,8 +50,8 @@ interface Enumerator<T = any> {
 }
 
 interface EnumeratorConstructor {
-    new <T = any>(collection: SafeArray<T> | { Item(index: any): T }): Enumerator<T>;
-    new (collection: any): Enumerator;
+    new <T = any>(collection: { Item(index: any): T }): Enumerator<T>;
+    // new (collection: any): Enumerator;
 }
 
 declare var Enumerator: EnumeratorConstructor;
diff --git a/types/activex-iwshruntimelibrary/index.d.ts b/types/activex-iwshruntimelibrary/index.d.ts
index 1f89c2b84a..fad992e185 100644
--- a/types/activex-iwshruntimelibrary/index.d.ts
+++ b/types/activex-iwshruntimelibrary/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://msdn.microsoft.com/en-us/library/9bbdkx3k.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="activex-interop" />
 
diff --git a/types/activex-libreoffice/index.d.ts b/types/activex-libreoffice/index.d.ts
index 3459215083..7d8e109861 100644
--- a/types/activex-libreoffice/index.d.ts
+++ b/types/activex-libreoffice/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://api.libreoffice.org/
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="activex-interop" />
 
diff --git a/types/activex-mshtml/index.d.ts b/types/activex-mshtml/index.d.ts
index b2f8a92883..93b307d3ba 100644
--- a/types/activex-mshtml/index.d.ts
+++ b/types/activex-mshtml/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://msdn.microsoft.com/en-us/library/aa741317(v=vs.85).aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 declare namespace MSHTML {
     const enum _BEHAVIOR_EVENT {
diff --git a/types/activex-msxml2/index.d.ts b/types/activex-msxml2/index.d.ts
index 5353864443..3ee2b1f050 100644
--- a/types/activex-msxml2/index.d.ts
+++ b/types/activex-msxml2/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://msdn.microsoft.com/en-us/library/ms763742.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="activex-interop" />
 
diff --git a/types/activex-scripting/index.d.ts b/types/activex-scripting/index.d.ts
index e0f8ba306d..0d2ae52343 100644
--- a/types/activex-scripting/index.d.ts
+++ b/types/activex-scripting/index.d.ts
@@ -491,7 +491,7 @@ declare namespace Scripting {
 }
 
 interface ActiveXObject {
-    set(obj: Scripting.Dictionary, propertyName: 'Item', parameterTypes: [any], newValue: any): void;
+    set<TKey = any, TValue = any>(obj: Scripting.Dictionary<TKey, TValue>, propertyName: 'Item', parameterTypes: [TKey], newValue: TValue): void;
 }
 
 interface ActiveXObjectNameMap {
@@ -499,3 +499,7 @@ interface ActiveXObjectNameMap {
     'Scripting.Encoder': Scripting.Encoder;
     'Scripting.FileSystemObject': Scripting.FileSystemObject;
 }
+
+interface EnumeratorConstructor {
+    new <TKey>(dict: Scripting.Dictionary<TKey>): Enumerator<TKey>;
+}
diff --git a/types/windows-script-host/index.d.ts b/types/windows-script-host/index.d.ts
index 47f11e4d39..a6be9a0e4c 100644
--- a/types/windows-script-host/index.d.ts
+++ b/types/windows-script-host/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://msdn.microsoft.com/en-us/library/9bbdkx3k.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="activex-iwshruntimelibrary" />
 

From 4757d2b37ce6eeb047d1aafb2d6dad817bcef63a Mon Sep 17 00:00:00 2001
From: Jan Bevers <janbevers87@gmail.com>
Date: Wed, 30 May 2018 00:54:55 +0200
Subject: [PATCH 517/575] [redux-first-router] Add querySerializer param to
 pathToAction (#26099)

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

diff --git a/types/redux-first-router/index.d.ts b/types/redux-first-router/index.d.ts
index 750f8438b6..f15d27ceb7 100644
--- a/types/redux-first-router/index.d.ts
+++ b/types/redux-first-router/index.d.ts
@@ -249,7 +249,8 @@ export function nextPath(): string | void;
 
 export function pathToAction<TKeys = {}, TState = any>(
     pathname: string,
-    routesMap: RoutesMap<TKeys, TState>
+    routesMap: RoutesMap<TKeys, TState>,
+    querySerializer?: QuerySerializer
 ): ReceivedAction;
 
 export function prevPath(): string | void;
diff --git a/types/redux-first-router/redux-first-router-tests.ts b/types/redux-first-router/redux-first-router-tests.ts
index 3168db6ed8..7d14b755c3 100644
--- a/types/redux-first-router/redux-first-router-tests.ts
+++ b/types/redux-first-router/redux-first-router-tests.ts
@@ -6,7 +6,8 @@ import {
     ReceivedAction,
     redirect,
     Action as ReduxFirstRouterAction,
-    QuerySerializer
+    QuerySerializer,
+    pathToAction
 } from 'redux-first-router';
 import {
     createStore,
@@ -23,8 +24,8 @@ import {
 } from 'redux';
 import { History } from 'history';
 
-declare var console: any;
-declare var history: History;
+declare const console: any;
+declare const history: History;
 
 interface Keys {
     role: string;
@@ -97,12 +98,14 @@ const receivedAction: ReceivedAction = {
     payload: {}
 };
 actionToPath(receivedAction, routesMap); // $ExpectType string
+pathToAction('/', routesMap); // $ExpectType ReceivedAction
 
 const querySerializer: QuerySerializer = {
     stringify: (params) => '',
     parse: (queryString) => ({})
 };
 actionToPath(receivedAction, routesMap, querySerializer); // $ExpectType string
+pathToAction('/', routesMap, querySerializer); // $ExpectType ReceivedAction
 
 const action: ReduxFirstRouterAction = {
     type: 'HOME'

From 38df6613ce7cd2a25c03cf7194136c0229bccfa6 Mon Sep 17 00:00:00 2001
From: James Garbutt <43081j@users.noreply.github.com>
Date: Tue, 29 May 2018 23:55:03 +0100
Subject: [PATCH 518/575] sinon: move incorrect xhr restore method (#26119)

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

diff --git a/types/sinon/index.d.ts b/types/sinon/index.d.ts
index 4bdf3272ee..2922b5a2c7 100644
--- a/types/sinon/index.d.ts
+++ b/types/sinon/index.d.ts
@@ -271,7 +271,6 @@ declare namespace Sinon {
         getAllResponseHeaders(): any;
 
         // Methods
-        restore(): void;
         setResponseHeaders(headers: any): void;
         setResponseBody(body: string): void;
         respond(status: number, headers: any, body: string): void;
@@ -285,6 +284,7 @@ declare namespace Sinon {
         useFilters: boolean;
         addFilter(filter: (method: string, url: string, async: boolean, username: string, password: string) => boolean): void;
         onCreate(xhr: SinonFakeXMLHttpRequest): void;
+        restore(): void;
     }
 
     interface SinonFakeServer extends SinonFakeServerOptions {
diff --git a/types/sinon/sinon-tests.ts b/types/sinon/sinon-tests.ts
index 0a88a4eeba..55e6a7a0bc 100644
--- a/types/sinon/sinon-tests.ts
+++ b/types/sinon/sinon-tests.ts
@@ -40,6 +40,7 @@ function testSandbox() {
 
     const xhr = sb.useFakeXMLHttpRequest();
     xhr.useFilters = true;
+    xhr.restore();
 
     const server = sb.useFakeServer();
     server.respondWith('foo');
@@ -98,7 +99,6 @@ function testXHR() {
     const headers = xhr.getAllResponseHeaders();
     const header = xhr.getResponseHeader('foo');
 
-    xhr.restore();
     xhr.setResponseHeaders({ 'Content-Type': 'text/html' });
     xhr.setResponseBody('foo');
     xhr.respond(200, { 'Content-Type': 'foo' }, 'bar');
@@ -107,6 +107,7 @@ function testXHR() {
     sinon.FakeXMLHttpRequest.useFilters = true;
     sinon.FakeXMLHttpRequest.addFilter((method, url, async, user, pass) => true);
     sinon.FakeXMLHttpRequest.onCreate = (xhr) => {};
+    sinon.FakeXMLHttpRequest.restore();
 }
 
 function testClock() {

From a5bc807dac9845639378858d295034cf313b3de3 Mon Sep 17 00:00:00 2001
From: Alaa Masoud <alaa.masoud@live.com>
Date: Wed, 30 May 2018 01:57:13 +0300
Subject: [PATCH 519/575] Add named exports (#26060)

---
 types/react-content-loader/index.d.ts         |  5 ++
 .../react-content-loader-tests.tsx            | 48 +++++++++++--------
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/types/react-content-loader/index.d.ts b/types/react-content-loader/index.d.ts
index ce48b63b77..23b0ad02c3 100644
--- a/types/react-content-loader/index.d.ts
+++ b/types/react-content-loader/index.d.ts
@@ -24,3 +24,8 @@ export interface ContentLoaderProps {
     className?: string;
 }
 export default class ContentLoader extends React.Component<ContentLoaderProps> { }
+export class Facebook extends React.Component<ContentLoaderProps> { }
+export class Instagram extends React.Component<ContentLoaderProps> { }
+export class Code extends React.Component<ContentLoaderProps> { }
+export class List extends React.Component<ContentLoaderProps> { }
+export class BulletList extends React.Component<ContentLoaderProps> { }
diff --git a/types/react-content-loader/react-content-loader-tests.tsx b/types/react-content-loader/react-content-loader-tests.tsx
index 70cdec26f0..b64deba6c4 100644
--- a/types/react-content-loader/react-content-loader-tests.tsx
+++ b/types/react-content-loader/react-content-loader-tests.tsx
@@ -1,26 +1,34 @@
 import * as React from 'react';
-import ContentLoader from 'react-content-loader';
+import ContentLoader, { BulletList, Code, Facebook, Instagram, List } from 'react-content-loader';
 
 const CustomComponent = () => {
     return (
-        <ContentLoader
-            style={{ borderBottom: '1px solid' }}
-            animate={false}
-            speed={1}
-            height={100}
-            width={100}
-            primaryColor="#333"
-            secondaryColor="#999"
-            primaryOpacity={0.06}
-            secondaryOpacity={0.12}
-            preserveAspectRatio="xMinYMin meet"
-            uniquekey="reactcontentloader"
-            className="my-class"
-        >
-            {/* Pure SVG */}
-            <rect x="0" y="0" rx="5" ry="5" width="70" height="70" />
-            <rect x="80" y="17" rx="4" ry="4" width="300" height="13" />
-            <rect x="80" y="40" rx="3" ry="3" width="250" height="10" />
-        </ContentLoader>
+        <>
+            <ContentLoader
+                style={{ borderBottom: '1px solid' }}
+                animate={false}
+                speed={1}
+                height={100}
+                width={100}
+                primaryColor="#333"
+                secondaryColor="#999"
+                primaryOpacity={0.06}
+                secondaryOpacity={0.12}
+                preserveAspectRatio="xMinYMin meet"
+                uniquekey="reactcontentloader"
+                className="my-class"
+            >
+                {/* Pure SVG */}
+                <rect x="0" y="0" rx="5" ry="5" width="70" height="70" />
+                <rect x="80" y="17" rx="4" ry="4" width="300" height="13" />
+                <rect x="80" y="40" rx="3" ry="3" width="250" height="10" />
+            </ContentLoader>
+
+            <Facebook />
+            <Instagram />
+            <Code />
+            <List />
+            <BulletList />
+        </>
     );
 };

From 454f19e14d3cf4867cc0f1ba0f96a8e1111f512b Mon Sep 17 00:00:00 2001
From: Jeong Inyong <ckboyjiy@nate.com>
Date: Wed, 30 May 2018 07:57:51 +0900
Subject: [PATCH 520/575] added parameter at Map constructor (#26075)

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

diff --git a/types/navermaps/index.d.ts b/types/navermaps/index.d.ts
index aa36578e63..ec857696bf 100644
--- a/types/navermaps/index.d.ts
+++ b/types/navermaps/index.d.ts
@@ -657,7 +657,7 @@ declare namespace naver.maps {
     layers: any;
     mapTypes: any;
     mapSystemProjection: any;
-    constructor(mapDiv: string, mapOptions?: MapOptions);
+    constructor(mapDiv: string | HTMLElement, mapOptions?: MapOptions);
     addPane(name: string, elementOrIndex: HTMLElement | number): void;
     destory(): void;
     fitBounds(bounds: any, margin?: any): void;
diff --git a/types/navermaps/navermaps-tests.ts b/types/navermaps/navermaps-tests.ts
index 81bbe620f5..2d5f5a75b8 100644
--- a/types/navermaps/navermaps-tests.ts
+++ b/types/navermaps/navermaps-tests.ts
@@ -1,4 +1,6 @@
 let map = new naver.maps.Map('map');
+
+map = new naver.maps.Map(document.createElement('div'));
 map.setMapTypeId(naver.maps.MapTypeId.HYBRID);
 
 const jeju = new naver.maps.LatLng(33.3590628, 126.534361);

From 57c9e88f6bf4960431381d835eaa87007d5f49d5 Mon Sep 17 00:00:00 2001
From: Ruben Vermeersch <ruben@rocketeer.be>
Date: Wed, 30 May 2018 00:58:48 +0200
Subject: [PATCH 521/575] fetch-mock: Add missing sandbox() definition (#25993)

Fixes #20421
---
 types/fetch-mock/fetch-mock-tests.ts |  6 ++++++
 types/fetch-mock/index.d.ts          | 16 ++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/types/fetch-mock/fetch-mock-tests.ts b/types/fetch-mock/fetch-mock-tests.ts
index 84218fb9e1..b265e1c33f 100644
--- a/types/fetch-mock/fetch-mock-tests.ts
+++ b/types/fetch-mock/fetch-mock-tests.ts
@@ -92,3 +92,9 @@ fetchMock.get("http://test.com", {
     body: 'abc',
     redirectUrl: "http://example.org"
 });
+
+const sandbox = fetchMock.sandbox();
+sandbox.get("http://test.com", {
+    body: 'abc',
+    redirectUrl: "http://example.org"
+});
diff --git a/types/fetch-mock/index.d.ts b/types/fetch-mock/index.d.ts
index 0231d8b208..891fb0ec7b 100644
--- a/types/fetch-mock/index.d.ts
+++ b/types/fetch-mock/index.d.ts
@@ -203,6 +203,14 @@ declare namespace fetchMock {
          */
         mock(options: MockOptions): this;
 
+        /**
+         * Returns a drop-in mock for fetch which can be passed to other mocking
+         * libraries. It implements the full fetch-mock api and maintains its
+         * own state independent of other instances, so tests can be run in
+         * parallel.
+         */
+        sandbox(): FetchMockSandbox;
+
         /**
          * Replaces fetch() with a stub which records its calls, grouped by
          * route, and optionally returns a mocked Response object or passes the
@@ -450,6 +458,14 @@ declare namespace fetchMock {
          */
         configure(opts: {}): void;
     }
+
+    interface FetchMockSandbox extends FetchMockStatic {
+        /**
+         * Also callable as fetch(). Use `typeof fetch` in your code to define
+         * a field that accepts both `fetch()` and a fetch-mock sandbox.
+         */
+        (input?: string | Request , init?: RequestInit): Promise<Response>;
+    }
 }
 
 declare var fetchMock: fetchMock.FetchMockStatic;

From 5d98d9b7fdd5324d6bf9a352709fd025ea8d69a9 Mon Sep 17 00:00:00 2001
From: Drew Diamantoukos <MercifulCode@gmail.com>
Date: Tue, 29 May 2018 18:59:07 -0400
Subject: [PATCH 522/575] Plotly.js: Fixing and expanding ScatterMarker types
 (#26038)

* Adding pointcloud type for Plotly scatter type and sizemax for Marker

* Added xy field for ScatterData, which is used by pointcloud

* Added colorbar and gradient types to ScatterMarker. Fixed cmax/cmin being boolean when they are numbers. Allowed colorscale to be array of arrays per spec.
---
 types/plotly.js/index.d.ts | 71 ++++++++++++++++++++++++++++++++++----
 1 file changed, 65 insertions(+), 6 deletions(-)

diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index 7c2cd7b34c..689214138b 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for plotly.js 1.37
+// Type definitions for plotly.js 1.38
 // Project: https://plot.ly/javascript/
 // Definitions by: Chris Gervang <https://github.com/chrisgervang>
 // 				Martin Duparc <https://github.com/martinduparc>
@@ -412,10 +412,10 @@ export interface ScatterData {
 export interface ScatterMarker {
 	symbol: string | string[]; // Drawing.symbolList
 	color: Color | number[];
-	colorscale: string | string[];
+	colorscale: string | string[] | Array<Array<(string | number)>>;
 	cauto: boolean;
-	cmax: boolean;
-	cmin: boolean;
+	cmax: number;
+	cmin: number;
 	autocolorscale: boolean;
 	reversescale: boolean;
 	opacity: number | number[];
@@ -427,8 +427,67 @@ export interface ScatterMarker {
 	sizemode: 'diameter' | 'area';
 	showscale: boolean;
 	line: Partial<ScatterMarkerLine>;
-	colorbar: {}; // TODO
-	gradient: {}; // TODO
+	colorbar: {
+        thicknessmode: 'fraction' | 'pixels',
+        thickness: number,
+        lenmode: 'fraction' | 'pixels',
+        len: number,
+        x: number,
+        xanchor: 'left' | 'center' | 'right',
+        xpad: number,
+        y: number,
+        yanchor: 'top' | 'middle' | 'bottom',
+        ypad: number,
+        outlinecolor: Color,
+        outlinewidth: number,
+        bordercolor: Color,
+        borderwidth: Color,
+        bgcolor: Color,
+        tickmode: 'auto' | 'linear' | 'array',
+        nticks: number,
+        tick0: number | string,
+        dtick: number | string,
+        tickvals: Datum[] | Datum[][] | Datum[][][] | TypedArray,
+        ticktext: Datum[] | Datum[][] | Datum[][][] | TypedArray,
+        ticks: 'outside' | 'inside' | '',
+        ticklen: number,
+        tickwidth: number,
+        tickcolor: Color,
+        showticklabels: boolean,
+        tickfont: {
+            family: string,
+            size: number,
+            color: Color,
+        },
+        tickangle: number,
+        tickformat: string,
+        tickformatstops: {
+            dtickrange: any[],
+            value: string,
+        },
+        tickprefix: string,
+        showtickprefix: 'all' | 'first' | 'last' | 'none',
+        ticksuffix: string,
+        showticksuffix: 'all' | 'first' | 'last' | 'none',
+        separatethousands: boolean,
+        exponentformat: 'none' | 'e' | 'E' | 'power' | 'SI' | 'B',
+        showexponent: 'all' | 'first' | 'last' | 'none',
+        title: string,
+        titlefont: {
+            family: string,
+            size: number,
+            color: Color,
+        },
+        titleside: 'right' | 'top' | 'bottom',
+        tickvalssrc: any,
+        ticktextsrc: any,
+    };
+	gradient: {
+        type: 'radial' | 'horizontal' | 'vertical' | 'none',
+        color: Color,
+        typesrc: any,
+        colorsrc: any,
+    };
 }
 
 export interface ScatterMarkerLine {

From faf359186945e81d70f92b90403aa19cb2db3674 Mon Sep 17 00:00:00 2001
From: Dongwoon Son <dplusic@gmail.com>
Date: Wed, 30 May 2018 07:59:38 +0900
Subject: [PATCH 523/575] Declare namespace for p-defer (#25917)

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

diff --git a/types/p-defer/index.d.ts b/types/p-defer/index.d.ts
index 2b5e1ce56e..54ba6dd98b 100644
--- a/types/p-defer/index.d.ts
+++ b/types/p-defer/index.d.ts
@@ -3,12 +3,14 @@
 // Definitions by: Sam Verschueren <https://github.com/SamVerschueren>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface DeferredPromise<T> {
-	resolve<U>(value: U | PromiseLike<U>): Promise<U>;
-	reject(reason: any): Promise<never>;
-	promise: Promise<T>;
+declare namespace pDefer {
+	interface DeferredPromise<T> {
+		resolve<U>(value: U | PromiseLike<U>): Promise<U>;
+		reject(reason: any): Promise<never>;
+		promise: Promise<T>;
+	}
 }
 
-declare function pDefer<T>(): DeferredPromise<T>;
+declare function pDefer<T>(): pDefer.DeferredPromise<T>;
 
 export = pDefer;
diff --git a/types/p-defer/p-defer-tests.ts b/types/p-defer/p-defer-tests.ts
index 565c50e9dd..ad6c771590 100644
--- a/types/p-defer/p-defer-tests.ts
+++ b/types/p-defer/p-defer-tests.ts
@@ -1,10 +1,9 @@
 import pDefer = require('p-defer');
 
-function delay(ms: number) {
-    const deferred = pDefer<string>();
+function delay(deferred: pDefer.DeferredPromise<string>,  ms: number) {
     setTimeout(deferred.resolve, ms, '🦄');
     return deferred.promise;
 }
 
 let s: string;
-async function f() { s = await delay(100); }
+async function f() { s = await delay(pDefer<string>(), 100); }

From 9ffa281e1b74e0e32396c2010a4b82afbc26909b Mon Sep 17 00:00:00 2001
From: Kalle <khirvola@gmail.com>
Date: Wed, 30 May 2018 02:00:04 +0300
Subject: [PATCH 524/575] [node-telegram-bot-api] Added sendMediaGroup (#26066)

* Added sendMediaGroup

[sendMediaGroup](https://github.com/yagop/node-telegram-bot-api/blob/435f06319e92f12fb7ef642f91d031dafe5aff80/src/telegram.js#L1831-L1877) doesn't seem to [work](https://github.com/yagop/node-telegram-bot-api/issues/492) currently but here are the typings for it.

* Typo in github domain

* Removed whitespace and added semicolon
---
 types/node-telegram-bot-api/index.d.ts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/types/node-telegram-bot-api/index.d.ts b/types/node-telegram-bot-api/index.d.ts
index cacc064abd..7785617957 100644
--- a/types/node-telegram-bot-api/index.d.ts
+++ b/types/node-telegram-bot-api/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Alex Muench <https://github.com/ammuench>
 //                 Agadar <https://github.com/agadar>
 //                 Giorgio Garasto <https://github.com/Dabolus>
+//                 Kallu609 <https://github.com/Kallu609>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -109,6 +110,11 @@ declare namespace TelegramBot {
         caption?: string;
     }
 
+    interface SendMediaGroupOptions {
+        disable_notification?: boolean;
+        reply_to_message_id?: number;
+    }
+
     type SendStickerOptions = SendBasicOptions;
 
     interface SendVideoOptions extends SendBasicOptions {
@@ -355,6 +361,17 @@ declare namespace TelegramBot {
         mime_type?: string;
     }
 
+    interface InputMediaPhoto {
+        type: string;
+        media: string;
+        fileOptions?: {
+            filename: string;
+            contentType: string;
+        };
+    }
+
+    type InputMediaVideo = InputMediaPhoto;
+
     interface VideoNote extends FileBase {
         length: number;
         duration: number;
@@ -835,6 +852,8 @@ declare class TelegramBot extends EventEmitter {
 
     sendDocument(chatId: number | string, doc: string | Stream | Buffer, options?: TelegramBot.SendDocumentOptions, fileOpts?: any): Promise<TelegramBot.Message | Error>;
 
+    sendMediaGroup(chatId: number | string, media: Array<TelegramBot.InputMediaPhoto | TelegramBot.InputMediaVideo>, options?: TelegramBot.SendMediaGroupOptions): Promise<TelegramBot.Message | Error>;
+
     sendSticker(chatId: number | string, sticker: string | Stream | Buffer, options?: TelegramBot.SendStickerOptions): Promise<TelegramBot.Message | Error>;
 
     sendVideo(chatId: number | string, video: string | Stream | Buffer, options?: TelegramBot.SendVideoOptions): Promise<TelegramBot.Message | Error>;

From ab95daceb22f1c587f496fca3c7645c6c5aa057e Mon Sep 17 00:00:00 2001
From: Mosh Feu <moshfeu@gmail.com>
Date: Wed, 30 May 2018 02:00:21 +0300
Subject: [PATCH 525/575] takePictureAsync should take a optional param
 (#26065)

`options: PictureOptions` is not mandatory.
---
 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 f51d2d13b6..4e7a0ebdb3 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -761,7 +761,7 @@ export interface RecordingOptions {
 }
 
 export class CameraObject {
-    takePictureAsync(options: PictureOptions): Promise<PictureResponse>;
+    takePictureAsync(options?: PictureOptions): Promise<PictureResponse>;
     recordAsync(options: RecordingOptions): Promise<{ uri: string; }>;
     stopRecording(): void;
     getSupportedRatiosAsync(): Promise<string[]>; // Android only

From 7993842d5e433b6fe6f844463a715fb56bafa27c Mon Sep 17 00:00:00 2001
From: RayBrokeSomething <38739657+RayBrokeSomething@users.noreply.github.com>
Date: Wed, 30 May 2018 09:00:37 +1000
Subject: [PATCH 526/575] Added webdriverIO startActivity optionals (#25957)

* Added webdriverIO startActivity optionals

* Fixed spacing.
---
 types/webdriverio/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/webdriverio/index.d.ts b/types/webdriverio/index.d.ts
index 235760d47b..556e034227 100644
--- a/types/webdriverio/index.d.ts
+++ b/types/webdriverio/index.d.ts
@@ -841,7 +841,7 @@ declare namespace WebdriverIO {
         setOrientation(setTo: 'landscape' | 'portrait'): Client<T>;
         settings(settings?: { [key: string]: string }): Client<T>;
         shake(): Client<T>;
-        startActivity(appPackage: string, activity: string): Client<T>;
+        startActivity(appPackage: string, activity: string, appWaitPackage?: string, appWaitActivity?: string): Client<T>;
         strings(language: string): Client<T>;
 
         swipe(

From 12e3811181e979ef6a6494f62bbe7b04fc30433b Mon Sep 17 00:00:00 2001
From: Ingmar Jager <ijager@users.noreply.github.com>
Date: Wed, 30 May 2018 01:01:32 +0200
Subject: [PATCH 527/575] Add Hasher functions and improve interfaces (#26030)

Differentiate between Ciphers and Hashers so that it aligns better with the real library
---
 types/crypto-js/index.d.ts | 65 +++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 22 deletions(-)

diff --git a/types/crypto-js/index.d.ts b/types/crypto-js/index.d.ts
index db9ed6c30e..22e5c1253c 100644
--- a/types/crypto-js/index.d.ts
+++ b/types/crypto-js/index.d.ts
@@ -8,15 +8,27 @@ export as namespace CryptoJS;
 
 declare var CryptoJS: CryptoJS.Hashes;
 declare namespace CryptoJS {
-	interface Cipher {
+
+	interface Base {}
+
+	interface BufferedBlockAlgorithm extends Base {}
+
+	interface Hasher extends BufferedBlockAlgorithm {}
+
+	interface Cipher extends BufferedBlockAlgorithm {
+		createEncryptor(secretPassphrase: string, option?: CipherOption): Encryptor;
+		createDecryptor(secretPassphrase: string, option?: CipherOption): Decryptor;
+	}
+
+	interface BlockCipher extends Cipher {}
+
+	interface StreamCipher extends Cipher {}
+
+	interface CipherHelper {
 		encrypt(message: string, secretPassphrase: string | WordArray, option?: CipherOption): WordArray;
 		decrypt(encryptedMessage: string | WordArray, secretPassphrase: string | WordArray, option?: CipherOption): DecryptedMessage;
 	}
-	interface CipherAlgorythm {
-		createEncryptor(secretPassphrase: string, option?: CipherOption): Encriptor;
-		createDecryptor(secretPassphrase: string, option?: CipherOption): Decryptor;
-	}
-	interface Encriptor {
+	interface Encryptor {
 		process(messagePart: string): string;
 		finalize(): string;
 	}
@@ -87,23 +99,32 @@ declare namespace CryptoJS {
 		HmacRIPEMD160(message: string | LibWordArray, ...options: any[]): WordArray;
 		PBKDF2(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
 		PBKDF2(message: string | LibWordArray, ...options: any[]): WordArray;
-		AES: Cipher;
-		DES: Cipher;
-		TripleDES: Cipher;
-		RC4: Cipher;
-		RC4Drop: Cipher;
-		Rabbit: Cipher;
-		RabbitLegacy: Cipher;
-		EvpKDF: Cipher;
+		AES: CipherHelper;
+		DES: CipherHelper;
+		TripleDES: CipherHelper;
+		RC4: CipherHelper;
+		RC4Drop: CipherHelper;
+		Rabbit: CipherHelper;
+		RabbitLegacy: CipherHelper;
+		EvpKDF: CipherHelper;
 		algo: {
-			AES: CipherAlgorythm;
-			DES: CipherAlgorythm;
-			TrippleDES: CipherAlgorythm;
-			RC4: CipherAlgorythm;
-			RC4Drop: CipherAlgorythm;
-			Rabbit: CipherAlgorythm;
-			RabbitLegacy: CipherAlgorythm;
-			EvpKDF: CipherAlgorythm;
+			AES: BlockCipher;
+			DES: BlockCipher;
+			TripleDES: BlockCipher;
+			RC4: StreamCipher;
+			RC4Drop: StreamCipher;
+			Rabbit: StreamCipher;
+			RabbitLegacy: StreamCipher;
+			EvpKDF: Base;
+			HMAC: Base;
+			PBKDF2: Base;
+			SHA1: Hasher;
+			SHA3: Hasher;
+			SHA256: Hasher;
+			SHA384: Hasher;
+			SHA512: Hasher;
+			MD5: Hasher;
+			RIPEMD160: Hasher;
 		};
 		format: {
 			OpenSSL: any;

From 044f8c7d84628dcad73757b18372c0b333667297 Mon Sep 17 00:00:00 2001
From: Budi Irawan <deerawan@gmail.com>
Date: Wed, 30 May 2018 09:01:47 +1000
Subject: [PATCH 528/575] feat: add date properties in Job (#26076)

---
 types/kue/index.d.ts   | 5 +++++
 types/kue/kue-tests.ts | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/types/kue/index.d.ts b/types/kue/index.d.ts
index 35c7a1c475..4117ef0a82 100644
--- a/types/kue/index.d.ts
+++ b/types/kue/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Nicholas Penree <https://github.com/drudge>
 //                 Amiram Korach <https://github.com/amiram>
 //                 Christian D. <https://github.com/pc-jedi>
+//                 Budi Irawan <https://github.com/deerawan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -72,6 +73,10 @@ export declare class Job extends events.EventEmitter {
     // Should always be a number however currently it is a number when creating and a string when loading
     // https://github.com/Automattic/kue/issues/1081
     public created_at: string | number;
+    public updated_at: string | number;
+    public promote_at: string | number;
+    public failed_at: string | number;
+    public started_at: string | number;
     public client: redisClientFactory.RedisClient;
     private _max_attempts;
 
diff --git a/types/kue/kue-tests.ts b/types/kue/kue-tests.ts
index 7bf45b3e54..9234101e05 100644
--- a/types/kue/kue-tests.ts
+++ b/types/kue/kue-tests.ts
@@ -41,6 +41,12 @@ function create() {
 
   kue.Job.get(job.id, function (err: any, _job: kue.Job) {
     console.log('get job', _job);
+
+    _job.created_at;
+    _job.promote_at;
+    _job.updated_at;
+    _job.failed_at;
+    _job.started_at;
   });
   kue.Job.get(job.id, 'video conversion', function (err: any, _job: kue.Job) {
     console.log('get job', _job);

From 060f28864a17435950785d83b73c71acc2bfb855 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 29 May 2018 16:07:31 -0700
Subject: [PATCH 529/575] Add types for semver-sort

---
 types/semver-sort/index.d.ts           |  7 +++++++
 types/semver-sort/semver-sort-tests.ts |  3 +++
 types/semver-sort/tsconfig.json        | 16 ++++++++++++++++
 types/semver-sort/tslint.json          |  1 +
 4 files changed, 27 insertions(+)
 create mode 100644 types/semver-sort/index.d.ts
 create mode 100644 types/semver-sort/semver-sort-tests.ts
 create mode 100644 types/semver-sort/tsconfig.json
 create mode 100644 types/semver-sort/tslint.json

diff --git a/types/semver-sort/index.d.ts b/types/semver-sort/index.d.ts
new file mode 100644
index 0000000000..63f0a7dca4
--- /dev/null
+++ b/types/semver-sort/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for semver-sort 0.0
+// Project: https://github.com/ragingwind/semver-sort
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function desc(versions: string[]): string[];
+export = desc;
diff --git a/types/semver-sort/semver-sort-tests.ts b/types/semver-sort/semver-sort-tests.ts
new file mode 100644
index 0000000000..dd34bd0dd1
--- /dev/null
+++ b/types/semver-sort/semver-sort-tests.ts
@@ -0,0 +1,3 @@
+import semverSort = require('semver-sort');
+
+semverSort(['1.0.0', '2.0.0']);
diff --git a/types/semver-sort/tsconfig.json b/types/semver-sort/tsconfig.json
new file mode 100644
index 0000000000..4cbd8146d6
--- /dev/null
+++ b/types/semver-sort/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "semver-sort-tests.ts"]
+}
diff --git a/types/semver-sort/tslint.json b/types/semver-sort/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/semver-sort/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 932fd7a065f83b3d91a0ca94454bd9db754b5675 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 29 May 2018 16:30:34 -0700
Subject: [PATCH 530/575] Add types for web3-eth-abi

---
 types/web3-eth-abi/index.d.ts            |  7 +++++++
 types/web3-eth-abi/tsconfig.json         | 16 ++++++++++++++++
 types/web3-eth-abi/tslint.json           |  1 +
 types/web3-eth-abi/web3-eth-abi-tests.ts |  3 +++
 4 files changed, 27 insertions(+)
 create mode 100644 types/web3-eth-abi/index.d.ts
 create mode 100644 types/web3-eth-abi/tsconfig.json
 create mode 100644 types/web3-eth-abi/tslint.json
 create mode 100644 types/web3-eth-abi/web3-eth-abi-tests.ts

diff --git a/types/web3-eth-abi/index.d.ts b/types/web3-eth-abi/index.d.ts
new file mode 100644
index 0000000000..0fe67f2109
--- /dev/null
+++ b/types/web3-eth-abi/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for web3-eth-abi 1.0
+// Project: https://github.com/ethereum/web3.js/tree/1.0/packages/web3-eth-abi
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function encodeParameters(typesArray: string[], parameters: any[]): string;
+export = encodeParameters;
diff --git a/types/web3-eth-abi/tsconfig.json b/types/web3-eth-abi/tsconfig.json
new file mode 100644
index 0000000000..848d401a22
--- /dev/null
+++ b/types/web3-eth-abi/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", "web3-eth-abi-tests.ts"]
+}
diff --git a/types/web3-eth-abi/tslint.json b/types/web3-eth-abi/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/web3-eth-abi/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/web3-eth-abi/web3-eth-abi-tests.ts b/types/web3-eth-abi/web3-eth-abi-tests.ts
new file mode 100644
index 0000000000..b2539cafb1
--- /dev/null
+++ b/types/web3-eth-abi/web3-eth-abi-tests.ts
@@ -0,0 +1,3 @@
+import encodeParameters = require('web3-eth-abi');
+
+encodeParameters(['uint256', 'string'], [1, '0x']);

From 14370ec612cd48cab7c9a859e9a068f5ab52753d Mon Sep 17 00:00:00 2001
From: cavarzan <deividi.cavarzan@gmail.com>
Date: Tue, 29 May 2018 20:31:02 -0300
Subject: [PATCH 531/575] removed types

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

diff --git a/types/react-native-sqlite-storage/index.d.ts b/types/react-native-sqlite-storage/index.d.ts
index 59aa52553c..0b3e083407 100644
--- a/types/react-native-sqlite-storage/index.d.ts
+++ b/types/react-native-sqlite-storage/index.d.ts
@@ -61,14 +61,12 @@ export interface SQLError {
 export type StatementCallback = (transaction: Transaction, resultSet: ResultSet) => void;
 export type StatementErrorCallback = (transaction: Transaction, error: SQLError) => void;
 export interface Transaction {
-    executeSql(sqlStatement: string, arguments?: any[]): Promise<TransactionResultSetPromise>;
+    executeSql(sqlStatement: string, arguments?: any[]): Promise<[Transaction, ResultSet]>;
     executeSql(sqlStatement: string, arguments?: any[], callback?: StatementCallback, errorCallback?: StatementErrorCallback): void;
 }
 
 export type TransactionCallback = (transaction: Transaction) => void;
 export type TransactionErrorCallback = (error: SQLError) => void;
-export type ResultSetPromise = [ResultSet];
-export type TransactionResultSetPromise = [Transaction, ResultSet];
 
 export interface SQLiteDatabase {
     transaction(scope: (tx: Transaction) => void): Promise<Transaction>;
@@ -77,7 +75,7 @@ export interface SQLiteDatabase {
     readTransaction(scope: (tx: Transaction) => void, error?: TransactionErrorCallback, success?: TransactionCallback): void;
     close(): Promise<void>;
     close(success: () => void, error: (err: SQLError) => void): void;
-    executeSql(statement: string, params?: any[]): Promise<ResultSetPromise>;
+    executeSql(statement: string, params?: any[]): Promise<[ResultSet]>;
     executeSql(statement: string, params?: any[], success?: StatementCallback, error?: StatementErrorCallback): void;
 
     attach(nameToAttach: string, alias: string): Promise<void>;
diff --git a/types/react-native-sqlite-storage/react-native-sqlite-storage-tests.ts b/types/react-native-sqlite-storage/react-native-sqlite-storage-tests.ts
index f93e763004..471b03908c 100644
--- a/types/react-native-sqlite-storage/react-native-sqlite-storage-tests.ts
+++ b/types/react-native-sqlite-storage/react-native-sqlite-storage-tests.ts
@@ -24,7 +24,7 @@ sqlite.openDatabase({ name: 'test.db', location: 'default' }).then((db) => {
         .transaction((tx) => {
             tx
                 .executeSql('SELECT * FROM Employees a, Departments b WHERE a.department = b.department_id', [])
-                .then((result: sqlite.TransactionResultSetPromise) => {
+                .then((result: [sqlite.Transaction, sqlite.ResultSet]) => {
                     // handle result
                 });
         })
@@ -34,7 +34,7 @@ sqlite.openDatabase({ name: 'test.db', location: 'default' }).then((db) => {
         .catch((e: sqlite.SQLError) => {
             // log error
         });
-    db.executeSql('SELECT * FROM Employees a, Departments b WHERE a.department = b.department_id', []).then((result: sqlite.ResultSetPromise) => {
+    db.executeSql('SELECT * FROM Employees a, Departments b WHERE a.department = b.department_id', []).then((result: [sqlite.ResultSet]) => {
         // handle result
     });
 });

From 5f0289a00d45f17a13db93755c4033300e555a75 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 29 May 2018 16:35:24 -0700
Subject: [PATCH 532/575] Add types for to-snake-case

---
 types/to-snake-case/index.d.ts             |  7 +++++++
 types/to-snake-case/to-snake-case-tests.ts |  3 +++
 types/to-snake-case/tsconfig.json          | 16 ++++++++++++++++
 types/to-snake-case/tslint.json            |  1 +
 4 files changed, 27 insertions(+)
 create mode 100644 types/to-snake-case/index.d.ts
 create mode 100644 types/to-snake-case/to-snake-case-tests.ts
 create mode 100644 types/to-snake-case/tsconfig.json
 create mode 100644 types/to-snake-case/tslint.json

diff --git a/types/to-snake-case/index.d.ts b/types/to-snake-case/index.d.ts
new file mode 100644
index 0000000000..ce3220275b
--- /dev/null
+++ b/types/to-snake-case/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for to-snake-case 1.0
+// Project: https://github.com/ianstormtaylor/to-snake-case
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function toSnakeCase(str: string): string;
+export = toSnakeCase;
diff --git a/types/to-snake-case/to-snake-case-tests.ts b/types/to-snake-case/to-snake-case-tests.ts
new file mode 100644
index 0000000000..47c798bfd1
--- /dev/null
+++ b/types/to-snake-case/to-snake-case-tests.ts
@@ -0,0 +1,3 @@
+import toSnakeCase = require('to-snake-case');
+
+toSnakeCase('camelCase');
diff --git a/types/to-snake-case/tsconfig.json b/types/to-snake-case/tsconfig.json
new file mode 100644
index 0000000000..aec7de1407
--- /dev/null
+++ b/types/to-snake-case/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "to-snake-case-tests.ts"]
+}
diff --git a/types/to-snake-case/tslint.json b/types/to-snake-case/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/to-snake-case/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 0b088aaccf47e7ce134f55584133ae97256f6b6d Mon Sep 17 00:00:00 2001
From: Benjamin Lichtman <belichtm@microsoft.com>
Date: Tue, 29 May 2018 16:44:03 -0700
Subject: [PATCH 533/575] Update CODEOWNERS

---
 .github/CODEOWNERS | 576 +++++++++++++++++++++++++++++++--------------
 1 file changed, 400 insertions(+), 176 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9084f165aa..06b2401d83 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,6 +2,7 @@
 # Add yourself to the "Definitions by:" list instead.
 # See https://github.com/DefinitelyTyped/DefinitelyTyped#edit-an-existing-package
 
+/types/a-big-triangle/                          @MathiasPaumgarten
 /types/abbrev/                                  @BendingBender
 /types/abs/                                     @AyaMorisawa
 /types/absolute/                                @AyaMorisawa
@@ -10,17 +11,20 @@
 /types/accepts/                                 @bomret @brikou
 /types/accounting/                              @gerich-home @chrisleck
 /types/ace/                                     @Diullei
+/types/ace-diff/                                @innovation-team
 /types/acl/                                     @tkQubo
 /types/acorn/                                   @RReverser @e-cloud
 /types/actioncable/                             @zhu1230
 /types/actions-on-google/                       @joelhegg
 /types/activex-access/                          @zspitz
 /types/activex-adodb/                           @zspitz
+/types/activex-adox/                            @zspitz
 /types/activex-dao/                             @zspitz
 /types/activex-diskquota/                       @zspitz
 /types/activex-excel/                           @zspitz
 /types/activex-faxcomexlib/                     @zspitz
 /types/activex-infopath/                        @zspitz
+/types/activex-interop/                         @zspitz
 /types/activex-iwshruntimelibrary/              @zspitz
 /types/activex-libreoffice/                     @zspitz
 /types/activex-msforms/                         @zspitz
@@ -36,19 +40,21 @@
 /types/activex-vbide/                           @zspitz
 /types/activex-wia/                             @zspitz
 /types/activex-word/                            @zspitz
-/types/adal-angular/                            @unindented
+/types/adal-angular/                            @unindented @aciccarello
 /types/add-zero/                                @Roaders
 /types/adm-zip/                                 @jvilk @abner
 /types/adone/                                   @s0m3on3 @maxveres
-/types/aframe/                                  @devpaul @bertoritger
+/types/aframe/                                  @devpaul @bertoritger @twastvedt
 /types/agenda/                                  @meirgottlieb @princjef
 /types/aggregate-error/                         @BendingBender
 /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
+/types/algoliasearch/                           @cbaptiste @haroenv @aherve @samouss
+/types/allure-js-commons/                       @zaqqaz
 /types/alt/                                     @Shearerbeard
+/types/amazon-cognito-auth-js/                  @scottescue
 /types/amazon-product-api/                      @MattiLehtinen @alien35
 /types/amcharts/                                @ldrick
 /types/amp/                                     @jewbre
@@ -119,7 +125,7 @@
 /types/angular-toastr/                          @nkovacic @trodi
 /types/angular-toasty/                          @muenchdo
 /types/angular-tooltips/                        @leonard-thieu
-/types/angular-translate/                       @michelsalib
+/types/angular-translate/                       @michelsalib @GabrielGil
 /types/angular-ui-bootstrap/                    @xt0rted @ry8806
 /types/angular-ui-router/                       @michelsalib @matiishyn @mikehaas763
 /types/angular-ui-scroll/                       @marknadig
@@ -136,8 +142,9 @@
 /types/animejs/                                 @A-Babin
 /types/annyang/                                 @hisham @theluk
 /types/ansi-colors/                             @rogierschouten
+/types/ansi-escapes/                            @jacobbubu
 /types/ansi-regex/                              @mvachhar
-/types/ansi-styles/                             @brynbellomy
+/types/ansi-styles/                             @brynbellomy @plylrnsdy
 /types/ansicolors/                              @rogierschouten
 /types/any-db/                                  @rogierschouten
 /types/any-db-transaction/                      @rogierschouten
@@ -146,6 +153,7 @@
 /types/apex.js/                                 @y13i
 /types/aphrodite/                               @asvetliakov
 /types/api-error-handler/                       @tkrotoff
+/types/apicache/                                @danielsogl
 /types/apigee-access/                           @CasperSkydt
 /types/apollo-codegen/                          @bradleyayers
 /types/app-root-dir/                            @chenyang-biu
@@ -156,9 +164,10 @@
 /types/appletvjs/                               @brainded
 /types/applicationinsights-js/                  @kamilszostak
 /types/aqb/                                     @Athenkosi-Mase
+/types/arangodb/                                @pluma
 /types/arbiter/                                 @arash16
-/types/arcgis-js-api/v3/                        @Esri
-/types/arcgis-js-api/                           @Esri
+/types/arcgis-js-api/v3/                        @Esri @bsvensson
+/types/arcgis-js-api/                           @Esri @bsvensson
 /types/arcgis-rest-api/                         @JeffJacobson
 /types/arcgis-to-geojson-utils/                 @JeffJacobson
 /types/archiver/                                @dolanmiu @crevil
@@ -192,7 +201,12 @@
 /types/async.nexttick/                          @pyrho
 /types/asynciterator/                           @rubensworks
 /types/atlaskit__button/                        @dijimsta
+/types/atlaskit__calendar/                      @lstanden
+/types/atlaskit__inline-edit/                   @lstanden
+/types/atlaskit__layer/                         @lstanden
+/types/atlaskit__single-select/                 @lstanden
 /types/atmosphere.js/                           @toedter @Mory1879 @Scipion
+/types/atob/                                    @johngeorgewright
 /types/atom/                                    @GlenCFL @smhxx @lierdakil
 /types/atom-keymap/                             @GlenCFL
 /types/atom-mocha-test-runner/                  @GlenCFL
@@ -211,12 +225,13 @@
 /types/autoprefixer/                            @odnamrataizem
 /types/autosize/                                @kingdango @keika299 @NeekSandhu
 /types/autosuggest-highlight/                   @senukartur
-/types/awesomplete/                             @webbiesdk @bmdixon @tbekolay
+/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
+/types/aws-lambda/                              @skarum @tobyhede @buggy @y13i @wwwy3y3 @OrthoDex @MichaelMarner @daniel-cottone @kostya-misura @coderbyheart @palmithor @daniloraisi @simonbuchan @Haydabase @repl-chris @aneilbaboo
 /types/aws-serverless-express/                  @threesquared @jcaffey @mattmeye @albertovasquez
 /types/aws4/                                    @ajcrites
 /types/axel/                                    @ruslan-molodyko
+/types/axon/                                    @jewbre
 /types/azure/                                   @AndrewGaspar @antiveeranna @SomaticIT
 /types/azure-mobile-services-client/            @dmorosinotto
 /types/azure-sb/                                @Azure
@@ -254,6 +269,7 @@
 /types/base-64/                                 @dolanmiu
 /types/base-x/                                  @chrootsu
 /types/base16/                                  @alechill
+/types/base64-arraybuffer/                      @jbencook
 /types/base64-js/                               @pe8ter
 /types/base64-url/                              @urish
 /types/base64topdf/                             @lucasriondel
@@ -262,10 +278,11 @@
 /types/basic-auth/                              @moonpyk @vesse
 /types/batch-stream/                            @drudge
 /types/bazinga-translator/                      @alexndlm
-/types/bcrypt/                                  @codeanimal @IOAyman
+/types/bcrypt/                                  @codeanimal @IOAyman @dstapleton92
 /types/bcryptjs/                                @RafaelKr
 /types/beats/                                   @urish
 /types/bech32/                                  @micksatana
+/types/behavior3/                               @carrrywu
 /types/bell/                                    @SimonSchick
 /types/bem-cn/                                  @selkinvitaly
 /types/better-curry/                            @pocesar
@@ -273,6 +290,7 @@
 /types/bezier-easing/                           @ptlis
 /types/bezier-js/                               @danmarshall
 /types/bgiframe/                                @sumegizoltan
+/types/bidirectional-map/                       @helenanderson
 /types/big.js/                                  @nycdotnet @googol
 /types/bigi/                                    @mhegazy
 /types/bigint/                                  @Evgenus
@@ -286,7 +304,7 @@
 /types/bip38/                                   @micksatana
 /types/bip39/                                   @micksatana
 /types/bit-array/                               @mudkipme
-/types/bitcoinjs-lib/                           @mhegazy @dlebrecht @rbuckton @micksatana @youssefgh
+/types/bitcoinjs-lib/                           @mhegazy @dlebrecht @rbuckton @micksatana @youssefgh @kento1218
 /types/bitcore-lib/                             @lautarodragan
 /types/bittorrent-protocol/                     @feross @tlaziuk
 /types/bitwise-xor/                             @rogierschouten
@@ -298,6 +316,8 @@
 /types/blob-stream/                             @erichillah
 /types/blob-to-buffer/                          @nrlquaker
 /types/blob-util/                               @WorldMaker
+/types/blocked/                                 @l-jonas
+/types/blockies/                                @LogvinovLeon
 /types/blocks/                                  @ksmigiel
 /types/bloomfilter/                             @slawiko
 /types/blue-tape/                               @sodatea
@@ -307,7 +327,9 @@
 /types/bluebird-global/                         @d-ph
 /types/bluebird-retry/                          @pvomhoff
 /types/blueimp-md5/                             @rmartone @mkohlmyr
-/types/body-parser/                             @santialbo @vilic @dreampulse @blendsdk @tlaziuk
+/types/bn.js/                                   @LogvinovLeon
+/types/body-parser/                             @santialbo @vilic @dreampulse @blendsdk @tlaziuk @jwalton
+/types/body-parser-xml/                         @tbounsiar
 /types/bonjour/                                 @quentin-ol @octo-sniffle
 /types/bookshelf/                               @arcticwaters @vesse
 /types/boom/v3/                                 @rogatty
@@ -350,10 +372,11 @@
 /types/browser-pack/                            @TeamworkGuy2
 /types/browser-report/                          @JTOne123
 /types/browser-resolve/                         @marionebl
-/types/browser-sync/                            @joeskeen
+/types/browser-sync/                            @joeskeen @aznnomness
 /types/browserify/                              @AndrewGaspar @jvilk @leonard-thieu
 /types/bs58/                                    @chrootsu
 /types/bson/                                    @horiuchi @CaselIT
+/types/btoa/                                    @johngeorgewright
 /types/bucks/                                   @zaneli
 /types/buffer-compare/                          @chrootsu
 /types/buffer-equal/                            @Bartvds
@@ -404,7 +427,7 @@
 /types/cbor/                                    @pushplay
 /types/ccap/                                    @taoqf
 /types/chai/v2/                                 @Bartvds @AGBrown
-/types/chai/                                    @jedmao @Bartvds @AGBrown @olivr70 @mwistrand @joshuakgoldberg @shaunluttin @Naktibalda @micksatana
+/types/chai/                                    @jedmao @Bartvds @AGBrown @olivr70 @mwistrand @joshuakgoldberg @shaunluttin @Naktibalda @micksatana @ErikSchierboom
 /types/chai-arrays/                             @clementprevot
 /types/chai-as-promised/                        @jt000 @Kuniwak @leonard-thieu @lazerwalker @mattbishop
 /types/chai-datetime/                           @cliffburger
@@ -419,14 +442,16 @@
 /types/chai-spies/                              @kuzn-ilya
 /types/chai-string/                             @nmalaguti
 /types/chai-subset/                             @delta62 @AGBrown
+/types/chai-uuid/                               @harm-less
 /types/chai-webdriverio/                        @sherlock1982
 /types/chai-xml/                                @jedigo
 /types/chance/                                  @cbowdon @brikou @cafesanu
 /types/change-emitter/                          @iskandersierra
+/types/chardet/                                 @Gebatzens
 /types/charm/                                   @Xananax
 /types/charset/                                 @cspotcode
-/types/chart.js/                                @anuti @FabienLavocat @KentarouTakeda @larrybahr @mernen @josefpaij @danmana @guillaume-ro-fr @chicoxyzzy
-/types/chartist/                                @mtgibbs @psimonski @clottman
+/types/chart.js/                                @anuti @FabienLavocat @KentarouTakeda @larrybahr @mernen @josefpaij @danmana @guillaume-ro-fr @chicoxyzzy @archy-bold @braincore
+/types/chartist/                                @mtgibbs @psimonski @clottman @affilnost
 /types/chayns/                                  @HenningKuehl
 /types/check-sum/                               @BendingBender
 /types/check-types/                             @idchlife
@@ -441,9 +466,11 @@
 /types/chroma-js/v0/                            @invliD
 /types/chroma-js/                               @invliD @mpacholec
 /types/chrome/                                  @matthewkimber @otiai10 @couven92 @rreverser @sreimer15
+/types/chromedriver/                            @pe8ter
 /types/circuit-breaker-js/                      @DeTeam
 /types/circular-json/                           @jpevarnek
-/types/ckeditor/                                @wittwert
+/types/ckeditor/v2/                             @wittwert
+/types/ckeditor/                                @wittwert @stuartlong
 /types/clamp-js/                                @Hikariii
 /types/clamp-js-main/                           @sinziananicolae
 /types/classnames/                              @adidahiya @JKillian @seansfkelley @mradamczyk @marvinhagemeister
@@ -458,15 +485,21 @@
 /types/cleave.js/                               @clentfort @jasongi-at-sportsbet @sashashakun
 /types/cli/                                     @kayahr
 /types/cli-color/                               @ChaosinaCan
+/types/cli-progress/                            @mhegazy
 /types/cli-spinner/                             @janslow
+/types/cli-table/                               @arylo
 /types/cli-table2/                              @mgroenhoff
 /types/client-sessions/                         @netroy
+/types/clientjs/                                @icopp
 /types/cliff/                                   @brynbellomy
 /types/clipboard/                               @impworks
 /types/clipboard-js/                            @markwongsk
 /types/clipboardy/                              @BendingBender
+/types/clmtrackr/                               @hellochar
 /types/clndr/                                   @jasperjn
 /types/clockpicker/                             @jfcere
+/types/cloneable-readable/                      @qlonik
+/types/cloner/                                  @matrumz
 /types/closure-compiler/                        @mprobst
 /types/cloud-env/                               @Morfent
 /types/cloudflare-apps/                         @MartynasZilinskas
@@ -496,14 +529,17 @@
 /types/combined-stream/                         @felixge @tlaziuk
 /types/combokeys/                               @iclanton
 /types/cometd/                                  @derekcicerone
-/types/command-line-args/                       @CzBuCHi
+/types/command-line-args/v4/                    @CzBuCHi @75lb
+/types/command-line-args/                       @75lb
 /types/command-line-commands/                   @CzBuCHi
-/types/command-line-usage/                      @Dvorsky
+/types/command-line-usage/                      @matrumz @Dvorsky
 /types/commangular/                             @hiraash
 /types/comment-json/                            @Jason3S
+/types/common-errors/                           @icopp
 /types/common-tags/                             @zuzusik @tzupengwang
 /types/commonmark/                              @nicojs @leonard-thieu
 /types/compare-version/                         @jpevarnek
+/types/compare-versions/                        @LogvinovLeon
 /types/complex/                                 @AyaMorisawa
 /types/component-emitter/                       @psnider
 /types/compose-function/                        @denis-sokolov
@@ -520,7 +556,7 @@
 /types/configstore/                             @ArcticLight
 /types/configurable/                            @jewbre
 /types/confit/                                  @ethanresnick
-/types/connect/                                 @SomaticIT
+/types/connect/                                 @SomaticIT @EvanHahn
 /types/connect-busboy/                          @pinguet62
 /types/connect-ensure-login/                    @0x6368656174
 /types/connect-flash/                           @AndreasGassmann
@@ -543,7 +579,7 @@
 /types/convert-hrtime/                          @BendingBender
 /types/convert-layout/                          @xeningem
 /types/convert-source-map/                      @AndrewGaspar @mgroenhoff @TeamworkGuy2
-/types/convict/                                 @Nemo157 @vesse @elyscape
+/types/convict/                                 @Nemo157 @vesse @elyscape @vanthiyathevan
 /types/cookie/                                  @pine613
 /types/cookie-parser/                           @santialbo @BendingBender
 /types/cookie-session/                          @borislavjivkov
@@ -576,7 +612,10 @@
 /types/cordova_app_version_plugin/              @larrybahr
 /types/cordovarduino/                           @hendrikmaus
 /types/core-js/                                 @rbuckton @mfdeveloper
-/types/cosmiconfig/                             @ozum
+/types/correlation-id/                          @natemara
+/types/cors/                                    @pluma
+/types/cosmiconfig/v4/                          @ozum
+/types/cosmiconfig/                             @ozum @szeck87 @saadq
 /types/cote/                                    @makepost
 /types/couchbase/                               @maouida
 /types/countdown/                               @gjuchault
@@ -593,13 +632,14 @@
 /types/crc/                                     @YuJianrong
 /types/create-error/                            @tkrotoff
 /types/create-react-class/                      @jgoz
+/types/create-subscription/                     @Asana @vsiao
 /types/createjs/                                @evilangelist @gyohk
 /types/createjs-lib/                            @evilangelist @gyohk
 /types/credential/                              @phuvo
 /types/credit-card-type/                        @LKay
 /types/cron/                                    @horiuchi @winup
 /types/cropperjs/                               @stepancar
-/types/croppie/                                 @connor4312 @dklmuc @sarunint
+/types/croppie/                                 @connor4312 @dklmuc @sarunint @knuthelgesen
 /types/cross-spawn/                             @Alorel
 /types/crossfilter/                             @schmuli @iebaker @nordfjord
 /types/crossroads/                              @diullei
@@ -628,29 +668,29 @@
 /types/cwise-compiler/                          @taoqf
 /types/cwise-parser/                            @taoqf
 /types/cybozulabs-md5/                          @pine613
-/types/cytoscape/                               @phreed @wy193777 @ypconstante @janniclas
+/types/cytoscape/                               @phreed @wy193777 @ypconstante @janniclas @cerberuser
 /types/d3/v3/                                   @gustavderdrache @borisyankov @MatthiasJobst
 /types/d3/v4/                                   @tomwanzek @gustavderdrache @borisyankov
 /types/d3/                                      @tomwanzek @gustavderdrache @borisyankov
 /types/d3-array/                                @gustavderdrache @borisyankov @tomwanzek
-/types/d3-axis/                                 @tomwanzek @gustavderdrache @borisyankov
+/types/d3-axis/                                 @tomwanzek @gustavderdrache @borisyankov @denisname
 /types/d3-box/                                  @lk-chen
 /types/d3-brush/                                @tomwanzek @gustavderdrache @borisyankov
 /types/d3-chord/                                @tomwanzek @gustavderdrache @borisyankov
 /types/d3-collection/                           @tomwanzek @gustavderdrache @borisyankov
-/types/d3-color/                                @tomwanzek @gustavderdrache @borisyankov
+/types/d3-color/                                @tomwanzek @gustavderdrache @borisyankov @denisname @ledragon
 /types/d3-contour/                              @tomwanzek @Ledragon
-/types/d3-dispatch/                             @tomwanzek @gustavderdrache @borisyankov
+/types/d3-dispatch/                             @tomwanzek @gustavderdrache @borisyankov @denisname
 /types/d3-drag/                                 @tomwanzek @gustavderdrache @borisyankov
 /types/d3-dsv/                                  @tomwanzek @gustavderdrache @borisyankov
 /types/d3-ease/                                 @tomwanzek @gustavderdrache @borisyankov
 /types/d3-fetch/                                @ledragon
 /types/d3-force/                                @tomwanzek @gustavderdrache @borisyankov
-/types/d3-format/                               @tomwanzek @gustavderdrache @borisyankov
-/types/d3-geo/                                  @Ledragon @tomwanzek @gustavderdrache @borisyankov
+/types/d3-format/                               @tomwanzek @gustavderdrache @borisyankov @denisname
+/types/d3-geo/                                  @ledragon @tomwanzek @gustavderdrache @borisyankov
 /types/d3-hexbin/                               @uncovertruth @tomwanzek
 /types/d3-hierarchy/                            @tomwanzek @gustavderdrache @borisyankov
-/types/d3-hsv/                                  @arrayjam
+/types/d3-hsv/                                  @arrayjam @denisname
 /types/d3-interpolate/                          @tomwanzek @gustavderdrache @borisyankov
 /types/d3-path/                                 @tomwanzek @gustavderdrache @borisyankov
 /types/d3-polygon/                              @tomwanzek @gustavderdrache @borisyankov
@@ -702,6 +742,7 @@
 /types/db-migrate-pg/                           @nickiannone
 /types/db.js/                                   @cgwrench
 /types/dc/                                      @hansrwindhoff @mtraynham @MatthiasJobst
+/types/dd-trace/                                @ColinBradley
 /types/deasync/                                 @Sicilica
 /types/debessmann/                              @vkorehov
 /types/debounce/                                @denis-sokolov
@@ -724,16 +765,20 @@
 /types/defer-promise/                           @niklasf
 /types/define-lazy-prop/                        @BendingBender
 /types/defined/                                 @BendingBender
+/types/deglob/                                  @saadq
 /types/deku/                                    @pocka
 /types/del/v2/                                  @AyaMorisawa
 /types/del/                                     @AyaMorisawa @BendingBender @bitjson
 /types/delaunator/                              @DenisCarriere
 /types/delay/                                   @BendingBender
+/types/deline/                                  @iarroyo5
 /types/denodeify/                               @joaomoreno
 /types/deoxxa-content-type/                     @pine613
 /types/depcheck/                                @ark120202
 /types/depd/                                    @danny8002 @BendingBender
+/types/dependency-tree/                         @joscha
 /types/deployjava/                              @cyrilschumacher
+/types/derhuerst__cli-on-key/                   @jacobbubu
 /types/destroy/                                 @BendingBender
 /types/destroy-on-hwm/                          @BendingBender
 /types/detect-browser/                          @rogierschouten
@@ -746,6 +791,7 @@
 /types/detect-pointer/                          @thomastilkema
 /types/detect-port/                             @lith-light-g
 /types/detect-touch-events/                     @thomastilkema
+/types/detox/                                   @TareqElMasri
 /types/df-visible/                              @Litee
 /types/dhtmlxgantt/                             @mkozhukh @chriscamicas
 /types/dhtmlxscheduler/                         @mkozhukh
@@ -755,6 +801,7 @@
 /types/diff2html/                               @rtfpessoa
 /types/dir-resolve/                             @andy-ms
 /types/discontinuous-range/                     @OiCMudkips
+/types/discourse-sso/                           @championswimmer
 /types/dispatchr/                               @Ragg-
 /types/disposable-email-domains/                @geoffreak
 /types/dnssd/                                   @angelmerino
@@ -762,11 +809,13 @@
 /types/dockerode/                               @seikho @nlaplante @isac322 @lazarusx @meisenzahl @thegecko
 /types/docopt/                                  @giggio
 /types/doctrine/                                @rictic
+/types/document-promises/                       @NotWoods
 /types/documentdb/                              @NoelAbrahams @brettferdosi @ctstone @yifanwu
 /types/documentdb-server/                       @lith-light-g
 /types/documentdb-session/                      @DanielRosenwasser
 /types/dojo/                                    @vansimke
 /types/dom-inputevent/                          @diagramatics
+/types/dom-to-image/                            @JipSterk
 /types/dom4/                                    @adidahiya @giladgray
 /types/domo/                                    @Steve-Fenton
 /types/dompurify/                               @bazuzi
@@ -824,7 +873,7 @@
 /types/easy-xapi/                               @DeadAlready
 /types/easy-xapi-utils/                         @DeadAlready
 /types/ebongarde-root/                          @Ebongarde
-/types/echarts/                                 @xieisabug @AntiMoron
+/types/echarts/                                 @xieisabug @AntiMoron @liveangela
 /types/ecurve/                                  @mhegazy
 /types/ed25519/                                 @erikma
 /types/ed2curve/                                @ffflorian
@@ -839,7 +888,7 @@
 /types/elasticsearch/                           @CasperSkydt @bfsmith @ddunkin @pushplay @mlamp @ahmadferdous @SimonSchick @brabster @deerawan
 /types/electron-config/                         @mrfunkycold @unindented
 /types/electron-debug/                          @unindented
-/types/electron-devtools-installer/             @gamesmaxed
+/types/electron-devtools-installer/             @gamesmaxed @mfatihmar
 /types/electron-is-dev/                         @trodi
 /types/electron-json-storage/                   @stpettersens @nrlquaker @jbw91
 /types/electron-notifications/                  @djpereira
@@ -886,6 +935,7 @@
 /types/enzyme-adapter-react-15/                 @tkrotoff
 /types/enzyme-adapter-react-15.4/               @nali
 /types/enzyme-adapter-react-16/                 @tkrotoff
+/types/enzyme-redux/                            @knegusen
 /types/enzyme-to-json/                          @joscha
 /types/eonasdan-bootstrap-datetimepicker/       @ToastHawaii
 /types/epiceditor/                              @borisyankov
@@ -902,7 +952,7 @@
 /types/escape-regexp/                           @jewbre
 /types/escape-string-regexp/                    @kruncher @faergeek
 /types/escodegen/                               @simondel
-/types/eslint/                                  @pmdartus @j-f1
+/types/eslint/                                  @pmdartus @j-f1 @saadq
 /types/eslint-plugin-prettier/                  @ikatyang
 /types/eslint-scope/                            @mysticatea
 /types/eslint-visitor-keys/                     @mysticatea
@@ -915,12 +965,15 @@
 /types/estraverse/                              @sanex3339
 /types/estree/                                  @RReverser
 /types/etag/                                    @BendingBender
+/types/ethereumjs-abi/                          @LogvinovLeon
+/types/ethereumjs-tx/                           @LogvinovLeon
 /types/ethereumjs-util/                         @cortopy
 /types/ethjs-signer/                            @doppio
 /types/eureka-js-client/                        @Schnillz
-/types/evaporate/                               @kookster @chrisrhoden
+/types/evaporate/                               @kookster @chrisrhoden @ailrun
 /types/event-emitter/                           @LKay
 /types/event-emitter-es6/                       @ahstro
+/types/event-hooks-webpack-plugin/              @pine
 /types/event-kit/                               @GlenCFL
 /types/event-loop-lag/                          @rogierschouten
 /types/event-stream/                            @flcdrg
@@ -941,6 +994,7 @@
 /types/expectations/                            @vvakame
 /types/expo/v23/                                @KonstantinKai
 /types/expo/v24/                                @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger
+/types/expo/v25/                                @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov
 /types/expo/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov
 /types/expo__vector-icons/                      @incleaf
 /types/express/                                 @borisyankov
@@ -951,6 +1005,7 @@
 /types/express-bunyan-logger/                   @shreyjain1994
 /types/express-busboy/                          @pinguet62
 /types/express-cluster/                         @nenadalm
+/types/express-correlation-id/                  @natemara
 /types/express-debug/                           @federicobond
 /types/express-domain-middleware/               @hookclaw
 /types/express-ejs-layouts/                     @erikma
@@ -962,6 +1017,7 @@
 /types/express-formidable/                      @tdolsen @evanshortiss
 /types/express-graphql/                         @isman-usoh @nitintutlani @hubel @zya @mlamp @firede
 /types/express-handlebars/                      @stpettersens @yhaskell
+/types/express-jsonschema/                      @atd-schubert
 /types/express-jwt/                             @wokim @kacepe @Sl1MBoy @milan-mimra
 /types/express-less/                            @xieyubo
 /types/express-minify/                          @borislavjivkov
@@ -971,26 +1027,32 @@
 /types/express-mysql-session/                   @Akim95
 /types/express-oauth-server/                    @atd-schubert
 /types/express-openapi/                         @mugeso
+/types/express-paginate/                        @AmirTugi
 /types/express-partials/                        @jt000
 /types/express-promise-router/                  @wanganjun
 /types/express-rate-limit/                      @cyrilschumacher @makepost
 /types/express-route-fs/                        @kripod
+/types/express-routemap/                        @icopp
 /types/express-sanitized/                       @cjbarth
 /types/express-serve-static-core/               @borisyankov @19majkel94 @kacepe @micksatana @samijaber
 /types/express-session/                         @horiuchi @jacobbogers @builtinnya @ry7n
+/types/express-socket.io-session/               @AylaJK
 /types/express-to-koa/                          @xiaohanzhang
 /types/express-unless/                          @wokim
 /types/express-winston/                         @bricka
+/types/express-ws/                              @ajliv
+/types/express-xml-bodyparser/                  @noticeMaker
 /types/extend/                                  @reppners
 /types/extjs/                                   @brian428
+/types/extract-files/                           @Slessi
 /types/extract-stack/                           @BendingBender
 /types/extract-text-webpack-plugin/             @flying-sheep @katyo
 /types/extract-zip/                             @mizunashi-mana
 /types/eyes/                                    @brynbellomy
 /types/ez-plus/                                 @AndersonFriaca
 /types/f1/                                      @neolwc
-/types/fabric/                                  @oklemencic @joewashear007 @mrand01 @NotWoods @bmartinson
-/types/facebook-instant-games/                  @menushka
+/types/fabric/                                  @oklemencic @joewashear007 @mrand01 @NotWoods @bmartinson @RogerioTeixeira
+/types/facebook-instant-games/                  @menushka @oyvindjam
 /types/facebook-js-sdk/                         @amritk
 /types/facebook-pixel/                          @noctishsu
 /types/faker/v3/                                @Kuniwak
@@ -1010,9 +1072,11 @@
 /types/fast-stats/                              @rogierschouten
 /types/fastclick/                               @shinnn
 /types/favico.js/                               @drowse314-dev-ymat
+/types/favicons/                                @mohsen1
 /types/fb/                                      @JoshStrobl
 /types/fb-watchman/                             @whtsky
 /types/fbemitter/                               @kmxz
+/types/feather-icons/                           @jineshshah36
 /types/featherlight/                            @xStrom
 /types/feathersjs__authentication/              @AbraaoAlves @j2L4e
 /types/feathersjs__authentication-client/       @AbraaoAlves @j2L4e
@@ -1038,6 +1102,7 @@
 /types/ffi/                                     @loyd
 /types/ffmpeg-static/                           @iamstevetran
 /types/ffprobe-static/                          @iamstevetran
+/types/fhir-js-client/                          @rmchndrng
 /types/fibers/                                  @soywiz
 /types/figures/                                 @BendingBender
 /types/file-exists/                             @BendingBender
@@ -1047,11 +1112,13 @@
 /types/filenamify/                              @rokt33r
 /types/filesize/                                @GiedriusGrabauskas @renchap
 /types/fill-pdf/                                @westy92
+/types/filter-invalid-dom-props/                @icopp
 /types/finalhandler/                            @chrootsu
 /types/finch/                                   @DavidSichau
 /types/find/                                    @andypyrope
 /types/find-root/                               @Alorel
 /types/find-up/                                 @BendingBender
+/types/find-versions/                           @LogvinovLeon
 /types/findup-sync/                             @Bartvds @ngbrown
 /types/fingerprintjs/                           @zaneli
 /types/fingerprintjs2/                          @curtstate
@@ -1070,18 +1137,23 @@
 /types/flight/                                  @jonathanhedren
 /types/flightplan/                              @borislavjivkov
 /types/flipsnap/                                @kubosho @gsino @mayuki
+/types/float-regex/                             @wanganjun
 /types/flot/                                    @burlandm @Anticom @admiralsmaster
 /types/flowjs/                                  @ryan10132
 /types/fluent-ffmpeg/                           @tcaesvk @DingWeizhe
 /types/flux/                                    @stkb @GiedriusGrabauskas
+/types/fluxible/                                @xbim
+/types/fluxible-router/                         @xbim
 /types/fluxxor/                                 @mrk21
 /types/fm-websync/                              @markusmauch
 /types/fnv-lite/                                @marcind
+/types/focus-within/                            @eramdam
 /types/fontfaceobserver/                        @RandScullard
 /types/fontoxml/                                @rolandzwaga
 /types/forever-agent/                           @yavanosta
 /types/forever-monitor/                         @shuntksh @wrboyce
 /types/forge-di/                                @adamcarr
+/types/fork-ts-checker-webpack-plugin/          @JounQin
 /types/form-data/                               @soywiz @leonyu @BendingBender
 /types/form-serializer/                         @flqw
 /types/form-urlencoded/                         @alepee
@@ -1098,6 +1170,7 @@
 /types/freedom/                                 @jpevarnek
 /types/freeport/                                @atd-schubert
 /types/fresh/                                   @BendingBender
+/types/freshy/                                  @qlonik
 /types/friendly-errors-webpack-plugin/          @bahlo
 /types/frisby/v0/                               @johnny4753
 /types/frisby/                                  @cwoodland @johnny4753
@@ -1108,7 +1181,7 @@
 /types/fs-cson/                                 @dex4er
 /types/fs-ext/                                  @OguzhanE
 /types/fs-extra/v4/                             @alan-agius4 @midknight41 @shiftkey @mees-
-/types/fs-extra/                                @alan-agius4 @midknight41 @shiftkey @mees-
+/types/fs-extra/                                @alan-agius4 @midknight41 @shiftkey @mees- @jrockwood
 /types/fs-extra-promise/                        @midknight41 @jasonswearingen @HiromiShikata
 /types/fs-extra-promise-es6/                    @midknight41 @jasonswearingen @geoffreak @HiromiShikata
 /types/fs-finder/                               @misak113
@@ -1278,7 +1351,7 @@
 /types/generic-pool/                            @jerray @wrboyce
 /types/gently/                                  @bonnici
 /types/geodesy/                                 @DenisCarriere @HandyG52 @excelulous
-/types/geojson/                                 @cobster @atd-schubert @JeffJacobson
+/types/geojson/                                 @cobster @atd-schubert @JeffJacobson @icholy
 /types/geojson2osm/                             @DenisCarriere
 /types/geokdbush/                               @DenisCarriere
 /types/geometry-dom/                            @nakakura
@@ -1300,6 +1373,8 @@
 /types/github-username-regex/                   @BehindTheMath
 /types/gitlab/                                  @yanqing6628780 @Arylo
 /types/gl-matrix/                               @mattijskneppers @tatchx @nbabanov @auzmartist @surtr-isaz
+/types/gl-shader/                               @MathiasPaumgarten
+/types/gl-texture2d/                            @MathiasPaumgarten
 /types/gldatepicker/                            @qcz
 /types/glidejs/                                 @milanjaros
 /types/glob/                                    @vvakame @voy
@@ -1323,7 +1398,7 @@
 /types/google-cloud__storage/                   @blove @nbperry
 /types/google-earth/                            @icholy
 /types/google-images/                           @dolanmiu
-/types/google-libphonenumber/                   @leonyu
+/types/google-libphonenumber/                   @leonyu @winfinit
 /types/google-map-react/                        @honzabrecka
 /types/google-maps/                             @DeividasBakanas @GiedriusGrabauskas
 /types/google-protobuf/                         @marcuslongmuir
@@ -1335,13 +1410,16 @@
 /types/google.visualization/                    @danludwig @gmoore-sjcorg @danmana @mlcheng @IvanBisultanov @glebm
 /types/googlemaps/                              @cgwrench @nertzy @xaolas @mrmcnerd @martincostello @svenkreiss
 /types/googlemaps.infobubble/                   @Dashue
-/types/got/                                     @BendingBender @LinusU
+/types/googlepay/                               @Fluccioni
+/types/got/                                     @BendingBender @LinusU @ikokostya
 /types/graceful-fs/v2/                          @Bartvds
 /types/graceful-fs/                             @Bartvds @BendingBender
 /types/graham_scan/                             @hberntsen
 /types/graphite-udp/                            @EricByers
-/types/graphql/                                 @TonyPythoneer @calebmer @intellix @firede @kepennar @freiksenet @IvanGoncharov @DxCx @rportugal @tgriesser @dyst5422 @adnsio @divyenduz
+/types/graphql/                                 @TonyPythoneer @calebmer @intellix @firede @kepennar @freiksenet @IvanGoncharov @DxCx @rportugal @tgriesser @dyst5422 @adnsio @divyenduz @bradzacher
 /types/graphql-date/                            @enaeseth
+/types/graphql-deduplicator/                    @lfades
+/types/graphql-depth-limit/                     @eritikass
 /types/graphql-iso-date/                        @jwaldrip
 /types/graphql-list-fields/                     @filipows
 /types/graphql-relay/                           @arvitaly @nitintutlani @Grelinfo
@@ -1355,11 +1433,12 @@
 /types/grecaptcha/v0/                           @brentj73
 /types/grecaptcha/                              @DethAriel
 /types/gregorian-calendar/                      @cwalv
-/types/grid-styled/                             @antonvasin
+/types/grid-styled/                             @antonvasin @vittorio @lhache
 /types/gridfs-stream/                           @liorm
 /types/gridstack/                               @PascalSenn @ZoolWay @Sl1MBoy
 /types/grunt/                                   @jeffmay @basarat
 /types/gsap/                                    @codebelt @ProbablePrime @philipbulley
+/types/gtin/                                    @RafaelKr
 /types/guid/                                    @maroy1986
 /types/gulp/                                    @GiedriusGrabauskas
 /types/gulp-angular-templatecache/              @amanmahajan7
@@ -1368,6 +1447,7 @@
 /types/gulp-bump/                               @silkentrance
 /types/gulp-cache/                              @aravindarun
 /types/gulp-cached/                             @tomc974
+/types/gulp-change/                             @Aankhen
 /types/gulp-changed/                            @tomc974
 /types/gulp-cheerio/                            @tkQubo
 /types/gulp-clean-dest/                         @andypyrope
@@ -1390,6 +1470,8 @@
 /types/gulp-html-replace/                       @peterjuras
 /types/gulp-htmlmin/                            @tkrotoff
 /types/gulp-if/                                 @joeskeen
+/types/gulp-image/                              @Aankhen
+/types/gulp-image-resize/                       @Aankhen
 /types/gulp-inject/                             @k-kagurazaka
 /types/gulp-insert/                             @shantmarouti
 /types/gulp-install/                            @peterjuras
@@ -1411,6 +1493,7 @@
 /types/gulp-protractor/                         @tkrotoff
 /types/gulp-pug/                                @remisery
 /types/gulp-remember/                           @tomc974
+/types/gulp-responsive-images/                  @aankhen
 /types/gulp-rev/                                @tkrotoff
 /types/gulp-rev-replace/                        @tkrotoff
 /types/gulp-ruby-sass/                          @agnislav
@@ -1419,6 +1502,7 @@
 /types/gulp-sort/                               @joeskeen
 /types/gulp-strip-debug/                        @peterjuras
 /types/gulp-svg-sprite/                         @tkqubo
+/types/gulp-svgmin/                             @Aankhen
 /types/gulp-task-listing/                       @joeskeen
 /types/gulp-tsd/                                @k-kagurazaka
 /types/gulp-uglify/                             @ChristopherHaws @leonard-thieu
@@ -1433,12 +1517,12 @@
 /types/halfred/                                 @dherges
 /types/halogen/                                 @steller
 /types/hammerjs/                                @milkisevil @codler
-/types/handlebars/                              @borisyankov
+/types/handlebars/                              @borisyankov @evil-shrike
 /types/hapi/v8/                                 @jasonswearingen
 /types/hapi/v12/                                @jasonswearingen
 /types/hapi/v15/                                @jasonswearingen
 /types/hapi/v16/                                @jasonswearingen @AJamesPhillips
-/types/hapi/                                    @BorntraegerMarc @rafaelsouzaf @jhsimms
+/types/hapi/                                    @BorntraegerMarc @rafaelsouzaf @jhsimms @SimonSchick
 /types/hapi-auth-basic/                         @AJamesPhillips @saboya
 /types/hapi-auth-jwt2/v7/                       @warrenseymour
 /types/hapi-auth-jwt2/                          @warrenseymour @SimonSchick
@@ -1455,7 +1539,8 @@
 /types/hashmap/                                 @outring
 /types/haversine/                               @screendriver
 /types/hbs/                                     @davidm77
-/types/he/                                      @sedwards2009
+/types/hdkey/                                   @LogvinovLeon
+/types/he/                                      @sedwards2009 @lokidokicoki
 /types/headroom/                                @hakubo
 /types/heap/                                    @ryan10132
 /types/heapdump/                                @weekens
@@ -1465,7 +1550,7 @@
 /types/hellosign-embedded/                      @xt0rted
 /types/helmet/                                  @cyrilschumacher @EvanHahn @bluehatbrit
 /types/heredatalens/                            @denyo
-/types/heremaps/                                @Josh-ES @denyo
+/types/heremaps/                                @Josh-ES @denyo @fx88
 /types/heroku-logger/                           @kylevogt
 /types/hex-rgba/                                @r3nya
 /types/hexo-bunyan/                             @segayuu
@@ -1480,6 +1565,7 @@
 /types/history/v3/                              @sergey-buturlakin @ngbrown @LKay
 /types/history/                                 @sergey-buturlakin @ngbrown @rokoroku
 /types/history.js/                              @borisyankov @gjunge
+/types/historykana/                             @h-shiratsuki
 /types/hjson/                                   @crunchie84
 /types/hls.js/                                  @jgainfort
 /types/hoek/                                    @prashaantt
@@ -1492,11 +1578,12 @@
 /types/html-minifier/v1/                        @tkrotoff
 /types/html-minifier/                           @tkrotoff @rikuayanokozy
 /types/html-pdf/                                @westy92
+/types/html-tag-names/                          @sandersn
 /types/html-to-text/                            @erykwarren
 /types/html-void-elements/                      @rhysd
 /types/html-webpack-plugin/                     @deevus @bumbleblym @tlaziuk
 /types/html-webpack-template/                   @bumbleblym
-/types/html2canvas/                             @rwhepburn @tan9
+/types/html2canvas/                             @rwhepburn @tan9 @sschocke
 /types/htmlbars-inline-precompile/              @chriskrycho
 /types/htmlparser2/                             @staticfunction @LinusU
 /types/htmltojsx/                               @basarat
@@ -1505,14 +1592,14 @@
 /types/http-codes/                              @mhegazy
 /types/http-context/                            @mtraynham
 /types/http-errors/                             @tkrotoff @BendingBender
-/types/http-proxy/                              @SomaticIT @Raigen
+/types/http-proxy/                              @SomaticIT @Raigen @DanielMSchmidt
 /types/http-proxy-agent/                        @mrmlnc
 /types/http-proxy-middleware/                   @zebMcCorkle @BendingBender
 /types/http-server/                             @plantain-00
 /types/http-status/                             @misak113
 /types/http-string-parser/                      @pine613
 /types/httperr/                                 @yortus
-/types/hubot/                                   @dirk
+/types/hubot/                                   @dirk @KeesCBakker
 /types/hubspot-pace/                            @borislavjivkov
 /types/humane/                                  @jmvrbanac
 /types/humanize-plus/                           @DenisCarriere
@@ -1540,7 +1627,11 @@
 /types/icepick/                                 @ngbrown @tobico
 /types/icheck/                                  @qcz
 /types/iconv/                                   @delphinus35
-/types/ids/                                     @3fd
+/types/idyll/                                   @iocat
+/types/idyll-ast/                               @iocat
+/types/idyll-compiler/                          @iocat
+/types/idyll-document/                          @iocat
+/types/iferr/                                   @segayuu
 /types/iframe-resizer/                          @arminbaljic
 /types/ignite-ui/                               @IgniteUI
 /types/ignore-styles/                           @tai2
@@ -1555,6 +1646,7 @@
 /types/imap-simple/                             @pushplay
 /types/imgur-rest-api/                          @lukewestby
 /types/impress/                                 @borisyankov
+/types/in-app-purchase/                         @l-jonas
 /types/in-range/                                @DanielRosenwasser
 /types/incremental-dom/                         @basarat @lanthaler @vvakame
 /types/indent-string/                           @mhegazy
@@ -1572,7 +1664,8 @@
 /types/insight/                                 @vvakame
 /types/integer/                                 @Morfent
 /types/interact.js/                             @dduugg @adidahiya @thasner
-/types/intercom-web/                            @fongandrew @salbahra
+/types/intercom-client/                         @jineshshah36
+/types/intercom-web/                            @fongandrew @salbahra @onatm
 /types/intercomjs/                              @spencerwi
 /types/internal-ip/                             @BendingBender
 /types/intl/                                    @RagibHasin
@@ -1597,6 +1690,7 @@
 /types/is-archive/                              @mhegazy
 /types/is-array/                                @pine
 /types/is-binary-path/                          @DanielRosenwasser
+/types/is-ci/                                   @atd-schubert
 /types/is-color/                                @VitorLuizC
 /types/is-compressed/                           @mhegazy
 /types/is-empty/                                @termosa
@@ -1604,6 +1698,7 @@
 /types/is-glob/                                 @mrmlnc
 /types/is-hotkey/                               @petester42
 /types/is-ip/                                   @coderslagoon
+/types/is-mobile/                               @LogvinovLeon
 /types/is-my-json-valid/                        @kruncher
 /types/is-negated-glob/                         @ajafff
 /types/is-number/                               @harryshipton
@@ -1622,7 +1717,7 @@
 /types/is-url-superb/                           @kryops
 /types/is-windows/                              @mizunashi-mana
 /types/isbn-utils/                              @elhaard
-/types/iscroll/                                 @csrakowski
+/types/iscroll/                                 @csrakowski @devlato
 /types/ismobilejs/                              @Ty3uK
 /types/iso-3166-2/                              @sicilica
 /types/iso8601-localizer/                       @avielfedida
@@ -1667,8 +1762,10 @@
 /types/jdenticon/                               @mtr
 /types/jest/v16/                                @NoHomey @jwbay
 /types/jest/                                    @NoHomey @jwbay @asvetliakov @alexjoverm @epicallan @ikatyang @wsmd @JamieMason @douglasduteil @AhnpGit @joshuakgoldberg @bradleyayers
+/types/jest-axe/                                @JoshuaKGoldberg
 /types/jest-diff/                               @myabc
 /types/jest-docblock/                           @ikatyang
+/types/jest-each/                               @theutz
 /types/jest-environment-puppeteer/              @joshuakgoldberg
 /types/jest-get-type/                           @myabc
 /types/jest-image-snapshot/                     @dawnmist
@@ -1684,11 +1781,12 @@
 /types/jmespath/                                @pushplay
 /types/johnny-five/                             @nakakura @ujvzolee @workshop2
 /types/joi/v6/                                  @Bartvds @laurence-myers @cglantschnig @DavidBR-SW
-/types/joi/v10/                                 @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku
-/types/joi/                                     @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @dankraus @wanganjun @rafaelkallis
+/types/joi/v10/                                 @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @aconanlai
+/types/joi/                                     @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @dankraus @wanganjun @rafaelkallis @aconanlai
 /types/joigoose/                                @boothwhack
 /types/josa/                                    @vichyssoise
 /types/jpeg-js/                                 @DanielRosenwasser
+/types/jpegtran-bin/                            @hikoma
 /types/jpm/                                     @github-account-because-they-want-it
 /types/jqgrid/                                  @lokeshpeta
 /types/jqrangeslider/                           @qcz
@@ -1706,6 +1804,8 @@
 /types/jquery-drawer/                           @pine
 /types/jquery-easy-loading/                     @delphinus35
 /types/jquery-editable-select/                  @baywet
+/types/jquery-focus-exit/                       @AndersonFriaca
+/types/jquery-focusable/                        @AndersonFriaca
 /types/jquery-fullscreen/                       @bgrieder
 /types/jquery-galleria/                         @rimig
 /types/jquery-handsontable/                     @intelorca
@@ -1713,13 +1813,16 @@
 /types/jquery-jsonrpcclient/                    @Ty3uK
 /types/jquery-knob/                             @iain8
 /types/jquery-lazyload/                         @AndersonFriaca
+/types/jquery-loading-overlay/                  @AndersonFriaca
 /types/jquery-mask-plugin/                      @avidenic @AndersonFriaca
 /types/jquery-maskmoney/                        @AndersonFriaca
 /types/jquery-match-height/                     @kbytesys
 /types/jquery-mockjax/                          @laszlojakab @vladeck
 /types/jquery-mousewheel/                       @xt0rted
+/types/jquery-next-id/                          @AndersonFriaca
 /types/jquery-notifier/                         @allipierre
 /types/jquery-param/                            @patsissons
+/types/jquery-slugify/                          @AndersonFriaca
 /types/jquery-sortable/                         @Seltzer
 /types/jquery-steps/                            @jblank @nickwph
 /types/jquery-sticky/                           @maixiu
@@ -1810,6 +1913,7 @@
 /types/js-git/                                  @Bartvds
 /types/js-md5/                                  @mwmccarthy
 /types/js-money/                                @kanatkubash
+/types/js-nacl/                                 @ethanfrey
 /types/js-quantities/                           @wrummler
 /types/js-schema/                               @marcinporebski @roblabat
 /types/js-search/                               @guoyunhe
@@ -1828,7 +1932,7 @@
 /types/jsend/                                   @CaselIT
 /types/jsesc/                                   @Bartvds
 /types/jsfl/                                    @soywiz
-/types/jsforce/                                 @dolanmiu @netes
+/types/jsforce/                                 @dolanmiu @netes @amphro @tnoonan-salesforce
 /types/jshamcrest/                              @dharkness
 /types/jsmockito/                               @shiver-me-timbers
 /types/jsnox/                                   @stkb @DovydasNavickas
@@ -1845,11 +1949,13 @@
 /types/json-stringify-safe/                     @BendingBender
 /types/json2csv/                                @juanjoDiaz
 /types/json2md/                                 @MartynasZilinskas
+/types/json3/                                   @NN---
 /types/jsonata/                                 @nick121212
 /types/jsoneditor/                              @alejo90
 /types/jsoneditor-for-react/                    @joshuakgoldberg
 /types/jsoneditoronline/                        @vbortone
 /types/jsonfile/                                @dbowring
+/types/jsonic/                                  @jacobbubu
 /types/jsonminify/                              @no23reason
 /types/jsonnet/                                 @hookclaw
 /types/jsonp/                                   @surenkov
@@ -1857,8 +1963,8 @@
 /types/jsonrpc-serializer/                      @Akim95 @many20
 /types/jsonstream/                              @Bartvds
 /types/jsontoxml/                               @benstevens48
-/types/jsonwebtoken/                            @SomaticIT @danielheim @brikou
-/types/jsonwebtoken-promisified                 @aneilbaboo
+/types/jsonwebtoken/                            @SomaticIT @danielheim @brikou @vpk
+/types/jsonwebtoken-promisified/                @SomaticIT @danielheim @brikou @aneilbaboo
 /types/jspdf/                                   @amberjs
 /types/jsqrcode/                                @lordazzi
 /types/jsrender/                                @zakki
@@ -1883,8 +1989,9 @@
 /types/jui/                                     @easylogic
 /types/jui-core/                                @easylogic
 /types/jui-grid/                                @easylogic
+/types/just-extend/                             @pe8ter
 /types/jweixin/                                 @taoqf @gomydodo
-/types/jwplayer/                                @martinduparc @kutomer @philippguertler @danielmcgraw
+/types/jwplayer/                                @martinduparc @kutomer @philippguertler @danielmcgraw @bpdsw
 /types/jws/                                     @JustinBeckwith
 /types/jwt-client/                              @timoteoponce
 /types/jwt-decode/v1/                           @QuatroDevOfficial
@@ -1965,6 +2072,7 @@
 /types/koa-pug/                                 @Xstoudi
 /types/koa-range/                               @strax
 /types/koa-redis/                               @nsimmons
+/types/koa-response-time/                       @thorsedeke
 /types/koa-route/                               @migstopheles
 /types/koa-router/                              @hellopao @schfkt
 /types/koa-send/                                @pe8ter @tlaziuk
@@ -1975,6 +2083,7 @@
 /types/koa-views/                               @brooklyndev
 /types/koa-webpack/                             @malj
 /types/koa-websocket/                           @me
+/types/koa-xml-body/                            @uwinkelvos
 /types/koa2-cors/                               @xialeistudio
 /types/koa__cors/                               @Xstoudi @izayoiko @stevehipwell
 /types/kolite/                                  @borisyankov
@@ -1982,7 +2091,7 @@
 /types/kraken-js/                               @darkwebdev
 /types/kramed/                                  @tonicblue
 /types/kss/                                     @giladgray
-/types/kue/                                     @drudge @amiram @pc-jedi
+/types/kue/                                     @drudge @amiram @pc-jedi @deerawan
 /types/kurento-utils/                           @nenadalm @riggs
 /types/kuromoji/                                @mzsm @kgtkr
 /types/lab/                                     @prashaantt
@@ -1992,25 +2101,27 @@
 /types/latinize/                                @GiedriusGrabauskas
 /types/latlon-geohash/                          @rimig
 /types/launchpad/                               @rictic
+/types/lazy-value/                              @ikatyang
 /types/lazy.js/                                 @Bartvds
 /types/lazypipe/                                @tomc974
 /types/ldapjs/                                  @cvillemure @peterkooijmans
 /types/leadfoot/                                @theintern
 /types/leaflet/v0/                              @rgripper
-/types/leaflet/                                 @alejo90 @atd-schubert
+/types/leaflet/                                 @alejo90 @atd-schubert @mcauer
 /types/leaflet-areaselect/                      @awallat
 /types/leaflet-curve/                           @onikiienko
-/types/leaflet-draw/                            @matt-guest @reblace @YunS-Stacy
+/types/leaflet-draw/                            @matt-guest @reblace @YunS-Stacy @beschoenen
 /types/leaflet-editable/                        @dalie
 /types/leaflet-fullscreen/                      @DenisCarriere
 /types/leaflet-geocoder-mapzen/                 @leezu
-/types/leaflet-gpx/                             @soucekv
+/types/leaflet-gpx/                             @soucekv @molnarm
 /types/leaflet-imageoverlay-rotated/            @tkleinke
 /types/leaflet-label/                           @Nemo157
 /types/leaflet-mouse-position/                  @Hanyon
 /types/leaflet-polylinedecorator/               @soucekv
 /types/leaflet-providers/                       @BendingBender
 /types/leaflet-rotatedmarker/                   @robert-prib-polestar
+/types/leaflet-routing-machine/                 @chanakadrathnayaka
 /types/leaflet.awesome-markers/v0/              @Odrin @sebek64
 /types/leaflet.awesome-markers/                 @sebek64
 /types/leaflet.fullscreen/                      @wcomartin
@@ -2024,6 +2135,7 @@
 /types/leaflet.polylinemeasure/                 @RiON69
 /types/leapmotionts/                            @logotype
 /types/legal-eagle/                             @j-f1
+/types/lerna-get-packages/                      @LogvinovLeon
 /types/less/                                    @thasner @pranaygp
 /types/less-middleware/                         @federicobond
 /types/less2sass/                               @gatimus
@@ -2047,6 +2159,7 @@
 /types/load-json-file/                          @SamVerschueren
 /types/loader-runner/                           @e-cloud
 /types/loader-utils/                            @Perlmint @TotooriaHyperion
+/types/loadjs/                                  @screendriver
 /types/loadware/                                @ALyman
 /types/lobibox/                                 @itboy87
 /types/local-dynamo/                            @Sicilica
@@ -2356,7 +2469,7 @@
 /types/lokijs/                                  @TeamworkGuy2 @thomasconner
 /types/lolex/                                   @Nemo157 @joshuakgoldberg @rogierschouten
 /types/long/                                    @peterkooijmans
-/types/loopback/                                @kattsushi @enko @sequoia @drmikecrowe
+/types/loopback/                                @kattsushi @enko @sequoia @drmikecrowe @karimsa
 /types/loopback-boot/                           @kattsushi
 /types/lorem-ipsum/                             @durad
 /types/lory.js/                                 @kubosho @milkisevil
@@ -2390,6 +2503,8 @@
 /types/map-obj/                                 @BendingBender
 /types/mapbox/                                  @anahkiasen
 /types/mapbox-gl/                               @dobrud @patrickr
+/types/mapbox-gl-leaflet/                       @agorshkov23
+/types/mapbox__geojson-area/                    @n0nick
 /types/mapbox__shelf-pack/                      @Perlmint
 /types/mapnik/                                  @ipv4sec
 /types/mapsjs/                                  @davismj
@@ -2408,35 +2523,41 @@
 /types/massive/v3/                              @swissspidy @clarenceh
 /types/massive/                                 @swissspidy @clarenceh @AmazingTurtle
 /types/match-media-mock/                        @asvetliakov
-/types/material-components-web/                 @BrentDouglas
+/types/material-components-web/                 @BrentDouglas @ckosti
 /types/material-design-lite/                    @bradzacher
-/types/material-ui/                             @ngbrown @theigor @alitaheri @herrmanno @DaIgeb @allienna @schlesingermatthias @InsidersByte @artyomsv @dan-j @minodisk
+/types/material-ui/                             @ngbrown @theigor @alitaheri @herrmanno @DaIgeb @allienna @schlesingermatthias @InsidersByte @artyomsv @dan-j @minodisk @samwalshnz
 /types/material-ui-datatables/                  @coding2012
-/types/material__animation/                     @BrentDouglas
-/types/material__auto-init/                     @BrentDouglas
-/types/material__base/                          @BrentDouglas
-/types/material__checkbox/                      @BrentDouglas
-/types/material__dialog/                        @BrentDouglas
-/types/material__drawer/                        @BrentDouglas
-/types/material__form-field/                    @BrentDouglas
-/types/material__grid-list/                     @BrentDouglas
-/types/material__icon-toggle/                   @BrentDouglas
-/types/material__linear-progress/               @BrentDouglas
-/types/material__menu/                          @BrentDouglas
-/types/material__radio/                         @BrentDouglas
-/types/material__ripple/                        @BrentDouglas
-/types/material__select/                        @BrentDouglas
-/types/material__selection-control/             @BrentDouglas
-/types/material__slider/                        @BrentDouglas
-/types/material__snackbar/                      @BrentDouglas
-/types/material__tabs/                          @BrentDouglas
-/types/material__textfield/                     @BrentDouglas
-/types/material__toolbar/                       @BrentDouglas
+/types/material__animation/                     @BrentDouglas @ckosti
+/types/material__auto-init/                     @BrentDouglas @ckosti
+/types/material__base/                          @BrentDouglas @ckosti
+/types/material__checkbox/                      @BrentDouglas @ckosti
+/types/material__chips/                         @BrentDouglas @ckosti
+/types/material__dialog/                        @BrentDouglas @ckosti
+/types/material__drawer/                        @BrentDouglas @ckosti
+/types/material__floating-label/                @BrentDouglas @ckosti
+/types/material__form-field/                    @BrentDouglas @ckosti
+/types/material__grid-list/                     @BrentDouglas @ckosti
+/types/material__icon-toggle/                   @BrentDouglas @ckosti
+/types/material__line-ripple/                   @BrentDouglas @ckosti
+/types/material__linear-progress/               @BrentDouglas @ckosti
+/types/material__menu/                          @BrentDouglas @ckosti
+/types/material__notched-outline/               @BrentDouglas @ckosti
+/types/material__radio/                         @BrentDouglas @ckosti
+/types/material__ripple/                        @BrentDouglas @ckosti
+/types/material__select/                        @BrentDouglas @ckosti
+/types/material__selection-control/             @BrentDouglas @ckosti
+/types/material__slider/                        @BrentDouglas @ckosti
+/types/material__snackbar/                      @BrentDouglas @ckosti
+/types/material__tab/                           @BrentDouglas @ckosti
+/types/material__tabs/                          @BrentDouglas @ckosti
+/types/material__textfield/                     @BrentDouglas @ckosti
+/types/material__toolbar/                       @BrentDouglas @ckosti
+/types/material__top-app-bar/                   @BrentDouglas @ckosti
 /types/materialize-css/v0/                      @eriklieben @leonyu @SinghSukhdeep @jfcere @scote @LiadIdan
-/types/materialize-css/                         @huww98
+/types/materialize-css/                         @huww98 @MaximBalaganskiy @MonizDave @broccoliarchy
 /types/math3d/                                  @laszlojakab @jimsmart
 /types/mathjax/                                 @rolandzwaga
-/types/mathjs/                                  @siavol
+/types/mathjs/                                  @siavol @andnp
 /types/matter-js/                               @piranha771 @hasparus
 /types/maxmind/                                 @geoffreak
 /types/mcustomscrollbar/                        @flurg
@@ -2444,10 +2565,12 @@
 /types/mdns/                                    @reppners
 /types/mdurl/                                   @rokt33r
 /types/media-typer/                             @BendingBender
-/types/medium-editor/                           @keika299
+/types/medium-editor/                           @keika299 @pascaliske
 /types/mem/                                     @SamVerschueren
 /types/mem-fs/                                  @MyFoodBag
+/types/mem-fs-editor/                           @MyFoodBag
 /types/memcached/                               @KentarouTakeda
+/types/memoize-one/                             @karol-majewski
 /types/memoizee/                                @juanpicado
 /types/memory-cache/                            @jedigo @thieman
 /types/memory-fs/                               @e-cloud
@@ -2461,7 +2584,7 @@
 /types/meshblu/                                 @fnipo
 /types/mess/                                    @Nemo157
 /types/messenger/                               @derekcicerone
-/types/meteor/                                  @barbatus @fullflavedave @orefalo @dagatsoin @birkskyum @ardatan @stefanholzapfel
+/types/meteor/                                  @barbatus @fullflavedave @orefalo @dagatsoin @birkskyum @ardatan @stefanholzapfel @andrei-markeev
 /types/meteor-accounts-phone/                   @DAB0mB
 /types/meteor-collection-hooks/                 @twastvedt
 /types/meteor-jboulhous-dev/                    @vangorra
@@ -2469,6 +2592,7 @@
 /types/meteor-prime8consulting-oauth2/          @vangorra
 /types/meteor-publish-composite/                @vangorra
 /types/meteor-roles/                            @vangorra @mattmm3d
+/types/meteor-univserse-i18n/                   @mathewmeconry
 /types/method-override/                         @santialbo
 /types/methods/                                 @cprecioso
 /types/metric-suffix/                           @davidm77
@@ -2500,9 +2624,12 @@
 /types/mitm/                                    @alejo90
 /types/mixpanel/                                @hjellek @Manduro
 /types/mixto/                                   @vvakame
+/types/mjml/                                    @aahoughton
 /types/mkdirp/                                  @Bartvds @mrmlnc
+/types/mkdirp-promise/                          @pluma
 /types/mkpath/                                  @optical
 /types/mobx-apollo/                             @pselden
+/types/mobx-devtools-mst/                       @pluma
 /types/mocha/                                   @kazimanzurrashid @otiai10 @jt000 @enlight @cspotcode
 /types/mocha-each/                              @magnostherobot
 /types/mocha-phantomjs/                         @ErikSchierboom
@@ -2517,6 +2644,7 @@
 /types/mockery/                                 @jt000
 /types/modernizr/                               @borisyankov @theodorejb @leonyu @lucax88x @nhardy
 /types/modesl/                                  @neeschit
+/types/module-alias/                            @KevinRamharak
 /types/moji/                                    @yasupeke
 /types/moment-business/                         @wonbyte
 /types/moment-business-time/                    @swist
@@ -2529,7 +2657,7 @@
 /types/moment-timezone/                         @michelsalib @alanblins
 /types/mongo-sanitize/                          @CedricCazin
 /types/mongodb/v2/                              @CaselIT @alanmarcell @kikar @bitjson @dante-101 @mcortesi
-/types/mongodb/                                 @CaselIT @alanmarcell @kikar @bitjson @dante-101 @mcortesi @EnricoPicci @AJCStriker @julien-c
+/types/mongodb/                                 @CaselIT @alanmarcell @kikar @bitjson @dante-101 @mcortesi @EnricoPicci @AJCStriker @julien-c @daprahamian
 /types/mongoose/v4/                             @simonxca @horiuchi @sindrenm @lukasz-zak
 /types/mongoose/                                @horiuchi @sindrenm @lukasz-zak @Alorel @jendrikw @ethanresnick @vologab
 /types/mongoose-auto-increment/                 @AyaMorisawa
@@ -2546,12 +2674,14 @@
 /types/moo/                                     @deltaidea @MofX
 /types/moonjs/                                  @DanielRosenwasser
 /types/morgan/                                  @staticfunction @pscanf
+/types/morphdom/                                @arvitaly
 /types/morris.js/                               @mareek @sindilevich
 /types/mousetrap/                               @qcz
 /types/move-concurrently/                       @mgroenhoff
 /types/moviedb/                                 @basarat @0x6368656174
 /types/moxios/                                  @itoasuka
 /types/mozilla-readability/                     @charlesvdv
+/types/mozjpeg/                                 @hikoma
 /types/mpromise/                                @sgkim126
 /types/mri/                                     @shiftkey @j-f1
 /types/ms/                                      @danny8002
@@ -2565,13 +2695,15 @@
 /types/multer/                                  @jt000 @DavidBR-SW @mxl @hyunseob
 /types/multer-gridfs-storage/v1/                @devconcept
 /types/multer-gridfs-storage/                   @devconcept
-/types/multer-s3/                               @tcaesvk @galtalmor
+/types/multer-s3/                               @tcaesvk @galtalmor @terski
 /types/multi-typeof/                            @mhegazy
 /types/multimatch/                              @stephenlautier
 /types/multiparty/                              @kenfdev
 /types/multiplexjs/                             @KamyarNazeri
 /types/multisort/                               @CzBuCHi
 /types/multistream/                             @mrmlnc @kenzierocks
+/types/muri/                                    @jloveridge
+/types/murmurhash/                              @atd-schubert
 /types/murmurhash-js/                           @cvle
 /types/murmurhash3js/                           @dlee-nvisia
 /types/musicmetadata/                           @Xstoudi
@@ -2590,7 +2722,7 @@
 /types/nats-hemera/                             @vforv
 /types/natsort/                                 @mgroenhoff
 /types/natural/                                 @dmoonfire
-/types/natural-sort/                            @a-morales
+/types/natural-sort/                            @a-morales @fluggo
 /types/navermaps/                               @ckboyjiy
 /types/navigation/                              @grahammendick
 /types/navigation-react/                        @grahammendick
@@ -2610,6 +2742,7 @@
 /types/nes/                                     @NoHomey @saboya
 /types/net-keepalive/                           @hertzg
 /types/netmask/                                 @mhfrantz
+/types/network-interfaces/                      @anderswestberg
 /types/new-relic-browser/                       @renehamburger @piotrkubisa
 /types/newline-remove/                          @OpenByteDev
 /types/newrelic/                                @mastermatt
@@ -2626,6 +2759,7 @@
 /types/ng-i18next/                              @cyrilschumacher
 /types/ng-notify/                               @nzamosenchuk
 /types/ng-stomp/                                @lpotapczuk
+/types/ng-tags-input/                           @GiorgosPap
 /types/ngbootbox/                               @stpettersens
 /types/ngeohash/                                @erkie
 /types/ngkookies/                               @martinmcwhorter
@@ -2633,6 +2767,7 @@
 /types/ngprogress/                              @martinmcwhorter
 /types/ngprogress-lite/                         @LukeForder
 /types/ngreact/                                 @velveret
+/types/ngsijs/                                  @guillermofr
 /types/ngstorage/                               @kubiq
 /types/ngtoaster/                               @btesser
 /types/ngwysiwyg/                               @patrick-mackay
@@ -2643,21 +2778,21 @@
 /types/nock/                                    @bonnici @horiuchi @afharo @mastermatt @damour
 /types/nodal/                                   @charrondev
 /types/node/v4/                                 @eps1lon
-/types/node/v6/                                 @WilcoBakker @inlined @eps1lon @Alorel
-/types/node/v7/                                 @parambirs @tellnes @WilcoBakker @eps1lon
-/types/node/v8/                                 @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @hoo29 @n-e
-/types/node/                                    @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @ajafff @hoo29 @n-e
+/types/node/v6/                                 @WilcoBakker @inlined @eps1lon @Alorel @KSXGitHub
+/types/node/v7/                                 @parambirs @tellnes @WilcoBakker @eps1lon @KSXGitHub
+/types/node/v8/                                 @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @OliverJAsh @eps1lon @Hannes-Magnusson-CK @jkomyno @hoo29 @n-e @brunoscheufler @KSXGitHub @islishude
+/types/node/v9/                                 @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @OliverJAsh @eps1lon @Hannes-Magnusson-CK @jkomyno @ajafff @hoo29 @n-e @brunoscheufler @mohsen1 @KSXGitHub @a-tarasyuk @islishude
+/types/node/                                    @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
 /types/node-7z/                                 @erkie
 /types/node-array-ext/                          @Beng89
 /types/node-cache/                              @chrootsu @dthunell @useltmann
 /types/node-calendar/                           @luzianz
 /types/node-cleanup/                            @agadar
-/types/node-common-errors/                      @icopp
 /types/node-cron/                               @maximelkin
 /types/node-dir/                                @panuhorsmalahti
 /types/node-dogstatsd/                          @chrisbobo
 /types/node-emoji/                              @jonestristand @styu
-/types/node-fetch/                              @torstenwerner
+/types/node-fetch/                              @torstenwerner @nikcorg
 /types/node-fibers/                             @caryhaynie
 /types/node-forge/                              @westy92 @flynetworks @a-k-g @rafal2228
 /types/node-gcm/                                @horiuchi
@@ -2676,7 +2811,7 @@
 /types/node-powershell/                         @rodrigoff
 /types/node-pushnotifications/                  @menushka
 /types/node-ral/                                @ssddi456
-/types/node-red/                                @andersea
+/types/node-red/                                @andersea @tbowmo
 /types/node-rsa/                                @alitaheri @xm
 /types/node-schedule/                           @cyrilschumacher @flowpl
 /types/node-slack/                              @tkQubo
@@ -2684,7 +2819,7 @@
 /types/node-sprite-generator/                   @Perlmint
 /types/node-static/                             @Morfent
 /types/node-statsd/                             @alexturek @convoyinc
-/types/node-telegram-bot-api/                   @ammuench @agadar @Dabolus
+/types/node-telegram-bot-api/                   @ammuench @agadar @Dabolus @Kallu609
 /types/node-uuid/                               @jeffmay
 /types/node-validator/                          @kengorab
 /types/node-vault/                              @YuJianrong
@@ -2712,7 +2847,7 @@
 /types/normalize-url/                           @odin3 @BendingBender
 /types/notie/                                   @mateusdemboski
 /types/notify/                                  @hellochar
-/types/notifyjs/                                @soundTricker
+/types/notifyjs/                                @soundTricker @NateScarlet
 /types/notifyjs-browser/                        @bahman616
 /types/notyf/                                   @gurov
 /types/nouislider/v7/                           @acoreyj
@@ -2722,6 +2857,7 @@
 /types/npm/                                     @SomaticIT
 /types/npm-package-arg/                         @mgroenhoff
 /types/npm-packlist/                            @ajafff
+/types/npmlog/                                  @DanielMSchmidt
 /types/ns-api/                                  @Archcry
 /types/nslog/                                   @unindented
 /types/nsqjs/                                   @cezaryrk
@@ -2735,6 +2871,7 @@
 /types/nw.gui/                                  @xperiments
 /types/nw.js/                                   @alirdn
 /types/o.js/                                    @IceOnFire @bradzacher @janhommes @jcchalte
+/types/oauth/                                   @nonAlgebraic
 /types/oauth.js/                                @nobuoka
 /types/oauth2-server/                           @vangorra @cirick
 /types/oauth2orize/                             @wokim @heycalmdown @stevehipwell
@@ -2757,6 +2894,7 @@
 /types/offline-js/                              @cgwrench
 /types/oibackoff/                               @geoffreak
 /types/oidc-token-manager/                      @rosieks
+/types/okta__okta-vue/                          @innovation-team
 /types/ol/                                      @yairtawil
 /types/on-finished/                             @czechboy0 @BendingBender
 /types/on-headers/                              @jjeffery @BendingBender
@@ -2772,7 +2910,7 @@
 /types/openjscad/                               @danmarshall
 /types/openlayers/v2/                           @bolhovsky
 /types/openlayers/v3/                           @osechet @matthiasdailey-ccri
-/types/openlayers/                              @osechet @wb14123 @ailrun @mylen @iamthechad @danmana @yairtawil @pierremarc
+/types/openlayers/                              @osechet @wb14123 @ailrun @mylen @iamthechad @danmana @yairtawil @pierremarc @hauke96
 /types/openstack-wrapper/                       @sanjaymadane
 /types/opentok/                                 @westy92 @CatGuardian
 /types/opentype.js/                             @danmarshall @edzis
@@ -2814,6 +2952,7 @@
 /types/p-log/                                   @BendingBender
 /types/p-map/                                   @BendingBender
 /types/p-map-series/                            @BendingBender
+/types/p-memoize/                               @forabi
 /types/p-one/                                   @BendingBender
 /types/p-props/                                 @BendingBender
 /types/p-queue/                                 @BendingBender @evanshortiss
@@ -2845,7 +2984,7 @@
 /types/parity-pmr/                              @leovujanic
 /types/parity-poe/                              @leovujanic
 /types/parse/                                   @dpoetzsch @jaeggerr @flavionegrao @wesleygrimes @owsas
-/types/parse-git-config/                        @leonard-thieu
+/types/parse-git-config/                        @leonard-thieu @deltaidea
 /types/parse-glob/                              @glen-84
 /types/parse-json/                              @mrmlnc
 /types/parse-link-header/                       @zelein
@@ -2873,8 +3012,9 @@
 /types/passport-local/                          @SomaticIT
 /types/passport-local-mongoose/                 @linusbrolin
 /types/passport-naver/                          @Park9eon
-/types/passport-oauth2/                         @pasieronen
+/types/passport-oauth2/                         @pasieronen @WangZishi
 /types/passport-oauth2-client-password/         @akaNightmare
+/types/passport-remember-me-extended/           @AylaJK
 /types/passport-saml/                           @cjbarth
 /types/passport-steam/                          @kzay
 /types/passport-strategy/                       @liorm
@@ -2896,6 +3036,7 @@
 /types/pbf/                                     @cschwarz
 /types/pdfjs-dist/                              @jbaldwin
 /types/pdfkit/                                  @erichillah
+/types/pdfmake/                                 @m1llen1um @radziksh
 /types/pdfobject/                               @nielsboogaard
 /types/pebblekitjs/                             @makotokw
 /types/peer-dial/                               @RealTYPICAL
@@ -2908,6 +3049,7 @@
 /types/pg/                                      @pspeter3
 /types/pg-ears/                                 @bradleyayers
 /types/pg-escape/                               @khell
+/types/pg-format/                               @zopf
 /types/pg-pool/                                 @aleung
 /types/pg-query-stream/                         @asmarques
 /types/pg-types/                                @waratuman
@@ -2930,13 +3072,13 @@
 /types/pickadate/                               @theodorejb @leonard-thieu
 /types/picturefill/                             @alaz
 /types/pidusage/                                @cyrilschumacher
-/types/pify/                                    @samverschueren @mad-mike
+/types/pify/                                    @samverschueren @mad-mike @c7hm4r
 /types/pigpio/                                  @manerfan
 /types/pikaday/                                 @MidnightDesign @wake42
 /types/pikaday-time/                            @Sayan751
 /types/pinkyswear/                              @chances
 /types/pino/v3/                                 @psnider
-/types/pino/                                    @psnider @BendingBender
+/types/pino/                                    @psnider @BendingBender @screendriver
 /types/pino-multi-stream/                       @JakeGinnivan
 /types/pinterest-sdk/                           @adamburmister
 /types/pinyin/                                  @wanganjun
@@ -2949,13 +3091,14 @@
 /types/playerframework/                         @ricardosabino
 /types/playmusic/                               @nickp10
 /types/pleasejs/                                @nakakura
-/types/plotly.js/                               @chrisgervang @martinduparc @frederikaalund @taoqf @Dadstart @szechyjs
+/types/plotly.js/                               @chrisgervang @martinduparc @frederikaalund @taoqf @Dadstart @szechyjs @MercifulCode @soorajpudiyadath
 /types/plugapi/                                 @BNedry
 /types/plugin-error/                            @rogierschouten
 /types/plupload/                                @patrickbussmann
 /types/pluralize/                               @ukyo
 /types/png-async/                               @kanreisa
 /types/pngjs/                                   @jason0x43
+/types/pngquant-bin/                            @hikoma
 /types/podcast/                                 @nikeee
 /types/podium/                                  @AJamesPhillips
 /types/point-in-polygon/                        @dyst5422 @kogai
@@ -2979,15 +3122,16 @@
 /types/pouchdb-adapter-node-websql/             @spaulg @geppy @fredgalvao
 /types/pouchdb-adapter-websql/                  @spaulg @geppy @fredgalvao
 /types/pouchdb-browser/                         @spaulg @geppy @fredgalvao
-/types/pouchdb-core/                            @spaulg @trubit @geppy @fredgalvao @TobiasBales
+/types/pouchdb-core/                            @spaulg @trubit @geppy @fredgalvao @TobiasBales @tiangolo
 /types/pouchdb-find/                            @trubit
 /types/pouchdb-http/                            @spaulg @geppy @fredgalvao
 /types/pouchdb-mapreduce/                       @spaulg @geppy @fredgalvao
 /types/pouchdb-node/                            @spaulg @geppy @fredgalvao
-/types/pouchdb-replication/                     @trubit
+/types/pouchdb-replication/                     @trubit @tiangolo
 /types/pouchdb-upsert/                          @keithdmoore @hotforfeature @apolkingg8
 /types/power-assert/                            @vvakame
 /types/power-assert-formatter/                  @vvakame
+/types/powerbi-visuals-tools/                   @zBritva @Microsoft
 /types/precise/                                 @codeanimal
 /types/precond/                                 @olsio
 /types/preloadjs/                               @endel
@@ -3015,6 +3159,7 @@
 /types/promise-pool/                            @vilic
 /types/promise-queue/                           @LachlanStuart
 /types/promise-retry/                           @shirakaba
+/types/promise-timeout/                         @Aankhen
 /types/promise.prototype.finally/               @slavik57 @BendingBender
 /types/promised-temp/                           @rokadias
 /types/promisify-node/                          @borekb
@@ -3023,28 +3168,34 @@
 /types/prompt-sync-history/                     @MugeSo
 /types/promptly/                                @danrspencer
 /types/prop-types/                              @DovydasNavickas
+/types/proper-lockfile/                         @qlonik
 /types/properties-reader/                       @Goldsmith42
-/types/prosemirror-collab/                      @bradleyayers @davidka @timjb
-/types/prosemirror-commands/                    @bradleyayers @davidka @timjb
-/types/prosemirror-gapcursor/                   @bradleyayers @davidka @timjb
-/types/prosemirror-history/                     @bradleyayers @davidka @timjb
-/types/prosemirror-inputrules/                  @bradleyayers @davidka @timjb
-/types/prosemirror-keymap/                      @bradleyayers @davidka @timjb
-/types/prosemirror-markdown/                    @bradleyayers @davidka @timjb
-/types/prosemirror-menu/                        @bradleyayers @davidka @timjb
-/types/prosemirror-model/                       @bradleyayers @davidka @timjb @neknalb
-/types/prosemirror-schema-basic/                @bradleyayers @davidka @timjb
-/types/prosemirror-schema-list/                 @bradleyayers @davidka @timjb
-/types/prosemirror-state/                       @bradleyayers @davidka @timjb
-/types/prosemirror-tables/                      @superchu @eshvedai
-/types/prosemirror-transform/                   @bradleyayers @davidka @timjb
-/types/prosemirror-view/                        @bradleyayers @davidka @timjb
+/types/prosemirror-collab/                      @bradleyayers @davidka @timjb @patsimm
+/types/prosemirror-commands/                    @bradleyayers @davidka @timjb @patsimm
+/types/prosemirror-gapcursor/                   @bradleyayers @davidka @timjb @patsimm
+/types/prosemirror-history/                     @bradleyayers @davidka @timjb @patsimm
+/types/prosemirror-inputrules/                  @bradleyayers @davidka @timjb @patsimm
+/types/prosemirror-keymap/                      @bradleyayers @davidka @timjb @patsimm
+/types/prosemirror-markdown/                    @bradleyayers @davidka @timjb @patsimm
+/types/prosemirror-menu/                        @bradleyayers @davidka @timjb @patsimm
+/types/prosemirror-model/                       @bradleyayers @davidka @timjb @neknalb @patsimm
+/types/prosemirror-schema-basic/                @bradleyayers @davidka @timjb @patsimm
+/types/prosemirror-schema-list/                 @bradleyayers @davidka @timjb @patsimm
+/types/prosemirror-state/                       @bradleyayers @davidka @timjb @patsimm
+/types/prosemirror-tables/                      @superchu @eshvedai @patsimm
+/types/prosemirror-transform/                   @bradleyayers @davidka @timjb @patsimm
+/types/prosemirror-view/                        @bradleyayers @davidka @timjb @patsimm
+/types/proton-native/                           @khanhas
 /types/protractor-browser-logs/                 @rokadias
 /types/protractor-helpers/                      @johncant
 /types/protractor-http-mock/                    @Crevil
 /types/provinces/                               @gatimus
 /types/proxy-addr/                              @BendingBender
+/types/proxy-lists/                             @BehindTheMath
+/types/proxy-verifier/                          @BehindTheMath
 /types/proxyquire/                              @jt000
+/types/ps-tree/                                 @alessiopcc
+/types/ptomasroos__react-native-multi-slider/   @Slessi
 /types/pty.js/                                  @enlight
 /types/public-ip/                               @BendingBender
 /types/pubnub/                                  @bitbankinc @rollymaduk @vitosamson
@@ -3052,6 +3203,7 @@
 /types/pug/                                     @TonyPythoneer @19majkel94
 /types/pulltorefreshjs/                         @DanielRosenwasser @humpedli
 /types/pump/                                    @tlaziuk
+/types/pumpify/                                 @JustinBeckwith @aoberoi
 /types/pupa/                                    @nju33
 /types/puppeteer/v0/                            @marvinhagemeister @cdeutsch
 /types/puppeteer/                               @marvinhagemeister @cdeutsch @jwbay
@@ -3078,13 +3230,14 @@
 /types/quixote/                                 @greybax
 /types/qunit/v1/                                @diullei
 /types/qunit/                                   @waratuman
+/types/qunit-dom/                               @happycollision
 /types/quoted-printable/                        @pushplay
 /types/qwest/                                   @lindsayevans
 /types/r-script/                                @NaridaL
 /types/rabbit.js/                               @wokim
 /types/radium/                                  @alexgorbatchev @nupplaphil @asvetliakov @mihe
 /types/radius/                                  @codeanimal
-/types/ramda/                                   @donnut @mdekrey @mrdziuban @sbking @afharo @teves-castro @1M0reBug @hojberg @charlespwd @samsonkeung @angeloocana @raynerd @googol @moshensky @ethanresnick @leighman
+/types/ramda/                                   @donnut @tycho01 @mdekrey @mrdziuban @sbking @afharo @teves-castro @1M0reBug @hojberg @charlespwd @samsonkeung @angeloocana @raynerd @googol @moshensky @ethanresnick @leighman @CaptJakk @deftomat @deptno @blimusiek @biern
 /types/random-js/                               @pistacchio
 /types/random-number/                           @OpenByteDev
 /types/random-seed/                             @endel
@@ -3113,16 +3266,18 @@
 /types/rc/                                      @DanielRosenwasser
 /types/rc-select/                               @DenisTirilis
 /types/rc-slider/                               @mantasmarcinkus @mattoni @paustint @j-fro
-/types/rc-tree/                                 @johnnyreilly
+/types/rc-tree/                                 @johnnyreilly @Methuselah96
 /types/rcloader/                                @panuhorsmalahti
 /types/rdf-data-model/                          @rubensworks
 /types/rdf-js/                                  @rubensworks
 /types/react/v15/                               @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz
-/types/react/                                   @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz @theruther4d @guilhermehubner @joshuakgoldberg @jrakotoharisoa
+/types/react/                                   @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz @theruther4d @guilhermehubner @ferdaber @jrakotoharisoa
 /types/react-alert/                             @ssyrell
 /types/react-alice-carousel/                    @endigo
+/types/react-animate-on-scroll/                 @ralbuque
 /types/react-app/                               @prakarshpandey
 /types/react-aria-menubutton/                   @forabi @crohlfs
+/types/react-autocomplete/                      @lstanden
 /types/react-autosuggest/                       @nicolas-schmitt @pjo256 @robessog @tbayne @cdeutsch @rosskevin
 /types/react-avatar-editor/                     @diogocorrea @gabsprates
 /types/react-beautiful-dnd/                     @varHarrie @bradleyayers @paustint
@@ -3141,13 +3296,16 @@
 /types/react-calendar-heatmap/                  @9renpoto
 /types/react-calendar-timeline/                 @radziksh
 /types/react-cartographer/                      @trevonmckay
+/types/react-circular-progressbar/              @lstanden
 /types/react-click-outside/                     @screendriver
 /types/react-codemirror/                        @velveret @rudi-c
 /types/react-collapse/                          @Kimahriman
+/types/react-collapsible/                       @knegusen
 /types/react-color/                             @LKay @markspolakovs @mntdn
 /types/react-confirm/                           @santiagodoldan
-/types/react-content-loader/                    @alaatm
+/types/react-content-loader/                    @alaatm @samwalshnz
 /types/react-copy-to-clipboard/                 @mabels @BernabeFelix
+/types/react-credit-cards/                      @vstrimaitis
 /types/react-cropper/                           @stepancar
 /types/react-css-modules/                       @KostyaEsmukov @skirsdeda
 /types/react-css-transition-replace/            @LKay
@@ -3177,7 +3335,7 @@
 /types/react-event-listener/                    @asvetliakov
 /types/react-fa/                                @flaub @patsissons @LKay
 /types/react-facebook-login/                    @apare @jankarres
-/types/react-faux-dom/                          @alitaheri @cleverguy25 @deviousm
+/types/react-faux-dom/                          @alitaheri @cleverguy25 @deviousm @hanai
 /types/react-file-input/                        @dmitryrogozhny
 /types/react-file-reader-input/                 @dmitryrogozhny @alitaheri
 /types/react-flags-select/                      @senukartur
@@ -3189,6 +3347,8 @@
 /types/react-form/                              @cameron-mcateer @TiuSh
 /types/react-foundation/                        @danielearwicker
 /types/react-geosuggest/                        @brmenchl
+/types/react-google-maps-loader/                @vasilysn
+/types/react-google-places-suggest/             @vasilysn
 /types/react-google-recaptcha/                  @KoalaHuman
 /types/react-gravatar/                          @invliD
 /types/react-grid-layout/                       @abirkholz @alitaheri @ZheyangSong @andrewhathaway
@@ -3199,13 +3359,14 @@
 /types/react-highlight-words/                   @mhegazy
 /types/react-highlighter/                       @oizie
 /types/react-holder/                            @isman-usoh
-/types/react-hot-loader/                        @jacekjagiello
+/types/react-hot-loader/                        @jacekjagiello @MartynasZilinskas @DovydasNavickas
 /types/react-hyperscript/                       @tock203
 /types/react-i18next/v1/                        @KostyaEsmukov
 /types/react-i18next/v4/                        @GiedriusGrabauskas
 /types/react-i18next/                           @GiedriusGrabauskas @chnoch
 /types/react-icon-base/                         @apare @LKay
 /types/react-icons/                             @apare @johnnyreilly @LKay
+/types/react-image-crop/                        @danielasy
 /types/react-image-gallery/                     @adamwpc
 /types/react-imageloader/                       @stephenjelfs
 /types/react-infinite/                          @rhysd
@@ -3216,6 +3377,7 @@
 /types/react-intl/v1/                           @bgrieder
 /types/react-intl/                              @bgrieder @cdroulers @gyzerok @tillwolff @LKay @bhouser @kristerkari @formatlos
 /types/react-intl-redux/                        @LKay
+/types/react-is/                                @AviVahl
 /types/react-is-deprecated/                     @seansfkelley
 /types/react-joyride/                           @DanielRosenwasser @bendxn
 /types/react-json/                              @spielc
@@ -3235,18 +3397,18 @@
 /types/react-measure/                           @asvetliakov @marcfallows
 /types/react-mixin/                             @tkqubo
 /types/react-modal/                             @radziksh @drewnoakes @homburg @ttamminen @hallowatcher @peterblazejewicz
-/types/react-monaco-editor/                     @jnetterf
 /types/react-motion/                            @stepancar @asvetliakov @dimitarnestorov
 /types/react-motion-slider/                     @asvetliakov
-/types/react-native/                            @alloy @huhuanming @iRoachie @timwangdev @kamal @nelyousfi @alexdunne @swissmanu @bm-software
+/types/react-native/                            @alloy @huhuanming @iRoachie @timwangdev @kamal @nelyousfi @alexdunne @swissmanu @bm-software @tkrotoff
 /types/react-native-android-taskdescription/    @christianchown
 /types/react-native-auth0/                      @ascariandrea
-/types/react-native-collapsible/                @iRoachie @umidbekkarimov
+/types/react-native-autocomplete-input/         @ifiokjr
+/types/react-native-bluetooth-serial/           @RodrigoAWeber
 /types/react-native-communications/             @huhuanming @PaitoAnderson
 /types/react-native-datepicker/                 @jacobbaskin
 /types/react-native-doc-viewer/                 @iRoachie
 /types/react-native-document-picker/            @plantain-00
-/types/react-native-drawer/                     @jnbt
+/types/react-native-drawer/                     @jnbt @suniahk
 /types/react-native-drawer-layout/              @jmfirth
 /types/react-native-elevated-view/              @fhelwanger
 /types/react-native-fabric/                     @josephroque
@@ -3254,15 +3416,20 @@
 /types/react-native-fetch-blob/                 @MNBuyskih
 /types/react-native-fs/                         @pocesar @josephroque
 /types/react-native-google-signin/              @j-fro
+/types/react-native-htmlview/                   @ifiokjr
 /types/react-native-i18n/                       @VincentLanglet
+/types/react-native-indicators/                 @ifiokjr
 /types/react-native-keep-awake/                 @huhuanming
-/types/react-native-linear-gradient/            @j-fro
+/types/react-native-keyboard-spacer/            @VincentLanglet
+/types/react-native-keychain/                   @DavidFarinha
 /types/react-native-loading-spinner-overlay/    @fhelwanger
 /types/react-native-material-design-searchbar/  @iRoachie
 /types/react-native-material-kit/               @iRoachie @timwangdev
+/types/react-native-material-textfield/         @mindhivefi
 /types/react-native-material-ui/                @iRoachie
 /types/react-native-mixpanel/                   @r3nya
 /types/react-native-modalbox/                   @iRoachie
+/types/react-native-multi-slider/               @Slessi
 /types/react-native-navigation/                 @egorshulga
 /types/react-native-orientation/                @MoLow
 /types/react-native-permissions/                @vincentlanglet
@@ -3275,7 +3442,7 @@
 /types/react-native-sensor-manager/             @SahinVardar
 /types/react-native-snap-carousel/              @jnbt @j-fro @gazaret
 /types/react-native-sortable-grid/              @j-fro
-/types/react-native-sortable-list/              @sivolobov
+/types/react-native-sortable-list/              @sivolobov @RookY2K
 /types/react-native-sqlite-storage/             @dryganets
 /types/react-native-star-rating/                @iRoachie
 /types/react-native-svg-uri/                    @iRoachie
@@ -3287,7 +3454,8 @@
 /types/react-native-vector-icons/               @iRoachie @timwangdev
 /types/react-native-version-number/             @VincentLanglet
 /types/react-native-video/                      @huhuanming
-/types/react-navigation/                        @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @robertohuertasm @YourGamesBeOver @ArmandoAssuncao @cliedeman
+/types/react-navigation/v1/                     @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @robertohuertasm @YourGamesBeOver @ArmandoAssuncao @cliedeman @Slessi
+/types/react-navigation/                        @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @robertohuertasm @YourGamesBeOver @ArmandoAssuncao @cliedeman @Slessi @magrinj
 /types/react-notification-system/               @GiedriusGrabauskas @DeividasBakanas @LKay @sztobar
 /types/react-notification-system-redux/         @LKay
 /types/react-numeric-input/                     @heatherbooker
@@ -3295,31 +3463,36 @@
 /types/react-onclickoutside/                    @LKay
 /types/react-onsenui/                           @salim7 @jemmyw
 /types/react-overlays/                          @aaronbeall @vitosamson
+/types/react-owl-carousel/                      @tbounsiar @igorissen @KennethanCeyer
 /types/react-paginate/                          @deevus @wouterhardeman @pegel03 @archy-bold
 /types/react-places-autocomplete/               @guilhermehubner
 /types/react-pointable/                         @istefo @mdibyo
+/types/react-popover/                           @jacoporicare
 /types/react-portal/                            @shuntksh
 /types/react-props-decorators/                  @tkqubo
+/types/react-radio-group/                       @jsonunger
 /types/react-recaptcha/                         @mhegazy @zzanol
-/types/react-redux/                             @tkqubo @thasner @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva
+/types/react-redux/v5/                          @tkqubo @thasner @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva
+/types/react-redux/                             @tkqubo @thasner @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva @kallikrein @val1984 @jrakotoharisoa
 /types/react-redux-epic/                        @forabi
 /types/react-redux-i18n/                        @clementdevos
 /types/react-redux-toastr/                      @Smiche @artyomsv @kulmajaba
-/types/react-relay/                             @graphcool @voxmatt @alloy @npirotte
-/types/react-resize-detector/                   @matthew-matvei
+/types/react-relay/                             @graphcool @voxmatt @alloy @npirotte @ckknight
+/types/react-resize-detector/                   @matthew-matvei @aMoniker
 /types/react-resolver/                          @forabi
 /types/react-responsive/v1/                     @asvetliakov
 /types/react-responsive/                        @asvetliakov @alechill @xaviergonz
 /types/react-rnd/                               @Ragg-
 /types/react-router/v2/                         @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov
 /types/react-router/v3/                         @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @ssorallen
-/types/react-router/                            @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @tkrotoff @huy-nguyen @grmiade @DaIgeb @egorshulga @neuoy @rraina
+/types/react-router/                            @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @tkrotoff @huy-nguyen @grmiade @DaIgeb @egorshulga @neuoy @rraina @pret-a-porter
 /types/react-router-bootstrap/                  @vlesierse @LKay @olmobrutall
 /types/react-router-config/                     @lith-light-g
 /types/react-router-dom/                        @tkrotoff @huy-nguyen @p-jackson
 /types/react-router-native/                     @ezintz @fhelwanger
 /types/react-router-navigation/                 @kaoDev
 /types/react-router-navigation-core/            @kaoDev
+/types/react-router-param-link/                 @mtsg
 /types/react-router-redux/v3/                   @isman-usoh @noah79 @rosendi
 /types/react-router-redux/v4/                   @isman-usoh @noah79 @rosendi @LKay @DovydasNavickas
 /types/react-router-redux/                      @huy-nguyen @8398a7 @mykolas
@@ -3327,6 +3500,7 @@
 /types/react-scroll/                            @sudoplz @GiedriusGrabauskas
 /types/react-scrollbar/                         @stephenjelfs
 /types/react-select/                            @Hesquibet @giladgray @iebaker @skirsdeda @vujevits @devrelm @MartynasZilinskas @onatm @ninjaferret @tehbi4 @misantronic @darkartur
+/types/react-share/                             @icopp
 /types/react-side-effect/                       @remojansen
 /types/react-sidebar/                           @jeroenvervaeke
 /types/react-sketchapp/                         @ricokahler @DomiR
@@ -3334,12 +3508,13 @@
 /types/react-smooth-scrollbar/                  @asvetliakov
 /types/react-sortable-hoc/                      @NoHomey @charlesrey
 /types/react-sortable-pane/                     @rhysd
-/types/react-sortable-tree/                     @wouterhardeman @jzoric
+/types/react-sortable-tree/                     @wouterhardeman @jzoric @kevinsperrine
 /types/react-spinkit/v1/                        @tkqubo @mleko @pelotom
 /types/react-spinkit/                           @tkqubo @mleko @pelotom @zzanol
 /types/react-sticky/                            @curtisw0
+/types/react-stickynode/                        @tstirrat
 /types/react-stripe-elements/                   @dan-j @santiagodoldan @sonnysangha @9y5 @thchia
-/types/react-svg/                               @viccrubs
+/types/react-svg/                               @viccrubs @chrisgarber
 /types/react-svg-pan-zoom/                      @huy-nguyen
 /types/react-swf/                               @stepancar
 /types/react-swipe/                             @DeividasBakanas
@@ -3355,9 +3530,11 @@
 /types/react-test-renderer/v15/                 @arvitaly @lochbrunner @lochbrunner @johnnyreilly
 /types/react-test-renderer/                     @arvitaly @lochbrunner @johnnyreilly @jgoz
 /types/react-tether/                            @ryprice
-/types/react-text-mask/                         @guilhermehubner
+/types/react-text-mask/                         @guilhermehubner @cavarzan
 /types/react-textarea-autosize/                 @asvetliakov @zry656565
-/types/react-toastr/                            @shssoichiro
+/types/react-timeout/                           @kerwynrg
+/types/react-toastify/                          @icopp
+/types/react-toastr/                            @shssoichiro @DanRegazzi
 /types/react-toggle/v2/                         @LKay
 /types/react-toggle/                            @LKay
 /types/react-tooltip/                           @DeividasBakanas
@@ -3377,10 +3554,11 @@
 /types/react-widgets/                           @rogierschouten @sanyatuning @frodehansen2 @r3nya
 /types/react-widgets-moment/                    @dawnmist
 /types/react-youtube/                           @kgtkr
+/types/react-youtube-embed/                     @charles-salmon
 /types/reactable/                               @spielc
 /types/reactcss/                                @chrisgervang @LKay
 /types/reactstrap/v4/                           @alihammad @mfal @danilobjr @fabiopaiva
-/types/reactstrap/                              @alihammad @mfal @danilobjr @fabiopaiva @FaithForHumans @KurtPreston @timc13
+/types/reactstrap/                              @alihammad @mfal @danilobjr @FaithForHumans @KurtPreston @timc13 @patrickrgaffney
 /types/read/                                    @timjk
 /types/read-chunk/                              @crispybee
 /types/read-package-tree/                       @mgroenhoff
@@ -3391,10 +3569,11 @@
 /types/readline-sync/                           @jonestristand
 /types/readline-transform/                      @dex4er
 /types/reapop/                                  @Barrokgl
+/types/recaptcha2/                              @l-jonas
 /types/recase/                                  @18steps
 /types/recharts/                                @mthmulders @rapmue @royxue @ZheyangSong @richbai90 @caspeco-dan
 /types/recluster/                               @dex4er
-/types/recompose/                               @iskandersierra @mrapogee @clayne11 @Pajn
+/types/recompose/                               @iskandersierra @mrapogee @clayne11 @Pajn @lucasterra
 /types/reconnectingwebsocket/                   @nguarracino
 /types/recursive-readdir/v1/                    @elisee
 /types/recursive-readdir/                       @elisee @MicahZoltu
@@ -3409,7 +3588,7 @@
 /types/reduce-reducers/                         @huy-nguyen
 /types/redux-action/                            @newraina
 /types/redux-action-utils/                      @tkqubo
-/types/redux-actions/                           @jaysoo @alexgorbatchev @alechill
+/types/redux-actions/                           @jaysoo @alexgorbatchev @alechill @alexey-pelykh
 /types/redux-auth-wrapper/v1/                   @LKay
 /types/redux-auth-wrapper/                      @LKay
 /types/redux-batched-subscribe/                 @mDibyo
@@ -3420,6 +3599,7 @@
 /types/redux-doghouse/                          @BendingBender
 /types/redux-first-router/                      @Valbrand @viggyfresh @janb87 @corydeppen
 /types/redux-first-router-link/                 @janb87
+/types/redux-first-router-restore-scroll/       @icopp
 /types/redux-form/v4/                           @aikoven
 /types/redux-form/v6/                           @carsonf @aikoven @LKay @bancek
 /types/redux-form/                              @carsonf @aikoven @LKay @bancek @alsiola @tehbi4 @huwmartin
@@ -3434,13 +3614,14 @@
 /types/redux-logger/                            @arusakov @kgroat
 /types/redux-mock-store/                        @MarianPalkus
 /types/redux-optimistic-ui/                     @asvetliakov
-/types/redux-pack/                              @tansongyang
-/types/redux-persist-transform-encrypt/         @LKay
+/types/redux-pack/                              @tansongyang @quicksnap @no-stack-dub-sack
+/types/redux-persist-transform-encrypt/         @LKay @dante-101
 /types/redux-persist-transform-filter/          @LKay
 /types/redux-promise/                           @molekilla @xStrom
 /types/redux-promise-middleware/                @ianks
 /types/redux-recycle/                           @LKay
 /types/redux-router/                            @stepancar
+/types/redux-shortcuts/                         @tstirrat
 /types/redux-socket.io/                         @snakeego
 /types/redux-storage/                           @asvetliakov
 /types/redux-storage-engine-jsurl/              @screendriver
@@ -3458,8 +3639,10 @@
 /types/remarkable/                              @makepost
 /types/remote-redux-devtools/                   @ColinEberhardt @unindented
 /types/remove-markdown/                         @RagibHasin
+/types/rename/                                  @Aankhen
 /types/replace-ext/                             @DeividasBakanas
 /types/request/                                 @soywiz @bonnici @Bartvds @joeskeen @ccurrens @lookfirst @mastermatt
+/types/request-as-curl/                         @atd-schubert
 /types/request-ip/                              @mrhen
 /types/request-promise/                         @cglantschnig @joeskeen @AyaMorisawa @mastermatt
 /types/request-promise-native/                  @gustavohenke @mastermatt
@@ -3480,7 +3663,7 @@
 /types/restangular/                             @borisyankov
 /types/restful.js/                              @tkqubo
 /types/restify/v4/                              @blittle @stevehipwell
-/types/restify/                                 @blittle @stevehipwell
+/types/restify/                                 @blittle @stevehipwell @leanazulyoro
 /types/restify-cookies/                         @weekens
 /types/restify-cors-middleware/                 @dthunell
 /types/restify-errors/                          @stevehipwell
@@ -3488,7 +3671,7 @@
 /types/restler/                                 @cyrilschumacher
 /types/restling/                                @loghorn
 /types/resumablejs/                             @DanielMcAssey
-/types/rethinkdb/                               @alexgorbatchev @AdrianFarmadin
+/types/rethinkdb/                               @alexgorbatchev @AdrianFarmadin @kondi @hoishin
 /types/retry/                                   @krenor
 /types/retry-as-promised/                       @Raigen
 /types/rev-hash/                                @ikatyang
@@ -3509,8 +3692,10 @@
 /types/riotjs/                                  @vvakame
 /types/rison/                                   @impworks
 /types/rivets/                                  @TrevorDev @matjanos
+/types/rmfr/                                    @pluma
 /types/roads/                                   @dancespiele
 /types/roads-server/                            @dancespiele
+/types/roll/                                    @icopp
 /types/rollup-plugin-json/                      @asmockler
 /types/ronomon__crypto-async/                   @BendingBender
 /types/rosie/                                   @abner @subvertallchris @abukurov
@@ -3527,7 +3712,9 @@
 /types/rsvp/                                    @chriskrycho
 /types/rsync/                                   @philippstucki
 /types/rtree/                                   @oefirouz
+/types/run-parallel/                            @mrmlnc
 /types/run-sequence/                            @k-kagurazaka
+/types/rword/                                   @icopp
 /types/rx/                                      @Igorbek
 /types/rx-angular/                              @mickdelaney
 /types/rx-core/                                 @Igorbek @mizunashi-mana
@@ -3569,6 +3756,8 @@
 /types/satnav/                                  @DotNetNerd
 /types/saywhen/                                 @SeanSobey
 /types/scalike/                                 @ryoppy
+/types/schema-registry/                         @bonzzy
+/types/schwifty/                                @ozum
 /types/screenfull/                              @icholy @lionelb @joelshepherd
 /types/screeps/                                 @MarkoSulamagi @NhanHo @bryanbecker @resir014 @Arcath @apemanzilla
 /types/screeps-profiler/                        @ramblurr
@@ -3581,11 +3770,13 @@
 /types/scryptsy/                                @micksatana
 /types/seamless/                                @danmana
 /types/seamless-immutable/                      @alex3165 @xsburg @geirsagberg
+/types/secp256k1/                               @anler
+/types/seed-random/                             @l-jonas
 /types/seededshuffle/                           @urish
 /types/seedrandom/                              @kernhanda
 /types/segment-analytics/                       @fongandrew
 /types/select2/v3/                              @borisyankov
-/types/select2/                                 @borisyankov
+/types/select2/                                 @borisyankov @denisname
 /types/selectables/                             @renjfk
 /types/selectize/                               @adidahiya @naBausch
 /types/selenium-webdriver/v2/                   @BillArmstrong @Kuniwak @cnishina
@@ -3615,6 +3806,7 @@
 /types/semver/                                  @Bartvds @BendingBender @LucianBuzzo
 /types/semver-compare/                          @vincekovacs
 /types/semver-diff/                             @chrismbarr
+/types/semver-sort/                             @LogvinovLeon
 /types/sencha_touch/                            @brian428
 /types/send/                                    @MikeJerred
 /types/seneca/                                  @psnider @kevynb
@@ -3643,7 +3835,8 @@
 /types/sheetify/                                @toddself
 /types/shell-escape/                            @nenadalm
 /types/shell-quote/                             @jason0x43
-/types/shelljs/                                 @nikeee @voy
+/types/shelljs/                                 @nikeee @voy @gkalpak @pheromonez
+/types/shelljs-exec-proxy/                      @qlonik
 /types/shimmer/                                 @kjin
 /types/shipit/                                  @cyrilschumacher
 /types/shipit-utils/                            @cyrilschumacher
@@ -3665,7 +3858,7 @@
 /types/simple-cw-node/                          @vvakame
 /types/simple-lru/                              @NN---
 /types/simple-mock/                             @leonyu
-/types/simple-oauth2/                           @mad-mike
+/types/simple-oauth2/                           @mad-mike @troy-lamerton
 /types/simple-peer/                             @tlaziuk
 /types/simple-url-cache/                        @a-lucas
 /types/simple-websocket/                        @dex4er
@@ -3676,7 +3869,7 @@
 /types/simplesmtp/                              @rogierschouten
 /types/simplestorage.js/                        @axelcostaspena @mxl
 /types/single-line-log/                         @ffflorian
-/types/sinon/                                   @mrbigdog2u @rationull @lumaxis @nicojs @43081j
+/types/sinon/                                   @mrbigdog2u @rationull @lumaxis @nicojs @43081j @joshuakgoldberg
 /types/sinon-as-promised/                       @igrayson
 /types/sinon-chai/                              @kazimanzurrashid @jedmao
 /types/sinon-chrome/                            @pimterry @crimx @kobanyan
@@ -3710,8 +3903,8 @@
 /types/smtpapi/                                 @a-morales
 /types/snapsvg/                                 @lhk @mattanja @kant2002
 /types/snazzy-info-window/                      @milosd92
-/types/snekfetch/                               @DarkerTV
-/types/snoowrap/                                @vitosamson
+/types/snekfetch/                               @DarkerTV @ShayBox @Dev-Yukine
+/types/snoowrap/                                @vitosamson @TheAppleFreak
 /types/snowboy/                                 @dolanmiu
 /types/socket.io/                               @progre @divillysausages @florentpoujol @KentarouTakeda @gigi
 /types/socket.io-client/                        @progre @divillysausages @florentpoujol
@@ -3723,6 +3916,8 @@
 /types/socketty/                                @Nax
 /types/sockjs/                                  @pmccloghrylaing
 /types/sockjs-client/                           @vladev @arusakov @BendingBender @renjfk
+/types/solidity-parser-antlr/                   @LogvinovLeon
+/types/solr-client/                             @liul85
 /types/solution-center-communicator/            @dami-gg
 /types/sort-array/                              @mrmlnc
 /types/sortablejs/                              @Maw-Fox
@@ -3734,7 +3929,7 @@
 /types/spark-md5/                               @bastienmoulia
 /types/sparkly/                                 @BendingBender
 /types/sparkpost/v1/                            @geoffreak
-/types/sparkpost/                               @geoffreak @bondz
+/types/sparkpost/                               @geoffreak @bondz @vvu
 /types/sparqljs/                                @AlexeyMz
 /types/spatialite/                              @atd-schubert
 /types/spdx-correct/                            @jinwoo
@@ -3767,6 +3962,7 @@
 /types/stack-utils/                             @BendingBender
 /types/stacktrace-js/                           @exceptionless @pilagod
 /types/stale-lru-cache/                         @cxcorp
+/types/stampit/v2/                              @koresar
 /types/stampit/                                 @koresar
 /types/stamplay-js-sdk/                         @ridermansb
 /types/stat-mode/                               @BendingBender
@@ -3792,7 +3988,8 @@
 /types/storybook__addon-knobs/                  @joscha @martynaskadisa
 /types/storybook__addon-links/                  @joscha @jessepinho
 /types/storybook__addon-notes/                  @joscha
-/types/storybook__addon-options/                @joscha
+/types/storybook__addon-options/                @joscha @simonhn
+/types/storybook__addon-storyshots/             @bradleyayers
 /types/storybook__react/                        @joscha @wapgear
 /types/storybook__vue/                          @pntgupta
 /types/stream-buffers/                          @Jason3S
@@ -3827,27 +4024,32 @@
 /types/stylelint/                               @alan-agius4
 /types/stylelint-webpack-plugin/                @bahlo
 /types/stylus/                                  @SomaticIT
+/types/subscribe-ui-event/                      @wangcheng678
 /types/subsume/                                 @BendingBender
 /types/succinct/                                @EnableSoftware
 /types/sudo-block/                              @BendingBender
 /types/suitescript/                             @darrenhillconsulting
 /types/sumo-logger/                             @forabi @clementallen
 /types/superagent/v2/                           @varju @NicoZelaya @mxl
-/types/superagent/                              @NicoZelaya @mxl @paplorinc @shreyjain1994
+/types/superagent/                              @NicoZelaya @mxl @paplorinc @shreyjain1994 @zopf
 /types/superagent-no-cache/                     @mxl
 /types/superagent-prefix/                       @mxl
 /types/supercluster/                            @DenisCarriere
 /types/supertest/                               @varju
 /types/supertest-as-promised/                   @tkrotoff
-/types/supports-color/                          @mgroenhoff
+/types/supports-color/v3/                       @mgroenhoff
+/types/supports-color/                          @mgroenhoff @mtraynham
 /types/svg-injector/                            @poke
 /types/svg-parser/                              @mrmlnc
+/types/svg-path-bounding-box/                   @NotWoods
 /types/svg-sprite/                              @tkqubo
 /types/svg2png/                                 @hansrwindhoff @sccgithub
 /types/svg4everybody/                           @BendingBender
 /types/svgjs.draggable/                         @LiFeleSs
 /types/svgjs.resize/                            @jkevingutierrez
-/types/svgo/                                    @bradleyayers @giladgray
+/types/svgo/                                    @bradleyayers @giladgray @Aankhen
+/types/sw-precache/                             @JounQin
+/types/sw-precache-webpack-plugin/              @JounQin
 /types/swag/                                    @shiwano
 /types/swagger-express-middleware/              @alexandreroba
 /types/swagger-express-mw/                      @micmro
@@ -3861,12 +4063,14 @@
 /types/swagger-schema-official/                 @mohsen1 @bsouthga @nimerritt
 /types/swagger-tools/                           @bricka
 /types/swaggerize-express/                      @mugeso @nickmorton
+/types/swe-validation/                          @hjalmers
 /types/swfobject/                               @rou
 /types/swiftclick/                              @Laurence-C
 /types/swig/                                    @CodeAnimal @soywiz
 /types/swig-email-templates/                    @mrhen @micksatana
 /types/swipe/                                   @kant2002
-/types/swiper/                                  @sgaliano @lucax88x
+/types/swiper/v3/                               @sgaliano @lucax88x
+/types/swiper/                                  @sgaliano @lucax88x @ematseruk
 /types/swipeview/                               @borisyankov
 /types/switchery/                               @bgrieder @claylaut
 /types/swiz/                                    @jedigo
@@ -3875,14 +4079,17 @@
 /types/systeminformation/                       @PixelcrabAT
 /types/systemjs/                                @ludohenin @NathanWalker @GiedriusGrabauskas @aluanhaddad
 /types/table/                                   @evanshortiss @mrmlnc
+/types/tableau/                                 @protip
 /types/tabris-plugin-firebase/                  @eclipsesource
 /types/tabtab/                                  @vojtechhabarta
 /types/tabulator/                               @euginio
+/types/tail/                                    @spacejack
 /types/tapable/v0/                              @e-cloud
 /types/tapable/                                 @e-cloud
 /types/tape/                                    @Bartvds @sodatea @DennisSchwartz @mikehenrty
 /types/tar/                                     @SomaticIT @connor4312
 /types/tar-fs/                                  @Umoxfo
+/types/tar-stream/                              @glicht
 /types/tcp-ping/                                @stegano
 /types/tedious/                                 @rogierschouten @cjthompson
 /types/tedious-connection-pool/                 @sandorfr
@@ -3899,8 +4106,9 @@
 /types/text-buffer/                             @GlenCFL
 /types/text-encoding/                           @pine613
 /types/text-encoding-utf-8/                     @trxcllnt
+/types/text-table/                              @saadq
 /types/textarea-caret/                          @shiftkey
-/types/three/                                   @gyohk @florentpoujol @SereznoKot @omni360 @ivoisbelongtous @piranha771 @qszhusightp @nakakura @s093294 @Pro @efokschaner @PsychoSTS @dhritzkiv @apurvaojas
+/types/three/                                   @gyohk @florentpoujol @SereznoKot @omni360 @ivoisbelongtous @piranha771 @qszhusightp @nakakura @s093294 @Pro @efokschaner @PsychoSTS @dhritzkiv @apurvaojas @NotWoods @sethk
 /types/thrift/                                  @kamek-pf @kevin-greene-ck @jessezhang91
 /types/throng/                                  @cyrilschumacher @tatethurston
 /types/throttle/                                @BendingBender
@@ -3931,19 +4139,26 @@
 /types/to-title-case-gouch/                     @stpettersens
 /types/toastr/                                  @borisyankov
 /types/tocktimer/                               @evanshortiss
+/types/tokgen/                                  @l-jonas
+/types/toobusy-js/                              @atd-schubert
 /types/tooltipster/                             @stephenlautier @pjmagee @VorobeY1326 @leonard-thieu @janhi @joeskeen
 /types/topojson/                                @ricardo-mello @chenzhutian @denisname
+/types/topojson-client/                         @denisname @ricardo-mello
+/types/topojson-simplify/                       @denisname @ricardo-mello
+/types/topojson-specification/                  @denisname
 /types/torrent-stream/                          @xstoudi
 /types/touch/                                   @mizunashi-mana @BendingBender
 /types/touch-events/                            @kevinb7
-/types/tough-cookie/                            @leonard-thieu @LiJinyao
+/types/tough-cookie/                            @leonard-thieu @LiJinyao @no2chem
 /types/traceback/                               @misak113
 /types/tracking/                                @pimterry
 /types/transducers-js/                          @colinkahn @dphilipson @NaridaL
 /types/transducers.js/                          @dphilipson
+/types/transliteration/                         @tony19
 /types/trash/                                   @matthew-matvei @hoishin
 /types/traverse/                                @newclear
 /types/traverson/                               @marcinporebski
+/types/travis-fold/                             @andy-ms
 /types/trayballoon/                             @korve
 /types/tress/                                   @sindilevich
 /types/trim/                                    @skysteve
@@ -3954,7 +4169,7 @@
 /types/tus-js-client/                           @kevhiggins
 /types/tv4/                                     @Bartvds @psnider
 /types/tween.js/                                @Amos47 @sunetos @jzarnikov @alexburner
-/types/tweenjs/                                 @evilangelist
+/types/tweenjs/                                 @evilangelist @jcyuan
 /types/tweezer.js/                              @praxxis
 /types/twig/                                    @soywiz @enko
 /types/twilio/                                  @nickiannone @ashleybrener
@@ -3969,6 +4184,7 @@
 /types/type-is/                                 @BendingBender
 /types/type-name/                               @armorik83
 /types/typeahead/                               @igochkov @gjunge
+/types/typed.js/                                @Dona278
 /types/typedarray-pool/                         @pawsong
 /types/typeof/                                  @OpenByteDev
 /types/typescript-deferred/                     @DirtyHairy
@@ -4005,7 +4221,7 @@
 /types/untildify/                               @BendingBender
 /types/unused-filename/                         @BendingBender
 /types/unzip/                                   @coding2012
-/types/unzipper/                                @s73obrien
+/types/unzipper/                                @s73obrien @natemara
 /types/update-notifier/v1/                      @vvakame @nchen63
 /types/update-notifier/                         @vvakame @nchen63 @bitjson
 /types/upng-js/                                 @plantain-00
@@ -4017,8 +4233,10 @@
 /types/url-assembler/                           @wolfgang42
 /types/url-join/                                @rogierschouten @devrelm
 /types/url-metadata/                            @mrkmg
+/types/url-params/                              @danielsogl
 /types/url-parse/                               @ChernenkoPaul
 /types/url-regex/                               @unindented
+/types/url-safe-base64/                         @johngeorgewright
 /types/url-search-params/                       @nick121212 @nrathi
 /types/url-template/                            @marcinporebski
 /types/urllib/                                  @sorayama
@@ -4044,7 +4262,7 @@
 /types/valerie/                                 @conficient
 /types/vali-date/                               @SamVerschueren
 /types/valid-url/                               @stevehipwell
-/types/validator/                               @tgfjt @chrootsu @IOAyman @louy @kacepe @deptno @builtinnya
+/types/validator/                               @tgfjt @chrootsu @IOAyman @louy @kacepe @deptno @builtinnya @qqilihq
 /types/validatorjs/                             @LKay @danmana
 /types/vanilla-modal/                           @samnau
 /types/vanilla-tilt/                            @BrunnerLivio
@@ -4061,7 +4279,7 @@
 /types/vfile/                                   @bizen241 @rokt33r
 /types/vfile-location/                          @ikatyang
 /types/victory/                                 @asvetliakov @snerks @Havret
-/types/video.js/                                @vbortone @scleriot @SWBennett06 @IgelCampus
+/types/video.js/                                @vbortone @scleriot @SWBennett06 @IgelCampus @giofreitas
 /types/viewability-helper/                      @lironzluf
 /types/viewerjs/                                @lrh3321
 /types/viewporter/                              @borisyankov
@@ -4086,6 +4304,7 @@
 /types/voronoi-diagram/                         @michaelneu
 /types/vortex-web-client/                       @Pro
 /types/voximplant-websdk/                       @aylarov
+/types/vue-markdown/                            @neodon
 /types/vue-resource/                            @kaorun343
 /types/vue-scrollto/                            @vincekovacs
 /types/vuex-i18n/                               @jaeggerr
@@ -4120,11 +4339,11 @@
 /types/webdriverio/                             @nmalaguti @timbru31 @fsmedberg-tc @tanvirislam06 @phil-lgr
 /types/webfontloader/                           @doskallemaskin
 /types/webgl-ext/                               @zenmumbler
-/types/webgl2/                                  @nkemnitz
+/types/webgl2/                                  @nkemnitz @karhu
 /types/webidl2/                                 @saschanaz
 /types/webmidi/                                 @lostfictions
-/types/webpack/v3/                              @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @ahmed-taj @alan-agius4 @elliottsj @jason0x43
-/types/webpack/                                 @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @ahmed-taj @alan-agius4 @elliottsj @jason0x43 @dennispg
+/types/webpack/v3/                              @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @ahmed-taj @alan-agius4 @elliottsj @jason0x43 @christophehurpeau
+/types/webpack/                                 @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @ahmed-taj @alan-agius4 @elliottsj @jason0x43 @dennispg @christophehurpeau
 /types/webpack-bundle-analyzer/                 @kryops
 /types/webpack-chain/                           @eirikurn @psachs21
 /types/webpack-chunk-hash/                      @mtraynham
@@ -4155,7 +4374,7 @@
 /types/weixin-app/                              @taoqf @AlexStacker
 /types/wellknown/                               @yairtawil
 /types/whatwg-mimetype/                         @petejohanson
-/types/whatwg-streams/                          @saschanaz
+/types/whatwg-streams/                          @saschanaz @ksm2
 /types/whatwg-url/                              @aomarks
 /types/wheel/                                   @BTOdell
 /types/when/                                    @derekcicerone @Nemo157
@@ -4165,6 +4384,7 @@
 /types/window-or-global/                        @vvakame
 /types/window-size/                             @pmkary
 /types/windows-1251/                            @RomanGolovanov
+/types/windows-script-host/                     @zspitz
 /types/windows-service/                         @rogierschouten
 /types/winjs/v1/                                @adamhewitt627 @craigktreasure @xirzec
 /types/winjs/v2/                                @adamhewitt627 @craigktreasure @xirzec
@@ -4183,9 +4403,11 @@
 /types/wpapi/                                   @guoyunhe
 /types/wrap-ansi/v2/                            @kayahr
 /types/wrap-ansi/                               @kayahr
-/types/wreck/                                   @marcinporebski
+/types/wreck/v7/                                @marcinporebski
+/types/wreck/                                   @marcinporebski @saboya
 /types/wrench/                                  @soywiz
 /types/write-file-atomic/                       @BendingBender
+/types/write-file-atomically/                   @Aankhen
 /types/write-json-file/                         @DenisCarriere
 /types/write-pkg/                               @azasypkin
 /types/ws/                                      @loyd @elithrar @mlamp @TitaneBoy @orblazer
@@ -4234,9 +4456,10 @@
 /types/youtube/                                 @DazWilkin @JoshuaKGoldberg @eliotfallon213
 /types/youtube-dl/                              @bsurai
 /types/yui/                                     @giabao
-/types/yup/                                     @dhardtke @vtserman @MoretonBayRC
+/types/yup/                                     @dhardtke @vtserman @MoretonBayRC @sseppola
 /types/z-schema/                                @pgonzal
 /types/zapier-platform-core/                    @bradleyayers
+/types/zeit__next-typescript/                   @icopp
 /types/zen-observable/                          @aicest
 /types/zen-push/                                @daprahamian
 /types/zenscroll/                               @HamedFathi
@@ -4252,5 +4475,6 @@
 /types/zipkin-transport-http/                   @plantain-00
 /types/zmq/                                     @davemckeown
 /types/zookeeper/                               @xialeistudio
+/types/zopflipng-bin/                           @hikoma
 /types/zui/                                     @yuanxu
 /types/zxcvbn/                                  @mtraynham

From 524cd8423952372d96a54a87a1a6a7570cee88a3 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Tue, 29 May 2018 17:02:25 -0700
Subject: [PATCH 534/575] Outlook documentation migration - spacing

---
 types/office-js/index.d.ts | 148 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 147 insertions(+), 1 deletion(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index b360bdf381..76ef91c769 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -4526,6 +4526,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Read
      */
     export interface AttachmentDetails {
@@ -4561,6 +4562,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Compose or read
      */
     export interface Body {
@@ -4575,6 +4577,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          * 
          * @param coercionType The format for the returned body.
@@ -4591,6 +4594,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose
          * 
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -4630,8 +4634,11 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadWriteItem
+         * 
          * Applicable Outlook mode: Compose
+         * 
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * 
          * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
          * 
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
@@ -4652,8 +4659,11 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadWriteItem
+         * 
          * Applicable Outlook mode: Compose
+         * 
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * 
          * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
          * 
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
@@ -4673,6 +4683,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: Restricted
+     * 
      * Applicable Outlook mode: Read
      */
     export interface Contact {
@@ -4736,6 +4747,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: Restricted
+         * 
          * Applicable Outlook mode: Compose or read
          */
         mailbox: Mailbox;
@@ -4768,6 +4780,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: Restricted
+         * 
          * Applicable Outlook mode: Compose or read
          */
         roamingSettings: RoamingSettings;
@@ -4781,6 +4794,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Compose or read
      */
     export interface CustomProperties {
@@ -4793,6 +4807,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         get(name: string): any;
@@ -4807,6 +4822,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          * 
          * @param name The name of the property to be set.
@@ -4823,6 +4839,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         remove(name: string): void;
@@ -4840,6 +4857,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         saveAsync(callback?: (result: AsyncResult) => void, asyncContext?: any): void;
@@ -4851,6 +4869,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Compose or read
      */
     export interface Diagnostics {
@@ -4863,6 +4882,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         hostName: string;
@@ -4875,6 +4895,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         hostVersion: string;
@@ -4897,6 +4918,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         OWAView: string;
@@ -4908,6 +4930,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Compose or read
      */
     export interface EmailAddressDetails {
@@ -4935,6 +4958,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Read
      */
     export interface EmailUser {
@@ -4966,6 +4990,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Read
      */
     export interface Entities {
@@ -5023,6 +5048,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         end: Time;
@@ -5042,6 +5068,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         location: Location;
@@ -5061,6 +5088,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         optionalAttendees: Recipients;
@@ -5080,6 +5108,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         requiredAttendees: Recipients;
@@ -5103,6 +5132,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         start: Time;
@@ -5125,6 +5155,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         location: string;
@@ -5144,6 +5175,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         optionalAttendees: Array<EmailAddressDetails>;
@@ -5155,6 +5187,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          */
         organizer: EmailAddressDetails;
@@ -5174,6 +5207,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         requiredAttendees: Array<EmailAddressDetails>;
@@ -5197,6 +5231,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         start: Date;
@@ -5222,6 +5257,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         end: Date; 
@@ -5260,6 +5296,7 @@ declare namespace Office {
         * @remarks
         * 
         * Minimum permission level: ReadItem
+        * 
         * Applicable Outlook mode: Compose or read
         */
        optionalAttendees: Array<string> | Array<EmailAddressDetails>;
@@ -5279,6 +5316,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         requiredAttendees: Array<string> | Array<EmailAddressDetails>;
@@ -5302,6 +5340,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         start: Date;    
@@ -5323,6 +5362,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */   
         subject: string;
@@ -5335,6 +5375,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: Restricted
+     * 
      * Applicable Outlook mode: Compose or read
      */
     export interface Item {
@@ -5346,6 +5387,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         body: Body;
@@ -5357,6 +5399,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          */
         dateTimeCreated: Date;
@@ -5370,6 +5413,7 @@ declare namespace Office {
          * Note: This member is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          */
         dateTimeModifed: Date;
@@ -5383,6 +5427,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         itemType: Office.MailboxEnums.ItemType;
@@ -5394,6 +5439,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         notificationMessages: NotificationMessages;       
@@ -5409,6 +5455,7 @@ declare namespace Office {
         * @remarks
         * 
         * Minimum permission level: ReadItem
+        * 
         * Applicable Outlook mode: Compose or read
         * 
         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
@@ -5435,6 +5482,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         subject: Subject;
@@ -5449,6 +5497,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadWriteItem
+         * 
          * Applicable Outlook mode: Compose
          * 
          * Errors: 
@@ -5480,6 +5529,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadWriteItem
+         * 
          * Applicable Outlook mode: Compose
          * 
          * Errors:
@@ -5507,6 +5557,7 @@ declare namespace Office {
          * Note: In Outlook on the web, if the item is an appointment and it has previously been saved using saveAsync, the user is prompted to save, discard, or cancel even if no changes have occurred since the item was last saved.
          * 
          * Minimum permission level: Restricted
+         * 
          * Applicable Outlook mode: Compose
          */
         close(): void;
@@ -5520,6 +5571,7 @@ declare namespace Office {
          * Note: This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the web for Office 365.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          * 
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -5542,6 +5594,7 @@ declare namespace Office {
          * To access the selected data from the callback method, call asyncResult.value.data. To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
          * 
          * Minimum permission level: ReadWriteItem
+         * 
          * Applicable Outlook mode: Compose
          * 
          * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string , removing any HTML tags present. If HTML, the method returns the selected text, whether it is plaintext or HTML.
@@ -5563,6 +5616,7 @@ declare namespace Office {
          * To access the selected data from the callback method, call asyncResult.value.data. To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
          * 
          * Minimum permission level: ReadWriteItem
+         * 
          * Applicable Outlook mode: Compose
          * 
          * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string , removing any HTML tags present. If HTML, the method returns the selected text, whether it is plaintext or HTML.
@@ -5581,7 +5635,9 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadWriteItem
+         * 
          * Applicable Outlook mode: Compose
+         * 
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
          * 
          * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
@@ -5590,7 +5646,7 @@ declare namespace Office {
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
         removeAttachmentAsync(attachmentIndex: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-                /**
+        /**
          * Asynchronously saves an item.
          * 
          * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
@@ -5610,7 +5666,9 @@ declare namespace Office {
          * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
          * 
          * Minimum permission level: ReadWriteItem
+         * 
          * Applicable Outlook mode: Compose
+         * 
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
          * 
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -5628,7 +5686,9 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadWriteItem
+         * 
          * Applicable Outlook mode: Compose
+         * 
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
          * 
          * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
@@ -5645,7 +5705,9 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadWriteItem
+         * 
          * Applicable Outlook mode: Compose
+         * 
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
          * 
          * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
@@ -5668,6 +5730,7 @@ declare namespace Office {
          * Note: Certain types of files are blocked by Outlook due to potential security issues and are therefore not returned. For more information, see [Blocked attachments in Outlook]<https://support.office.com/article/Blocked-attachments-in-Outlook-434752E1-02D3-4E90-9124-8B81E49A8519>.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          * 
          */
@@ -5689,6 +5752,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          */
         itemClass: string;
@@ -5704,6 +5768,7 @@ declare namespace Office {
          * Note: The identifier returned by the itemId property is the same as the Exchange Web Services item identifier. The itemId property is not identical to the Outlook Entry ID or the ID used by the Outlook REST API. Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. For more details, see Use the Outlook REST APIs from an Outlook add-in.         * 
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          */
         itemId: string;
@@ -5717,6 +5782,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          */
         normalizedSubject: string;
@@ -5738,6 +5804,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         subject: string;
@@ -5757,6 +5824,7 @@ declare namespace Office {
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          * 
          * @param formData A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
@@ -5787,6 +5855,7 @@ declare namespace Office {
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          * 
          * @param formData A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB.
@@ -5811,6 +5880,7 @@ declare namespace Office {
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          */
         getEntities(): Entities;
@@ -5838,7 +5908,9 @@ declare namespace Office {
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: Restricted
+         * 
          * Applicable Outlook mode: Read
+         * 
          * @param entityType One of the EntityType enumeration values.
          */
         getEntitiesByType(entityType: Office.MailboxEnums.EntityType): Array<(string | Contact | MeetingSuggestion | PhoneNumber | TaskSuggestion)>;
@@ -5854,6 +5926,7 @@ declare namespace Office {
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          * 
          * @param name The name of the ItemHasKnownEntity rule element that defines the filter to match.
@@ -5877,6 +5950,7 @@ declare namespace Office {
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          */
         getRegExMatches(): any;
@@ -5897,6 +5971,7 @@ declare namespace Office {
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          * 
          * @param name The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
@@ -5912,6 +5987,7 @@ declare namespace Office {
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          * 
          * @param name The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
@@ -5934,6 +6010,7 @@ declare namespace Office {
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          */
         getSelectedRegExMatches(): any;
@@ -5951,6 +6028,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         conversationId: string;
@@ -5964,6 +6042,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose
          */
         bcc: Recipients;
@@ -5983,6 +6062,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         cc: Recipients;
@@ -6002,6 +6082,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         to: Recipients;
@@ -6023,6 +6104,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         cc: Array<EmailAddressDetails>;
@@ -6038,6 +6120,7 @@ declare namespace Office {
          * Note: The recipientType property of the EmailAddressDetails object in the from property is undefined.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          */
         from: EmailAddressDetails;
@@ -6049,6 +6132,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          */
         internetMessageId: string;
@@ -6064,6 +6148,7 @@ declare namespace Office {
          * Note: The recipientType property of the EmailAddressDetails object in the sender property is undefined.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          */
         sender: EmailAddressDetails;
@@ -6083,6 +6168,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         to: Array<EmailAddressDetails>;
@@ -6095,6 +6181,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Read
      */
     export interface LocalClientTime {
@@ -6138,6 +6225,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Compose
      */
     export interface Location {
@@ -6154,6 +6242,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose
          */
         getAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
@@ -6171,7 +6260,9 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose
+         * 
          * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
          */
         setAsync(location: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
@@ -6192,6 +6283,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: Restricted
+     * 
      * Applicable Outlook mode: Compose or read
      */
     export interface Mailbox {
@@ -6211,6 +6303,7 @@ declare namespace Office {
          * Note: This member is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         ewsUrl: string;
@@ -6234,6 +6327,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */        
         restUrl: string;
@@ -6247,6 +6341,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          * 
          * @param eventType The event that should invoke the handler.
@@ -6267,6 +6362,7 @@ declare namespace Office {
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: Restricted
+         * 
          * Applicable Outlook mode: Compose or read
          * 
          * @param itemId An item ID formatted for the Outlook REST APIs.
@@ -6285,6 +6381,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          * 
          * @param timeValue A Date object.
@@ -6301,6 +6398,7 @@ declare namespace Office {
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: Restricted
+         * 
          * Applicable Outlook mode: Compose or read
          * 
          * @param itemId An item ID formatted for Exchange Web Services (EWS)
@@ -6317,6 +6415,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          * 
          * @param input The local time value to convert.
@@ -6340,7 +6439,9 @@ declare namespace Office {
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
+         * 
          * @param itemId The Exchange Web Services (EWS) identifier for an existing calendar appointment.
          */
         displayAppointmentForm(itemId: string): void;
@@ -6361,7 +6462,9 @@ declare namespace Office {
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
+         * 
          * @param itemId The Exchange Web Services (EWS) identifier for an existing message.
          */
         displayMessageForm(itemId: string): void;
@@ -6382,6 +6485,7 @@ declare namespace Office {
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          * 
          * @param parameters A dictionary of parameters describing the new appointment. All parameters are optional.
@@ -6407,6 +6511,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Read
          * 
          * @param parameters A dictionary containing all values to be filled in for the user in the new form. All parameters are optional.
@@ -6447,6 +6552,7 @@ declare namespace Office {
          * Note: It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible. 
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose and read
          * 
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. The token is provided as a string in the asyncResult.value property.
@@ -6476,6 +6582,7 @@ declare namespace Office {
          * Note: It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible. 
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose and read
          * 
          * @param options An object literal that contains one or more of the following properties.
@@ -6500,6 +6607,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose and read
          * 
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. The token is provided as a string in the asyncResult.value property.
@@ -6518,6 +6626,7 @@ declare namespace Office {
          * @remarks
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose and read
          * 
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
@@ -6557,6 +6666,7 @@ declare namespace Office {
          * You do not need to set the encoding value when your mail app is running in Outlook on the web. You can determine whether your mail app is running in Outlook or Outlook on the web by using the mailbox.diagnostics.hostName property. You can determine what version of Outlook is running by using the mailbox.diagnostics.hostVersion property.
          * 
          * Minimum permission level: ReadWriteMailbox
+         * 
          * Applicable Outlook mode: Compose and read
          * 
          * @param data The EWS request.
@@ -6577,6 +6687,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Read
      */
     export interface MeetingSuggestion {
@@ -6612,6 +6723,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Compose or read
      */
     export interface NotificationMessageDetails {
@@ -6643,6 +6755,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Compose or read
      */
     export interface NotificationMessages {
@@ -6665,6 +6778,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         addAsync(key: string, JSONmessage: NotificationMessageDetails, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
@@ -6676,6 +6790,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          * 
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -6691,6 +6806,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          * 
          * @param key The key for the notification message to remove.
@@ -6709,6 +6825,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          * 
          * @param key The key for the notification message to replace. It can't be longer than 32 characters.
@@ -6733,6 +6850,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Read
      */
     export interface PhoneNumber {
@@ -6754,6 +6872,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Compose
      */
     export interface Recipients {
@@ -6772,7 +6891,9 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadWriteItem
+         * 
          * Applicable Outlook mode: Compose
+         * 
          * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
          * 
          * @param recipients The recipients to add to the recipients list.
@@ -6791,6 +6912,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose
          * 
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
@@ -6805,6 +6927,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose
          * 
          * @param options An object literal that contains one or more of the following properties.
@@ -6830,7 +6953,9 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadWriteItem
+         * 
          * Applicable Outlook mode: Compose
+         * 
          * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
          * 
          * @param recipients The recipients to add to the recipients list.
@@ -6867,6 +6992,7 @@ declare namespace Office {
      * Important: The RoamingSettings object is initialized from the persisted storage only when the add-in is first loaded. For task panes, this means that it is only initialized when the task pane first opens. If the task pane navigates to another page or reloads the current page, the in-memory object is reset to its initial values, even if your add-in has persisted changes. The persisted changes will not be available until the task pane is closed and reopened.
      * 
      * Minimum permission level: Restricted
+     * 
      * Applicable Outlook mode: Compose or read
      */
     export interface RoamingSettings {
@@ -6877,6 +7003,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: Restricted
+         * 
          * Applicable Outlook mode: Compose or read
          * 
          * @param name The case-sensitive name of the setting to retrieve.
@@ -6890,6 +7017,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: Restricted
+         * 
          * Applicable Outlook mode: Compose or read
          * 
          * @param name The case-sensitive name of the setting to remove.
@@ -6904,6 +7032,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: Restricted
+         * 
          * Applicable Outlook mode: Compose or read
          * 
          * @param callback Optional? When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
@@ -6922,6 +7051,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: Restricted
+         * 
          * Applicable Outlook mode: Compose or read
          * 
          * @param name The case-sensitive name of the setting to set or create.
@@ -6937,6 +7067,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Compose
      */
     export interface Subject {
@@ -6948,6 +7079,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose
          * 
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
@@ -6962,6 +7094,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose
          * 
          * @param options An object literal that contains one or more of the following properties.
@@ -6979,7 +7112,9 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose
+         * 
          * Errors: DataExceedsMaximumSize - The subject parameter is longer than 255 characters.
          * 
          * @param subject The subject of the appointment or message. The string is limited to 255 characters.
@@ -6999,6 +7134,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Read
      */
     export interface TaskSuggestion {
@@ -7018,6 +7154,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Compose
      */
     export interface Time {
@@ -7030,6 +7167,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose
          * 
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
@@ -7044,6 +7182,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose
          * 
          * @param options An object literal that contains one or more of the following properties.
@@ -7063,7 +7202,9 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadWriteItem
+         * 
          * Applicable Outlook mode: Compose
+         * 
          * Errors: InvalidEndTime - The appointment end time is before the appointment start time.
          * 
          * @param dateTime A date-time object in Coordinated Universal Time (UTC).
@@ -7079,6 +7220,7 @@ declare namespace Office {
      * 
      * @remarks
      * Minimum permission level: ReadItem
+     * 
      * Applicable Outlook mode: Compose or read
      */
     export interface UserProfile {
@@ -7098,6 +7240,7 @@ declare namespace Office {
          * |outlookCom |The mailbox is associated with a personal Outlook.com account.|
          * 
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         accountType: string;
@@ -7108,6 +7251,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         displayName: string;
@@ -7118,6 +7262,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         emailAddress: string;
@@ -7128,6 +7273,7 @@ declare namespace Office {
          * 
          * @remarks
          * Minimum permission level: ReadItem
+         * 
          * Applicable Outlook mode: Compose or read
          */
         timeZone: string;

From f73089b02231a60a0d8bdbfd5d70901ad440dc6b Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Tue, 29 May 2018 17:38:36 -0700
Subject: [PATCH 535/575] Outlook documentation migration - OfficeTheme fix

---
 types/office-js/index.d.ts | 44 +++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 76ef91c769..827a159214 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -388,10 +388,34 @@ declare namespace Office {
          */
         asyncContext?: any
     }
+    /**
+     * Provides access to the properties for Office theme colors.
+     * 
+     * Using Office theme colors lets you coordinate the color scheme of your add-in with the current Office theme selected by the user with File > Office Account > Office Theme UI, which is applied across all Office host applications. Using Office theme colors is appropriate for mail and task pane add-ins.
+     * 
+     * [Api set: Mailbox 1.3]
+     * 
+     * @remarks
+     * Note: This member is not supported in Outlook for iOS or Outlook for Android.
+     * 
+     * Applicable Outlook mode: Compose or read
+     */
     export interface OfficeTheme {
+        /**
+         * Gets the Office theme body background color as a hexadecimal color triplet.
+         */
         bodyBackgroundColor: string;
+        /**
+         * Gets the Office theme body foreground color as a hexadecimal color triplet.
+         */
         bodyForegroundColor: string;
+        /**
+         * Gets the Office theme control background color as a hexadecimal color triplet.
+         */
         controlBackgroundColor: string;
+        /**
+         * Gets the Office theme body control color as a hexadecimal color triplet.
+         */
         controlForegroundColor: string;
     }
     /**
@@ -4751,26 +4775,6 @@ declare namespace Office {
          * Applicable Outlook mode: Compose or read
          */
         mailbox: Mailbox;
-        /**
-         * Provides access to the properties for Office theme colors.
-         * 
-         * Using Office theme colors let's you coordinate the color scheme of your add-in with the current Office theme selected by the user with File > Office Account > Office Theme UI, which is applied across all Office host applications. Using Office theme colors is appropriate for mail and task pane add-ins.
-         * 
-         * |Name |Type |Description|
-         * |-----|-----|-----------|
-         * |bodyBackgroundColor|String|Gets the Office theme body background color as a hexadecimal color triplet.|
-         * |bodyForegroundColor|String|Gets the Office theme body foreground color as a hexadecimal color triplet.|
-         * |controlBackgroundColor|String|Gets the Office theme control background color as a hexadecimal color triplet.|
-         * |controlForegroundColor|String|Gets the Office theme body control color as a hexadecimal color triplet.|
-         * 
-         * [Api set: Mailbox 1.3]
-         * 
-         * @remarks
-         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
-         * 
-         * Applicable Outlook mode: Compose or read
-         */
-        officeTheme: Object;
         /**
          * Gets an object that represents the custom settings or state of a mail add-in saved to a user's mailbox.
          * 

From 05cec665da3d3003ceed13aa43dc683091505db7 Mon Sep 17 00:00:00 2001
From: Stephanie Yu <stephaniey@palantir.com>
Date: Tue, 29 May 2018 21:03:46 -0400
Subject: [PATCH 536/575] Add optimization class to webpack-chain typings

---
 types/webpack-chain/index.d.ts             | 28 ++++++++++++++++++++++
 types/webpack-chain/webpack-chain-tests.ts | 21 ++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/types/webpack-chain/index.d.ts b/types/webpack-chain/index.d.ts
index 6f6c46daa8..1a18737bc2 100644
--- a/types/webpack-chain/index.d.ts
+++ b/types/webpack-chain/index.d.ts
@@ -47,6 +47,7 @@ declare class Config extends __Config.ChainedMap<void> {
 	module: Config.Module;
 	node: Config.ChainedMap<this>;
 	output: Config.Output;
+	optimization: Config.Optimization;
 	performance: Config.Performance;
 	plugins: Config.Plugins<this>;
 	resolve: Config.Resolve;
@@ -198,6 +199,33 @@ declare namespace Config {
 		post(): this;
 	}
 
+	class Optimization extends ChainedMap<Config> {
+		concatenateModules(value: boolean): this;
+		flagIncludedChunks(value: boolean): this;
+		mergeDuplicateChunks(value: boolean): this;
+		minimize(value: boolean): this;
+		minimizer(value: webpack.Plugin[]): this;
+		namedChunks(value: boolean): this;
+		namedModules(value: boolean): this;
+		nodeEnv(value: boolean | string): this;
+		noEmitOnErrors(value: boolean): this;
+		occurrenceOrder(value: boolean): this;
+		portableRecords(value: boolean): this;
+		providedExports(value: boolean): this;
+		removeAvailableModules(value: boolean): this;
+		removeEmptyChunks(value: boolean): this;
+		runtimeChunk(value: boolean | "single" | "multiple" | RuntimeChunk): this;
+		sideEffects(value: boolean): this;
+		splitChunks(value: SplitChunksOptions): this;
+		usedExports(value: boolean): this;
+	}
+
+	interface RuntimeChunk {
+		name: string | Function;
+	}
+
+	interface SplitChunksOptions { [name: string]: any; }
+
 	interface LoaderOptions { [name: string]: any; }
 
 	class Use extends ChainedMap<Rule> {
diff --git a/types/webpack-chain/webpack-chain-tests.ts b/types/webpack-chain/webpack-chain-tests.ts
index 07593687cf..387162fb07 100644
--- a/types/webpack-chain/webpack-chain-tests.ts
+++ b/types/webpack-chain/webpack-chain-tests.ts
@@ -150,6 +150,27 @@ config
 		.umdNamedDefine(true)
 		.end()
 
+	.optimization
+		.concatenateModules(true)
+		.flagIncludedChunks(true)
+		.mergeDuplicateChunks(true)
+		.minimize(true)
+		.minimizer([])
+		.namedChunks(true)
+		.namedModules(true)
+		.nodeEnv(true)
+		.noEmitOnErrors(true)
+		.occurrenceOrder(true)
+		.portableRecords(true)
+		.providedExports(true)
+		.removeAvailableModules(true)
+		.removeEmptyChunks(true)
+		.runtimeChunk("single")
+		.sideEffects(true)
+		.splitChunks({})
+		.usedExports(true)
+		.end()
+
 	.performance
 		.hints(true)
 		.hints('warning')

From d01651413004cc54ea1e2f92be0ed17343311121 Mon Sep 17 00:00:00 2001
From: Stephanie Yu <stephaniey@palantir.com>
Date: Tue, 29 May 2018 21:09:32 -0400
Subject: [PATCH 537/575] Fix RuntimeChunk types

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

diff --git a/types/webpack-chain/index.d.ts b/types/webpack-chain/index.d.ts
index 1a18737bc2..ecf995cf59 100644
--- a/types/webpack-chain/index.d.ts
+++ b/types/webpack-chain/index.d.ts
@@ -221,7 +221,11 @@ declare namespace Config {
 	}
 
 	interface RuntimeChunk {
-		name: string | Function;
+		name: string | RuntimeChunkFunction;
+	}
+
+	interface RuntimeChunkFunction {
+		(entryPoint: Config.EntryPoint): string;
 	}
 
 	interface SplitChunksOptions { [name: string]: any; }
diff --git a/types/webpack-chain/webpack-chain-tests.ts b/types/webpack-chain/webpack-chain-tests.ts
index 387162fb07..f9a075cc71 100644
--- a/types/webpack-chain/webpack-chain-tests.ts
+++ b/types/webpack-chain/webpack-chain-tests.ts
@@ -166,6 +166,7 @@ config
 		.removeAvailableModules(true)
 		.removeEmptyChunks(true)
 		.runtimeChunk("single")
+		.runtimeChunk({ name: ({}) => "hello" })
 		.sideEffects(true)
 		.splitChunks({})
 		.usedExports(true)

From d1c2fe0b853f27de0b50a456acee3113ed3bf5a7 Mon Sep 17 00:00:00 2001
From: Stephanie Yu <stephaniey@palantir.com>
Date: Tue, 29 May 2018 21:15:18 -0400
Subject: [PATCH 538/575] lint

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

diff --git a/types/webpack-chain/index.d.ts b/types/webpack-chain/index.d.ts
index ecf995cf59..59cfc15797 100644
--- a/types/webpack-chain/index.d.ts
+++ b/types/webpack-chain/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for webpack-chain 4.0
+// Type definitions for webpack-chain 4.8.0
 // Project: https://github.com/mozilla-neutrino/webpack-chain
 // Definitions by: Eirikur Nilsson <https://github.com/eirikurn>, Paul Sachs <https://github.com/psachs21>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -224,9 +224,7 @@ declare namespace Config {
 		name: string | RuntimeChunkFunction;
 	}
 
-	interface RuntimeChunkFunction {
-		(entryPoint: Config.EntryPoint): string;
-	}
+	type RuntimeChunkFunction = (entryPoint: Config.EntryPoint) => string;
 
 	interface SplitChunksOptions { [name: string]: any; }
 

From eb7d4fa11bbac5fdac60497a9c3493b5f415bf70 Mon Sep 17 00:00:00 2001
From: Stephanie Yu <stephaniey@palantir.com>
Date: Tue, 29 May 2018 22:08:18 -0400
Subject: [PATCH 539/575] lint

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

diff --git a/types/webpack-chain/index.d.ts b/types/webpack-chain/index.d.ts
index 59cfc15797..278b200733 100644
--- a/types/webpack-chain/index.d.ts
+++ b/types/webpack-chain/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for webpack-chain 4.8.0
+// Type definitions for webpack-chain 4.8
 // Project: https://github.com/mozilla-neutrino/webpack-chain
 // Definitions by: Eirikur Nilsson <https://github.com/eirikurn>, Paul Sachs <https://github.com/psachs21>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -224,7 +224,7 @@ declare namespace Config {
 		name: string | RuntimeChunkFunction;
 	}
 
-	type RuntimeChunkFunction = (entryPoint: Config.EntryPoint) => string;
+	type RuntimeChunkFunction = (entryPoint: EntryPoint) => string;
 
 	interface SplitChunksOptions { [name: string]: any; }
 

From 6c10f1278dd6f8c1962cf5aff6c545b7e990958c Mon Sep 17 00:00:00 2001
From: jacobbubu <rong.shen@gmail.com>
Date: Wed, 30 May 2018 10:18:34 +0800
Subject: [PATCH 540/575] Add types to string-width

---
 types/string-width/index.d.ts            |  9 +++++++++
 types/string-width/string-width-tests.ts |  4 ++++
 types/string-width/tsconfig.json         | 16 ++++++++++++++++
 types/string-width/tslint.json           |  1 +
 4 files changed, 30 insertions(+)
 create mode 100644 types/string-width/index.d.ts
 create mode 100644 types/string-width/string-width-tests.ts
 create mode 100644 types/string-width/tsconfig.json
 create mode 100644 types/string-width/tslint.json

diff --git a/types/string-width/index.d.ts b/types/string-width/index.d.ts
new file mode 100644
index 0000000000..d896fe3c79
--- /dev/null
+++ b/types/string-width/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for string-width 2.0
+// Project: https://github.com/sindresorhus/string-width
+// Definitions by: Rong Shen <https://github.com/jacobbubu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare function stringWidth(text: string): number;
+export = stringWidth;
diff --git a/types/string-width/string-width-tests.ts b/types/string-width/string-width-tests.ts
new file mode 100644
index 0000000000..f48fb647af
--- /dev/null
+++ b/types/string-width/string-width-tests.ts
@@ -0,0 +1,4 @@
+import stringWidth = require("string-width");
+
+stringWidth("古");
+// => 2
diff --git a/types/string-width/tsconfig.json b/types/string-width/tsconfig.json
new file mode 100644
index 0000000000..bc216bafd3
--- /dev/null
+++ b/types/string-width/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", "string-width-tests.ts"]
+}
diff --git a/types/string-width/tslint.json b/types/string-width/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/string-width/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 8148b63692ed93f823a2cb717dbbf73cb53f8a76 Mon Sep 17 00:00:00 2001
From: Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com>
Date: Tue, 29 May 2018 21:56:53 -0700
Subject: [PATCH 541/575] Add array overload

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

diff --git a/types/showdown/index.d.ts b/types/showdown/index.d.ts
index 948fd966ec..53744f6d75 100644
--- a/types/showdown/index.d.ts
+++ b/types/showdown/index.d.ts
@@ -321,6 +321,7 @@ declare namespace Showdown {
          * @param name
          */
         addExtension(extension: ShowdownExtension, name: string): void;
+        addExtension(extension: ShowdownExtension[], name: string): void;
 
         /**
          * Use a global registered extension with THIS converter
diff --git a/types/showdown/showdown-tests.ts b/types/showdown/showdown-tests.ts
index 09a04b920c..e31af905f7 100644
--- a/types/showdown/showdown-tests.ts
+++ b/types/showdown/showdown-tests.ts
@@ -17,6 +17,11 @@ var preloadedExtensions = [ 'my-ext' ],
 var configuredConverter = new showdown.Converter();
     configuredConverter.addExtension({type: 'output', filter: (text, converter)=>{return text.replace('#', '*')}}, 'myext');
 
+configuredConverter.addExtension([
+  {type: 'output', filter: (text, converter)=>{return text.replace('#', '*')}},
+  {type: 'output', filter: (text, converter)=>{return text.replace('#', '*')}}
+], 'myext');
+
 console.log(showdown.helper);
 
 console.log(converter.makeHtml(exampleMarkdown));

From fbf1d7012bbecb47419d8f5175977667a8dd54c5 Mon Sep 17 00:00:00 2001
From: Klaus Kopruch <klaus.kopruch@materna.de>
Date: Wed, 30 May 2018 08:37:52 +0200
Subject: [PATCH 542/575] make first parameter of 'noUnknown()' optinal

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

diff --git a/types/yup/index.d.ts b/types/yup/index.d.ts
index 699d1893bf..3b45b3fcaa 100644
--- a/types/yup/index.d.ts
+++ b/types/yup/index.d.ts
@@ -142,7 +142,7 @@ export interface ObjectSchemaConstructor {
 export interface ObjectSchema<T> extends Schema<T> {
     shape(fields: { [field in keyof T]: Schema<T[field]> }, noSortEdges?: Array<[string, string]>): ObjectSchema<T>;
     from(fromKey: string, toKey: string, alias?: boolean): ObjectSchema<T>;
-    noUnknown(onlyKnownKeys: boolean, message?: string): ObjectSchema<T>;
+    noUnknown(onlyKnownKeys?: boolean, message?: string): ObjectSchema<T>;
     transformKeys(callback: (key: any) => any): void;
     camelCase(): ObjectSchema<T>;
     constantCase(): ObjectSchema<T>;
diff --git a/types/yup/yup-tests.ts b/types/yup/yup-tests.ts
index 83e17abe3e..0ce88a6c66 100644
--- a/types/yup/yup-tests.ts
+++ b/types/yup/yup-tests.ts
@@ -232,6 +232,7 @@ yup.object({
 
 objSchema.from('prop', 'myProp');
 objSchema.from('prop', 'myProp', true);
+objSchema.noUnknown();
 objSchema.noUnknown(true);
 objSchema.noUnknown(true, 'message');
 objSchema.transformKeys(key => key.toUpperCase());

From 10b90e800309eb59cf362cac1d6a3c55bce6744c Mon Sep 17 00:00:00 2001
From: Oliver Joseph Ash <oliverjash@gmail.com>
Date: Wed, 30 May 2018 09:34:15 +0100
Subject: [PATCH 543/575] Node: remove myself as author

---
 .github/CODEOWNERS       | 4 ++--
 types/node/v8/index.d.ts | 1 -
 types/node/v9/index.d.ts | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 06b2401d83..86b77f8c6b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2780,8 +2780,8 @@
 /types/node/v4/                                 @eps1lon
 /types/node/v6/                                 @WilcoBakker @inlined @eps1lon @Alorel @KSXGitHub
 /types/node/v7/                                 @parambirs @tellnes @WilcoBakker @eps1lon @KSXGitHub
-/types/node/v8/                                 @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @OliverJAsh @eps1lon @Hannes-Magnusson-CK @jkomyno @hoo29 @n-e @brunoscheufler @KSXGitHub @islishude
-/types/node/v9/                                 @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @OliverJAsh @eps1lon @Hannes-Magnusson-CK @jkomyno @ajafff @hoo29 @n-e @brunoscheufler @mohsen1 @KSXGitHub @a-tarasyuk @islishude
+/types/node/v8/                                 @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @hoo29 @n-e @brunoscheufler @KSXGitHub @islishude
+/types/node/v9/                                 @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
 /types/node/                                    @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
 /types/node-7z/                                 @erkie
 /types/node-array-ext/                          @Beng89
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index defcda33d8..277fa03104 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -13,7 +13,6 @@
 //                 Deividas Bakanas <https://github.com/DeividasBakanas>
 //                 Kelvin Jin <https://github.com/kjin>
 //                 Alvis HT Tang <https://github.com/alvis>
-//                 Oliver Joseph Ash <https://github.com/OliverJAsh>
 //                 Sebastian Silbermann <https://github.com/eps1lon>
 //                 Hannes Magnusson <https://github.com/Hannes-Magnusson-CK>
 //                 Alberto Schiabel <https://github.com/jkomyno>
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index 62cf6b568c..e8b01b5b54 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -13,7 +13,6 @@
 //                 Deividas Bakanas <https://github.com/DeividasBakanas>
 //                 Kelvin Jin <https://github.com/kjin>
 //                 Alvis HT Tang <https://github.com/alvis>
-//                 Oliver Joseph Ash <https://github.com/OliverJAsh>
 //                 Sebastian Silbermann <https://github.com/eps1lon>
 //                 Hannes Magnusson <https://github.com/Hannes-Magnusson-CK>
 //                 Alberto Schiabel <https://github.com/jkomyno>

From e914756530988d3c99a659518e56cb6d2c08e6ca Mon Sep 17 00:00:00 2001
From: ColinBradley <colinbradley@driveworks.co.uk>
Date: Wed, 30 May 2018 16:18:31 +0100
Subject: [PATCH 544/575] [dd-trace] moving types out to files so they can be
 referenced directly

---
 types/dd-trace/dd-trace-tests.ts              |  13 +-
 types/dd-trace/index.d.ts                     | 276 +-----------------
 types/dd-trace/src/opentracing/reference.d.ts |  29 ++
 types/dd-trace/src/opentracing/span.d.ts      | 120 ++++++++
 .../src/opentracing/span_context.d.ts         |  38 +++
 .../src/opentracing/span_options.d.ts         |  37 +++
 types/dd-trace/src/opentracing/tracer.d.ts    |  91 ++++++
 7 files changed, 330 insertions(+), 274 deletions(-)
 create mode 100644 types/dd-trace/src/opentracing/reference.d.ts
 create mode 100644 types/dd-trace/src/opentracing/span.d.ts
 create mode 100644 types/dd-trace/src/opentracing/span_context.d.ts
 create mode 100644 types/dd-trace/src/opentracing/span_options.d.ts
 create mode 100644 types/dd-trace/src/opentracing/tracer.d.ts

diff --git a/types/dd-trace/dd-trace-tests.ts b/types/dd-trace/dd-trace-tests.ts
index d027e714bf..6281802d36 100644
--- a/types/dd-trace/dd-trace-tests.ts
+++ b/types/dd-trace/dd-trace-tests.ts
@@ -1,10 +1,19 @@
 import * as ddTrace from 'dd-trace';
+import SpanContext = require('dd-trace/src/opentracing/span_context');
 
-const tracer = ddTrace.init();
+const tracer = ddTrace.init({
+    service: 'MyLovelyService',
+    hostname: 'localhost',
+    port: 8126,
+});
 
 tracer
     .trace('web.request', {
-        service: 'my_service'
+        service: 'my_service',
+        childOf: new SpanContext({ traceId: 1337, spanId: 42 }),
+        tags: {
+            env: 'dev'
+        }
     })
     .then(span => {
         span.setTag('my_tag', 'my_value');
diff --git a/types/dd-trace/index.d.ts b/types/dd-trace/index.d.ts
index a7c1437464..7ce1e89b09 100644
--- a/types/dd-trace/index.d.ts
+++ b/types/dd-trace/index.d.ts
@@ -3,6 +3,10 @@
 // Definitions by: Colin Bradley <https://github.com/ColinBradley>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+import Tracer = require('./src/opentracing/tracer');
+import Span = require('./src/opentracing/span');
+import SpanContext = require('./src/opentracing/span_context');
+
 declare var trace: TraceProxy;
 export = trace;
 
@@ -40,278 +44,6 @@ declare class TraceProxy extends Tracer {
     currentSpan(): Span | null;
 }
 
-interface SpanOptions {
-    /**
-     * a parent SpanContext (or Span, for convenience) that the newly-started
-     * span will be the child of (per REFERENCE_CHILD_OF). If specified,
-     * `references` must be unspecified.
-     */
-    childOf?: Span | SpanContext;
-
-    /**
-     * an array of Reference instances, each pointing to a causal parent
-     * SpanContext. If specified, `fields.childOf` must be unspecified.
-     */
-    references?: Reference[];
-
-    /**
-     * set of key-value pairs which will be set as tags on the newly created
-     * Span. Ownership of the object is passed to the created span for
-     * efficiency reasons (the caller should not modify this object after
-     * calling startSpan).
-     */
-    tags?: {
-        [key: string]: any;
-    };
-
-    /**
-     * a manually specified start time for the created Span object. The time
-     * should be specified in milliseconds as Unix timestamp. Decimal value are
-     * supported to represent time values with sub-millisecond accuracy.
-     */
-    startTime?: number;
-}
-
-/**
- * Tracer is the entry-point between the instrumentation API and the tracing
- * implementation.
- */
-declare class Tracer {
-    /**
-     * Starts and returns a new Span representing a logical unit of work.
-     *
-     * For example:
-     *
-     *     // Start a new (parentless) root Span:
-     *     var parent = Tracer.startSpan('DoWork');
-     *
-     *     // Start a new (child) Span:
-     *     var child = Tracer.startSpan('load-from-db', {
-     *         childOf: parent.context(),
-     *     });
-     *
-     *     // Start a new async (FollowsFrom) Span:
-     *     var child = Tracer.startSpan('async-cache-write', {
-     *         references: [
-     *             opentracing.followsFrom(parent.context())
-     *         ],
-     *     });
-     *
-     * @param name - the name of the operation (REQUIRED).
-     * @param options - options for the newly created span.
-     * @return A new Span object.
-     */
-    startSpan(name: string, options?: SpanOptions): Span;
-
-    /**
-     * Injects the given SpanContext instance for cross-process propagation
-     * within `carrier`. The expected type of `carrier` depends on the value of
-     * `format.
-     *
-     * OpenTracing defines a common set of `format` values (see
-     * FORMAT_TEXT_MAP, FORMAT_HTTP_HEADERS, and FORMAT_BINARY), and each has
-     * an expected carrier type.
-     *
-     * Consider this pseudocode example:
-     *
-     *     var clientSpan = ...;
-     *     ...
-     *     // Inject clientSpan into a text carrier.
-     *     var headersCarrier = {};
-     *     Tracer.inject(clientSpan.context(), Tracer.FORMAT_HTTP_HEADERS, headersCarrier);
-     *     // Incorporate the textCarrier into the outbound HTTP request header
-     *     // map.
-     *     Object.assign(outboundHTTPReq.headers, headersCarrier);
-     *     // ... send the httpReq
-     *
-     * @param  spanContext - the SpanContext to inject into the
-     *         carrier object. As a convenience, a Span instance may be passed
-     *         in instead (in which case its .context() is used for the
-     *         inject()).
-     * @param  format - the format of the carrier.
-     * @param  carrier - see the documentation for the chosen `format`
-     *         for a description of the carrier object.
-     */
-    inject(spanContext: SpanContext | Span, format: string, carrier: any): void;
-
-    /**
-     * Returns a SpanContext instance extracted from `carrier` in the given
-     * `format`.
-     *
-     * OpenTracing defines a common set of `format` values (see
-     * FORMAT_TEXT_MAP, FORMAT_HTTP_HEADERS, and FORMAT_BINARY), and each has
-     * an expected carrier type.
-     *
-     * Consider this pseudocode example:
-     *
-     *     // Use the inbound HTTP request's headers as a text map carrier.
-     *     var headersCarrier = inboundHTTPReq.headers;
-     *     var wireCtx = Tracer.extract(Tracer.FORMAT_HTTP_HEADERS, headersCarrier);
-     *     var serverSpan = Tracer.startSpan('...', { childOf : wireCtx });
-     *
-     * @param  format - the format of the carrier.
-     * @param  carrier - the type of the carrier object is determined by
-     *         the format.
-     * @return The extracted SpanContext, or null if no such SpanContext could
-     *         be found in `carrier`
-     */
-    extract(format: string, carrier: any): SpanContext | null;
-}
-
-declare class Span {
-    /**
-     * Returns the SpanContext object associated with this Span.
-     */
-    context(): SpanContext;
-
-    /**
-     * Returns the Tracer object used to create this Span.
-     */
-    tracer(): Tracer;
-
-    /**
-     * Sets the string name for the logical operation this span represents.
-     */
-    setOperationName(name: string): this;
-
-    /**
-     * Sets a key:value pair on this Span that also propagates to future
-     * children of the associated Span.
-     *
-     * setBaggageItem() enables powerful functionality given a full-stack
-     * opentracing integration (e.g., arbitrary application data from a web
-     * client can make it, transparently, all the way into the depths of a
-     * storage system), and with it some powerful costs: use this feature with
-     * care.
-     *
-     * IMPORTANT NOTE #1: setBaggageItem() will only propagate baggage items to
-     * *future* causal descendants of the associated Span.
-     *
-     * IMPORTANT NOTE #2: Use this thoughtfully and with care. Every key and
-     * value is copied into every local *and remote* child of the associated
-     * Span, and that can add up to a lot of network and cpu overhead.
-     */
-    setBaggageItem(key: string, value: string): this;
-
-    /**
-     * Returns the value for a baggage item given its key.
-     *
-     * @param  key
-     *         The key for the given trace attribute.
-     * @return String value for the given key, or undefined if the key does not
-     *         correspond to a set trace attribute.
-     */
-    getBaggageItem(key: string): string | undefined;
-
-    /**
-     * Adds a single tag to the span.  See `addTags()` for details.
-     */
-    setTag(key: string, value: any): this;
-
-    /**
-     * Adds the given key value pairs to the set of span tags.
-     *
-     * Multiple calls to addTags() results in the tags being the superset of
-     * all calls.
-     *
-     * The behavior of setting the same key multiple times on the same span
-     * is undefined.
-     *
-     * The supported type of the values is implementation-dependent.
-     * Implementations are expected to safely handle all types of values but
-     * may choose to ignore unrecognized / unhandle-able values (e.g. objects
-     * with cyclic references, function objects).
-     */
-    addTags(keyValueMap: {
-        [key: string]: any;
-    }): this;
-
-    /**
-     * Add a log record to this Span, optionally at a user-provided timestamp.
-     *
-     * For example:
-     *
-     *     span.log({
-     *         size: rpc.size(),  // numeric value
-     *         URI: rpc.URI(),  // string value
-     *         payload: rpc.payload(),  // Object value
-     *         "keys can be arbitrary strings": rpc.foo(),
-     *     });
-     *
-     *     span.log({
-     *         "error.description": someError.description(),
-     *     }, someError.timestampMillis());
-     *
-     * @param keyValuePairs
-     *        An object mapping string keys to arbitrary value types. All
-     *        Tracer implementations should support bool, string, and numeric
-     *        value types, and some may also support Object values.
-     * @param timestamp
-     *        An optional parameter specifying the timestamp in milliseconds
-     *        since the Unix epoch. Fractional values are allowed so that
-     *        timestamps with sub-millisecond accuracy can be represented. If
-     *        not specified, the implementation is expected to use its notion
-     *        of the current time of the call.
-     */
-
-    log(keyValuePairs: {
-        [key: string]: any;
-    }, timestamp?: number): this;
-
-    /**
-     * Sets the end timestamp and finalizes Span state.
-     *
-     * With the exception of calls to Span.context() (which are always allowed),
-     * finish() must be the last call made to any span instance, and to do
-     * otherwise leads to undefined behavior.
-     *
-     * @param  finishTime
-     *         Optional finish time in milliseconds as a Unix timestamp. Decimal
-     *         values are supported for timestamps with sub-millisecond accuracy.
-     *         If not specified, the current time (as defined by the
-     *         implementation) will be used.
-     */
-    finish(finishTime?: number): void;
-}
-
-declare class Reference {
-    /**
-     * @return The Reference type (e.g., REFERENCE_CHILD_OF or
-     *         REFERENCE_FOLLOWS_FROM).
-     */
-    type(): string;
-
-    /**
-     * @return The SpanContext being referred to (e.g., the
-     *         parent in a REFERENCE_CHILD_OF Reference).
-     */
-    referencedContext(): SpanContext;
-
-    /**
-     * Initialize a new Reference instance.
-     *
-     * @param type - the Reference type constant (e.g.,
-     *        REFERENCE_CHILD_OF or REFERENCE_FOLLOWS_FROM).
-     * @param referencedContext - the SpanContext being referred
-     *        to. As a convenience, a Span instance may be passed in instead
-     *        (in which case its .context() is used here).
-     */
-    constructor(type: string, referencedContext: SpanContext | Span);
-}
-
-/**
- * SpanContext represents Span state that must propagate to descendant Spans
- * and across process boundaries.
- *
- * SpanContext is logically divided into two pieces: the user-level "Baggage"
- * (see setBaggageItem and getBaggageItem) that propagates across Span
- * boundaries and any Tracer-implementation-specific fields that are needed to
- * identify or otherwise contextualize the associated Span instance (e.g., a
- * <trace_id, span_id, sampled> tuple).
- */
-declare class SpanContext {
-}
-
 interface TracerOptions {
     /**
      * Enable debug logging in the tracer.
diff --git a/types/dd-trace/src/opentracing/reference.d.ts b/types/dd-trace/src/opentracing/reference.d.ts
new file mode 100644
index 0000000000..57def49166
--- /dev/null
+++ b/types/dd-trace/src/opentracing/reference.d.ts
@@ -0,0 +1,29 @@
+import Span = require('./span');
+import SpanContext = require('./span_context');
+
+declare class Reference {
+    /**
+     * @return The Reference type (e.g., REFERENCE_CHILD_OF or
+     *         REFERENCE_FOLLOWS_FROM).
+     */
+    type(): string;
+
+    /**
+     * @return The SpanContext being referred to (e.g., the
+     *         parent in a REFERENCE_CHILD_OF Reference).
+     */
+    referencedContext(): SpanContext;
+
+    /**
+     * Initialize a new Reference instance.
+     *
+     * @param type - the Reference type constant (e.g.,
+     *        REFERENCE_CHILD_OF or REFERENCE_FOLLOWS_FROM).
+     * @param referencedContext - the SpanContext being referred
+     *        to. As a convenience, a Span instance may be passed in instead
+     *        (in which case its .context() is used here).
+     */
+    constructor(type: string, referencedContext: SpanContext | Span);
+}
+
+export = Reference;
\ No newline at end of file
diff --git a/types/dd-trace/src/opentracing/span.d.ts b/types/dd-trace/src/opentracing/span.d.ts
new file mode 100644
index 0000000000..e61a611efd
--- /dev/null
+++ b/types/dd-trace/src/opentracing/span.d.ts
@@ -0,0 +1,120 @@
+import Tracer = require('./tracer');
+import SpanContext = require('./span_context');
+
+declare class Span {
+    /**
+     * Returns the SpanContext object associated with this Span.
+     */
+    context(): SpanContext;
+
+    /**
+     * Returns the Tracer object used to create this Span.
+     */
+    tracer(): Tracer;
+
+    /**
+     * Sets the string name for the logical operation this span represents.
+     */
+    setOperationName(name: string): this;
+
+    /**
+     * Sets a key:value pair on this Span that also propagates to future
+     * children of the associated Span.
+     *
+     * setBaggageItem() enables powerful functionality given a full-stack
+     * opentracing integration (e.g., arbitrary application data from a web
+     * client can make it, transparently, all the way into the depths of a
+     * storage system), and with it some powerful costs: use this feature with
+     * care.
+     *
+     * IMPORTANT NOTE #1: setBaggageItem() will only propagate baggage items to
+     * *future* causal descendants of the associated Span.
+     *
+     * IMPORTANT NOTE #2: Use this thoughtfully and with care. Every key and
+     * value is copied into every local *and remote* child of the associated
+     * Span, and that can add up to a lot of network and cpu overhead.
+     */
+    setBaggageItem(key: string, value: string): this;
+
+    /**
+     * Returns the value for a baggage item given its key.
+     *
+     * @param  key
+     *         The key for the given trace attribute.
+     * @return String value for the given key, or undefined if the key does not
+     *         correspond to a set trace attribute.
+     */
+    getBaggageItem(key: string): string | undefined;
+
+    /**
+     * Adds a single tag to the span.  See `addTags()` for details.
+     */
+    setTag(key: string, value: any): this;
+
+    /**
+     * Adds the given key value pairs to the set of span tags.
+     *
+     * Multiple calls to addTags() results in the tags being the superset of
+     * all calls.
+     *
+     * The behavior of setting the same key multiple times on the same span
+     * is undefined.
+     *
+     * The supported type of the values is implementation-dependent.
+     * Implementations are expected to safely handle all types of values but
+     * may choose to ignore unrecognized / unhandle-able values (e.g. objects
+     * with cyclic references, function objects).
+     */
+    addTags(keyValueMap: {
+        [key: string]: any;
+    }): this;
+
+    /**
+     * Add a log record to this Span, optionally at a user-provided timestamp.
+     *
+     * For example:
+     *
+     *     span.log({
+     *         size: rpc.size(),  // numeric value
+     *         URI: rpc.URI(),  // string value
+     *         payload: rpc.payload(),  // Object value
+     *         "keys can be arbitrary strings": rpc.foo(),
+     *     });
+     *
+     *     span.log({
+     *         "error.description": someError.description(),
+     *     }, someError.timestampMillis());
+     *
+     * @param keyValuePairs
+     *        An object mapping string keys to arbitrary value types. All
+     *        Tracer implementations should support bool, string, and numeric
+     *        value types, and some may also support Object values.
+     * @param timestamp
+     *        An optional parameter specifying the timestamp in milliseconds
+     *        since the Unix epoch. Fractional values are allowed so that
+     *        timestamps with sub-millisecond accuracy can be represented. If
+     *        not specified, the implementation is expected to use its notion
+     *        of the current time of the call.
+     */
+
+    log(keyValuePairs: {
+        [key: string]: any;
+    }, timestamp?: number): this;
+
+    /**
+     * Sets the end timestamp and finalizes Span state.
+     *
+     * With the exception of calls to Span.context() (which are always allowed),
+     * finish() must be the last call made to any span instance, and to do
+     * otherwise leads to undefined behavior.
+     *
+     * @param  finishTime
+     *         Optional finish time in milliseconds as a Unix timestamp. Decimal
+     *         values are supported for timestamps with sub-millisecond accuracy.
+     *         If not specified, the current time (as defined by the
+     *         implementation) will be used.
+     */
+    finish(finishTime?: number): void;
+}
+
+export = Span;
diff --git a/types/dd-trace/src/opentracing/span_context.d.ts b/types/dd-trace/src/opentracing/span_context.d.ts
new file mode 100644
index 0000000000..4e3b532649
--- /dev/null
+++ b/types/dd-trace/src/opentracing/span_context.d.ts
@@ -0,0 +1,38 @@
+/**
+ * SpanContext represents Span state that must propagate to descendant Spans
+ * and across process boundaries.
+ *
+ * SpanContext is logically divided into two pieces: the user-level "Baggage"
+ * (see setBaggageItem and getBaggageItem) that propagates across Span
+ * boundaries and any Tracer-implementation-specific fields that are needed to
+ * identify or otherwise contextualize the associated Span instance (e.g., a
+ * <trace_id, span_id, sampled> tuple).
+ */
+declare class SpanContext {
+    /**
+     * Use to create references to parent spans.
+     */
+    constructor(props: SpanContextLike);
+
+    public traceId: number;
+
+    public spanId: number;
+
+    public parentId?: number | null;
+
+    public sampled?: boolean;
+
+    public baggageItems?: { [key: string]: string };
+
+    public trace?: {
+        started: number[],
+        finished: number[]
+    }
+}
+
+interface SpanContextLike {
+    traceId: number;
+    spanId: number;
+}
+
+export = SpanContext;
diff --git a/types/dd-trace/src/opentracing/span_options.d.ts b/types/dd-trace/src/opentracing/span_options.d.ts
new file mode 100644
index 0000000000..054d9024d1
--- /dev/null
+++ b/types/dd-trace/src/opentracing/span_options.d.ts
@@ -0,0 +1,37 @@
+import Span = require('./span');
+import Reference = require('./reference');
+import SpanContext = require('./span_context');
+
+interface SpanOptions {
+    /**
+     * a parent SpanContext (or Span, for convenience) that the newly-started
+     * span will be the child of (per REFERENCE_CHILD_OF). If specified,
+     * `references` must be unspecified.
+     */
+    childOf?: Span | SpanContext;
+
+    /**
+     * an array of Reference instances, each pointing to a causal parent
+     * SpanContext. If specified, `fields.childOf` must be unspecified.
+     */
+    references?: Reference[];
+
+    /**
+     * set of key-value pairs which will be set as tags on the newly created
+     * Span. Ownership of the object is passed to the created span for
+     * efficiency reasons (the caller should not modify this object after
+     * calling startSpan).
+     */
+    tags?: {
+        [key: string]: any;
+    };
+
+    /**
+     * a manually specified start time for the created Span object. The time
+     * should be specified in milliseconds as Unix timestamp. Decimal value are
+     * supported to represent time values with sub-millisecond accuracy.
+     */
+    startTime?: number;
+}
+
+export = SpanOptions;
diff --git a/types/dd-trace/src/opentracing/tracer.d.ts b/types/dd-trace/src/opentracing/tracer.d.ts
new file mode 100644
index 0000000000..a40559dbcd
--- /dev/null
+++ b/types/dd-trace/src/opentracing/tracer.d.ts
@@ -0,0 +1,91 @@
+import SpanOptions = require('./span_options');
+import Span = require('./span');
+import SpanContext = require('./span_context');
+
+/**
+ * Tracer is the entry-point between the instrumentation API and the tracing
+ * implementation.
+ */
+declare class Tracer {
+    /**
+     * Starts and returns a new Span representing a logical unit of work.
+     *
+     * For example:
+     *
+     *     // Start a new (parentless) root Span:
+     *     var parent = Tracer.startSpan('DoWork');
+     *
+     *     // Start a new (child) Span:
+     *     var child = Tracer.startSpan('load-from-db', {
+     *         childOf: parent.context(),
+     *     });
+     *
+     *     // Start a new async (FollowsFrom) Span:
+     *     var child = Tracer.startSpan('async-cache-write', {
+     *         references: [
+     *             opentracing.followsFrom(parent.context())
+     *         ],
+     *     });
+     *
+     * @param name - the name of the operation (REQUIRED).
+     * @param options - options for the newly created span.
+     * @return A new Span object.
+     */
+    startSpan(name: string, options?: SpanOptions): Span;
+
+    /**
+     * Injects the given SpanContext instance for cross-process propagation
+     * within `carrier`. The expected type of `carrier` depends on the value of
+     * `format.
+     *
+     * OpenTracing defines a common set of `format` values (see
+     * FORMAT_TEXT_MAP, FORMAT_HTTP_HEADERS, and FORMAT_BINARY), and each has
+     * an expected carrier type.
+     *
+     * Consider this pseudocode example:
+     *
+     *     var clientSpan = ...;
+     *     ...
+     *     // Inject clientSpan into a text carrier.
+     *     var headersCarrier = {};
+     *     Tracer.inject(clientSpan.context(), Tracer.FORMAT_HTTP_HEADERS, headersCarrier);
+     *     // Incorporate the textCarrier into the outbound HTTP request header
+     *     // map.
+     *     Object.assign(outboundHTTPReq.headers, headersCarrier);
+     *     // ... send the httpReq
+     *
+     * @param  spanContext - the SpanContext to inject into the
+     *         carrier object. As a convenience, a Span instance may be passed
+     *         in instead (in which case its .context() is used for the
+     *         inject()).
+     * @param  format - the format of the carrier.
+     * @param  carrier - see the documentation for the chosen `format`
+     *         for a description of the carrier object.
+     */
+    inject(spanContext: SpanContext | Span, format: string, carrier: any): void;
+
+    /**
+     * Returns a SpanContext instance extracted from `carrier` in the given
+     * `format`.
+     *
+     * OpenTracing defines a common set of `format` values (see
+     * FORMAT_TEXT_MAP, FORMAT_HTTP_HEADERS, and FORMAT_BINARY), and each has
+     * an expected carrier type.
+     *
+     * Consider this pseudocode example:
+     *
+     *     // Use the inbound HTTP request's headers as a text map carrier.
+     *     var headersCarrier = inboundHTTPReq.headers;
+     *     var wireCtx = Tracer.extract(Tracer.FORMAT_HTTP_HEADERS, headersCarrier);
+     *     var serverSpan = Tracer.startSpan('...', { childOf : wireCtx });
+     *
+     * @param  format - the format of the carrier.
+     * @param  carrier - the type of the carrier object is determined by
+     *         the format.
+     * @return The extracted SpanContext, or null if no such SpanContext could
+     *         be found in `carrier`
+     */
+    extract(format: string, carrier: any): SpanContext | null;
+}
+
+export = Tracer;

From 951a2de52bfd37ae0f9d1220f42e2f0e7b17959e Mon Sep 17 00:00:00 2001
From: rayhaneh <rbanyassady@onist.com>
Date: Wed, 30 May 2018 12:48:20 -0400
Subject: [PATCH 545/575] Added last curried version

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

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 6cf29b5e51..52e4becc10 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -524,7 +524,8 @@ declare namespace R {
          * elements.
          */
         differenceWith<T>(pred: (a: T, b: T) => boolean, list1: ReadonlyArray<T>, list2: ReadonlyArray<T>): T[];
-        differenceWith<T>(pred: (a: T, b: T) => boolean): <T> (list1: ReadonlyArray<T>, list2: ReadonlyArray<T>) => T[];
+        differenceWith<T>(pred: (a: T, b: T) => boolean): (list1: ReadonlyArray<T>, list2: ReadonlyArray<T>) => T[];
+        differenceWith<T>(pred: (a: T, b: T) => boolean, list1: ReadonlyArray<T>): (list2: ReadonlyArray<T>) => T[];
 
         /*
          * Returns a new object that does not contain a prop property.
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 9d0120b8aa..ee9e7512e1 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -1958,8 +1958,11 @@ class Rectangle {
     const l2 = [{a: 3}, {a: 4}];
     R.differenceWith(cmp, l1, l2); // => [{a: 1}, {a: 2}]
 
-    const differenceWithCurried = R.differenceWith(cmp);
-    differenceWithCurried(l1, l2); // =>[{a: 1}, {a: 2}]
+    const differenceWithCurried1 = R.differenceWith(cmp);
+    differenceWithCurried1(l1, l2); // =>[{a: 1}, {a: 2}]
+
+    const differenceWithCurried2 = R.differenceWith(cmp, l1);
+    differenceWithCurried2(l2); // =>[{a: 1}, {a: 2}]
 };
 
 () => {

From 4f074b2c8546288c9cc169396123f8c5be5c6aa0 Mon Sep 17 00:00:00 2001
From: Suman Lama <lamasuman2@gmail.com>
Date: Wed, 30 May 2018 11:05:53 -0700
Subject: [PATCH 546/575] fixes "string to 'ondemand' | 'progressive' issue"

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

diff --git a/types/react-slick/index.d.ts b/types/react-slick/index.d.ts
index fc7568ac4c..e9f03b80fa 100644
--- a/types/react-slick/index.d.ts
+++ b/types/react-slick/index.d.ts
@@ -25,6 +25,8 @@ export interface ResponsiveObject {
 
 export type SwipeDirection = "left" | "down" | "right" | "up" | string;
 
+export type LazyLoadTypes = "ondemand" | "progressive";
+
 export interface Settings {
   accessibility?: boolean;
   adaptiveHeight?: boolean;
@@ -49,7 +51,7 @@ export interface Settings {
   focusOnSelect?: boolean;
   infinite?: boolean;
   initialSlide?: number;
-  lazyLoad?: "ondemand" | "progressive";
+  lazyLoad?: LazyLoadTypes;
   nextArrow?: JSX.Element;
   onEdge?(swipeDirection: SwipeDirection): void;
   onInit?(): void;

From 84804112d419e5792b14821cdd379d120b2d525e Mon Sep 17 00:00:00 2001
From: Bryce Godfrey <brycelg@gmail.com>
Date: Wed, 30 May 2018 13:56:02 -0700
Subject: [PATCH 547/575] add optional params

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

diff --git a/types/servicenow/index.d.ts b/types/servicenow/index.d.ts
index abf46bcede..eaa56f4fc0 100644
--- a/types/servicenow/index.d.ts
+++ b/types/servicenow/index.d.ts
@@ -324,7 +324,7 @@ declare namespace servicenow {
         orderBy(name: string): void;
         orderByDesc(name: string): void;
         query(field?: string, value?: object): void;
-        _query(field: string, value: object): void;
+        _query(field?: string, value?: object): void;
         setAbortAction(b: boolean): void;
         setNewGuidValue(guid: string): void;
         setLimit(limit: number): void;

From a6e42584af96e221ae3c0eb1c975f6e37cde4016 Mon Sep 17 00:00:00 2001
From: Bryce Godfrey <brycelg@gmail.com>
Date: Wed, 30 May 2018 13:59:50 -0700
Subject: [PATCH 548/575] fix typo

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

diff --git a/types/servicenow/tslint.json b/types/servicenow/tslint.json
index 5da5a8c9f1..20a8cbac04 100644
--- a/types/servicenow/tslint.json
+++ b/types/servicenow/tslint.json
@@ -1,7 +1,7 @@
 { 
     "extends": "dtslint/dt.json",
     "rules": {
-        // Interface is needed for merging which is not possible on delcared classes
+        // Interface is needed for merging GlideRecord types
         "no-misused-new": false
     }
 }
\ No newline at end of file

From 0deac20f0902ec26e74708ea2f8cb19bae39fa44 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Wed, 30 May 2018 15:04:06 -0700
Subject: [PATCH 549/575] Office Migration - Zlatkovsky's change requests

---
 types/office-js/index.d.ts | 375 +++++++++++++++++++++----------------
 1 file changed, 217 insertions(+), 158 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 827a159214..18975697fe 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -392,29 +392,25 @@ declare namespace Office {
      * Provides access to the properties for Office theme colors.
      * 
      * Using Office theme colors lets you coordinate the color scheme of your add-in with the current Office theme selected by the user with File > Office Account > Office Theme UI, which is applied across all Office host applications. Using Office theme colors is appropriate for mail and task pane add-ins.
-     * 
-     * [Api set: Mailbox 1.3]
-     * 
+     *  
      * @remarks
-     * Note: This member is not supported in Outlook for iOS or Outlook for Android.
-     * 
-     * Applicable Outlook mode: Compose or read
+     * Hosts: Excel, Outlook, Powerpoint, Project, Word
      */
     export interface OfficeTheme {
         /**
-         * Gets the Office theme body background color as a hexadecimal color triplet.
+         * Gets the Office theme body background color as a hexadecimal color triplet (e.g. "FFA500").
          */
         bodyBackgroundColor: string;
         /**
-         * Gets the Office theme body foreground color as a hexadecimal color triplet.
+         * Gets the Office theme body foreground color as a hexadecimal color triplet (e.g. "FFA500").
          */
         bodyForegroundColor: string;
         /**
-         * Gets the Office theme control background color as a hexadecimal color triplet.
+         * Gets the Office theme control background color as a hexadecimal color triplet (e.g. "FFA500").
          */
         controlBackgroundColor: string;
         /**
-         * Gets the Office theme body control color as a hexadecimal color triplet.
+         * Gets the Office theme body control color as a hexadecimal color triplet (e.g. "FFA500").
          */
         controlForegroundColor: string;
     }
@@ -1745,11 +1741,11 @@ declare namespace Office {
         /**
          * Adds an event handler for the settingsChanged event.
          * 
+         * Important: Your add-in's code can register a handler for the settingsChanged event when the add-in is running with any Excel client, but the event will fire only when the add-in is loaded with a spreadsheet that is opened in Excel Online, and more than one user is editing the spreadsheet (co-authoring). Therefore, effectively the settingsChanged event is supported only in Excel Online in co-authoring scenarios.
+         *
          * @remarks
          * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
          * 
-         * Important: Your add-in's code can register a handler for the settingsChanged event when the add-in is running with any Excel client, but the event will fire only when the add-in is loaded with a spreadsheet that is opened in Excel Online, and more than one user is editing the spreadsheet (co-authoring). Therefore, effectively the settingsChanged event is supported only in Excel Online in co-authoring scenarios.
-         * 
          * Hosts: Excel
          * 
          * Available in Requirement set: Settings
@@ -1808,10 +1804,11 @@ declare namespace Office {
         /**
          * Removes the specified setting.
          * 
+         * Important: Be aware that the Settings.remove method affects only the in-memory copy of the settings property bag. To persist the removal of the specified setting in the document, at some point after calling the Settings.remove method and before the add-in is closed, you must call the Settings.saveAsync method.
+         * 
          * @remarks
          * null is a valid value for a setting. Therefore, assigning null to the setting will not remove it from the settings property bag.
          * 
-         * Important: Be aware that the Settings.remove method affects only the in-memory copy of the settings property bag. To persist the removal of the specified setting in the document, at some point after calling the Settings.remove method and before the add-in is closed, you must call the Settings.saveAsync method.
          * Hosts: Access, Excel, PowerPoint, Word
          * 
          * Available in Requirement set: Settings
@@ -1867,11 +1864,12 @@ declare namespace Office {
         /**
          * Sets or creates the specified setting.
          * 
-         * @remarks
-         * The set method creates a new setting of the specified name if it does not already exist, or sets an existing setting of the specified name in the in-memory copy of the settings property bag. After you call the Settings.saveAsync method, the value is stored in the document as the serialized JSON representation of its data type. A maximum of 2MB is available for the settings of each add-in.
          * 
          * Important: Be aware that the Settings.set method affects only the in-memory copy of the settings property bag. To make sure that additions or changes to settings will be available to your add-in the next time the document is opened, at some point after calling the Settings.set method and before the add-in is closed, you must call the Settings.saveAsync method to persist settings in the document.
          * 
+         * @remarks
+         * The set method creates a new setting of the specified name if it does not already exist, or sets an existing setting of the specified name in the in-memory copy of the settings property bag. After you call the Settings.saveAsync method, the value is stored in the document as the serialized JSON representation of its data type. A maximum of 2MB is available for the settings of each add-in.
+         * 
          * Hosts: Access, Excel, PowerPoint, Word
          * 
          * Available in Requirement set: Settings
@@ -4380,7 +4378,7 @@ declare namespace Office {
              */
             Address,
             /**
-             * Specifies that the entity is a SMTP email address.
+             * Specifies that the entity is an SMTP email address.
              */
             EmailAddress,
             /**
@@ -4607,9 +4605,10 @@ declare namespace Office {
          * @param coercionType The format for the returned body.
          * @param options Optional. An object literal that contains one or more of the following properties:
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. The body is provided in the requested format in the asyncResult.value property.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The body is provided in the requested format in the asyncResult.value property.
          */
         getAsync(coercionType: CoercionType, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getAsync(coercionType: CoercionType, callback: (result: AsyncResult) => void): void;
 
         /**
          * Gets a value that indicates whether the content is in HTML or text format.
@@ -4623,13 +4622,13 @@ declare namespace Office {
          * 
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. The content type is returned as one of the CoercionType values in the asyncResult.value property.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The content type is returned as one of the CoercionType values in the asyncResult.value property.
          */
         getTypeAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Adds the specified content to the beginning of the item body.
          * 
-         * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to it's original place, relative to the inserted content.
+         * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
          * 
          * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
          * 
@@ -4644,9 +4643,12 @@ declare namespace Office {
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          *        coercionType: The desired format for the body. The string in the data parameter will be converted to this format.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. Any errors encountered will be provided in the asyncResult.error property.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. Any errors encountered will be provided in the asyncResult.error property.
          */
         prependAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
+        prependAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+        prependAsync(data: string, callback: (result: AsyncResult) => void): void;
+        prependAsync(data: string): void;
         /**
          * Replaces the entire body with the specified text.
          * 
@@ -4669,9 +4671,13 @@ declare namespace Office {
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          *        coercionType: The desired format for the body. The string in the data parameter will be converted to this format.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.  Any errors encountered will be provided in the asyncResult.error property.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  Any errors encountered will be provided in the asyncResult.error property.
          */
         setAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
+        setAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+        setAsync(data: string, callback: (result: AsyncResult) => void): void;
+        setAsync(data: string): void;
+
         /**
          * Replaces the selection in the body with the specified text.
          * 
@@ -4694,9 +4700,12 @@ declare namespace Office {
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          *        coercionType: The desired format for the body. The string in the data parameter will be converted to this format.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.  Any errors encountered will be provided in the asyncResult.error property.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  Any errors encountered will be provided in the asyncResult.error property.
          */
         setSelectedDataAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
+        setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+        setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
+        setSelectedDataAsync(data: string): void;
     }
     /**
      * Represents a contact stored on the server. Read mode only.
@@ -4737,11 +4746,13 @@ declare namespace Office {
         urls: Array<string>;
     }
     /**
-     * The Office.context namespace provides shared interfaces that are used by add-ins in all of the Office apps. This listing documents only those interfaces that are used by Outlook add-ins. For a full listing of the Office.context namespace, see the [Office.context reference in the Shared API]<https://dev.office.com/reference/add-ins/shared/office.context.htm>.
+     * The Office.context namespace provides shared interfaces that are used by add-ins in all of the Office apps. This listing documents only those interfaces that are used by Outlook add-ins.
      * 
      * [Api set: Mailbox 1.0]
      * 
      * @remarks
+     * For a full listing of the Office.context namespace, see the [Office.context reference in the Shared API]<https://dev.office.com/reference/add-ins/shared/office.context.htm>.
+     * 
      * Applicable Outlook mode: Compose or read
      */
     export interface Context {
@@ -4792,7 +4803,7 @@ declare namespace Office {
     /**
      * The CustomProperties object represents custom properties that are specific to a particular item and specific to a mail add-in for Outlook. For example, there might be a need for a mail add-in to save some data that is specific to the current email message that activated the add-in. If the user revisits the same message in the future and activates the mail add-in again, the add-in will be able to retrieve the data that had been saved as custom properties.
      * 
-     * Because Outlook for Mac doesn’t cache custom properties, if the user’s network goes down, mail add-ins cannot access their custom properties.
+     * Because Outlook for Mac doesn't cache custom properties, if the user's network goes down, mail add-ins cannot access their custom properties.
      * 
      * [Api set: Mailbox 1.0]
      * 
@@ -4852,9 +4863,9 @@ declare namespace Office {
          * 
          * You must call the saveAsync method to persist any changes made with the set method or the remove method of the CustomProperties object. The saving action is asynchronous.
          * 
-         * It’s a good practice to have your callback function check for and handle errors from saveAsync. In particular, a read add-in can be activated while the user is in a connected state in a read form, and subsequently the user becomes disconnected. If the add-in calls saveAsync while in the disconnected state, saveAsync would return an error. Your callback method should handle this error accordingly.
+         * It's a good practice to have your callback function check for and handle errors from saveAsync. In particular, a read add-in can be activated while the user is in a connected state in a read form, and subsequently the user becomes disconnected. If the add-in calls saveAsync while in the disconnected state, saveAsync would return an error. Your callback method should handle this error accordingly.
          * 
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          * @param asyncContext Optional. Any state data that is passed to the callback method.
          * 
          * [Api set: Mailbox 1.0]
@@ -5001,31 +5012,31 @@ declare namespace Office {
         /**
          * Gets the physical addresses (street or mailing addresses) found in an email message or appointment.
          */
-        addresses: Array<string>;
+        addresses: string[];
         /**
          * Gets the contacts found in an email address or appointment.
          */
-        contacts: Array<Contact>;
+        contacts: Contact[];
         /**
          * Gets the email addresses found in an email message or appointment.
          */
-        emailAddresses: Array<string>;
+        emailAddresses: string[];
         /**
          * Gets the meeting suggestions found in an email message.
          */
-        meetingSuggestions: Array<MeetingSuggestion>;
+        meetingSuggestions: MeetingSuggestion[];
         /**
          * Gets the phone numbers found in an email message or appointment.
          */
-        phoneNumbers: Array<PhoneNumber>;
+        phoneNumbers: PhoneNumber[];
         /**
          * Gets the task suggestions found in an email message or appointment.
          */
-        taskSuggestions: Array<string>;
+        taskSuggestions: string[];
         /**
          * Gets the Internet URLs present in an email message or appointment.
          */
-        urls: Array<string>;
+        urls: string[];
     }
 
 
@@ -5035,7 +5046,7 @@ declare namespace Office {
         /**
          * Gets or sets the date and time that the appointment is to end.
          * 
-         * The end property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the end property value to the client’s local date and time.
+         * The end property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the end property value to the client's local date and time.
          * 
          * *Read mode*
          * 
@@ -5119,7 +5130,7 @@ declare namespace Office {
         /**
          * Gets or sets the date and time that the appointment is to begin.
          * 
-         * The start property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the value to the client’s local date and time.
+         * The start property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the value to the client's local date and time.
          * 
          * *Read mode*
          * 
@@ -5182,7 +5193,7 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Compose or read
          */
-        optionalAttendees: Array<EmailAddressDetails>;
+        optionalAttendees: EmailAddressDetails[];
         /**
          * Gets the email address of the meeting organizer for a specified meeting. Read mode only.
          * 
@@ -5214,11 +5225,11 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Compose or read
          */
-        requiredAttendees: Array<EmailAddressDetails>;
+        requiredAttendees: EmailAddressDetails[];
         /**
          * Gets or sets the date and time that the appointment is to begin.
          * 
-         * The start property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the value to the client’s local date and time.
+         * The start property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the value to the client's local date and time.
          * 
          * *Read mode*
          * 
@@ -5244,7 +5255,7 @@ declare namespace Office {
         /**
          * Gets or sets the date and time that the appointment is to end.
          * 
-         * The end property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the end property value to the client’s local date and time.
+         * The end property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the end property value to the client's local date and time.
          * 
          * *Read mode*
          * 
@@ -5303,7 +5314,7 @@ declare namespace Office {
         * 
         * Applicable Outlook mode: Compose or read
         */
-       optionalAttendees: Array<string> | Array<EmailAddressDetails>;
+       optionalAttendees: string[] | EmailAddressDetails[];
         /**
          * Provides access to the required attendees of an event. The type of object and level of access depends on the mode of the current item.
          * 
@@ -5323,11 +5334,11 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Compose or read
          */
-        requiredAttendees: Array<string> | Array<EmailAddressDetails>;
+        requiredAttendees: string[] | EmailAddressDetails[];
         /**
          * Gets or sets the date and time that the appointment is to begin.
          * 
-         * The start property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the value to the client’s local date and time.
+         * The start property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the value to the client's local date and time.
          * 
          * *Read mode*
          * 
@@ -5462,7 +5473,7 @@ declare namespace Office {
         * 
         * Applicable Outlook mode: Compose or read
         * 
-        * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+        * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
         * @param userContext Optional. Developers can provide any object they wish to access in the callback function. This object can be accessed by the asyncResult.asyncContext property in the callback function.
         */
        loadCustomPropertiesAsync(callback: (result: AsyncResult) => void, userContext?: any): void;
@@ -5517,9 +5528,13 @@ declare namespace Office {
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          *        inInline: If true, indicates that the attachment will be shown inline in the message body, and should not be displayed in the attachment list.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. On success, the attachment identifier will be provided in the asyncResult.value property. If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type asyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
          */
         addFileAttachmentAsync(uri: string, attachmentName: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addFileAttachmentAsync(uri: string, attachmentName: string): void;
+        addFileAttachmentAsync(uri: string, attachmentName: string, options: AsyncContextOptions): void;
+        addFileAttachmentAsync(uri: string, attachmentName: string, callback: (result: AsyncResult) => void): void;
+
         /**
          * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
          * 
@@ -5544,21 +5559,25 @@ declare namespace Office {
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. On success, the attachment identifier will be provided in the asyncResult.value property. If adding the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. If adding the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
          */
         addItemAttachmentAsync(itemId: any, attachmentName: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addItemAttachmentAsync(itemId: any, attachmentName: string): void;
+        addItemAttachmentAsync(itemId: any, attachmentName: string, options: AsyncContextOptions): void;
+        addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: AsyncResult) => void): void;
+
         /**
          * Closes the current item that is being composed
          *
-         * The behaviors of the close method depends on the current state of the item being composed. If the item has unsaved changes, the client
-         * prompts the user to save, discard, or close the action.
+         * The behaviors of the close method depends on the current state of the item being composed. If the item has unsaved changes, the client prompts the user to save, discard, or close the action.
          *
          * In the Outlook desktop client, if the message is an inline reply, the close method has no effect.
          * 
+         * Note: In Outlook on the web, if the item is an appointment and it has previously been saved using saveAsync, the user is prompted to save, discard, or cancel even if no changes have occurred since the item was last saved.
+         * 
          * [Api set: Mailbox 1.3]
          * 
          * @remarks
-         * Note: In Outlook on the web, if the item is an appointment and it has previously been saved using saveAsync, the user is prompted to save, discard, or cancel even if no changes have occurred since the item was last saved.
          * 
          * Minimum permission level: Restricted
          * 
@@ -5566,21 +5585,22 @@ declare namespace Office {
          */
         close(): void;
         /**
-         * Gets initialization data passed when the add-in is [activated by an actionable message]<https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message>.
+         * Gets initialization data passed when the add-in is activated by an actionable message.
          * 
+         * Note: This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the web for Office 365.
+         *
          * [Api set: Mailbox Preview]
          * 
          * @remarks
          * 
-         * Note: This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the web for Office 365.
-         * 
+         * More information on [actionable messages]<https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message>.
          * Minimum permission level: ReadItem
          * 
          * Applicable Outlook mode: Read
          * 
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. On success, the initialization data is provided in the asyncResult.value property as a string. If there is no initialization context, the asyncResult object will contain an Error object with its code property set to 9020 and its name property set to GenericResponseError.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. On success, the initialization data is provided in the asyncResult.value property as a string. If there is no initialization context, the asyncResult object will contain an Error object with its code property set to 9020 and its name property set to GenericResponseError.
          */
         getInitializationContextAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
@@ -5588,6 +5608,8 @@ declare namespace Office {
          * 
          * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. If a field other than the body or subject is selected, the method returns the InvalidSelection error.
          * 
+         * To access the selected data from the callback method, call asyncResult.value.data. To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
+         * 
          * [Api set: Mailbox 1.0]
          * 
          * @returns
@@ -5595,14 +5617,12 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * To access the selected data from the callback method, call asyncResult.value.data. To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
-         * 
          * Minimum permission level: ReadWriteItem
          * 
          * Applicable Outlook mode: Compose
          * 
          * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string , removing any HTML tags present. If HTML, the method returns the selected text, whether it is plaintext or HTML.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getSelectedDataAsync(coercionType: CoercionType, callback: (result: AsyncResult) => void): void;
         /**
@@ -5610,6 +5630,8 @@ declare namespace Office {
          * 
          * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. If a field other than the body or subject is selected, the method returns the InvalidSelection error.
          * 
+         * To access the selected data from the callback method, call asyncResult.value.data. To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
+         * 
          * [Api set: Mailbox 1.0]
          * 
          * @returns
@@ -5617,8 +5639,6 @@ declare namespace Office {
          *
          * @remarks
          * 
-         * To access the selected data from the callback method, call asyncResult.value.data. To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
-         * 
          * Minimum permission level: ReadWriteItem
          * 
          * Applicable Outlook mode: Compose
@@ -5626,7 +5646,7 @@ declare namespace Office {
          * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string , removing any HTML tags present. If HTML, the method returns the selected text, whether it is plaintext or HTML.
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getSelectedDataAsync(coercionType: CoercionType, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
         /**
@@ -5647,9 +5667,13 @@ declare namespace Office {
          * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
         removeAttachmentAsync(attachmentIndex: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        removeAttachmentAsync(attachmentIndex: string): void;
+        removeAttachmentAsync(attachmentIndex: string, options: AsyncContextOptions): void;
+        removeAttachmentAsync(attachmentIndex: string, callback: (result: AsyncResult) => void): void;
+
         /**
          * Asynchronously saves an item.
          * 
@@ -5657,10 +5681,6 @@ declare namespace Office {
          * 
          * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. Saving an existing appointment will send an update to added or removed attendees.
          * 
-         * 
-         * [Api set: Mailbox 1.3]
-         * 
-         * @remarks
          * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that when Outlook is in cached mode, it may take some time before the item is actually synced to the server. Until the item is synced, using the itemId will return an error.
          * 
          * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
@@ -5669,6 +5689,10 @@ declare namespace Office {
          * 
          * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
          * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * 
          * Minimum permission level: ReadWriteItem
          * 
          * Applicable Outlook mode: Compose
@@ -5677,9 +5701,12 @@ declare namespace Office {
          * 
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
         saveAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        saveAsync(): void;
+        saveAsync(options: AsyncContextOptions): void;
+        saveAsync(callback: (result: AsyncResult) => void): void;
         /**
          * Asynchronously inserts data into the body or subject of a message.
          * 
@@ -5696,9 +5723,12 @@ declare namespace Office {
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
          * 
          * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
         setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
+        setSelectedDataAsync(data: string): void;
+        setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+        setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
         /**
          * Asynchronously inserts data into the body or subject of a message.
          * 
@@ -5718,7 +5748,7 @@ declare namespace Office {
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          *        coercionType: If text, the current style is applied in Outlook Web App and Outlook. If the field is an HTML editor, only the text data is inserted, even if the data is HTML. If html and the field supports HTML (the subject doesn't), the current style is applied in Outlook Web App and the default style is applied in Outlook. If the field is a text field, an InvalidDataFormat error is returned. If coercionType is not set, the result depends on the field: if the field is HTML then HTML is used; if the field is text, then plain text is used.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
         setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions, callback: (result: AsyncResult) => void): void;
 
@@ -5738,7 +5768,7 @@ declare namespace Office {
          * Applicable Outlook mode: Read
          * 
          */
-        attachments: Array<AttachmentDetails>;
+        attachments: AttachmentDetails[];
         /**
          * Gets the Exchange Web Services item class of the selected item. Read mode only.
          * 
@@ -5764,12 +5794,12 @@ declare namespace Office {
          * Gets the Exchange Web Services item identifier for the current item. Read mode only.
          * 
          * The itemId property is not available in compose mode. If an item identifier is required, the saveAsync method can be used to save the item to the store, which will return the item identifier in the AsyncResult.value parameter in the callback function.
+         *  
+         * Note: The identifier returned by the itemId property is the same as the Exchange Web Services item identifier. The itemId property is not identical to the Outlook Entry ID or the ID used by the Outlook REST API. Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. For more details, see Use the Outlook REST APIs from an Outlook add-in.         * 
          * 
          * [Api set: Mailbox 1.0]
          * 
          * @remarks
-         *  
-         * Note: The identifier returned by the itemId property is the same as the Exchange Web Services item identifier. The itemId property is not identical to the Outlook Entry ID or the ID used by the Outlook REST API. Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. For more details, see Use the Outlook REST APIs from an Outlook add-in.         * 
          * 
          * Minimum permission level: ReadItem
          * 
@@ -5821,12 +5851,11 @@ declare namespace Office {
          * 
          * When attachments are specified in the formData.attachments parameter, Outlook and Outlook Web App attempt to download all attachments and attach them to the reply form. If any attachments fail to be added, an error is shown in the form UI. If this isn't possible, then no error message is thrown.
          * 
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
          * [Api set: Mailbox 1.0]
          * 
          * @remarks
-         * 
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
          * Minimum permission level: ReadItem
          * 
          * Applicable Outlook mode: Read
@@ -5852,12 +5881,12 @@ declare namespace Office {
          * 
          * When attachments are specified in the formData.attachments parameter, Outlook and Outlook Web App attempt to download all attachments and attach them to the reply form. If any attachments fail to be added, an error is shown in the form UI. If this isn't possible, then no error message is thrown.
          * 
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
          * [Api set: Mailbox 1.0]
          * 
          * @remarks
          * 
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
          * Minimum permission level: ReadItem
          * 
          * Applicable Outlook mode: Read
@@ -5876,13 +5905,13 @@ declare namespace Office {
         displayReplyForm(formData: string | ReplyFormData): void;
         /**
          * Gets the entities found in the selected item.
-         *  
+         * 
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
          * [Api set: Mailbox 1.0]
          * 
          * @remarks
          * 
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
          * Minimum permission level: ReadItem
          * 
          * Applicable Outlook mode: Read
@@ -5890,7 +5919,9 @@ declare namespace Office {
         getEntities(): Entities;
         /**
          * Gets an array of all the entities of the specified entity type found in the selected item.
-         *  
+         * 
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
          * [Api set: Mailbox 1.0]
          * 
          * @returns
@@ -5908,26 +5939,23 @@ declare namespace Office {
          * |URL|String|Restricted|
          * 
          * @remarks
-         * 
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
          * Minimum permission level: Restricted
          * 
          * Applicable Outlook mode: Read
          * 
          * @param entityType One of the EntityType enumeration values.
          */
-        getEntitiesByType(entityType: Office.MailboxEnums.EntityType): Array<(string | Contact | MeetingSuggestion | PhoneNumber | TaskSuggestion)>;
+        getEntitiesByType(entityType: Office.MailboxEnums.EntityType): (string | Contact | MeetingSuggestion | PhoneNumber | TaskSuggestion)[];
         /**
          * Returns well-known entities in the selected item that pass the named filter defined in the manifest XML file.
          * 
          * The getFilteredEntitiesByName method returns the entities that match the regular expression defined in the ItemHasKnownEntity rule element in the manifest XML file with the specified FilterName element value.
-         *  
-         * [Api set: Mailbox 1.0]
-         * 
-         * @remarks
          * 
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks 
          * 
          * Minimum permission level: ReadItem
          * 
@@ -5936,7 +5964,7 @@ declare namespace Office {
          * @param name The name of the ItemHasKnownEntity rule element that defines the filter to match.
          * @returns If there is no ItemHasKnownEntity element in the manifest with a FilterName element value that matches the name parameter, the method returns null. If the name parameter does match an ItemHasKnownEntity element in the manifest, but there are no entities in the current item that match, the method return an empty array.
          */
-        getFilteredEntitiesByName(name: string): Array<(string | Contact | MeetingSuggestion | PhoneNumber | TaskSuggestion)>;
+        getFilteredEntitiesByName(name: string): (string | Contact | MeetingSuggestion | PhoneNumber | TaskSuggestion)[];
         /**
          * Returns string values in the selected item that match the regular expressions defined in the manifest XML file.
          * 
@@ -5944,6 +5972,8 @@ declare namespace Office {
          * 
          * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body and should not attempt to return the entire body of the item. Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results. Instead, use the Body.getAsync method to retrieve the entire body. 
          * 
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
          * [Api set: Mailbox 1.0]
          * 
          * @returns
@@ -5951,8 +5981,6 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
          * Minimum permission level: ReadItem
          * 
          * Applicable Outlook mode: Read
@@ -5965,6 +5993,8 @@ declare namespace Office {
          * 
          * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body and should not attempt to return the entire body of the item. Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results.
          * 
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
          * [Api set: Mailbox 1.0]
          * 
          * @returns
@@ -5972,24 +6002,22 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
          * Minimum permission level: ReadItem
          * 
          * Applicable Outlook mode: Read
          * 
          * @param name The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
          */
-        getRegExMatchesByName(name: string): Array<string>;
+        getRegExMatchesByName(name: string): string[];
         /**
          * Gets the entities found in a highlighted match a user has selected. Highlighted matches apply to contextual add-ins.
          * 
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
          * [Api set: Mailbox 1.6]
          *  
          * @remarks
          * 
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
          * Minimum permission level: ReadItem
          * 
          * Applicable Outlook mode: Read
@@ -6004,6 +6032,8 @@ declare namespace Office {
          * 
          * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body and should not attempt to return the entire body of the item. Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results. Instead, use the Body.getAsync method to retrieve the entire body.
          * 
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
          * [Api set: Mailbox 1.6]
          * 
          * @returns
@@ -6011,8 +6041,6 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
          * Minimum permission level: ReadItem
          * 
          * Applicable Outlook mode: Read
@@ -6111,18 +6139,18 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Compose or read
          */
-        cc: Array<EmailAddressDetails>;
+        cc: EmailAddressDetails[];
         /**
          * Gets the email address of the sender of a message. Read mode only.
          * 
          * The from and sender properties represent the same person unless the message is sent by a delegate. In that case, the from property represents the delegator, and the sender property represents the delegate.
          * 
+         * Note: The recipientType property of the EmailAddressDetails object in the from property is undefined.
+         * 
          * [Api set: Mailbox 1.0]
          * 
          * @remarks
          * 
-         * Note: The recipientType property of the EmailAddressDetails object in the from property is undefined.
-         * 
          * Minimum permission level: ReadItem
          * 
          * Applicable Outlook mode: Read
@@ -6145,12 +6173,12 @@ declare namespace Office {
          * 
          * The from and sender properties represent the same person unless the message is sent by a delegate. In that case, the from property represents the delegator, and the sender property represents the delegate.
          * 
+         * Note: The recipientType property of the EmailAddressDetails object in the sender property is undefined.
+         * 
          * [Api set: Mailbox 1.0]
          * 
          * @remarks
          * 
-         * Note: The recipientType property of the EmailAddressDetails object in the sender property is undefined.
-         * 
          * Minimum permission level: ReadItem
          * 
          * Applicable Outlook mode: Read
@@ -6175,7 +6203,7 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Compose or read
          */
-        to: Array<EmailAddressDetails>;
+        to: EmailAddressDetails[];
     }
 
     /**
@@ -6184,6 +6212,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      * 
      * @remarks
+     * 
      * Minimum permission level: ReadItem
      * 
      * Applicable Outlook mode: Read
@@ -6240,7 +6269,7 @@ declare namespace Office {
          * 
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          * 
          * [Api set: Mailbox 1.1]
          * 
@@ -6250,6 +6279,7 @@ declare namespace Office {
          * Applicable Outlook mode: Compose
          */
         getAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getAsync(callback: (result: AsyncResult) => void): void;
         /**
          * Sets the location of an appointment.
          * 
@@ -6258,7 +6288,7 @@ declare namespace Office {
          * @param data The location of the appointment. The string is limited to 255 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.  If setting the location fails, the asyncResult.error property will contain an error code.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  If setting the location fails, the asyncResult.error property will contain an error code.
          * 
          * [Api set: Mailbox 1.1]
          * 
@@ -6270,6 +6300,9 @@ declare namespace Office {
          * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
          */
         setAsync(location: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        setAsync(location: string): void;
+        setAsync(location: string, options: AsyncContextOptions): void;
+        setAsync(location: string, callback: (result: AsyncResult) => void): void;
 
     }
     /**
@@ -6294,17 +6327,17 @@ declare namespace Office {
         /**
          * Gets the URL of the Exchange Web Services (EWS) endpoint for this email account. Read mode only.
          * 
-         * The ewsUrl value can be used by a remote service to make EWS calls to the user's mailbox. For example, you can create a remote service to [get attachments from the selected item]<https://msdn.microsoft.com/library/office/dn148008.aspx>.
-         * 
          * Your app must have the ReadItem permission specified in its manifest to call the ewsUrl member in read mode.
          * 
          * In compose mode you must call the saveAsync method before you can use the ewsUrl member. Your app must have ReadWriteItem permissions to call the saveAsync method.
          * 
+         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
+         * 
          * [Api set: Mailbox 1.0]
          * 
          * @remarks
          * 
-         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
+         * The ewsUrl value can be used by a remote service to make EWS calls to the user's mailbox. For example, you can create a remote service to [get attachments from the selected item]<https://msdn.microsoft.com/library/office/dn148008.aspx>.
          * 
          * Minimum permission level: ReadItem
          * 
@@ -6320,8 +6353,6 @@ declare namespace Office {
         /**
          * Gets the URL of the REST endpoint for this email account.
          * 
-         * The restUrl value can be used to make [REST API]<https://docs.microsoft.com/outlook/rest/> calls to the user's mailbox.
-         * 
          * Your app must have the ReadItem permission specified in its manifest to call the restUrl member in read mode.
          * 
          * In compose mode you must call the saveAsync method before you can use the restUrl member. Your app must have ReadWriteItem permissions to call the saveAsync method.
@@ -6330,6 +6361,8 @@ declare namespace Office {
          * 
          * @remarks
          * 
+         * The restUrl value can be used to make [REST API]<https://docs.microsoft.com/outlook/rest/> calls to the user's mailbox.
+         * 
          * Minimum permission level: ReadItem
          * 
          * Applicable Outlook mode: Compose or read
@@ -6352,7 +6385,7 @@ declare namespace Office {
          * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         addHandlerAsync(eventType: Office.EventType, handler: (type: Office.EventType) => void, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
@@ -6360,10 +6393,11 @@ declare namespace Office {
          * 
          * Item IDs retrieved via a REST API (such as the Outlook Mail API or the Microsoft Graph) use a different format than the format used by Exchange Web Services (EWS). The convertToEwsId method converts a REST-formatted ID into the proper format for EWS.
          * 
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
          * [Api set: Mailbox 1.3]
          * 
          * @remarks
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: Restricted
          * 
@@ -6394,12 +6428,13 @@ declare namespace Office {
         /**
          * Converts an item ID formatted for EWS into REST format.
          * 
-         * Item IDs retrieved via EWS or via the itemId property use a different format than the format used by REST APIs (such as the [Outlook Mail API]<https://msdn.microsoft.com/office/office365/APi/mail-rest-operations> or the [Microsoft Graph]<http://graph.microsoft.io/>). The convertToRestId method converts an EWS-formatted ID into the proper format for REST.
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * [Api set: Mailbox 1.3]
          * 
          * @remarks
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
+         * Item IDs retrieved via EWS or via the itemId property use a different format than the format used by REST APIs (such as the [Outlook Mail API]<https://msdn.microsoft.com/office/office365/APi/mail-rest-operations> or the [Microsoft Graph]<http://graph.microsoft.io/>). The convertToRestId method converts an EWS-formatted ID into the proper format for REST.
          * 
          * Minimum permission level: Restricted
          * 
@@ -6437,10 +6472,11 @@ declare namespace Office {
          * 
          * If the specified item identifier does not identify an existing appointment, a blank pane opens on the client computer or device, and no error message will be returned.
          * 
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
          * [Api set: Mailbox 1.0]
          * 
          * @remarks
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
          * 
@@ -6460,10 +6496,11 @@ declare namespace Office {
          * 
          * Do not use the displayMessageForm with an itemId that represents an appointment. Use the displayAppointmentForm method to display an existing appointment, and displayNewAppointmentForm to display a form to create a new appointment.
          * 
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
          * [Api set: Mailbox 1.0]
          * 
          * @remarks
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
          * 
@@ -6483,10 +6520,11 @@ declare namespace Office {
          * 
          * If any of the parameters exceed the specified size limits, or if an unknown parameter name is specified, an exception is thrown.
          * 
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         * 
          * [Api set: Mailbox 1.0]
          * 
          * @remarks
-         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          * 
          * Minimum permission level: ReadItem
          * 
@@ -6549,17 +6587,17 @@ declare namespace Office {
          * 
          * The add-in should use the ewsUrl property to determine the correct URL to use when making EWS calls.
          * 
+         * Note: It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible. 
+         * 
          * [Api set: Mailbox 1.5]
          * 
          * @remarks
          * 
-         * Note: It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible. 
-         * 
          * Minimum permission level: ReadItem
          * 
          * Applicable Outlook mode: Compose and read
          * 
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. The token is provided as a string in the asyncResult.value property.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The token is provided as a string in the asyncResult.value property.
          */
         getCallbackTokenAsync(callback: (result: AsyncResult) => void): void;
         /**
@@ -6579,12 +6617,12 @@ declare namespace Office {
          * 
          * The add-in should use the ewsUrl property to determine the correct URL to use when making EWS calls.
          * 
+         * Note: It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible. 
+         * 
          * [Api set: Mailbox 1.5]
          * 
          * @remarks
          * 
-         * Note: It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible. 
-         * 
          * Minimum permission level: ReadItem
          * 
          * Applicable Outlook mode: Compose and read
@@ -6592,7 +6630,7 @@ declare namespace Office {
          * @param options An object literal that contains one or more of the following properties.
          *        isRest: Determines if the token provided will be used for the Outlook REST APIs or Exchange Web Services. Default value is false.
          *        asyncContext: Any state data that is passed to the asynchronous method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. The token is provided as a string in the asyncResult.value property.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The token is provided as a string in the asyncResult.value property.
          */
         getCallbackTokenAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
         /**
@@ -6614,32 +6652,31 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Compose and read
          * 
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. The token is provided as a string in the asyncResult.value property.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The token is provided as a string in the asyncResult.value property.
          * @param userContext Optional. Any state data that is passed to the asynchronous method.
          */
         getCallbackTokenAsync(callback: (result: AsyncResult) => void, userContext?: any): void;
         /**
          * Gets a token identifying the user and the Office Add-in.
          * 
-         * The getUserIdentityTokenAsync method returns a token that you can use to identify and [authenticate the add-in and user with a third-party system]<https://msdn.microsoft.com/library/office/fp179828.aspx>.
-         * 
          * The token is provided as a string in the asyncResult.value property.
          * 
          * [Api set: Mailbox 1.0]
          * 
          * @remarks
          * 
+         * The getUserIdentityTokenAsync method returns a token that you can use to identify and [authenticate the add-in and user with a third-party system]<https://msdn.microsoft.com/library/office/fp179828.aspx>.
+         * 
          * Minimum permission level: ReadItem
          * 
          * Applicable Outlook mode: Compose and read
          * 
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          * @param userContext Optional. Any state data that is passed to the asynchronous method.|
          */
         getUserIdentityTokenAsync(callback: (result: AsyncResult) => void, userContext?: any): void;
         /**
-         * Makes an asynchronous request to an Exchange Web Services (EWS) service on the Exchange server that hosts the user’s mailbox.
-         * 
+         * Makes an asynchronous request to an Exchange Web Services (EWS) service on the Exchange server that hosts the user's mailbox.
          * 
          * In these cases, add-ins should use REST APIs to access the user's mailbox instead.
          * 
@@ -6653,10 +6690,6 @@ declare namespace Office {
          * 
          * The XML result of the EWS call is provided as a string in the asyncResult.value property. If the result exceeds 1 MB in size, an error message is returned instead.
          * 
-         * [Api set: Mailbox 1.0]
-         * 
-         * @remarks
-         * 
          * Note: This method is not supported in the following scenarios. - In Outlook for iOS or Outlook for Android - When the add-in is loaded in a Gmail mailbox
          * 
          * Note: The server administrator must set OAuthAuthentication to true on the Client Access Server EWS directory to enable the makeEwsRequestAsync method to make EWS requests.
@@ -6667,14 +6700,18 @@ declare namespace Office {
          * 
          * <?xml version="1.0" encoding="iso-8859-1"?>
          * 
-         * You do not need to set the encoding value when your mail app is running in Outlook on the web. You can determine whether your mail app is running in Outlook or Outlook on the web by using the mailbox.diagnostics.hostName property. You can determine what version of Outlook is running by using the mailbox.diagnostics.hostVersion property.
+         * You do not need to set the encoding value when your mail app is running in Outlook on the web. You can determine whether your mail app is running in Outlook or Outlook on the web by using the mailbox.diagnostics.hostName property. You can determine what version of Outlook is running by using the mailbox.diagnostics.hostVersion property. 
+         * 
+         * [Api set: Mailbox 1.0]
+         * 
+         * @remarks
          * 
          * Minimum permission level: ReadWriteMailbox
          * 
          * Applicable Outlook mode: Compose and read
          * 
          * @param data The EWS request.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          * @param userContext Optional. Any state data that is passed to the asynchronous method.
          */
         makeEwsRequestAsync(data: any, callback: (result: AsyncResult) => void, userContext?: any): void;
@@ -6698,7 +6735,7 @@ declare namespace Office {
         /**
          * Gets the attendees for a suggested meeting.
          */
-        attendees: Array<EmailUser>;
+        attendees: EmailUser[];
         /**
          * Gets the date and time that a suggested meeting is to end.
          */
@@ -6776,7 +6813,7 @@ declare namespace Office {
          *        persistent: Only applicable when type is InformationalMessage. If true, the message remains until removed by this add-in or dismissed by the user. If false, it is removed when the user navigates to a different item. For error notifications, the message persists until the user sees it once. Specifying this parameter for an unsupported type throws an exception.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          * 
          * [Api set: Mailbox 1.3]
          * 
@@ -6786,6 +6823,9 @@ declare namespace Office {
          * Applicable Outlook mode: Compose or read
          */
         addAsync(key: string, JSONmessage: NotificationMessageDetails, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addAsync(key: string, JSONmessage: NotificationMessageDetails): void;
+        addAsync(key: string, JSONmessage: NotificationMessageDetails, options: AsyncContextOptions): void;
+        addAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult) => void): void;
 
         /**
          * Returns all keys and messages for an item.
@@ -6799,9 +6839,10 @@ declare namespace Office {
          * 
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAllAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getAllAsync(callback: (result: AsyncResult) => void): void;
 
         /**
          * Removes a notification message for an item.
@@ -6816,9 +6857,12 @@ declare namespace Office {
          * @param key The key for the notification message to remove.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         removeAsync(key: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        removeAsync(key: string): void;
+        removeAsync(key: string, options: AsyncContextOptions): void;
+        removeAsync(key: string, callback: (result: AsyncResult) => void): void;
 
         /**
          * Replaces a notification message that has a given key with another message. 
@@ -6840,10 +6884,12 @@ declare namespace Office {
          *        persistent: Only applicable when type is InformationalMessage. If true, the message remains until removed by this add-in or dismissed by the user. If false, it is removed when the user navigates to a different item. For error notifications, the message persists until the user sees it once. Specifying this parameter for an unsupported type throws an exception.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-
+        replaceAsync(key: string, JSONmessage: NotificationMessageDetails): void;
+        replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options: AsyncContextOptions): void;
+        replaceAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult) => void): void;
     }
     /**
      * Represents a phone number identified in an item. Read mode only.
@@ -6903,9 +6949,12 @@ declare namespace Office {
          * @param recipients The recipients to add to the recipients list.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. If adding the recipients fails, the asyncResult.error property will contain an error code.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If adding the recipients fails, the asyncResult.error property will contain an error code.
          */
-        addAsync(recipients: Array<string | EmailUser | EmailAddressDetails>, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addAsync(recipients: (string | EmailUser | EmailAddressDetails)[]): void;
+        addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: AsyncContextOptions): void;
+        addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult) => void): void;
         
         /**
          * Gets a recipient list for an appointment or message.
@@ -6919,7 +6968,7 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Compose
          * 
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAsync(callback: (result: AsyncResult) => void): void;
         /**
@@ -6936,7 +6985,7 @@ declare namespace Office {
          * 
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
 
@@ -6965,9 +7014,12 @@ declare namespace Office {
          * @param recipients The recipients to add to the recipients list.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.  If setting the recipients fails the asyncResult.error property will contain a code that indicates any error that occurred while adding the data.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  If setting the recipients fails the asyncResult.error property will contain a code that indicates any error that occurred while adding the data.
          */
-        setAsync(recipients: Array<string | EmailUser | EmailAddressDetails>, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        setAsync(recipients: (string | EmailUser | EmailAddressDetails)[]): void;
+        setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: AsyncContextOptions): void;
+        setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult) => void): void;
 
     }
     export interface ReplyFormAttachment {
@@ -6978,7 +7030,7 @@ declare namespace Office {
     }
     export interface ReplyFormData {
         htmlBody?: string;
-        attachments?: Array<ReplyFormAttachment>;
+        attachments?: ReplyFormAttachment[];
         callback?: (result: AsyncResult) => void;
     }
     /**
@@ -6990,11 +7042,11 @@ declare namespace Office {
      * 
      * The RoamingSettings object is accessible via the roamingSettings property in the Office.context namespace.
      * 
+     * Important: The RoamingSettings object is initialized from the persisted storage only when the add-in is first loaded. For task panes, this means that it is only initialized when the task pane first opens. If the task pane navigates to another page or reloads the current page, the in-memory object is reset to its initial values, even if your add-in has persisted changes. The persisted changes will not be available until the task pane is closed and reopened.
+     *
      * [Api set: Mailbox 1.0]
      * 
      * @remarks
-     * Important: The RoamingSettings object is initialized from the persisted storage only when the add-in is first loaded. For task panes, this means that it is only initialized when the task pane first opens. If the task pane navigates to another page or reloads the current page, the in-memory object is reset to its initial values, even if your add-in has persisted changes. The persisted changes will not be available until the task pane is closed and reopened.
-     * 
      * Minimum permission level: Restricted
      * 
      * Applicable Outlook mode: Compose or read
@@ -7039,7 +7091,7 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Compose or read
          * 
-         * @param callback Optional? When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback Optional? When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         saveAsync(callback?: (result: AsyncResult) => void): void;
         /**
@@ -7086,7 +7138,7 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Compose
          * 
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAsync(callback: (result: AsyncResult) => void): void;
         /**
@@ -7103,7 +7155,7 @@ declare namespace Office {
          * 
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
 
@@ -7124,9 +7176,12 @@ declare namespace Office {
          * @param subject The subject of the appointment or message. The string is limited to 255 characters.
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. If setting the subject fails, the asyncResult.error property will contain an error code.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If setting the subject fails, the asyncResult.error property will contain an error code.
          */
         setAsync(subject: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        setAsync(data: string): void;
+        setAsync(data: string, options: AsyncContextOptions): void;
+        setAsync(data: string, callback: (result: AsyncResult) => void): void;
 
     }
     /**
@@ -7145,7 +7200,7 @@ declare namespace Office {
         /**
          * Gets the users that should be assigned a suggested task.
          */
-        assignees: Array<EmailUser>;
+        assignees: EmailUser[];
         /**
          * Gets the text of an item that was identified as a task suggestion.
          */
@@ -7174,7 +7229,7 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Compose
          * 
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAsync(callback: (result: AsyncResult) => void): void;
         /**
@@ -7191,7 +7246,7 @@ declare namespace Office {
          * 
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
 
@@ -7214,9 +7269,12 @@ declare namespace Office {
          * @param dateTime A date-time object in Coordinated Universal Time (UTC).
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. If setting the date and time fails, the asyncResult.error property will contain an error code.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If setting the date and time fails, the asyncResult.error property will contain an error code.
          */
         setAsync(dateTime: Date, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        setAsync(dateTime: Date): void;
+        setAsync(dateTime: Date, options: AsyncContextOptions): void;
+        setAsync(dateTime: Date, callback: (result: AsyncResult) => void): void;
 
     }
     /**
@@ -7231,10 +7289,11 @@ declare namespace Office {
         /**
          * Gets the account type of the user associated with the mailbox. The possible values are listed in the following table.
          * 
+         * Note: This member is currently only supported in Outlook 2016 for Mac, build 16.9.1212 and greater.
+         * 
          * [Api set: Mailbox 1.6]
          * 
          * @remarks
-         * Note: This member is currently only supported in Outlook 2016 for Mac, build 16.9.1212 and greater.
          * 
          * |Value    |Description   |
          * |---------|--------------|

From a368664d073bbbedab46b36aefc79bffc129c4d4 Mon Sep 17 00:00:00 2001
From: Alex Jerabek <aljerabe@microsoft.com>
Date: Wed, 30 May 2018 17:16:35 -0700
Subject: [PATCH 550/575] Outlook Migration - Overload documentation and
 Zlatkovsky's comments

---
 types/office-js/index.d.ts | 1102 +++++++++++++++++++++++++++++++++---
 1 file changed, 1029 insertions(+), 73 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 18975697fe..da9e84fa1b 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -4529,16 +4529,6 @@ declare namespace Office {
          */
         Subject
     }
-    export interface AppointmentForm {
-        requiredAttendees: Array<string> | Array<EmailAddressDetails>;
-        optionalAttendees: Array<string> | Array<EmailAddressDetails>;
-        start: Date;
-        end: Date;
-        location: string;
-        resources: Array<string>;
-        subject: string;
-        body: string;
-    }
     /**
      * Represents an attachment on an item from the server. Read mode only.
      * 
@@ -4608,6 +4598,23 @@ declare namespace Office {
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The body is provided in the requested format in the asyncResult.value property.
          */
         getAsync(coercionType: CoercionType, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Returns the current body in a specified format.
+         * 
+         * This method returns the entire current body in the format specified by coercionType.
+         * 
+         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param coercionType The format for the returned body.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The body is provided in the requested format in the asyncResult.value property.
+         */
         getAsync(coercionType: CoercionType, callback: (result: AsyncResult) => void): void;
 
         /**
@@ -4646,8 +4653,60 @@ declare namespace Office {
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. Any errors encountered will be provided in the asyncResult.error property.
          */
         prependAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Adds the specified content to the beginning of the item body.
+         * 
+         * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
+         * 
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * 
+         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        coercionType: The desired format for the body. The string in the data parameter will be converted to this format.
+         */
         prependAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+        /**
+         * Adds the specified content to the beginning of the item body.
+         * 
+         * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
+         * 
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * 
+         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. Any errors encountered will be provided in the asyncResult.error property.
+         */
         prependAsync(data: string, callback: (result: AsyncResult) => void): void;
+        /**
+         * Adds the specified content to the beginning of the item body.
+         * 
+         * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
+         * 
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * Applicable Outlook mode: Compose
+         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * 
+         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters.
+         */
         prependAsync(data: string): void;
         /**
          * Replaces the entire body with the specified text.
@@ -4674,8 +4733,72 @@ declare namespace Office {
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  Any errors encountered will be provided in the asyncResult.error property.
          */
         setAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Replaces the entire body with the specified text.
+         * 
+         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
+         * 
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * 
+         * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * 
+         * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        coercionType: The desired format for the body. The string in the data parameter will be converted to this format.
+         */
         setAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+        /**
+         * Replaces the entire body with the specified text.
+         * 
+         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
+         * 
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * 
+         * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * 
+         * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  Any errors encountered will be provided in the asyncResult.error property.
+         */
         setAsync(data: string, callback: (result: AsyncResult) => void): void;
+        /**
+         * Replaces the entire body with the specified text.
+         * 
+         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
+         * 
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * 
+         * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * 
+         * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
+         */
         setAsync(data: string): void;
 
         /**
@@ -4703,8 +4826,72 @@ declare namespace Office {
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  Any errors encountered will be provided in the asyncResult.error property.
          */
         setSelectedDataAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Replaces the selection in the body with the specified text.
+         * 
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
+         * 
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * 
+         * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * 
+         * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        coercionType: The desired format for the body. The string in the data parameter will be converted to this format.
+         */
         setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+        /**
+         * Replaces the selection in the body with the specified text.
+         * 
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
+         * 
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * 
+         * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * 
+         * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  Any errors encountered will be provided in the asyncResult.error property.
+         */
         setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
+        /**
+         * Replaces the selection in the body with the specified text.
+         * 
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
+         * 
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * 
+         * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * 
+         * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
+         */
         setSelectedDataAsync(data: string): void;
     }
     /**
@@ -4936,7 +5123,7 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Compose or read
          */
-        OWAView: string;
+        OWAView: "string";
     }
     /**
      * Provides the email properties of the sender or specified recipients of an email message or appointment.
@@ -5252,6 +5439,18 @@ declare namespace Office {
         start: Date;
     }
     export interface AppointmentForm {
+        /**
+         * Gets an object that provides methods for manipulating the body of an item.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         */
+        body: string;
         /**
          * Gets or sets the date and time that the appointment is to end.
          * 
@@ -5315,6 +5514,7 @@ declare namespace Office {
         * Applicable Outlook mode: Compose or read
         */
        optionalAttendees: string[] | EmailAddressDetails[];
+       resources: string[];
         /**
          * Provides access to the required attendees of an event. The type of object and level of access depends on the mode of the current item.
          * 
@@ -5531,8 +5731,87 @@ declare namespace Office {
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type asyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
          */
         addFileAttachmentAsync(uri: string, attachmentName: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Adds a file to a message or appointment as an attachment.
+         * 
+         * The addFileAttachmentAsync method uploads the file at the specified URI and attaches it to the item in the compose form.
+         * 
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: 
+         * 
+         * AttachmentSizeExceeded - The attachment is larger than allowed.
+         * 
+         * FileTypeNotSupported - The attachment has an extension that is not allowed.
+         * 
+         * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * 
+         * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         */
         addFileAttachmentAsync(uri: string, attachmentName: string): void;
+        /**
+         * Adds a file to a message or appointment as an attachment.
+         * 
+         * The addFileAttachmentAsync method uploads the file at the specified URI and attaches it to the item in the compose form.
+         * 
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: 
+         * 
+         * AttachmentSizeExceeded - The attachment is larger than allowed.
+         * 
+         * FileTypeNotSupported - The attachment has an extension that is not allowed.
+         * 
+         * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * 
+         * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        inInline: If true, indicates that the attachment will be shown inline in the message body, and should not be displayed in the attachment list.
+         */
         addFileAttachmentAsync(uri: string, attachmentName: string, options: AsyncContextOptions): void;
+        /**
+         * Adds a file to a message or appointment as an attachment.
+         * 
+         * The addFileAttachmentAsync method uploads the file at the specified URI and attaches it to the item in the compose form.
+         * 
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: 
+         * 
+         * AttachmentSizeExceeded - The attachment is larger than allowed.
+         * 
+         * FileTypeNotSupported - The attachment has an extension that is not allowed.
+         * 
+         * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * 
+         * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type asyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
+         */
         addFileAttachmentAsync(uri: string, attachmentName: string, callback: (result: AsyncResult) => void): void;
 
         /**
@@ -5562,8 +5841,80 @@ declare namespace Office {
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. If adding the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
          */
         addItemAttachmentAsync(itemId: any, attachmentName: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
+         * 
+         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the callback method, if needed.
+         * 
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         * 
+         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that you are editing; however, this is not supported and is not recommended.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors:
+         * 
+         * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * 
+         * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         */
         addItemAttachmentAsync(itemId: any, attachmentName: string): void;
-        addItemAttachmentAsync(itemId: any, attachmentName: string, options: AsyncContextOptions): void;
+        /**
+         * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
+         * 
+         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the callback method, if needed.
+         * 
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         * 
+         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that you are editing; however, this is not supported and is not recommended.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors:
+         * 
+         * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * 
+         * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         */
+        addItemAttachmentAsync(itemId: any, attachmentName: string, options: AsyncContextOptions): void;     
+        /**
+         * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
+         * 
+         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the callback method, if needed.
+         * 
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         * 
+         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that you are editing; however, this is not supported and is not recommended.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors:
+         * 
+         * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * 
+         * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. If adding the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
+         */
         addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: AsyncResult) => void): void;
 
         /**
@@ -5594,6 +5945,7 @@ declare namespace Office {
          * @remarks
          * 
          * More information on [actionable messages]<https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message>.
+         * 
          * Minimum permission level: ReadItem
          * 
          * Applicable Outlook mode: Read
@@ -5670,8 +6022,62 @@ declare namespace Office {
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
         removeAttachmentAsync(attachmentIndex: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Removes an attachment from a message or appointment.
+         * 
+         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form to continue in a separate window.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * 
+         * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
+         */
         removeAttachmentAsync(attachmentIndex: string): void;
+        /**
+         * Removes an attachment from a message or appointment.
+         * 
+         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form to continue in a separate window.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * 
+         * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         */
         removeAttachmentAsync(attachmentIndex: string, options: AsyncContextOptions): void;
+        /**
+         * Removes an attachment from a message or appointment.
+         * 
+         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form to continue in a separate window.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * 
+         * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         */
         removeAttachmentAsync(attachmentIndex: string, callback: (result: AsyncResult) => void): void;
 
         /**
@@ -5704,15 +6110,78 @@ declare namespace Office {
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
         saveAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-        saveAsync(): void;
-        saveAsync(options: AsyncContextOptions): void;
-        saveAsync(callback: (result: AsyncResult) => void): void;
         /**
-         * Asynchronously inserts data into the body or subject of a message.
+         * Asynchronously saves an item.
          * 
-         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. After insertion, the cursor is placed at the end of the inserted content.
+         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
          * 
-         * [Api set: Mailbox 1.2]
+         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. Saving an existing appointment will send an update to added or removed attendees.
+         * 
+         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that when Outlook is in cached mode, it may take some time before the item is actually synced to the server. Until the item is synced, using the itemId will return an error.
+         * 
+         * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
+         * 
+         * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
+         * 
+         * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * 
+         */
+        saveAsync(): void;
+        /**
+         * Asynchronously saves an item.
+         * 
+         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
+         * 
+         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. Saving an existing appointment will send an update to added or removed attendees.
+         * 
+         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that when Outlook is in cached mode, it may take some time before the item is actually synced to the server. Until the item is synced, using the itemId will return an error.
+         * 
+         * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
+         * 
+         * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
+         * 
+         * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * 
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         */
+        saveAsync(options: AsyncContextOptions): void;
+        /**
+         * Asynchronously saves an item.
+         * 
+         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
+         * 
+         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. Saving an existing appointment will send an update to added or removed attendees.
+         * 
+         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that when Outlook is in cached mode, it may take some time before the item is actually synced to the server. Until the item is synced, using the itemId will return an error.
+         * 
+         * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
+         * 
+         * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
+         * 
+         * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
+         * 
+         * [Api set: Mailbox 1.3]
          * 
          * @remarks
          * 
@@ -5722,13 +6191,9 @@ declare namespace Office {
          * 
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
          * 
-         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
-        setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
-        setSelectedDataAsync(data: string): void;
-        setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
-        setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
+        saveAsync(callback: (result: AsyncResult) => void): void;
         /**
          * Asynchronously inserts data into the body or subject of a message.
          * 
@@ -5750,8 +6215,65 @@ declare namespace Office {
          *        coercionType: If text, the current style is applied in Outlook Web App and Outlook. If the field is an HTML editor, only the text data is inserted, even if the data is HTML. If html and the field supports HTML (the subject doesn't), the current style is applied in Outlook Web App and the default style is applied in Outlook. If the field is a text field, an InvalidDataFormat error is returned. If coercionType is not set, the result depends on the field: if the field is HTML then HTML is used; if the field is text, then plain text is used.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
-        setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions, callback: (result: AsyncResult) => void): void;
-
+        setSelectedDataAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Asynchronously inserts data into the body or subject of a message.
+         * 
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. After insertion, the cursor is placed at the end of the inserted content.
+         * 
+         * [Api set: Mailbox 1.2]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * 
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         */
+        setSelectedDataAsync(data: string): void;
+        /**
+         * Asynchronously inserts data into the body or subject of a message.
+         * 
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. After insertion, the cursor is placed at the end of the inserted content.
+         * 
+         * [Api set: Mailbox 1.2]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * 
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        coercionType: If text, the current style is applied in Outlook Web App and Outlook. If the field is an HTML editor, only the text data is inserted, even if the data is HTML. If html and the field supports HTML (the subject doesn't), the current style is applied in Outlook Web App and the default style is applied in Outlook. If the field is a text field, an InvalidDataFormat error is returned. If coercionType is not set, the result depends on the field: if the field is HTML then HTML is used; if the field is text, then plain text is used.
+         */
+        setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+        /**
+         * Asynchronously inserts data into the body or subject of a message.
+         * 
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. After insertion, the cursor is placed at the end of the inserted content.
+         * 
+         * [Api set: Mailbox 1.2]
+         * 
+         * @remarks
+         * 
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * 
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         */
+        setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
     }
     export interface ItemRead extends Item {
         /**
@@ -5795,7 +6317,7 @@ declare namespace Office {
          * 
          * The itemId property is not available in compose mode. If an item identifier is required, the saveAsync method can be used to save the item to the store, which will return the item identifier in the AsyncResult.value parameter in the callback function.
          *  
-         * Note: The identifier returned by the itemId property is the same as the Exchange Web Services item identifier. The itemId property is not identical to the Outlook Entry ID or the ID used by the Outlook REST API. Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. For more details, see Use the Outlook REST APIs from an Outlook add-in.         * 
+         * Note: The identifier returned by the itemId property is the same as the Exchange Web Services item identifier. The itemId property is not identical to the Outlook Entry ID or the ID used by the Outlook REST API. Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. For more details, see Use the Outlook REST APIs from an Outlook add-in.
          * 
          * [Api set: Mailbox 1.0]
          * 
@@ -6279,13 +6801,27 @@ declare namespace Office {
          * Applicable Outlook mode: Compose
          */
         getAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Gets the location of an appointment.
+         * 
+         * The getAsync method starts an asynchronous call to the Exchange server to get the location of an appointment. The location of the appointment is provided as a string in the asyncResult.value property.
+         * 
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose
+         */
         getAsync(callback: (result: AsyncResult) => void): void;
         /**
          * Sets the location of an appointment.
          * 
          * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. Setting the location of an appointment overwrites the current location.
          * 
-         * @param data The location of the appointment. The string is limited to 255 characters.
+         * @param location The location of the appointment. The string is limited to 255 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  If setting the location fails, the asyncResult.error property will contain an error code.
@@ -6300,8 +6836,59 @@ declare namespace Office {
          * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
          */
         setAsync(location: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Sets the location of an appointment.
+         * 
+         * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. Setting the location of an appointment overwrites the current location.
+         * 
+         * @param location The location of the appointment. The string is limited to 255 characters.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
+         */
         setAsync(location: string): void;
+        /**
+         * Sets the location of an appointment.
+         * 
+         * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. Setting the location of an appointment overwrites the current location.
+         * 
+         * @param location The location of the appointment. The string is limited to 255 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
+         */
         setAsync(location: string, options: AsyncContextOptions): void;
+        /**
+         * Sets the location of an appointment.
+         * 
+         * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. Setting the location of an appointment overwrites the current location.
+         * 
+         * @param location The location of the appointment. The string is limited to 255 characters.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  If setting the location fails, the asyncResult.error property will contain an error code.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
+         */
         setAsync(location: string, callback: (result: AsyncResult) => void): void;
 
     }
@@ -6530,15 +7117,7 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Read
          * 
-         * @param parameters A dictionary of parameters describing the new appointment. All parameters are optional.
-         *        requiredAttendees: An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the required attendees for the appointment. The array is limited to a maximum of 100 entries.
-         *        optionalAttendees: An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the optional attendees for the appointment. The array is limited to a maximum of 100 entries.
-         *        start: A Date object specifying the start date and time of the appointment.
-         *        end: A Date object specifying the end date and time of the appointment.
-         *        location: A string containing the location of the appointment. The string is limited to a maximum of 255 characters.
-         *        resources: An array of strings containing the resources required for the appointment. The array is limited to a maximum of 100 entries.
-         *        subject: A string containing the subject of the appointment. The string is limited to a maximum of 255 characters.
-         *        body: The body of the appointment. The body content is limited to a maximum size of 32 KB.
+         * @param parameters An AppointmentForm describing the new appointment. All properties are optional.
          */
         displayNewAppointmentForm(parameters: AppointmentForm): void;
         /**
@@ -6597,27 +7176,22 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Compose and read
          * 
+         * @param options An object literal that contains one or more of the following properties.
+         *        isRest: Determines if the token provided will be used for the Outlook REST APIs or Exchange Web Services. Default value is false.
+         *        asyncContext: Any state data that is passed to the asynchronous method.
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The token is provided as a string in the asyncResult.value property.
          */
-        getCallbackTokenAsync(callback: (result: AsyncResult) => void): void;
+        getCallbackTokenAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
         /**
-         * Gets a string that contains a token used to call REST APIs or Exchange Web Services.
+         * Gets a string that contains a token used to get an attachment or item from an Exchange Server.
          * 
          * The getCallbackTokenAsync method makes an asynchronous call to get an opaque token from the Exchange Server that hosts the user's mailbox. The lifetime of the callback token is 5 minutes.
          * 
-         * *REST Tokens*
+         * You can pass the token and an attachment identifier or item identifier to a third-party system. The third-party system uses the token as a bearer authorization token to call the Exchange Web Services (EWS) GetAttachment or GetItem operation to return an attachment or item. For example, you can create a remote service to get attachments from the selected item.
          * 
-         * When a REST token is requested (options.isRest = true), the resulting token will not work to authenticate Exchange Web Services calls. The token will be limited in scope to read-only access to the current item and its attachments, unless the add-in has specified the ReadWriteMailbox permission in its manifest. If the ReadWriteMailbox permission is specified, the resulting token will grant read/write access to mail, calendar, and contacts, including the ability to send mail.
+         * Your app must have the ReadItem permission specified in its manifest to call the getCallbackTokenAsync method in read mode.
          * 
-         * The add-in should use the restUrl property to determine the correct URL to use when making REST API calls.
-         * 
-         * *EWS Tokens*
-         * 
-         * When an EWS token is requested (options.isRest = false), the resulting token will not work to authenticate REST API calls. The token will be limited in scope to accessing the current item.
-         * 
-         * The add-in should use the ewsUrl property to determine the correct URL to use when making EWS calls.
-         * 
-         * Note: It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible. 
+         * In compose mode you must call the saveAsync method to get an item identifier to pass to the getCallbackTokenAsync method. Your app must have ReadWriteItem permissions to call the saveAsync method.
          * 
          * [Api set: Mailbox 1.5]
          * 
@@ -6627,12 +7201,9 @@ declare namespace Office {
          * 
          * Applicable Outlook mode: Compose and read
          * 
-         * @param options An object literal that contains one or more of the following properties.
-         *        isRest: Determines if the token provided will be used for the Outlook REST APIs or Exchange Web Services. Default value is false.
-         *        asyncContext: Any state data that is passed to the asynchronous method.
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The token is provided as a string in the asyncResult.value property.
          */
-        getCallbackTokenAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        getCallbackTokenAsync(callback: (result: AsyncResult) => void): void;
         /**
          * Gets a string that contains a token used to get an attachment or item from an Exchange Server.
          * 
@@ -6773,19 +7344,19 @@ declare namespace Office {
          */
         key?: string;
         /**
-         * The type of notification message.
+         * Specifies the Office.MailboxEnums.ItemNotificationMessageType of message. If type is ProgressIndicator or ErrorMessage, an icon is automatically supplied and the message is not persistent. Therefore the icon and persistent properties are not valid for these types of messages. Including them will result in an ArgumentException. If type is ProgressIndicator, the developer should remove or replace the progress indicator when the action is complete.
          */
         type: Office.MailboxEnums.ItemNotificationMessageType;
         /**
-         * The resource identifier of the icon used for the message. Only applicable when type is InformationalMessage.
+         * A reference to an icon that is defined in the manifest in the Resources section. It appears in the infobar area. It is only applicable if the type is InformationalMessage. Specifying this parameter for an unsupported type results in an exception.
          */
         icon?: string;
         /**
-         * This is the text of the message. Maximum length is 150 characters.
+         * The text of the notification message. Maximum length is 150 characters. If the developer passes in a longer string, an ArgumentOutOfRange exception is thrown.
          */
         message: string;
         /**
-         * If true, the message remains until removed by this add-in or dismissed by the user. If false, it is removed when the user navigates to a different item. Only applicable when type is InformationalMessage.
+         * Only applicable when type is InformationalMessage. If true, the message remains until removed by this add-in or dismissed by the user. If false, it is removed when the user navigates to a different item. For error notifications, the message persists until the user sees it once. Specifying this parameter for an unsupported type throws an exception.
          */
         persistent?: Boolean;
     }
@@ -6806,11 +7377,7 @@ declare namespace Office {
          * There are a maximum of 5 notifications per message. Setting more will return a NumberOfNotificationMessagesExceeded error.
          * 
          * @param key  A developer-specified key used to reference this notification message. Developers can use it to modify this message later. It can't be longer than 32 characters.
-         * @param JSONmessage A JSON object that contains the notification message to be added to the item. It consists of the following properties.
-         *        type: Specifies the Office.MailboxEnums.ItemNotificationMessageType of message. If type is ProgressIndicator or ErrorMessage, an icon is automatically supplied and the message is not persistent. Therefore the icon and persistent properties are not valid for these types of messages. Including them will result in an ArgumentException. If type is ProgressIndicator, the developer should remove or replace the progress indicator when the action is complete.
-         *        icon: A reference to an icon that is defined in the manifest in the Resources section. It appears in the infobar area. It is only applicable if the type is InformationalMessage. Specifying this parameter for an unsupported type results in an exception.
-         *        message: The text of the notification message. Maximum length is 150 characters. If the developer passes in a longer string, an ArgumentOutOfRange exception is thrown.
-         *        persistent: Only applicable when type is InformationalMessage. If true, the message remains until removed by this add-in or dismissed by the user. If false, it is removed when the user navigates to a different item. For error notifications, the message persists until the user sees it once. Specifying this parameter for an unsupported type throws an exception.
+         * @param JSONmessage A JSON object that contains the notification message to be added to the item. It contains a NotificationMessageDetails object.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
@@ -6823,10 +7390,57 @@ declare namespace Office {
          * Applicable Outlook mode: Compose or read
          */
         addAsync(key: string, JSONmessage: NotificationMessageDetails, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Adds a notification to an item.
+         * 
+         * There are a maximum of 5 notifications per message. Setting more will return a NumberOfNotificationMessagesExceeded error.
+         * 
+         * @param key  A developer-specified key used to reference this notification message. Developers can use it to modify this message later. It can't be longer than 32 characters.
+         * @param JSONmessage A JSON object that contains the notification message to be added to the item. It contains a NotificationMessageDetails object.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         */
         addAsync(key: string, JSONmessage: NotificationMessageDetails): void;
+        /**
+         * Adds a notification to an item.
+         * 
+         * There are a maximum of 5 notifications per message. Setting more will return a NumberOfNotificationMessagesExceeded error.
+         * 
+         * @param key  A developer-specified key used to reference this notification message. Developers can use it to modify this message later. It can't be longer than 32 characters.
+         * @param JSONmessage A JSON object that contains the notification message to be added to the item. It contains a NotificationMessageDetails object.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         */
         addAsync(key: string, JSONmessage: NotificationMessageDetails, options: AsyncContextOptions): void;
+        /**
+         * Adds a notification to an item.
+         * 
+         * There are a maximum of 5 notifications per message. Setting more will return a NumberOfNotificationMessagesExceeded error.
+         * 
+         * @param key  A developer-specified key used to reference this notification message. Developers can use it to modify this message later. It can't be longer than 32 characters.
+         * @param JSONmessage A JSON object that contains the notification message to be added to the item. It contains a NotificationMessageDetails object.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         */
         addAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult) => void): void;
-
         /**
          * Returns all keys and messages for an item.
          * 
@@ -6842,8 +7456,19 @@ declare namespace Office {
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAllAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Returns all keys and messages for an item.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         */
         getAllAsync(callback: (result: AsyncResult) => void): void;
-
         /**
          * Removes a notification message for an item.
          * 
@@ -6860,10 +7485,48 @@ declare namespace Office {
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         removeAsync(key: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Removes a notification message for an item.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param key The key for the notification message to remove.
+         */
         removeAsync(key: string): void;
+        /**
+         * Removes a notification message for an item.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param key The key for the notification message to remove.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         */
         removeAsync(key: string, options: AsyncContextOptions): void;
+        /**
+         * Removes a notification message for an item.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param key The key for the notification message to remove.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         */
         removeAsync(key: string, callback: (result: AsyncResult) => void): void;
-
         /**
          * Replaces a notification message that has a given key with another message. 
          * 
@@ -6877,18 +7540,62 @@ declare namespace Office {
          * Applicable Outlook mode: Compose or read
          * 
          * @param key The key for the notification message to replace. It can't be longer than 32 characters.
-         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. It consists of the following properties.
-         *        type: Specifies the Office.MailboxEnums.ItemNotificationMessageType of message. If type is ProgressIndicator or ErrorMessage, an icon is automatically supplied and the message is not persistent. Therefore the icon and persistent properties are not valid for these types of messages. Including them will result in an ArgumentException. If type is ProgressIndicator, the developer should remove or replace the progress indicator when the action is complete.
-         *        icon: A reference to an icon that is defined in the manifest in the Resources section. It appears in the infobar area. It is only applicable if the type is InformationalMessage. Specifying this parameter for an unsupported type results in an exception.
-         *        message: The text of the notification message. Maximum length is 150 characters. If the developer passes in a longer string, an ArgumentOutOfRange exception is thrown.
-         *        persistent: Only applicable when type is InformationalMessage. If true, the message remains until removed by this add-in or dismissed by the user. If false, it is removed when the user navigates to a different item. For error notifications, the message persists until the user sees it once. Specifying this parameter for an unsupported type throws an exception.
+         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. It contains a NotificationMessageDetails object.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Replaces a notification message that has a given key with another message. 
+         * 
+         * If a notification message with the specified key doesn't exist, replaceAsync will add the notification.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param key The key for the notification message to replace. It can't be longer than 32 characters.
+         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. It contains a NotificationMessageDetails object.
+         */
         replaceAsync(key: string, JSONmessage: NotificationMessageDetails): void;
+        /**
+         * Replaces a notification message that has a given key with another message. 
+         * 
+         * If a notification message with the specified key doesn't exist, replaceAsync will add the notification.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param key The key for the notification message to replace. It can't be longer than 32 characters.
+         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. It contains a NotificationMessageDetails object.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         */
         replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options: AsyncContextOptions): void;
+        /**
+         * Replaces a notification message that has a given key with another message. 
+         * 
+         * If a notification message with the specified key doesn't exist, replaceAsync will add the notification.
+         * 
+         * [Api set: Mailbox 1.3]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose or read
+         * 
+         * @param key The key for the notification message to replace. It can't be longer than 32 characters.
+         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. It contains a NotificationMessageDetails object.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         */
         replaceAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult) => void): void;
     }
     /**
@@ -6952,8 +7659,77 @@ declare namespace Office {
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If adding the recipients fails, the asyncResult.error property will contain an error code.
          */
         addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Adds a recipient list to the existing recipients for an appointment or message.
+         * 
+         * The recipients parameter can be an array of one of the following:
+         * 
+         * - Strings containing SMTP email addresses
+         * 
+         * - EmailUser objects
+         * 
+         * - EmailAddressDetails objects
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * 
+         * @param recipients The recipients to add to the recipients list.
+         */
         addAsync(recipients: (string | EmailUser | EmailAddressDetails)[]): void;
+        /**
+         * Adds a recipient list to the existing recipients for an appointment or message.
+         * 
+         * The recipients parameter can be an array of one of the following:
+         * 
+         * - Strings containing SMTP email addresses
+         * 
+         * - EmailUser objects
+         * 
+         * - EmailAddressDetails objects
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * 
+         * @param recipients The recipients to add to the recipients list.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         */
         addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: AsyncContextOptions): void;
+        /**
+         * Adds a recipient list to the existing recipients for an appointment or message.
+         * 
+         * The recipients parameter can be an array of one of the following:
+         * 
+         * - Strings containing SMTP email addresses
+         * 
+         * - EmailUser objects
+         * 
+         * - EmailAddressDetails objects
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * 
+         * @param recipients The recipients to add to the recipients list.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If adding the recipients fails, the asyncResult.error property will contain an error code.
+         */
         addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult) => void): void;
         
         /**
@@ -6988,7 +7764,6 @@ declare namespace Office {
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
-
         /**
          * Sets a recipient list for an appointment or message.
          * 
@@ -7017,8 +7792,83 @@ declare namespace Office {
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  If setting the recipients fails the asyncResult.error property will contain a code that indicates any error that occurred while adding the data.
          */
         setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Sets a recipient list for an appointment or message.
+         * 
+         * The setAsync method overwrites the current recipient list.
+         * 
+         * The recipients parameter can be an array of one of the following:
+         * 
+         * - Strings containing SMTP email addresses
+         * 
+         * - EmailUser objects
+         * 
+         * - EmailAddressDetails objects
+         *   
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * 
+         * @param recipients The recipients to add to the recipients list.
+         */
         setAsync(recipients: (string | EmailUser | EmailAddressDetails)[]): void;
+        /**
+         * Sets a recipient list for an appointment or message.
+         * 
+         * The setAsync method overwrites the current recipient list.
+         * 
+         * The recipients parameter can be an array of one of the following:
+         * 
+         * - Strings containing SMTP email addresses
+         * 
+         * - EmailUser objects
+         * 
+         * - EmailAddressDetails objects
+         *   
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * 
+         * @param recipients The recipients to add to the recipients list.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         */
         setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: AsyncContextOptions): void;
+        /**
+         * Sets a recipient list for an appointment or message.
+         * 
+         * The setAsync method overwrites the current recipient list.
+         * 
+         * The recipients parameter can be an array of one of the following:
+         * 
+         * - Strings containing SMTP email addresses
+         * 
+         * - EmailUser objects
+         * 
+         * - EmailAddressDetails objects
+         *   
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * 
+         * @param recipients The recipients to add to the recipients list.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  If setting the recipients fails the asyncResult.error property will contain a code that indicates any error that occurred while adding the data.
+         */
         setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult) => void): void;
 
     }
@@ -7158,7 +8008,6 @@ declare namespace Office {
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
-
         /**
          * Sets the subject of an appointment or message.
          * 
@@ -7179,8 +8028,59 @@ declare namespace Office {
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If setting the subject fails, the asyncResult.error property will contain an error code.
          */
         setAsync(subject: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Sets the subject of an appointment or message.
+         * 
+         * The setAsync method starts an asynchronous call to the Exchange server to set the subject of an appointment or message. Setting the subject overwrites the current subject, but leaves any prefixes, such as "Fwd:" or "Re:" in place.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: DataExceedsMaximumSize - The subject parameter is longer than 255 characters.
+         * 
+         * @param subject The subject of the appointment or message. The string is limited to 255 characters.
+         */
         setAsync(data: string): void;
+        /**
+         * Sets the subject of an appointment or message.
+         * 
+         * The setAsync method starts an asynchronous call to the Exchange server to set the subject of an appointment or message. Setting the subject overwrites the current subject, but leaves any prefixes, such as "Fwd:" or "Re:" in place.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: DataExceedsMaximumSize - The subject parameter is longer than 255 characters.
+         * 
+         * @param subject The subject of the appointment or message. The string is limited to 255 characters.
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         */
         setAsync(data: string, options: AsyncContextOptions): void;
+        /**
+         * Sets the subject of an appointment or message.
+         * 
+         * The setAsync method starts an asynchronous call to the Exchange server to set the subject of an appointment or message. Setting the subject overwrites the current subject, but leaves any prefixes, such as "Fwd:" or "Re:" in place.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: DataExceedsMaximumSize - The subject parameter is longer than 255 characters.
+         * 
+         * @param subject The subject of the appointment or message. The string is limited to 255 characters.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If setting the subject fails, the asyncResult.error property will contain an error code.
+         */
         setAsync(data: string, callback: (result: AsyncResult) => void): void;
 
     }
@@ -7249,7 +8149,6 @@ declare namespace Office {
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
-
         /**
          * Sets the start or end time of an appointment.
          * 
@@ -7272,8 +8171,65 @@ declare namespace Office {
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If setting the date and time fails, the asyncResult.error property will contain an error code.
          */
         setAsync(dateTime: Date, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Sets the start or end time of an appointment.
+         * 
+         * If the setAsync method is called on the start property, the end property will be adjusted to maintain the duration of the appointment as previously set. If the setAsync method is called on the end property, the duration of the appointment will be extended to the new end time.
+         * 
+         * The time must be in UTC; you can get the correct UTC time by using the convertToUtcClientTime method.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: InvalidEndTime - The appointment end time is before the appointment start time.
+         * 
+         * @param dateTime A date-time object in Coordinated Universal Time (UTC).
+         */
         setAsync(dateTime: Date): void;
+        /**
+         * Sets the start or end time of an appointment.
+         * 
+         * If the setAsync method is called on the start property, the end property will be adjusted to maintain the duration of the appointment as previously set. If the setAsync method is called on the end property, the duration of the appointment will be extended to the new end time.
+         * 
+         * The time must be in UTC; you can get the correct UTC time by using the convertToUtcClientTime method.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: InvalidEndTime - The appointment end time is before the appointment start time.
+         * 
+         * @param dateTime A date-time object in Coordinated Universal Time (UTC).
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         */
         setAsync(dateTime: Date, options: AsyncContextOptions): void;
+        /**
+         * Sets the start or end time of an appointment.
+         * 
+         * If the setAsync method is called on the start property, the end property will be adjusted to maintain the duration of the appointment as previously set. If the setAsync method is called on the end property, the duration of the appointment will be extended to the new end time.
+         * 
+         * The time must be in UTC; you can get the correct UTC time by using the convertToUtcClientTime method.
+         * 
+         * [Api set: Mailbox 1.1]
+         * 
+         * @remarks
+         * Minimum permission level: ReadWriteItem
+         * 
+         * Applicable Outlook mode: Compose
+         * 
+         * Errors: InvalidEndTime - The appointment end time is before the appointment start time.
+         * 
+         * @param dateTime A date-time object in Coordinated Universal Time (UTC).
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If setting the date and time fails, the asyncResult.error property will contain an error code.
+         */
         setAsync(dateTime: Date, callback: (result: AsyncResult) => void): void;
 
     }

From eea2cffc33a72696d3cce1f1ed904e975ab10558 Mon Sep 17 00:00:00 2001
From: Katie Soldau <ksoldau@gmail.com>
Date: Thu, 31 May 2018 11:22:57 +1000
Subject: [PATCH 551/575] add missing types to babel-core

---
 types/babel-core/index.d.ts | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/types/babel-core/index.d.ts b/types/babel-core/index.d.ts
index 3a41d2d252..de09b2a91f 100644
--- a/types/babel-core/index.d.ts
+++ b/types/babel-core/index.d.ts
@@ -169,9 +169,30 @@ export interface TransformOptions {
     wrapPluginVisitorMethod?(pluginAlias: string, visitorType: 'enter' | 'exit', callback: (path: NodePath, state: any) => void): (path: NodePath, state: any) => void ;
 }
 
+export interface BabelFileModulesMetadata {
+    imports: object[];
+    exports: {
+        exported: object[],
+        specifiers: object[]
+    };
+}
+
+export interface BabelFileMetadata {
+    usedHelpers: string[];
+    marked: Array<{
+        type: string;
+        message: string;
+        loc: object;
+    }>;
+    modules: BabelFileModulesMetadata;
+}
+
 export interface BabelFileResult {
     ast?: Node;
     code?: string;
+    ignored?: boolean;
     map?: object;
+    metadata?: BabelFileMetadata;
 }
+
 export as namespace babel;

From b66a84bda37db236bbf25a02c3a0cb109f981b47 Mon Sep 17 00:00:00 2001
From: Katie Soldau <ksoldau@gmail.com>
Date: Thu, 31 May 2018 11:47:36 +1000
Subject: [PATCH 552/575] update babel-core tests

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

diff --git a/types/babel-core/babel-core-tests.ts b/types/babel-core/babel-core-tests.ts
index b3839d151f..da87d891ba 100644
--- a/types/babel-core/babel-core-tests.ts
+++ b/types/babel-core/babel-core-tests.ts
@@ -1,13 +1,15 @@
 import * as babel from "babel-core";
 
-// Example from https://github.com/babel/babel/tree/master/packages/babel-core
+// Slightly modified example from https://github.com/babel/babel/tree/master/packages/babel-core
 const code = `class Example {}`;
 const result = babel.transform(code, { /* options */ });
 result.code; // Generated code
 result.map; // Sourcemap
 result.ast; // AST
+result.ignored;
+result.metadata;
 
-// Examples from http://babeljs.io/docs/usage/api/
+// Slightly modified examples from http://babeljs.io/docs/usage/api/
 const options: babel.TransformOptions = {
     plugins: [
         "es2015-arrow-functions",
@@ -24,6 +26,8 @@ babel.transformFile("filename.js", options, (err, result) => {
     result.code;
     result.map;
     result.ast;
+    result.ignored;
+    result.metadata;
 });
 
 babel.transformFileSync("filename.js", options).code;

From aecb8f95643e6d19da9584193d00d06a836a2a3d Mon Sep 17 00:00:00 2001
From: Justin Sprigg <justin.sprigg@gmail.com>
Date: Thu, 31 May 2018 12:44:43 +1000
Subject: [PATCH 553/575] Add type array to dateStrings

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

diff --git a/types/mysql/index.d.ts b/types/mysql/index.d.ts
index 555fc703bf..3be47cd100 100644
--- a/types/mysql/index.d.ts
+++ b/types/mysql/index.d.ts
@@ -397,10 +397,10 @@ export interface ConnectionConfig extends ConnectionOptions {
     bigNumberStrings?: boolean;
 
     /**
-     * Force date types (TIMESTAMP, DATETIME, DATE) to be returned as strings rather then inflated into JavaScript Date
-     * objects. (Default: false)
+     * Force date types (TIMESTAMP, DATETIME, DATE) to be returned as strings rather then inflated into JavaScript
+     * Date objects. Can be true/false or an array of type names to keep as strings. (Default: false)
      */
-    dateStrings?: boolean;
+    dateStrings?: boolean | (('TIMESTAMP' | 'DATETIME' | 'DATE')[]);;
 
     /**
      * This will print all incoming and outgoing packets on stdout.

From 5275b58e570459dfb20757bff6d2ac90f18e20f1 Mon Sep 17 00:00:00 2001
From: Justin Sprigg <justin.sprigg@gmail.com>
Date: Thu, 31 May 2018 12:49:54 +1000
Subject: [PATCH 554/575] Test dateStrings

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

diff --git a/types/mysql/mysql-tests.ts b/types/mysql/mysql-tests.ts
index 480e7e0275..d8abfe1dcd 100644
--- a/types/mysql/mysql-tests.ts
+++ b/types/mysql/mysql-tests.ts
@@ -429,3 +429,5 @@ connection.query({sql: '...', values: ['test']}, (err: Error, results: any) => {
 connection = mysql.createConnection("mysql://localhost/test?flags=-FOUND_ROWS");
 connection = mysql.createConnection({debug: true});
 connection = mysql.createConnection({debug: ['ComQueryPacket', 'RowDataPacket']});
+connection = mysql.createConnection({dateStrings: ['DATE']});
+connection = mysql.createConnection({dateStrings: true});

From e7eef22dcb697dd1ee9b465dd0d7f8f409d6a6d2 Mon Sep 17 00:00:00 2001
From: Justin Sprigg <justin.sprigg@gmail.com>
Date: Thu, 31 May 2018 13:02:16 +1000
Subject: [PATCH 555/575] Simplify array type

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

diff --git a/types/mysql/index.d.ts b/types/mysql/index.d.ts
index 3be47cd100..d98fe17ec5 100644
--- a/types/mysql/index.d.ts
+++ b/types/mysql/index.d.ts
@@ -400,7 +400,7 @@ export interface ConnectionConfig extends ConnectionOptions {
      * Force date types (TIMESTAMP, DATETIME, DATE) to be returned as strings rather then inflated into JavaScript
      * Date objects. Can be true/false or an array of type names to keep as strings. (Default: false)
      */
-    dateStrings?: boolean | (('TIMESTAMP' | 'DATETIME' | 'DATE')[]);;
+    dateStrings?: boolean | Array<'TIMESTAMP' | 'DATETIME' | 'DATE'>;
 
     /**
      * This will print all incoming and outgoing packets on stdout.

From db6325c99130f2db7cff16b79ad63b89cea5ab5b Mon Sep 17 00:00:00 2001
From: Trev Cobbett <trevor.cobbett@madgex.com>
Date: Thu, 31 May 2018 06:17:48 +0100
Subject: [PATCH 556/575] Renaming ResponseType to ResolutionType

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

diff --git a/types/promise-retry/index.d.ts b/types/promise-retry/index.d.ts
index 9257c08404..f2d9ee5747 100644
--- a/types/promise-retry/index.d.ts
+++ b/types/promise-retry/index.d.ts
@@ -14,7 +14,7 @@ import { WrapOptions } from "retry";
  * @param attempt The number of the attempt.
  * @returns A Promise for anything (eg. a HTTP response).
  */
-type RetryableFn<ResponseType> = ((retry: (error: any) => never, attempt: number) => Promise<ResponseType>);
+type RetryableFn<ResolutionType> = ((retry: (error: any) => never, attempt: number) => Promise<ResolutionType>);
 /**
  * Wrap all functions of the object with retry. The params can be entered in either order, just like in the original library.
  *
@@ -22,6 +22,6 @@ type RetryableFn<ResponseType> = ((retry: (error: any) => never, attempt: number
  * @param options The options for how long/often to retry the function for.
  * @returns The Promise resolved by the input retryableFn, or rejected (if not retried) from its catch block.
  */
-declare function promiseRetry<ResponseType>(retryableFn: RetryableFn<ResponseType>, options?: WrapOptions): Promise<ResponseType>;
-declare function promiseRetry<ResponseType>(options: WrapOptions, retryableFn: RetryableFn<ResponseType>): Promise<ResponseType>;
+declare function promiseRetry<ResolutionType>(retryableFn: RetryableFn<ResolutionType>, options?: WrapOptions): Promise<ResolutionType>;
+declare function promiseRetry<ResolutionType>(options: WrapOptions, retryableFn: RetryableFn<ResolutionType>): Promise<ResolutionType>;
 export = promiseRetry;

From ec2fbc378c821185cf88782f424c413a9ecc11c1 Mon Sep 17 00:00:00 2001
From: Afshawn Lotfi <afshawn.audatica292@gmail.com>
Date: Thu, 31 May 2018 02:17:52 -0400
Subject: [PATCH 557/575]  Fixed index.d.ts to be used as a module

index.d.ts can allow karma-fixture to be imported as a module like so:
import fixture from 'karma-fixture'
---
 types/karma-fixture/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/karma-fixture/index.d.ts b/types/karma-fixture/index.d.ts
index 75212799c1..32614e1e7d 100644
--- a/types/karma-fixture/index.d.ts
+++ b/types/karma-fixture/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for karma-fixture 0.2.6
 // Project: https://github.com/billtrik/karma-fixture
 // Definitions by: Ezekiel Victor <https://github.com/evictor>
+//                 Afshawn Lotfi <https://github.com/afshawnlotfi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace fixture {
@@ -25,3 +26,6 @@ declare namespace fixture {
 
   export function setBase(fixtureBasePath: string): void;
 }
+
+export = fixture;
+export as namespace fixture;

From d5e9fe1676aa903ce5cee7e40a4600261d906e28 Mon Sep 17 00:00:00 2001
From: Afshawn Lotfi <afshawn.audatica292@gmail.com>
Date: Thu, 31 May 2018 02:19:43 -0400
Subject: [PATCH 558/575] Adjusting version number

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

diff --git a/types/karma-fixture/index.d.ts b/types/karma-fixture/index.d.ts
index 32614e1e7d..42af1d5d60 100644
--- a/types/karma-fixture/index.d.ts
+++ b/types/karma-fixture/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for karma-fixture 0.2.6
+// Type definitions for karma-fixture 0.2.7
 // Project: https://github.com/billtrik/karma-fixture
 // Definitions by: Ezekiel Victor <https://github.com/evictor>
 //                 Afshawn Lotfi <https://github.com/afshawnlotfi>

From 4f80dd48d1d5938fec9db9146b45b674a919b7d1 Mon Sep 17 00:00:00 2001
From: Ryan Rhee <ryan.y.rhee@gmail.com>
Date: Thu, 31 May 2018 02:39:03 -0400
Subject: [PATCH 559/575] Add URLSearchParams as valid body

MDN includes URLSearchParams as a valid type for the body
---
 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 1ea5542691..b203744a72 100644
--- a/types/node-fetch/index.d.ts
+++ b/types/node-fetch/index.d.ts
@@ -7,6 +7,7 @@
 /// <reference types="node" />
 
 import { Agent } from "http";
+import { URLSearchParams } from "url";
 
 export class Request extends Body {
     constructor(input: string | { href: string } | Request, init?: RequestInit);
@@ -164,7 +165,7 @@ export interface ResponseInit {
 }
 
 export type HeaderInit = Headers | string[];
-export type BodyInit = ArrayBuffer | ArrayBufferView | NodeJS.ReadableStream | string;
+export type BodyInit = ArrayBuffer | ArrayBufferView | NodeJS.ReadableStream | string | URLSearchParams;
 export type RequestInfo = string | Request;
 
 export default function fetch(

From 5a548b59f34b81248400d16cf17a61bfda64f160 Mon Sep 17 00:00:00 2001
From: Sebastian Silbermann <silbermann.sebastian@gmail.com>
Date: Thu, 31 May 2018 09:09:13 +0200
Subject: [PATCH 560/575] fix(argparse): addArgument accepts strings

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

diff --git a/types/argparse/argparse-tests.ts b/types/argparse/argparse-tests.ts
index aef18b665b..ed714ada95 100644
--- a/types/argparse/argparse-tests.ts
+++ b/types/argparse/argparse-tests.ts
@@ -20,6 +20,12 @@ simpleExample.addArgument(
         help: 'bar foo',
     }
 );
+simpleExample.addArgument(
+    'positional',
+    {
+        help: 'bar foo',
+    }
+);
 
 simpleExample.printHelp();
 console.log('-----------');
diff --git a/types/argparse/index.d.ts b/types/argparse/index.d.ts
index d8907a2ecd..cf4d1f648e 100644
--- a/types/argparse/index.d.ts
+++ b/types/argparse/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/nodeca/argparse
 // Definitions by: Andrew Schurman <https://github.com/arcticwaters>
 //                 Tomasz Łaziuk <https://github.com/tlaziuk>
+//                 Sebastian Silbermann <https://github.com/eps1lon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -34,7 +35,7 @@ export class SubParser {
 }
 
 export class ArgumentGroup {
-    addArgument(args: string[], options?: ArgumentOptions): void;
+    addArgument(args: string[] | string, options?: ArgumentOptions): void;
     addArgumentGroup(options?: ArgumentGroupOptions): ArgumentGroup;
     addMutuallyExclusiveGroup(options?: { required: boolean }): ArgumentGroup;
     setDefaults(options?: {}): void;

From 3fa573769ed50e425a07355e4415e0a970c8bb1b Mon Sep 17 00:00:00 2001
From: gebeto <slavik.nychkalo@gmail.com>
Date: Thu, 31 May 2018 13:59:22 +0300
Subject: [PATCH 561/575] chart.js - improvements

---
 types/chart.js/index.d.ts | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 04d2e182ee..923af5583e 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -11,6 +11,7 @@
 //                 Sergey Rubanov <https://github.com/chicoxyzzy>
 //                 Simon Archer <https://github.com/archy-bold>
 //                 Ken Elkabany <https://github.com/braincore>
+//                 Slavik Nychkalo <https://github.com/gebeto>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -37,6 +38,7 @@ declare class Chart {
     canvas: HTMLCanvasElement|null;
     chartArea: Chart.ChartArea;
     static pluginService: PluginServiceStatic;
+    static plugins: PluginServiceStatic;
 
     static defaults: {
         global: Chart.ChartOptions & Chart.ChartFontOptions;
@@ -56,40 +58,40 @@ declare class PluginServiceStatic {
 }
 
 interface PluginServiceRegistrationOptions {
-    beforeInit?(chartInstance: Chart): void;
-    afterInit?(chartInstance: Chart): void;
+    beforeInit?(chartInstance: Chart, options?: any): void;
+    afterInit?(chartInstance: Chart, options?: any): void;
 
-    resize?(chartInstance: Chart, newChartSize: Size): void;
+    resize?(chartInstance: Chart, newChartSize: Size, options?: any): void;
 
-    beforeUpdate?(chartInstance: Chart): void;
-    afterScaleUpdate?(chartInstance: Chart): void;
-    beforeDatasetsUpdate?(chartInstance: Chart): void;
-    afterDatasetsUpdate?(chartInstance: Chart): void;
-    afterUpdate?(chartInstance: Chart): void;
+    beforeUpdate?(chartInstance: Chart, options?: any): void;
+    afterScaleUpdate?(chartInstance: Chart, options?: any): void;
+    beforeDatasetsUpdate?(chartInstance: Chart, options?: any): void;
+    afterDatasetsUpdate?(chartInstance: Chart, options?: any): void;
+    afterUpdate?(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): void;
+    beforeRender?(chartInstance: Chart, options?: any): void;
 
     // Easing is for animation
-    beforeDraw?(chartInstance: Chart, easing: string): void;
-    afterDraw?(chartInstance: Chart, easing: string): void;
+    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): void;
-    afterDatasetsDraw?(chartInstance: Chart, easing: string): void;
+    beforeDatasetsDraw?(chartInstance: Chart, easing: string, options?: any): void;
+    afterDatasetsDraw?(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): void;
+    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): void;
+    afterTooltipDraw?(chartInstance: Chart, tooltipData?: any, options?: any): void;
 
     destroy?(chartInstance: Chart): void;
 
     // Called when an event occurs on the chart
-    beforeEvent?(chartInstance: Chart, event: Event): void;
-    afterEvent?(chartInstance: Chart, event: Event): void;
+    beforeEvent?(chartInstance: Chart, event: Event, options?: any): void;
+    afterEvent?(chartInstance: Chart, event: Event, options?: any): void;
 }
 
 interface Size {
@@ -98,7 +100,7 @@ interface Size {
 }
 
 declare namespace Chart {
-    type ChartType = 'line' | 'bar' | 'radar' | 'doughnut' | 'polarArea' | 'bubble' | 'pie';
+    type ChartType = 'line' | 'bar' | 'horizontalBar' | 'radar' | 'doughnut' | 'polarArea' | 'bubble' | 'pie';
 
     type TimeUnit = 'millisecond' | 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'quarter' | 'year';
 

From 9205170509d057ec480e1726fdb8f58adb6b9c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matteus=20Hemstr=C3=B6m?= <matteus.hemstrom@valtech.se>
Date: Thu, 31 May 2018 13:57:48 +0200
Subject: [PATCH 562/575] [core-js] Update version string to 2.5

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

diff --git a/types/core-js/index.d.ts b/types/core-js/index.d.ts
index 86259f05ba..252e54bf9b 100644
--- a/types/core-js/index.d.ts
+++ b/types/core-js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for core-js 0.9
+// Type definitions for core-js 2.5
 // Project: https://github.com/zloirock/core-js/
 // Definitions by: Ron Buckton <https://github.com/rbuckton>, Michel Felipe <https://github.com/mfdeveloper>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 9dc7565b513056874cd83af89550ff9f7a8fd00e Mon Sep 17 00:00:00 2001
From: Agapanthus <eric@skaliks.blue>
Date: Thu, 31 May 2018 17:18:58 +0200
Subject: [PATCH 563/575] Cleanup

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

diff --git a/types/codemirror/index.d.ts b/types/codemirror/index.d.ts
index 0aec765065..1ad66db78b 100644
--- a/types/codemirror/index.d.ts
+++ b/types/codemirror/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for CodeMirror
+// Type definitions for CodeMirror
 // Project: https://github.com/marijnh/CodeMirror
 // Definitions by: mihailik <https://github.com/mihailik>
 //                 nrbernard <https://github.com/nrbernard>
@@ -327,7 +327,7 @@ declare namespace CodeMirror {
         getTokenTypeAt(pos: CodeMirror.Position): string;
 
         /** This is similar to getTokenAt, but collects all tokens for a given line into an array. */
-        getLineTokens(line: number, precise?: boolean): Token[]; 
+        getLineTokens(line: number, precise?: boolean): Token[];
 
         /** Returns the mode's parser state, if any, at the end of the given line number.
         If no line number is given, the state at the end of the document is returned.

From e90b1e5bbedde23b5d84c78355fb3dfb32ca7343 Mon Sep 17 00:00:00 2001
From: Agapanthus <eric@skaliks.blue>
Date: Thu, 31 May 2018 17:35:52 +0200
Subject: [PATCH 564/575] (Hopefully) removed BOM

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

diff --git a/types/codemirror/index.d.ts b/types/codemirror/index.d.ts
index 1ad66db78b..92424e9556 100644
--- a/types/codemirror/index.d.ts
+++ b/types/codemirror/index.d.ts
@@ -322,8 +322,8 @@ declare namespace CodeMirror {
         getTokenAt(pos: CodeMirror.Position, precise?: boolean): Token;
 
         /** This is a (much) cheaper version of getTokenAt useful for when you just need the type of the token at a given position, 
-        and no other information. Will return null for unstyled tokens, and a string, 
-        potentially containing multiple space-separated style names, otherwise. */
+        and no other information. Will return null for unstyled tokens, and a string, potentially containing multiple 
+        space-separated style names, otherwise. */
         getTokenTypeAt(pos: CodeMirror.Position): string;
 
         /** This is similar to getTokenAt, but collects all tokens for a given line into an array. */

From f9f4e61a1bbf21402832e13380442bf2dca70438 Mon Sep 17 00:00:00 2001
From: Agapanthus <eric@skaliks.blue>
Date: Thu, 31 May 2018 17:43:39 +0200
Subject: [PATCH 565/575] Finally removed BOM

using binary editor
---
 types/codemirror/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/codemirror/index.d.ts b/types/codemirror/index.d.ts
index 92424e9556..e7fa7c368e 100644
--- a/types/codemirror/index.d.ts
+++ b/types/codemirror/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for CodeMirror
+// Type definitions for CodeMirror
 // Project: https://github.com/marijnh/CodeMirror
 // Definitions by: mihailik <https://github.com/mihailik>
 //                 nrbernard <https://github.com/nrbernard>

From 128de1a552044e5fa43d1dba9daf461fb36ad508 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Thu, 31 May 2018 10:25:30 -0700
Subject: [PATCH 566/575] [@storybook/addon-storyshots] Fill out missing
 initStoryshots options

---
 types/storybook__addon-storyshots/index.d.ts  | 22 +++++++++++----
 .../storybook__addon-storyshots-tests.ts      | 28 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/types/storybook__addon-storyshots/index.d.ts b/types/storybook__addon-storyshots/index.d.ts
index cbece6e354..289efcf33c 100644
--- a/types/storybook__addon-storyshots/index.d.ts
+++ b/types/storybook__addon-storyshots/index.d.ts
@@ -11,11 +11,15 @@ import { Page, NavigationOptions, ScreenshotOptions } from "puppeteer";
 export type Test = (options: {
     story: StoryObject;
     context: StoryContext;
-    renderShallowTree: any;
-    renderTree: any;
+    renderShallowTree: RenderTree;
+    renderTree: RenderTree;
     snapshotFileName: string;
 }) => void | undefined | Promise<void>;
 
+export interface RenderTree {
+    (story: StoryObject, context: StoryContext, options?: SnapshotOptions): void | undefined | Promise<void>;
+}
+
 export interface SnapshotOptions {
     createNodeMock?: (element: any) => any;
 }
@@ -54,10 +58,16 @@ export const renderOnly: Test;
 
 export function getSnapshotFileName(context: StoryContext): string;
 
-export default function initStoryshots(options: {
+export default function initStoryshots<Rendered>(options: InitOptions<Rendered>): void;
+
+export interface InitOptions<Rendered = any> {
     configPath?: string;
-    framework?: string;
-    integrityOptions?: {};
     suite?: string;
+    storyKindRegex?: RegExp;
+    storyNameRegex?: RegExp;
+    framework?: string;
     test?: Test;
-}): void;
+    renderer?: (node: React.ReactElement<any>) => Rendered;
+    serializer?: (rendered: Rendered) => any;
+    integrityOptions?: {};
+}
diff --git a/types/storybook__addon-storyshots/storybook__addon-storyshots-tests.ts b/types/storybook__addon-storyshots/storybook__addon-storyshots-tests.ts
index a2bafa6a14..3d5eb2743a 100644
--- a/types/storybook__addon-storyshots/storybook__addon-storyshots-tests.ts
+++ b/types/storybook__addon-storyshots/storybook__addon-storyshots-tests.ts
@@ -1,5 +1,5 @@
 import initStoryshots, { multiSnapshotWithOptions, snapshotWithOptions, getSnapshotFileName, renderOnly, imageSnapshot } from "@storybook/addon-storyshots";
-import { shallow } from 'enzyme';
+import { shallow, ShallowWrapper } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import 'jest';
 import 'jest-specific-snapshot';
@@ -55,3 +55,29 @@ initStoryshots({
         }
     })
 });
+
+initStoryshots({
+    configPath: 'config/storybook',
+    suite: 'storybook snapshots',
+    storyNameRegex: /^(?!NOTEST )/,
+    test: function renderWithoutSnapshotting({ story, context, renderTree }) {
+        const result = renderTree(story, context, { createNodeMock });
+        const unmount = (tree: any) => typeof tree.unmount === 'function' && tree.unmount();
+        return result instanceof Promise ? result.then(unmount) : unmount(result);
+
+        function createNodeMock() {
+            return {
+                addEventListener: () => undefined,
+                getClientRects: () => [],
+                getBoundingClientRect: () => ({}),
+                getElementsByClassName: () => [],
+            };
+        }
+    },
+});
+
+// Ensure renderer is compatible with serializer
+initStoryshots<ShallowWrapper>({
+    renderer: shallow,
+    serializer: toJson,
+});

From 74b29ce480d3cf430407456f49013e1cc850abd6 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Thu, 31 May 2018 10:28:42 -0700
Subject: [PATCH 567/575] Fix lint

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

diff --git a/types/storybook__addon-storyshots/index.d.ts b/types/storybook__addon-storyshots/index.d.ts
index 289efcf33c..e703f374da 100644
--- a/types/storybook__addon-storyshots/index.d.ts
+++ b/types/storybook__addon-storyshots/index.d.ts
@@ -16,9 +16,11 @@ export type Test = (options: {
     snapshotFileName: string;
 }) => void | undefined | Promise<void>;
 
-export interface RenderTree {
-    (story: StoryObject, context: StoryContext, options?: SnapshotOptions): void | undefined | Promise<void>;
-}
+export type RenderTree = (
+    story: StoryObject,
+    context: StoryContext,
+    options?: SnapshotOptions
+) => void | undefined | Promise<void>;
 
 export interface SnapshotOptions {
     createNodeMock?: (element: any) => any;
@@ -58,6 +60,7 @@ export const renderOnly: Test;
 
 export function getSnapshotFileName(context: StoryContext): string;
 
+// tslint:disable-next-line no-unnecessary-generics
 export default function initStoryshots<Rendered>(options: InitOptions<Rendered>): void;
 
 export interface InitOptions<Rendered = any> {

From 68c8f889da705eab6f043d0f18955b85d202d7df Mon Sep 17 00:00:00 2001
From: rayhaneh <rbanyassady@onist.com>
Date: Thu, 31 May 2018 10:04:04 -0400
Subject: [PATCH 568/575] Modified ramda differenceWith typing to accept lists
 of different types

---
 types/ramda/index.d.ts     |  6 +++---
 types/ramda/ramda-tests.ts | 14 +++++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 52e4becc10..52872755d0 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -523,9 +523,9 @@ declare namespace R {
          * Duplication is determined according to the value returned by applying the supplied predicate to two list
          * elements.
          */
-        differenceWith<T>(pred: (a: T, b: T) => boolean, list1: ReadonlyArray<T>, list2: ReadonlyArray<T>): T[];
-        differenceWith<T>(pred: (a: T, b: T) => boolean): (list1: ReadonlyArray<T>, list2: ReadonlyArray<T>) => T[];
-        differenceWith<T>(pred: (a: T, b: T) => boolean, list1: ReadonlyArray<T>): (list2: ReadonlyArray<T>) => T[];
+        differenceWith<T1, T2>(pred: (a: T1, b: T2) => boolean, list1: ReadonlyArray<T1>, list2: ReadonlyArray<T2>): T1[];
+        differenceWith<T1, T2>(pred: (a: T1, b: T2) => boolean): (list1: ReadonlyArray<T1>, list2: ReadonlyArray<T2>) => T1[];
+        differenceWith<T1, T2>(pred: (a: T1, b: T2) => boolean, list1: ReadonlyArray<T1>): (list2: ReadonlyArray<T2>) => T1[];
 
         /*
          * Returns a new object that does not contain a prop property.
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index ee9e7512e1..27898696b7 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -1950,19 +1950,23 @@ class Rectangle {
 };
 
 () => {
-    function cmp(x: any, y: any) {
+    function cmp1(x: any, y: any) {
         return x.a === y.a;
     }
 
+    function cmp2(x: any, y: any) {
+        return x.a === y.b;
+    }
+
     const l1 = [{a: 1}, {a: 2}, {a: 3}];
     const l2 = [{a: 3}, {a: 4}];
-    R.differenceWith(cmp, l1, l2); // => [{a: 1}, {a: 2}]
+    const l3 = [{b: 3}, {b: 4}];
+    R.differenceWith(cmp1, l1, l2); // => [{a: 1}, {a: 2}]
 
-    const differenceWithCurried1 = R.differenceWith(cmp);
+    const differenceWithCurried1 = R.differenceWith(cmp1);
     differenceWithCurried1(l1, l2); // =>[{a: 1}, {a: 2}]
 
-    const differenceWithCurried2 = R.differenceWith(cmp, l1);
-    differenceWithCurried2(l2); // =>[{a: 1}, {a: 2}]
+    R.differenceWith(cmp2, l1, l3); // => [{a: 1}, {a: 2}]
 };
 
 () => {

From 2ec9cebadcba3307287e4ba6b8dcbe7aff1e7d01 Mon Sep 17 00:00:00 2001
From: Ricky Kirkham <rickki@microsoft.com>
Date: Thu, 31 May 2018 11:41:34 -0700
Subject: [PATCH 569/575] strongly typing the options parameters in Shared APIs

---
 types/office-js/index.d.ts | 555 ++++++++++++++++++++++++-------------
 1 file changed, 366 insertions(+), 189 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index da9e84fa1b..d1b3a15e5e 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -339,7 +339,10 @@ declare namespace Office {
          */
         closeContainer(): void;
     }
-    export interface DialogOptions {
+    /**
+	 * Provides options for how a dialog is displayed.
+	 */
+	export interface DialogOptions {
         /**
          * Defines the width of the dialog as a percentage of the current display. Defaults to 80%. 250px minimum.
          */
@@ -352,6 +355,10 @@ declare namespace Office {
          * Determines whether the dialog box should be displayed within an IFrame. This setting is only applicable in Office Online clients, and is ignored by other platforms. If false (default), the dialog will be displayed as a new browser window (pop-up). Recommended for authentication pages that cannot be displayed in an IFrame. If true, the dialog will be displayed as a floating overlay with an IFrame. This is best for user experience and performance.
          */
         displayInIframe?: boolean
+        /**
+         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         */
+        asyncContext?: any
     }
     export interface Auth {
         /**
@@ -370,21 +377,315 @@ declare namespace Office {
         getAccessTokenAsync(options?: AuthOptions, callback?: (result: AsyncResult) => void): void;
 
     }
-    export interface AuthOptions {
+    /**
+	 * 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.
+	 */
+	export interface AuthOptions {
         /**
-         * Optional. 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.
+         * 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,
         /**
-         * Optional. Prompts the user to add (or to switch if already added) his or her Office account.
+         * Prompts the user to add (or to switch if already added) his or her Office account.
          */
         forceAddAccount?: boolean,
         /**
-         * Optional. 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.
+         * 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
         /**
-         * Optional. A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         */
+        asyncContext?: any
+    }
+    /**
+	 * Provides an option for preserving, unchanged, context data of any type, for use in a callback, that might be changed by an asynchronous method.
+	 */
+	export interface AsyncContextOptions {
+        /**
+         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         */
+        asyncContext?: any
+    }
+    /**
+	 * Provides options for how to get the data in a binding.
+	 *
+	 * @remarks
+	 * If the rows option is used, the value must be "thisRow".
+	 */
+	export interface GetBindingDataOptions {
+		/**
+		 * The expected shape of the selection. Use Office.CoercionType or text value. Default: The original, uncoerced type of the binding.
+		 */
+		coercionType?: Office.CoercionType | string
+        /**
+		 * Specifies whether values, such as numbers and dates, are returned with their formatting applied. Use Office.ValueFormat or text value. Default: Unformatted data.
+		 */     
+		valueFormat?: Office.ValueFormat | string
+		/**
+		* For table or matrix bindings, specifies the zero-based starting row for a subset of the data in the binding. Default is first row.
+		*/ 
+		startRow?: number
+		/**
+		* For table or matrix bindings, specifies the zero-based starting column for a subset of the data in the binding. Default is first column.
+		*/ 
+		startColumn?: number
+		/**
+		* For table or matrix bindings, specifies the number of rows offset from the startRow. Default is all subsequent rows.
+		*/ 
+		rowCount?: number
+		/**
+		* For table or matrix bindings, specifies the number of columns offset from the startColumn. Default is all subsequent columns.
+		*/ 
+		columnCount?: number
+		/**
+		* Specify whether to get only the visible (filtered in) data or all the data (default is all). Useful when filtering data. Use Office.FilterType or text value.
+		*/ 
+		filterType?: Office.FilterType | string
+		/**
+		* Only for table bindings in content add-ins for Access. Specifies the pre-defined string "thisRow" to get data in the currently selected row.
+		*/ 
+		rows?: string
+        /**
+         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         */
+        asyncContext?: any
+    }
+    /**
+	 * Provides options for how to set the data in a binding.
+	 *
+	 * @remarks
+	 * If the rows option is used, the value must be "thisRow".
+	 */
+	export interface SetBindingDataOptions {
+		/**
+		 * Use only with binding type table and when a TableData object is passed for the data parameter. An array of objects that specify a range of columns, rows, or cells and specify, as key-value pairs, the cell formatting to apply to that range. Example: [{cells: Office.Table.Data, format: {fontColor: "yellow"}}, 
+        {cells: {row: 3, column: 4}, format: {borderColor: "white", fontStyle: "bold"}}]
+		 */
+		cellFormat?: Array<RangeFormatConfiguration>
+		/**
+		 * Explicitly sets the shape of the data object. If not supplied is inferred from the data type.
+		 */
+		coercionType?: Office.CoercionType | string
+        /**
+		* Only for table bindings in content add-ins for Access. Array of strings. Specifies the column names.
+		*/ 
+		columns?: Array<string>
+		/**
+		* Only for table bindings in content add-ins for Access. Specifies the pre-defined string "thisRow" to get data in the currently selected row.
+		*/ 
+		rows?: string
+		/**
+		* Specifies the zero-based starting row for a subset of the data in the binding. Only for table or matrix bindings. If omitted, data is set starting in the first row.
+		*/
+		startRow?: number
+		/**
+		* Specifies the zero-based starting column for a subset of the data. Only for table or matrix bindings. If omitted, data is set starting in the first column.
+		*/ 
+		startColumn?: number	
+		/**
+		* For an inserted table, a list of key-value pairs that specify table formatting options, such as header row, total row, and banded rows. Example: {bandedRows: true,  filterButton: false}
+		*/
+		tableOptions?: object
+        /**
+         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         */
+        asyncContext?: any
+    }
+    /**
+	 * Specifies a range and its formatting.
+	 */
+	export interface RangeFormatConfiguration {
+		/**
+		 * Specifies the range. Example of using Office.Table enum: Office.Table.All. Example of using RangeCoordinates: {row: 3, column: 4} specifies the cell in the 3rd (zero-based) row in the 4th (zero-based) column. 
+		 */
+		 cells: Office.Table | RangeCoordinates
+		/**
+		 * Specifies the formatting as key-value pairs. Example: {borderColor: "white", fontStyle: "bold"}
+		 */
+		 format: object	
+    }
+    /**
+	 * Specifies a cell, or row, or column, by its zero-based row and/or column number. Example: {row: 4, column: 3} specifies the cell in the 3rd (zero-based) row in the 4th (zero-based) column.
+	 */
+	export interface RangeCoordinates {
+		/**
+		 * The zero-based row of the range. If not specified, all cells, in the column specified by `column` are included.
+		 */
+		 row?: number
+		/**
+		 * The zero-based column of the range. If not specified, all cells, in the row specified by `row` are included.
+		 */
+		 column?: number	
+    }
+    /**
+	 * Provides options to determine which event handler or handlers are removed.
+	 */
+	export interface RemoveHandlerOptions {
+		/**
+         * The handler to be removed. If not specified all handlers for the specified event type are removed.
+         */
+        handler?: string
+        /**
+         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         */
+        asyncContext?: any
+    }
+    /**
+	 * Provides options for configuring the binding that is created.
+	 */
+	export interface AddBindingFromNamedItemOptions {
+		/**
+         * The unique ID of the binding. Autogenerated if not supplied.
+         */
+        id?: string
+        /**
+         * The names of the columns involved in the binding.
+         */
+        columns?: Array<string>
+		/**
+         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         */
+        asyncContext?: any	
+    }
+    /**
+	 * Provides options for configuring the prompt and identifying the binding that is created.
+	 */
+	export interface AddBindingFromPromptOptions {
+		/**
+         * The unique ID of the binding. Autogenerated if not supplied.
+         */
+        id?: string
+        /**
+         * Specifies the string to display in the prompt UI that tells the user what to select. Limited to 200 characters. If no promptText argument is passed, "Please make a selection" is displayed.
+         */
+        promptText?: string
+		/**
+         * Specifies a table of sample data displayed in the prompt UI as an example of the kinds of fields (columns) that can be bound by your add-in. The headers provided in the TableData object specify the labels used in the field selection UI. Note: This parameter is used only in add-ins for Access. It is ignored if provided when calling the method in an add-in for Excel.
+         */
+        sampleData?: TableData
+		/**
+         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         */
+        asyncContext?: any	
+    }
+    /**
+	 * Provides options for configuring the prompt and identifying the binding that is created.
+	 */
+	export interface AddBindingFromSelectionOptions {
+		/**
+         * The unique ID of the binding. Autogenerated if not supplied.
+         */
+        id?: string
+        /**
+         * The names of the columns involved in the binding.
+         */
+        columns?: Array<string>
+		/**
+         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         */
+        asyncContext?: any	
+    }
+    /**
+	 * Provides options for setting the size of slices that the document will be divided into.
+	 */
+	export interface GetFileOptions {
+		/**
+         * The the size of the slices in bytes. The maximum (and the default) is 4194304 (4MB).
+         */
+        sliceSize?: number
+		/**
+         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         */
+        asyncContext?: any	
+    }
+    /**
+	 * Provides options for customizing what data is returned and how it is formatted.
+	 */
+	export interface GetSelectedDataOptions {
+		/**
+         * Specify whether the data is formatted. Use Office.ValueFormat or string equivalent.
+         */
+        valueFormat?: Office.ValueFormat | string
+        /**
+         * Specify whether to get only the visible (that is, filtered-in) data or all the data. Useful when filtering data. Use Office.FilterType or string equivalent. This parameter is ignored in Word documents.
+         */
+        filterType?: Office.FilterType | string
+		/**
+         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         */
+        asyncContext?: any	
+    }
+    /**
+	 * Provides options for whether to select the location that is navigated to.
+	 * 
+	 * @remarks
+     * The behavior caused by the options.selectionMode option varies by host:
+	 * 
+	 * In Excel: Office.SelectionMode.Selected selects all content in the binding, or named item. Office.SelectionMode.None for text bindings, selects the cell; for matrix bindings, table bindings, and named items, selects the first data cell (not first cell in header row for tables).
+	 * 
+	 * In PowerPoint: Office.SelectionMode.Selected selects the slide title or first textbox on the slide. Office.SelectionMode.None Doesn't select anything.
+	 * 
+	 * In Word: Office.SelectionMode.Selected selects all content in the binding. Office.SelectionMode.None for text bindings, moves the cursor to the beginning of the text; for matrix bindings and table bindings, selects the first data cell (not first cell in header row for tables). 
+	 */
+	export interface GoToByIdOptions {
+		/**
+         * Specifies whether the location specified by the id parameter is selected (highlighted). Use Office.SelectionMode or string equivalent. See the Remarks for more information.
+         */
+        selectionMode?: Office.SelectionMode | string
+		/**
+         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         */
+        asyncContext?: any	
+    }
+    /**
+	 * Provides options for how to insert data to the selection.
+	 */
+	export interface SetSelectedDataOptions {
+		/**
+		 * Use only with binding type table and when a TableData object is passed for the data parameter. An array of objects that specify a range of columns, rows, or cells and specify, as key-value pairs, the cell formatting to apply to that range. Example: [{cells: Office.Table.Data, format: {fontColor: "yellow"}}, 
+        {cells: {row: 3, column: 4}, format: {borderColor: "white", fontStyle: "bold"}}]
+		 */
+		cellFormat?: Array<RangeFormatConfiguration>
+		/**
+		 * Explicitly sets the shape of the data object. If not supplied is inferred from the data type.
+		 */
+		coercionType?: Office.CoercionType | string        
+		/** 
+         * For an inserted table, a list of key-value pairs that specify table formatting options, such as header row, total row, and banded rows. Example: {bandedRows: true,  filterButton: false}
+		 */
+		tableOptions?: object
+		/**
+		* This option is applicable for inserting images. Indicates the insert location in relation to the top of the slide for PowerPoint, and its relation to the currently selected cell in Excel. This value is ignored for Word. This value is in points.
+		*/
+		imageTop?: number
+        /**
+		* This option is applicable for inserting images. Indicates the image width. If this option is provided without the imageHeight, the image will scale to match the value of the image width. If both image width and image height are provided, the image will be resized accordingly. If neither the image height or width is provided, the default image size and aspect ratio will be used. This value is in points.
+		*/
+		imageWidth?: number
+        /**
+		* This option is applicable for inserting images. Indicates the insert location in relation to the left side of the slide for PowerPoint, and its relation to the currently selected cell in Excel. This value is ignored for Word. This value is in points.
+		*/
+		imageLeft?: number
+        /**
+		* This option is applicable for inserting images. Indicates the image height. If this option is provided without the imageWidth, the image will scale to match the value of the image height. If both image width and image height are provided, the image will be resized accordingly. If neither the image height or width is provided, the default image size and aspect ratio will be used. This value is in points.
+		*/
+		imageHeight?: number
+        /**
+         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         */
+        asyncContext?: any
+    }
+    /**
+	 * Provides options for saving settings.
+	 */
+	export interface SaveSettingsOptions {
+		/**
+         * Indicates whether the setting will be replaced if stale.
+         */
+        overwriteIfStale?: boolean
+        /**
+         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
@@ -781,29 +1082,11 @@ declare namespace Office {
          * 
          * When called from a MatrixBinding or TableBinding, the getDataAsync method will return a subset of the bound values if the optional startRow, startColumn, rowCount, and columnCount parameters are specified (and they specify a contiguous and valid range).
          * 
-         * @param options An object with any of the following (example: {coercionType: 'matrix, 'valueFormat: 'formatted', filterType:'all'}):
-         * 
-         *       coercionType: The expected shape of the selection. Use Office.CoercionType or text value. Default: The original, uncoerced type of the binding.
-         * 
-         *       valueFormat: Specifies whether values, such as numbers and dates, are returned with their formatting applied. Use Office.ValueFormat or text value. Default: Unformatted data.
-         * 
-         *       startRow: For table or matrix bindings, specifies the zero-based starting row for a subset of the data in the binding. Default is first row.
-         * 
-         *       startColumn: For table or matrix bindings, specifies the zero-based starting column for a subset of the data in the binding. Default is first column.
-         * 
-         *       rowCount: For table or matrix bindings, specifies the number of rows offset from the startRow. Default is all subsequent rows.
-         * 
-         *       columnCount: For table or matrix bindings, specifies the number of columns offset from the startColumn. Default is all subsequent columns.
-         * 
-         *       filterType: Specify whether to get only the visible (filtered in) data or all the data (default is all). Useful when filtering data. Use Office.FilterType or text value.
-         * 
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         * 
-         *       rows: Only for table bindings in content add-ins for Access. Specifies the pre-defined string "thisRow" to get data in the currently selected row.
+         * @param options Provides options for how to get the data in a binding.
 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        getDataAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        getDataAsync(options?: GetBindingDataOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes the specified handler from the binding for the specified event type.
          * 
@@ -813,15 +1096,10 @@ declare namespace Office {
          * Available in Requirement set: BindingEvents
          * 
          * @param eventType The event type. For binding can be 'bindingDataChanged' and 'bindingSelectionChanged'
-         * @param options An object with any of the following:
-         * 
-         *       handler: The handler to be removed, if not specified all handlers are removed.
-         * 
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         * 
+         * @param options Provides options to determine which event handler or handlers are removed. 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
+        removeHandlerAsync(eventType: EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Writes data to the bound section of the document represented by the specified binding object.
          * 
@@ -842,27 +1120,11 @@ declare namespace Office {
          * 
          *        Office Open XML: Word only
          * 
-         * @param options Any of the following:
-         * 
-         *       cellFormat: For an inserted table, a list of key-value pairs that specify a range of columns, rows, or cells and the cell formatting to apply to that range.
-         * 
-         *       coercionType: Explicitly sets the shape of the data object. Use Office.CoercionType or text value. If not supplied is inferred from the data type.
-         * 
-         *       columns: Only for table bindings in content add-ins for Access. Array of strings. Specifies the column names.
-         * 
-         *       rows: Only for table bindings in content add-ins for Access. **Office.TableRange.ThisRow** Specifies the pre-defined string "thisRow" to set data in the currently selected row.
-         * 
-         *       startRow: Specifies the zero-based starting row for a subset of the data in the binding. Only for table or matrix bindings. If omitted, data is set starting in the first row.
-         * 
-         *       startColumn: Specifies the zero-based starting column for a subset of the data. Only for table or matrix bindings. If omitted, data is set starting in the first column.
-         * 
-         *       tableOptions: For an inserted table, a list of key-value pairs that specify table formatting options, such as header row, total row, and banded rows.
-         * 
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides options for how to set the data in a binding.
          * 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        setDataAsync(data: TableData | any, options?: any, callback?: (result: AsyncResult) => void): void;
+        setDataAsync(data: TableData | any, options?: SetBindingDataOptions, callback?: (result: AsyncResult) => void): void;
     }
     /**
     * Represents the bindings the add-in has within the document.
@@ -900,17 +1162,10 @@ declare namespace Office {
          * 
          * @param itemName Name of the bindable object in the document. For Example 'MyExpenses' table in Excel."
          * @param bindingType The Office BindingType for the data. The method returns null if the selected object cannot be coerced into the specified type.
-         * @param options An object like {id: "BindingID"} that has any of the following properties:
-         * 
-         *       id: Unique name of the binding. Autogenerated if not supplied.
-         * 
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         * 
-         *       columns: The string[] of the columns involved in the binding.
-         * 
+         * @param options Provides options for configuring the binding that is created. 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        addFromNamedItemAsync(itemName: string, bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
+        addFromNamedItemAsync(itemName: string, bindingType: BindingType, options?: AddBindingFromNamedItemOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Create a binding by prompting the user to make a selection on the document.
          * 
@@ -922,19 +1177,10 @@ declare namespace Office {
          * Adds a binding object of the specified type to the Bindings collection, which will be identified with the supplied id. The method fails if the specified selection cannot be bound.
          * 
          * @param bindingType Specifies the type of the binding object to create. Required. Returns null if the selected object cannot be coerced into the specified type.
-         * @param options An object like {promptText: "Please select data", id: "mySales"} with any of the following properties:
-         * 
-         *       promptText: Specifies the string to display in the prompt UI that tells the user what to select. Limited to 200 characters. If no promptText argument is passed, "Please make a selection" is displayed.
-         * 
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         * 
-         *       id: Specifies the unique name to be used to identify the new binding object.If no argument is passed for the id parameter, the Binding.id is autogenerated.
-         * 
-         *       sampleData: Specifies a table of sample data displayed in the prompt UI as an example of the kinds of fields (columns) that can be bound by your add-in. The headers provided in the TableData object specify the labels used in the field selection UI. Optional. Note: This parameter is used only in add-ins for Access. It is ignored if provided when calling the method in an add-in for Excel.
-         * 
+         * @param options Provides options for configuring the prompt and identifying the binding that is created.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        addFromPromptAsync(bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
+        addFromPromptAsync(bindingType: BindingType, options?: AddBindingFromPromptOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Create a binding based on the user's current selection.
          * 
@@ -948,19 +1194,10 @@ declare namespace Office {
          * Note In Excel, if you call the addFromSelectionAsync method passing in the Binding.id of an existing binding, the Binding.type of that binding is used, and its type cannot be changed by specifying a different value for the bindingType parameter.If you need to use an existing id and change the bindingType, call the Bindings.releaseByIdAsync method first to release the binding, and then call the addFromSelectionAsync method to reestablish the binding with a new type.
          * 
          * @param bindingType Specifies the type of the binding object to create. Required. Returns null if the selected object cannot be coerced into the specified type.
-         * @param options An object like {id: "BindingID"} with any of the following properties:
-         * 
-         *       id: Specifies the unique name to be used to identify the new binding object.If no argument is passed for the id parameter, the Binding.id is autogenerated.
-         * 
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         * 
-         *       columns: The string[] of the columns involved in the binding
-         * 
-         *       sampleData: A TableData that gives sample table in the Dialog.TableData.Headers is [][] of string.
-         * 
+         * @param options Provides options for configuring the prompt and identifying the binding that is created.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        addFromSelectionAsync(bindingType: BindingType, options?: any, callback?: (result: AsyncResult) => void): void;
+        addFromSelectionAsync(bindingType: BindingType, options?: AddBindingFromSelectionOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets all bindings that were previously created.
          * 
@@ -1251,12 +1488,10 @@ declare namespace Office {
          * Available in Requirement set: CustomXmlParts
          * 
          * @param eventType Specifies the type of event to remove. Required.For a CustomXmlPart object event, the eventType parameter can be specified as Office.EventType.DataNodeDeleted, Office.EventType.DataNodeInserted, Office.EventType.DataNodeReplaced, or the corresponding text values of these enumerations.
-         * @param handler The event handler function to remove. If not specified, all event handlers for the specified eventType will be removed.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides options to determine which event handler or handlers are removed.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        removeHandlerAsync(eventType: EventType, handler?: (result: any) => void, options?: any, callback?: (result: AsyncResult) => void): void;
+        removeHandlerAsync(eventType: EventType, handler?: (result: any) => void, options?: RemoveHandlerOptions, callback?: (result: AsyncResult) => void): void;
     }
     /**
      * Represents a collection of CustomXmlPart objects.
@@ -1462,15 +1697,10 @@ declare namespace Office {
          * Word on iPad: Office.FileType.Compressed, Office.FileType.Text
          * 
          * @param fileType The format in which the file will be returned
-         * @param options An object like {sliceSize:1024} that has any of the following properties:
-         * 
-         *       sliceSize: Specifies the desired slice size (in bytes) up to 4MB. If not specified a default slice size of 4MB will be used.
-         * 
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         * 
+         * @param options Provides options for setting the size of slices that the document will be divided into.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        getFileAsync(fileType: FileType, options?: any, callback?: (result: AsyncResult) => void): void;
+        getFileAsync(fileType: FileType, options?: GetFileOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets file properties of the current document.
          * 
@@ -1508,17 +1738,10 @@ declare namespace Office {
          * PowerPoint and PowerPoint Online only: Office.CoercionType.SlideRange
          * 
          * @param coercionType The type of data structure to return. 
-         * @param options An object like {valueFormat: 'formatted', filterType:'all'} that has any of the following properties:
-         * 
-         *       valueFormat: Get data with or without format. Use Office.ValueFormat or text value.
-         * 
-         *       filterType: Get the visible or all the data. Useful when filtering data. Use Office.FilterType or text value. This parameter is ignored in Word documents.
-         * 
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         * 
+         * @param options Provides options for customizing what data is returned and how it is formatted. 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        getSelectedDataAsync(coercionType: CoercionType, options?: any, callback?: (result: AsyncResult) => void): void;
+        getSelectedDataAsync(coercionType: CoercionType, options?: GetSelectedDataOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Goes to the specified object or location in the document.
          * 
@@ -1539,15 +1762,10 @@ declare namespace Office {
          * 
          * @param id The identifier of the object or location to go to.
          * @param goToType The type of the location to go to.
-         * @param options An object like {asyncContext:context} with any of the following values:
-         * 
-         *       selectionMode: Specifies whether the location specified by the id parameter is selected (highlighted). Use Office.SelectionMode or text value. See Remarks for more.
-         * 
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         * 
+         * @param options Provides options for whether to select the location that is navigated to. 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        goToByIdAsync(id: string | number, goToType: GoToType, options?: any, callback?: (result: AsyncResult) => void): void;
+        goToByIdAsync(id: string | number, goToType: GoToType, options?: GoToByIdOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes an event handler for the specified event type.
          * 
@@ -1557,15 +1775,10 @@ declare namespace Office {
          * Available in Requirement set: DocumentEvents
          * 
          * @param eventType The event type. For document can be 'Document.SelectionChanged' or 'Document.ActiveViewChanged'.
-         * @param options An object like Syntax example: {asyncContext:context} that has any of the following properties:
-         * 
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
-         * 
-         *       handler: The name of the handler. If not specified all handlers are removed.
-         * 
+         * @param options Provides options to determine which event handler or handlers are removed.         * 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
+        removeHandlerAsync(eventType: EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Writes the specified data into the current selection.
          * 
@@ -1589,26 +1802,10 @@ declare namespace Office {
          * Office.CoercionType.Image: Excel, Word, PowerPoint
          * 
          * @param data The data to be set. Either a string or CoercionType value, 2d array or TableData object.
-         * @param options An object like {coercionType:Office.CoercionType.Matrix} with any of the following properties:
-         * 
-         *       coercionType: Explicitly sets the shape of the data object. Use Office.CoercionType or text value. If not supplied is inferred from the data type.
-         * 
-         *       tableOptions: For an inserted table, a list of key-value pairs that specify table formatting options, such as header row, total row, and banded rows 
-         * 
-         *       cellFormat: For an inserted table, a list of key-value pairs that specify a range of columns, rows, or cells and the cell formatting to apply to that range
-         * 
-         *       imageLeft: (number) This option is applicable for inserting images. Indicates the insert location in relation to the left side of the slide for PowerPoint, and its relation to the currently selected cell in Excel. This value is ignored for Word. This value is in points.
-         * 
-         *       imageTop: (number) This option is applicable for inserting images. Indicates the insert location in relation to the top of the slide for PowerPoint, and its relation to the currently selected cell in Excel. This value is ignored for Word. This value is in points.
-         * 
-         *       imageWidth: (number) This option is applicable for inserting images. Indicates the image width. If this option is provided without the imageHeight, the image will scale to match the value of the image width. If both image width and image height are provided, the image will be resized accordingly. If neither the image height or width is provided, the default image size and aspect ratio will be used. This value is in points.
-         * 
-         *       imageHeight: (number) This option is applicable for inserting images. Indicates the image height. If this option is provided without the imageWidth, the image will scale to match the value of the image height. If both image width and image height are provided, the image will be resized accordingly. If neither the image height or width is provided, the default image size and aspect ratio will be used. This value is in points.
-         * 
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @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 AsyncResult.
          */
-        setSelectedDataAsync(data: string | TableData | any[][], options?: any, callback?: (result: AsyncResult) => void): void;
+        setSelectedDataAsync(data: string | TableData | any[][], options?: SetSelectedDataOptions, callback?: (result: AsyncResult) => void): void;
     }
     /**
      * Provides information about the document that raised the SelectionChanged event.
@@ -1752,8 +1949,7 @@ declare namespace Office {
          * 
          * @param eventType Specifies the type of event to add. Required.
          * @param handler The event handler function to add. Required.
-         * @param options Specifies any of the following optional parameters.
-         *        asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
@@ -1765,7 +1961,7 @@ declare namespace Office {
          * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
          * |AsyncResult.asyncContext|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
          */
-        addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
+        addHandlerAsync(eventType: EventType, handler: any, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Retrieves the specified setting.
          * 
@@ -1827,15 +2023,13 @@ declare namespace Office {
          * Available in Requirement set: Settings
          * 
          * @param eventType Specifies the type of event to remove. Required.
-         * @param options Specifies any of the following optional parameters.
-         * @param handler Specifies the name of the handler to remove.
-         *        asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides options to determine which event handler or handlers are removed.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
          * In the callback function passed to the removeHandlerAsync method, you can use the properties of the AsyncResult object to return the following information.
          */
-        removeHandlerAsync(eventType: EventType, options?: any, callback?: (result: AsyncResult) => void): void;
+        removeHandlerAsync(eventType: EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Persists the in-memory copy of the settings property bag in the document.
          * @remarks
@@ -1846,9 +2040,7 @@ declare namespace Office {
          * The refreshAsync method is only useful in coauthoring scenarios (which are only supported in Word) when other instances of the same add-in might change the settings and those changes should be made available to all instances.
          * 
          * Hosts: Access, Excel, PowerPoint, Word
-         * @param options Syntax example: {overwriteIfStale:false}
-         * @param overwriteIfStale Indicates whether the setting will be replaced if stale.
-         *        asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides options for saving settings.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
@@ -1860,10 +2052,9 @@ declare namespace Office {
          * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
          * |AsyncResult.asyncContext|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
          */
-        saveAsync(callback?: (result: AsyncResult) => void): void;
+        saveAsync(options?: SaveSettingsOptions, callback?: (result: AsyncResult) => void): void;
         /**
-         * Sets or creates the specified setting.
-         * 
+         * Sets or creates the specified setting. 
          * 
          * Important: Be aware that the Settings.set method affects only the in-memory copy of the settings property bag. To make sure that additions or changes to settings will be available to your add-in the next time the document is opened, at some point after calling the Settings.set method and before the add-in is closed, you must call the Settings.saveAsync method to persist settings in the document.
          * 
@@ -2017,11 +2208,10 @@ declare namespace Office {
          * Additional remark for Excel Online: The total number of cells in the TableData object passed to the data parameter can't exceed 20,000 in a single call to this method.
          *         
          * @param rows An array of arrays ("matrix") or a TableData object that contains one or more rows of data to add to the table. Required.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        addRowsAsync(rows: TableData | any[][], options?: any, callback?: (result: AsyncResult) => void): void;
+        addRowsAsync(rows: TableData | any[][], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Deletes all non-header rows and their values in the table, shifting appropriately for the host application.
          * 
@@ -2032,11 +2222,10 @@ declare namespace Office {
          * 
          * In Excel, if the table has no header row, this method will delete the table itself.
          *  
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        deleteAllDataValuesAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        deleteAllDataValuesAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Clears formatting on the bound table.
          *
@@ -2047,20 +2236,18 @@ declare namespace Office {
          * 
          * See [Format tables in add-ins for Excel](https://docs.microsoft.com/en-us/office/dev/add-ins/excel/excel-add-ins-tables#format-a-table) for more information.
          * 
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        clearFormatsAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        clearFormatsAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the formatting on specified items in the table.
          * @param cellReference An object literal containing name-value pairs that specify the range of cells to get formatting from.
          * @param formats An array specifying the format properties to get.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        getFormatsAsync(cellReference?: any, formats?: any[], options?: any, callback?: (result: AsyncResult) => void): void;
+        getFormatsAsync(cellReference?: any, formats?: any[], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets formatting on specified items and data in the table.
          * 
@@ -2076,11 +2263,10 @@ declare namespace Office {
          *       type: The kind of item to format. String.
          * 
          *       formats: An object literal containing a list of property name-value pairs that define the formatting to apply.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        setFormatsAsync(formatsInfo?: any[], options?: any, callback?: (result: AsyncResult) => void): void;
+        setFormatsAsync(formatsInfo?: any[], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Updates table formatting options on the bound table.
          *
@@ -2090,11 +2276,10 @@ declare namespace Office {
          * Available in Requirement set: Not in a set
          * 
          * @param tableOptions An object literal containing a list of property name-value pairs that define the table options to apply.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        setTableOptionsAsync(tableOptions: any, options?: any, callback?: (result: AsyncResult) => void): void;
+        setTableOptionsAsync(tableOptions: any, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
     }
     /**
      * Represents the data in a table or a TableBinding.
@@ -4257,65 +4442,57 @@ declare namespace Office {
         /**
          * Get Project field (Ex. ProjectWebAccessURL).
          * @param fieldId Project level fields.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        getProjectFieldAsync(fieldId: number, options?: any, callback?: (result: AsyncResult) => void): void;
+        getProjectFieldAsync(fieldId: number, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Get resource field for provided resource Id. (Ex.ResourceName)
          * @param resourceId Either a string or value of the Resource Id.
          * @param fieldId Resource Fields.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        getResourceFieldAsync(resourceId: string, fieldId: number, options?: any, callback?: (result: AsyncResult) => void): void;
+        getResourceFieldAsync(resourceId: string, fieldId: number, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Get the current selected Resource's Id.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        getSelectedResourceAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        getSelectedResourceAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Get the current selected Task's Id.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        getSelectedTaskAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        getSelectedTaskAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Get the current selected View Type (Ex. Gantt) and View Name.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        getSelectedViewAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        getSelectedViewAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Get the Task Name, WSS Task Id, and ResourceNames for given taskId.
          * @param taskId Either a string or value of the Task Id.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        getTaskAsync(taskId: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        getTaskAsync(taskId: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Get task field for provided task Id. (Ex. StartDate).
          * @param taskId Either a string or value of the Task Id.
          * @param fieldId Task Fields.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        getTaskFieldAsync(taskId: string, fieldId: number, options?: any, callback?: (result: AsyncResult) => void): void;
+        getTaskFieldAsync(taskId: string, fieldId: number, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Get the WSS Url and list name for the Tasks List, the MPP is synced too.
-         * @param options Syntax example: {asyncContext:context}
-         *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
-        getWSSUrlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        getWSSUrlAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
     }
 }
 

From 5c516d012a9d094df062f804ab4b61034282af5c Mon Sep 17 00:00:00 2001
From: Karol Majewski <karol-majewski@users.noreply.github.com>
Date: Thu, 31 May 2018 22:10:52 +0200
Subject: [PATCH 570/575] Allow Omit to exclude properties of type other than
 string

The legacy definition doesn't work with TypeScript 2.9.
---
 types/react-router/index.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index 32834eed79..5ae92ababc 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -18,7 +18,7 @@
 //                 Rahul Raina <https://github.com/rraina>
 //                 Maksim Sharipov <https://github.com/pret-a-porter>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import * as H from 'history';
@@ -106,8 +106,8 @@ export interface match<P> {
   url: string;
 }
 
-// Diff / Omit taken from https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-311923766
-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]>;
+// 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>>;
 
 export function matchPath<P>(pathname: string, props: RouteProps): match<P> | null;
 

From 2afd3d4795769f1d1bb75e2eefc1b2d4f33aeb7c Mon Sep 17 00:00:00 2001
From: Karol Majewski <karol-majewski@users.noreply.github.com>
Date: Thu, 31 May 2018 23:06:32 +0200
Subject: [PATCH 571/575] Bump up the required version of TypeScript for the
 consumer libraries

---
 types/react-router-bootstrap/index.d.ts       | 2 +-
 types/react-router-config/index.d.ts          | 2 +-
 types/react-router-dom/index.d.ts             | 2 +-
 types/react-router-native/index.d.ts          | 2 +-
 types/react-router-navigation-core/index.d.ts | 2 +-
 types/react-router-navigation/index.d.ts      | 2 +-
 types/react-router-param-link/index.d.ts      | 2 +-
 types/rrc/index.d.ts                          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/types/react-router-bootstrap/index.d.ts b/types/react-router-bootstrap/index.d.ts
index db2b67d040..ca431d64a0 100644
--- a/types/react-router-bootstrap/index.d.ts
+++ b/types/react-router-bootstrap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-bootstrap/react-router-bootstrap
 // Definitions by: Vincent Lesierse <https://github.com/vlesierse>, Karol Janyst <https://github.com/LKay>, Olmo del Corral <https://github.com/olmobrutall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 export { default as LinkContainer } from "react-router-bootstrap/lib/LinkContainer"
 export { default as IndexLinkContainer } from "react-router-bootstrap/lib/IndexLinkContainer"
diff --git a/types/react-router-config/index.d.ts b/types/react-router-config/index.d.ts
index deb9d8003d..132b5cc129 100644
--- a/types/react-router-config/index.d.ts
+++ b/types/react-router-config/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ReactTraining/react-router/tree/master/packages/react-router-config
 // Definitions by: François Nguyen <https://github.com/lith-light-g>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import { RouteComponentProps, match } from "react-router";
diff --git a/types/react-router-dom/index.d.ts b/types/react-router-dom/index.d.ts
index 9165f1182e..9870a487b3 100644
--- a/types/react-router-dom/index.d.ts
+++ b/types/react-router-dom/index.d.ts
@@ -4,7 +4,7 @@
 //                 Huy Nguyen <https://github.com/huy-nguyen>
 //                 Philip Jackson <https://github.com/p-jackson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { match } from "react-router";
 import * as React from 'react';
diff --git a/types/react-router-native/index.d.ts b/types/react-router-native/index.d.ts
index ea2a5f766c..3a450a1209 100644
--- a/types/react-router-native/index.d.ts
+++ b/types/react-router-native/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Eduard Zintz <https://github.com/ezintz>
 //                 Fernando Helwanger <https://github.com/fhelwanger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 export {
   match,
diff --git a/types/react-router-navigation-core/index.d.ts b/types/react-router-navigation-core/index.d.ts
index 8af7235a94..2bd544da4b 100644
--- a/types/react-router-navigation-core/index.d.ts
+++ b/types/react-router-navigation-core/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/LeoLeBras/react-router-navigation#readme
 // Definitions by: Kalle Ott <https://github.com/kaoDev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 // High-level wrappers
 import { PureComponent, ReactNode, ComponentClass, ReactElement } from "react";
diff --git a/types/react-router-navigation/index.d.ts b/types/react-router-navigation/index.d.ts
index 62258b4b6c..120ffb0d82 100644
--- a/types/react-router-navigation/index.d.ts
+++ b/types/react-router-navigation/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/LeoLeBras/react-router-navigation#readme
 // Definitions by: Kalle Ott <https://github.com/kaoDev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component, ReactNode, ReactElement, ComponentClass } from "react";
 import { StyleProp, ViewProps, ViewStyle, TextStyle } from "react-native";
diff --git a/types/react-router-param-link/index.d.ts b/types/react-router-param-link/index.d.ts
index 1b168839f5..5cbec4a27d 100644
--- a/types/react-router-param-link/index.d.ts
+++ b/types/react-router-param-link/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mtsg/react-router-param-link
 // Definitions by: Motosugi Murata <https://github.com/mtsg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import { LinkProps } from "react-router-dom";
diff --git a/types/rrc/index.d.ts b/types/rrc/index.d.ts
index 3bb04b4ec8..5c5ca85eca 100644
--- a/types/rrc/index.d.ts
+++ b/types/rrc/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/pshrmn/rrc#readme
 // Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import * as H from "history";

From aa69d42eaee9f954836eae0fb86084dc0458eaa1 Mon Sep 17 00:00:00 2001
From: Michael Zlatkovsky <michael.zlatkovsky@microsoft.com>
Date: Thu, 31 May 2018 16:55:17 -0700
Subject: [PATCH 572/575] Fix PromiseConstructor issue in office-js typings.

Also remove extraneous "export" keywords that were unnecessary, remove trailing spaces, and replace tabs with spaces.

The fix addresses OfficeDev/office-js#150, whereby PromiseConstructor is unavailable under the standard "lib.d.ts" file.
---
 types/office-js/index.d.ts | 4136 +++++++++++++++++++-----------------
 1 file changed, 2174 insertions(+), 1962 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index d1b3a15e5e..6ee6338c6f 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -18,44 +18,253 @@ declare namespace Office {
     /**
     * Provides a container for APIs that are still in Preview, not released for use in production add-ins.
     */
-    export var Preview: {
+    var Preview: {
         /**
          * Initializes the use of custom JavaScript functions in Excel.
          */
         startCustomFunctions(): Promise<void>;
     }
 
-    export var Promise: PromiseConstructor;
+    /** A Promise object. Promises can be chained via ".then", and errors can be caught via ".catch". When a browser-provided native Promise implementation is available, Office.Promise will switch to use the native Promise instead. */
+    var Promise: IPromiseConstructor;
+
+    // Note: this is a copy of the PromiseConstructor object from
+    //     https://github.com/Microsoft/TypeScript/blob/master/lib/lib.es2015.promise.d.ts
+    // It is necessary so that even with targeting "ES5" and not specifying any libs,
+    //     developers will still get IntelliSense for "Office.Promise" just as they would with a regular Promise.
+    // (because even though Promise is part of standard lib.d.ts, PromiseConstructor is not)
+    interface IPromiseConstructor {
+        /**
+         * A reference to the prototype.
+         */
+        readonly prototype: Promise<any>;
+
+        /**
+         * Creates a new Promise.
+         * @param executor A callback used to initialize the promise. This callback is passed two arguments:
+         * a resolve callback used resolve the promise with a value or the result of another promise,
+         * and a reject callback used to reject the promise with a provided reason or error.
+         */
+        new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
+
+        /**
+         * Creates a Promise that is resolved with an array of results when all of the provided Promises
+         * resolve, or rejected when any Promise is rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
+
+        /**
+         * Creates a Promise that is resolved with an array of results when all of the provided Promises
+         * resolve, or rejected when any Promise is rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
+
+        /**
+         * Creates a Promise that is resolved with an array of results when all of the provided Promises
+         * resolve, or rejected when any Promise is rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        all<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8]>;
+
+        /**
+         * Creates a Promise that is resolved with an array of results when all of the provided Promises
+         * resolve, or rejected when any Promise is rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        all<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<[T1, T2, T3, T4, T5, T6, T7]>;
+
+        /**
+         * Creates a Promise that is resolved with an array of results when all of the provided Promises
+         * resolve, or rejected when any Promise is rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        all<T1, T2, T3, T4, T5, T6>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<[T1, T2, T3, T4, T5, T6]>;
+
+        /**
+         * Creates a Promise that is resolved with an array of results when all of the provided Promises
+         * resolve, or rejected when any Promise is rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        all<T1, T2, T3, T4, T5>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>]): Promise<[T1, T2, T3, T4, T5]>;
+
+        /**
+         * Creates a Promise that is resolved with an array of results when all of the provided Promises
+         * resolve, or rejected when any Promise is rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        all<T1, T2, T3, T4>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>]): Promise<[T1, T2, T3, T4]>;
+
+        /**
+         * Creates a Promise that is resolved with an array of results when all of the provided Promises
+         * resolve, or rejected when any Promise is rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        all<T1, T2, T3>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<[T1, T2, T3]>;
+
+        /**
+         * Creates a Promise that is resolved with an array of results when all of the provided Promises
+         * resolve, or rejected when any Promise is rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        all<T1, T2>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[T1, T2]>;
+
+        /**
+         * Creates a Promise that is resolved with an array of results when all of the provided Promises
+         * resolve, or rejected when any Promise is rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        all<T>(values: (T | PromiseLike<T>)[]): Promise<T[]>;
+
+        /**
+         * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
+         * or rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        race<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9 | T10>;
+
+        /**
+         * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
+         * or rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        race<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8 | T9>;
+
+        /**
+         * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
+         * or rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        race<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7 | T8>;
+
+        /**
+         * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
+         * or rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        race<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<T1 | T2 | T3 | T4 | T5 | T6 | T7>;
+
+        /**
+         * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
+         * or rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        race<T1, T2, T3, T4, T5, T6>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<T1 | T2 | T3 | T4 | T5 | T6>;
+
+        /**
+         * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
+         * or rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        race<T1, T2, T3, T4, T5>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>]): Promise<T1 | T2 | T3 | T4 | T5>;
+
+        /**
+         * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
+         * or rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        race<T1, T2, T3, T4>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>]): Promise<T1 | T2 | T3 | T4>;
+
+        /**
+         * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
+         * or rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        race<T1, T2, T3>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<T1 | T2 | T3>;
+
+        /**
+         * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
+         * or rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        race<T1, T2>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<T1 | T2>;
+
+        /**
+         * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
+         * or rejected.
+         * @param values An array of Promises.
+         * @returns A new Promise.
+         */
+        race<T>(values: (T | PromiseLike<T>)[]): Promise<T>;
+
+        /**
+         * Creates a new rejected promise for the provided reason.
+         * @param reason The reason the promise was rejected.
+         * @returns A new rejected Promise.
+         */
+        reject(reason: any): Promise<never>;
+
+        /**
+         * Creates a new rejected promise for the provided reason.
+         * @param reason The reason the promise was rejected.
+         * @returns A new rejected Promise.
+         */
+        reject<T>(reason: any): Promise<T>;
+
+        /**
+         * Creates a new resolved promise for the provided value.
+         * @param value A promise.
+         * @returns A promise whose internal state matches the provided promise.
+         */
+        resolve<T>(value: T | PromiseLike<T>): Promise<T>;
+
+        /**
+         * Creates a new resolved promise .
+         * @returns A resolved promise.
+         */
+        resolve(): Promise<void>;
+    }
+
     /**
      * Gets the Context object that represents the runtime environment of the add-in and provides access to the top-level objects of the API.
      */
-    export var context: Context;
+    var context: Context;
     /**
      * This method is called after the Office API was loaded.
      * @param reason Indicates how the app was initialized
      */
-    export function initialize(reason: InitializationReason): void;
+    function initialize(reason: InitializationReason): void;
     /**
     * Ensures that the Office JavaScript APIs are ready to be called by the add-in. If the framework hasn't initialized yet, the callback or promise will wait until the Office host is ready to accept API calls.
     * Note that though this API is intended to be used inside an Office add-in, it can also be used outside the add-in. In that case, once Office.js determines that it is running outside of an Office host application, it will call the callback and resolve the promise with "null" for both the host and platform.
     * @param callback - An optional callback method, that will receive the host and platform info. Alternatively, rather than use a callback, an add-in may simply wait for the Promise returned by the function to resolve.
     * @returns A Promise that contains the host and platform info, once initialization is completed.
     */
-    export function onReady(callback?: (info: { host: HostType, platform: PlatformType }) => any): Promise<{ host: HostType, platform: PlatformType }>;
+    function onReady(callback?: (info: { host: HostType, platform: PlatformType }) => any): Promise<{ host: HostType, platform: PlatformType }>;
     /**
      * Indicates if the large namespace for objects will be used or not.
      * @param useShortNamespace Indicates if 'true' that the short namespace will be used
      */
-    export function useShortNamespace(useShortNamespace: boolean): void;
+    function useShortNamespace(useShortNamespace: boolean): void;
     // Enumerations
     /**
-     * Specifies the result of an asynchronous call. 
+     * Specifies the result of an asynchronous call.
      * @remarks
      * Returned by the status property of the AsyncResult object.
-     * 
+     *
      * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
      */
-    export enum AsyncResultStatus {
+    enum AsyncResultStatus {
         /**
          * The call succeeded.
          */
@@ -67,11 +276,11 @@ declare namespace Office {
     }
     /**
      * Specifies whether the add-in was just inserted or was already contained in the document.
-     * 
+     *
      * @remarks
      * Hosts: Excel, Project, Word
      */
-    export enum InitializationReason {
+    enum InitializationReason {
         /**
          * The add-in was just inserted into the document.
          */
@@ -83,11 +292,11 @@ declare namespace Office {
     }
     /**
      * Specifies the host Office application in which the add-in is running.
-     * 
+     *
      * @remarks
      * Hosts: Excel, Word, PowerPoint, Outlook, OneNote, Project, Access
      */
-    export enum HostType {
+    enum HostType {
         /**
          * The Office host is Microsoft Word.
          */
@@ -119,11 +328,11 @@ declare namespace Office {
     }
     /**
      * Specifies the OS or other platform on which the Office host application is running.
-     * 
+     *
      * @remarks
      * Hosts: Excel, Word, PowerPoint, Outlook, OneNote, Project, Access
      */
-    export enum PlatformType {
+    enum PlatformType {
         /**
          * The platform is PC (Windows).
          */
@@ -152,56 +361,56 @@ declare namespace Office {
     // Objects
         /**
         * An object which encapsulates the result of an asynchronous request, including status and error information if the request failed.
-        *         
+        *
         * @remarks
         * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
-        * 
+        *
         * When the function you pass to the `callback` parameter of an "Async" method executes, it receives an AsyncResult object that you can access from the `callback` function's only parameter.
         */
-        export interface AsyncResult {
+        interface AsyncResult {
         /**
         * Gets the user-defined item passed to the optional `asyncContext` parameter of the invoked method in the same state as it was passed in. This the user-defined item (which can be of any JavaScript type: String, Number, Boolean, Object, Array, Null, or Undefined) passed to the optional `asyncContext` parameter of the invoked method. Returns Undefined, if you didn't pass anything to the asyncContext parameter.
-        *         
+        *
         * @remarks
         * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
         */
         asyncContext: any;
         /**
         * Gets the [AsyncResultStatus](office.asyncresultstatus.md) of the asynchronous operation.
-        * 
+        *
         * @remarks
         * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
         */
         status: AsyncResultStatus;
         /**
         * Gets an [Error](office.error.md) object that provides a description of the error, if any error occurred.
-        * 
+        *
         * @remarks
         * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
         */
         error: Error;
         /**
         * Gets the payload or content of this asynchronous operation, if any.
-        
+
         * @remarks
         * You access the AsyncResult object in the function passed as the argument to the callback parameter of an "Async" method, such as the `getSelectedDataAsync` and `setSelectedDataAsync` methods of the Document object.
-        * 
+        *
         * Note: What the value property returns for a particular "Async" method varies depending on the purpose and context of that method. To determine what is returned by the value property for an "Async" method, refer to the "Callback value" section of the method's topic. For a complete listing of the "Async" methods, see the Remarks section of the AsyncResult object topic.
-        * 
+        *
         * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
         */
         value: any;
     }
     /**
     * Represents the runtime environment of the add-in and provides access to key objects of the API.
-    * 
+    *
     * @remarks
     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
     */
-    export interface Context {
+    interface Context {
         /**
         * Provides information and access to the signed-in user.
-        */ 
+        */
         auth: Auth;
         /**
         * Gets the locale (language) specified by the user for editing the document or item.
@@ -212,7 +421,7 @@ declare namespace Office {
         */
         displayLanguage: string;
         /**
-        * 
+        *
         */
         license: string;
         /**
@@ -236,7 +445,7 @@ declare namespace Office {
         */
         platform: PlatformType;
         /**
-        * 
+        *
         */
         diagnostics: {
             host: HostType;
@@ -257,13 +466,13 @@ declare namespace Office {
     }
     /**
      * Provides specific information about an error that occurred during an asynchronous data operation.
-     * 
+     *
      * @remarks
      * The Error object is accessed from the AsyncResult object that is returned in the function passed as the callback argument of an asynchronous data operation, such as the setSelectedDataAsync method of the Document object.
-     * 
+     *
      * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
      */
-    export interface Error {
+    interface Error {
         /**
          * Gets the numeric code of the error.
          */
@@ -278,39 +487,39 @@ declare namespace Office {
         name: string;
     }
     /**
-     * Provides objects and methods that you can use to create and manipulate UI components, such as dialog boxes, in your Office Add-ins. 
+     * Provides objects and methods that you can use to create and manipulate UI components, such as dialog boxes, in your Office Add-ins.
      */
-    export interface UI {
+    interface UI {
         /**
-        * Displays a dialog to show or collect information from the user or to facilitate Web navigation. 
-        *         
+        * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
+        *
         * @remarks
         * Hosts: Word, Excel, Outlook, PowerPoint
-        * 
+        *
         * Requirement sets: DialogApi, Mailbox 1.4
-        * 
+        *
         * The initial page must be on the same domain as the parent page (the startAddress parameter). After the initial page loads, you can go to other domains.
-        * 
+        *
         * Any page calling office.context.ui.messageParent must also be on the same domain as the parent page.
-        * 
+        *
         * The following design considerations apply to dialog boxes:
-        * 
+        *
         * - An Office Add-in can have only one dialog box open at any time.
-        * 
+        *
         * - Every dialog box can be moved and resized by the user.
-        * 
+        *
         * - Every dialog box is centered on the screen when opened.
-        * 
+        *
         * - Dialog boxes appear on top of the host application and in the order in which they were created.
-        * 
+        *
         * Use a dialog box to:
-        * 
+        *
         * - Display authentication pages to collect user credentials.
-        * 
+        *
         * - Display an error/progress/input screen from a ShowTaspane or ExecuteAction command.
-        * 
+        *
         * - Temporarily increase the surface area that a user has available to complete a task.
-        * 
+        *
         * Do not use a dialog box to interact with a document. Use a task pane instead.
         *
         * @param startAddress - Accepts the initial HTTPS URL that opens in the dialog.
@@ -319,30 +528,30 @@ declare namespace Office {
         */
         displayDialogAsync(startAddress: string, options?: DialogOptions, callback?: (result: AsyncResult) => void): void;
         /**
-         * Delivers a message from the dialog box to its parent/opener page. The page calling this API must be on the same domain as the parent. 
+         * Delivers a message from the dialog box to its parent/opener page. The page calling this API must be on the same domain as the parent.
          * @param messageObject Accepts a message from the dialog to deliver to the add-in.
          */
         messageParent(messageObject: any): void;
         /**
          * Closes the UI container where the JavaScript is executing.
-         * 
+         *
          * @remarks
          * The behavior of this method is specified by the following:
-         * 
+         *
          * - Called from a UI-less command button: No effect. Any dialog opened by displayDialogAsync will remain open.
-         * 
+         *
          * - Called from a taskpane: The taskpane will close. Any dialog opened by displayDialogAsync will also close. If the taskpane supports pinning and was pinned by the user, it will be un-pinned.
-         * 
+         *
          * - Called from a module extension: No effect.
-         * 
+         *
          * Hosts: Excel, Word, PowerPoint, Outlook (Minimum requirement set: Mailbox 1.5)
          */
         closeContainer(): void;
     }
     /**
-	 * Provides options for how a dialog is displayed.
-	 */
-	export interface DialogOptions {
+     * Provides options for how a dialog is displayed.
+     */
+    interface DialogOptions {
         /**
          * Defines the width of the dialog as a percentage of the current display. Defaults to 80%. 250px minimum.
          */
@@ -360,17 +569,17 @@ declare namespace Office {
          */
         asyncContext?: any
     }
-    export interface Auth {
+    interface Auth {
         /**
         * Obtains an access token from AAD V 2.0 endpoint to grant the Office host application access to the add-in's web application.
-        * 
+        *
         * @remarks
         * Hosts: Excel, OneNote, Outlook, PowerPoint, Word
-        * 
+        *
         * Requirement sets: IdentityAPI
-        * 
+        *
         * 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 to handle the token acquisition attempt. If AsyncResult.status is "succeeded", then AsyncResult.value is the raw AAD v. 2.0-formatted access token.
         */
@@ -378,9 +587,9 @@ declare namespace Office {
 
     }
     /**
-	 * 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.
-	 */
-	export interface AuthOptions {
+     * 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.
          */
@@ -399,130 +608,130 @@ declare namespace Office {
         asyncContext?: any
     }
     /**
-	 * Provides an option for preserving, unchanged, context data of any type, for use in a callback, that might be changed by an asynchronous method.
-	 */
-	export interface AsyncContextOptions {
+     * Provides an option for preserving, unchanged, context data of any type, for use in a callback, that might be changed by an asynchronous method.
+     */
+    interface AsyncContextOptions {
         /**
          * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
     /**
-	 * Provides options for how to get the data in a binding.
-	 *
-	 * @remarks
-	 * If the rows option is used, the value must be "thisRow".
-	 */
-	export interface GetBindingDataOptions {
-		/**
-		 * The expected shape of the selection. Use Office.CoercionType or text value. Default: The original, uncoerced type of the binding.
-		 */
-		coercionType?: Office.CoercionType | string
+     * Provides options for how to get the data in a binding.
+     *
+     * @remarks
+     * If the rows option is used, the value must be "thisRow".
+     */
+    interface GetBindingDataOptions {
         /**
-		 * Specifies whether values, such as numbers and dates, are returned with their formatting applied. Use Office.ValueFormat or text value. Default: Unformatted data.
-		 */     
-		valueFormat?: Office.ValueFormat | string
-		/**
-		* For table or matrix bindings, specifies the zero-based starting row for a subset of the data in the binding. Default is first row.
-		*/ 
-		startRow?: number
-		/**
-		* For table or matrix bindings, specifies the zero-based starting column for a subset of the data in the binding. Default is first column.
-		*/ 
-		startColumn?: number
-		/**
-		* For table or matrix bindings, specifies the number of rows offset from the startRow. Default is all subsequent rows.
-		*/ 
-		rowCount?: number
-		/**
-		* For table or matrix bindings, specifies the number of columns offset from the startColumn. Default is all subsequent columns.
-		*/ 
-		columnCount?: number
-		/**
-		* Specify whether to get only the visible (filtered in) data or all the data (default is all). Useful when filtering data. Use Office.FilterType or text value.
-		*/ 
-		filterType?: Office.FilterType | string
-		/**
-		* Only for table bindings in content add-ins for Access. Specifies the pre-defined string "thisRow" to get data in the currently selected row.
-		*/ 
-		rows?: string
+         * The expected shape of the selection. Use Office.CoercionType or text value. Default: The original, uncoerced type of the binding.
+         */
+        coercionType?: Office.CoercionType | string
+        /**
+         * Specifies whether values, such as numbers and dates, are returned with their formatting applied. Use Office.ValueFormat or text value. Default: Unformatted data.
+         */
+        valueFormat?: Office.ValueFormat | string
+        /**
+        * For table or matrix bindings, specifies the zero-based starting row for a subset of the data in the binding. Default is first row.
+        */
+        startRow?: number
+        /**
+        * For table or matrix bindings, specifies the zero-based starting column for a subset of the data in the binding. Default is first column.
+        */
+        startColumn?: number
+        /**
+        * For table or matrix bindings, specifies the number of rows offset from the startRow. Default is all subsequent rows.
+        */
+        rowCount?: number
+        /**
+        * For table or matrix bindings, specifies the number of columns offset from the startColumn. Default is all subsequent columns.
+        */
+        columnCount?: number
+        /**
+        * Specify whether to get only the visible (filtered in) data or all the data (default is all). Useful when filtering data. Use Office.FilterType or text value.
+        */
+        filterType?: Office.FilterType | string
+        /**
+        * Only for table bindings in content add-ins for Access. Specifies the pre-defined string "thisRow" to get data in the currently selected row.
+        */
+        rows?: string
         /**
          * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
     /**
-	 * Provides options for how to set the data in a binding.
-	 *
-	 * @remarks
-	 * If the rows option is used, the value must be "thisRow".
-	 */
-	export interface SetBindingDataOptions {
-		/**
-		 * Use only with binding type table and when a TableData object is passed for the data parameter. An array of objects that specify a range of columns, rows, or cells and specify, as key-value pairs, the cell formatting to apply to that range. Example: [{cells: Office.Table.Data, format: {fontColor: "yellow"}}, 
+     * Provides options for how to set the data in a binding.
+     *
+     * @remarks
+     * If the rows option is used, the value must be "thisRow".
+     */
+    interface SetBindingDataOptions {
+        /**
+         * Use only with binding type table and when a TableData object is passed for the data parameter. An array of objects that specify a range of columns, rows, or cells and specify, as key-value pairs, the cell formatting to apply to that range. Example: [{cells: Office.Table.Data, format: {fontColor: "yellow"}},
         {cells: {row: 3, column: 4}, format: {borderColor: "white", fontStyle: "bold"}}]
-		 */
-		cellFormat?: Array<RangeFormatConfiguration>
-		/**
-		 * Explicitly sets the shape of the data object. If not supplied is inferred from the data type.
-		 */
-		coercionType?: Office.CoercionType | string
+         */
+        cellFormat?: Array<RangeFormatConfiguration>
         /**
-		* Only for table bindings in content add-ins for Access. Array of strings. Specifies the column names.
-		*/ 
-		columns?: Array<string>
-		/**
-		* Only for table bindings in content add-ins for Access. Specifies the pre-defined string "thisRow" to get data in the currently selected row.
-		*/ 
-		rows?: string
-		/**
-		* Specifies the zero-based starting row for a subset of the data in the binding. Only for table or matrix bindings. If omitted, data is set starting in the first row.
-		*/
-		startRow?: number
-		/**
-		* Specifies the zero-based starting column for a subset of the data. Only for table or matrix bindings. If omitted, data is set starting in the first column.
-		*/ 
-		startColumn?: number	
-		/**
-		* For an inserted table, a list of key-value pairs that specify table formatting options, such as header row, total row, and banded rows. Example: {bandedRows: true,  filterButton: false}
-		*/
-		tableOptions?: object
+         * Explicitly sets the shape of the data object. If not supplied is inferred from the data type.
+         */
+        coercionType?: Office.CoercionType | string
+        /**
+        * Only for table bindings in content add-ins for Access. Array of strings. Specifies the column names.
+        */
+        columns?: Array<string>
+        /**
+        * Only for table bindings in content add-ins for Access. Specifies the pre-defined string "thisRow" to get data in the currently selected row.
+        */
+        rows?: string
+        /**
+        * Specifies the zero-based starting row for a subset of the data in the binding. Only for table or matrix bindings. If omitted, data is set starting in the first row.
+        */
+        startRow?: number
+        /**
+        * Specifies the zero-based starting column for a subset of the data. Only for table or matrix bindings. If omitted, data is set starting in the first column.
+        */
+        startColumn?: number
+        /**
+        * For an inserted table, a list of key-value pairs that specify table formatting options, such as header row, total row, and banded rows. Example: {bandedRows: true,  filterButton: false}
+        */
+        tableOptions?: object
         /**
          * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
     /**
-	 * Specifies a range and its formatting.
-	 */
-	export interface RangeFormatConfiguration {
-		/**
-		 * Specifies the range. Example of using Office.Table enum: Office.Table.All. Example of using RangeCoordinates: {row: 3, column: 4} specifies the cell in the 3rd (zero-based) row in the 4th (zero-based) column. 
-		 */
-		 cells: Office.Table | RangeCoordinates
-		/**
-		 * Specifies the formatting as key-value pairs. Example: {borderColor: "white", fontStyle: "bold"}
-		 */
-		 format: object	
+     * Specifies a range and its formatting.
+     */
+    interface RangeFormatConfiguration {
+        /**
+         * Specifies the range. Example of using Office.Table enum: Office.Table.All. Example of using RangeCoordinates: {row: 3, column: 4} specifies the cell in the 3rd (zero-based) row in the 4th (zero-based) column.
+         */
+         cells: Office.Table | RangeCoordinates
+        /**
+         * Specifies the formatting as key-value pairs. Example: {borderColor: "white", fontStyle: "bold"}
+         */
+         format: object
     }
     /**
-	 * Specifies a cell, or row, or column, by its zero-based row and/or column number. Example: {row: 4, column: 3} specifies the cell in the 3rd (zero-based) row in the 4th (zero-based) column.
-	 */
-	export interface RangeCoordinates {
-		/**
-		 * The zero-based row of the range. If not specified, all cells, in the column specified by `column` are included.
-		 */
-		 row?: number
-		/**
-		 * The zero-based column of the range. If not specified, all cells, in the row specified by `row` are included.
-		 */
-		 column?: number	
+     * Specifies a cell, or row, or column, by its zero-based row and/or column number. Example: {row: 4, column: 3} specifies the cell in the 3rd (zero-based) row in the 4th (zero-based) column.
+     */
+    interface RangeCoordinates {
+        /**
+         * The zero-based row of the range. If not specified, all cells, in the column specified by `column` are included.
+         */
+         row?: number
+        /**
+         * The zero-based column of the range. If not specified, all cells, in the row specified by `row` are included.
+         */
+         column?: number
     }
     /**
-	 * Provides options to determine which event handler or handlers are removed.
-	 */
-	export interface RemoveHandlerOptions {
-		/**
+     * Provides options to determine which event handler or handlers are removed.
+     */
+    interface RemoveHandlerOptions {
+        /**
          * The handler to be removed. If not specified all handlers for the specified event type are removed.
          */
         handler?: string
@@ -532,10 +741,10 @@ declare namespace Office {
         asyncContext?: any
     }
     /**
-	 * Provides options for configuring the binding that is created.
-	 */
-	export interface AddBindingFromNamedItemOptions {
-		/**
+     * Provides options for configuring the binding that is created.
+     */
+    interface AddBindingFromNamedItemOptions {
+        /**
          * The unique ID of the binding. Autogenerated if not supplied.
          */
         id?: string
@@ -543,16 +752,16 @@ declare namespace Office {
          * The names of the columns involved in the binding.
          */
         columns?: Array<string>
-		/**
+        /**
          * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
          */
-        asyncContext?: any	
+        asyncContext?: any
     }
     /**
-	 * Provides options for configuring the prompt and identifying the binding that is created.
-	 */
-	export interface AddBindingFromPromptOptions {
-		/**
+     * Provides options for configuring the prompt and identifying the binding that is created.
+     */
+    interface AddBindingFromPromptOptions {
+        /**
          * The unique ID of the binding. Autogenerated if not supplied.
          */
         id?: string
@@ -560,20 +769,20 @@ declare namespace Office {
          * Specifies the string to display in the prompt UI that tells the user what to select. Limited to 200 characters. If no promptText argument is passed, "Please make a selection" is displayed.
          */
         promptText?: string
-		/**
+        /**
          * Specifies a table of sample data displayed in the prompt UI as an example of the kinds of fields (columns) that can be bound by your add-in. The headers provided in the TableData object specify the labels used in the field selection UI. Note: This parameter is used only in add-ins for Access. It is ignored if provided when calling the method in an add-in for Excel.
          */
         sampleData?: TableData
-		/**
+        /**
          * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
          */
-        asyncContext?: any	
+        asyncContext?: any
     }
     /**
-	 * Provides options for configuring the prompt and identifying the binding that is created.
-	 */
-	export interface AddBindingFromSelectionOptions {
-		/**
+     * Provides options for configuring the prompt and identifying the binding that is created.
+     */
+    interface AddBindingFromSelectionOptions {
+        /**
          * The unique ID of the binding. Autogenerated if not supplied.
          */
         id?: string
@@ -581,29 +790,29 @@ declare namespace Office {
          * The names of the columns involved in the binding.
          */
         columns?: Array<string>
-		/**
+        /**
          * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
          */
-        asyncContext?: any	
+        asyncContext?: any
     }
     /**
-	 * Provides options for setting the size of slices that the document will be divided into.
-	 */
-	export interface GetFileOptions {
-		/**
+     * Provides options for setting the size of slices that the document will be divided into.
+     */
+    interface GetFileOptions {
+        /**
          * The the size of the slices in bytes. The maximum (and the default) is 4194304 (4MB).
          */
         sliceSize?: number
-		/**
+        /**
          * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
          */
-        asyncContext?: any	
+        asyncContext?: any
     }
     /**
-	 * Provides options for customizing what data is returned and how it is formatted.
-	 */
-	export interface GetSelectedDataOptions {
-		/**
+     * Provides options for customizing what data is returned and how it is formatted.
+     */
+    interface GetSelectedDataOptions {
+        /**
          * Specify whether the data is formatted. Use Office.ValueFormat or string equivalent.
          */
         valueFormat?: Office.ValueFormat | string
@@ -611,76 +820,76 @@ declare namespace Office {
          * Specify whether to get only the visible (that is, filtered-in) data or all the data. Useful when filtering data. Use Office.FilterType or string equivalent. This parameter is ignored in Word documents.
          */
         filterType?: Office.FilterType | string
-		/**
-         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
-         */
-        asyncContext?: any	
-    }
-    /**
-	 * Provides options for whether to select the location that is navigated to.
-	 * 
-	 * @remarks
-     * The behavior caused by the options.selectionMode option varies by host:
-	 * 
-	 * In Excel: Office.SelectionMode.Selected selects all content in the binding, or named item. Office.SelectionMode.None for text bindings, selects the cell; for matrix bindings, table bindings, and named items, selects the first data cell (not first cell in header row for tables).
-	 * 
-	 * In PowerPoint: Office.SelectionMode.Selected selects the slide title or first textbox on the slide. Office.SelectionMode.None Doesn't select anything.
-	 * 
-	 * In Word: Office.SelectionMode.Selected selects all content in the binding. Office.SelectionMode.None for text bindings, moves the cursor to the beginning of the text; for matrix bindings and table bindings, selects the first data cell (not first cell in header row for tables). 
-	 */
-	export interface GoToByIdOptions {
-		/**
-         * Specifies whether the location specified by the id parameter is selected (highlighted). Use Office.SelectionMode or string equivalent. See the Remarks for more information.
-         */
-        selectionMode?: Office.SelectionMode | string
-		/**
-         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
-         */
-        asyncContext?: any	
-    }
-    /**
-	 * Provides options for how to insert data to the selection.
-	 */
-	export interface SetSelectedDataOptions {
-		/**
-		 * Use only with binding type table and when a TableData object is passed for the data parameter. An array of objects that specify a range of columns, rows, or cells and specify, as key-value pairs, the cell formatting to apply to that range. Example: [{cells: Office.Table.Data, format: {fontColor: "yellow"}}, 
-        {cells: {row: 3, column: 4}, format: {borderColor: "white", fontStyle: "bold"}}]
-		 */
-		cellFormat?: Array<RangeFormatConfiguration>
-		/**
-		 * Explicitly sets the shape of the data object. If not supplied is inferred from the data type.
-		 */
-		coercionType?: Office.CoercionType | string        
-		/** 
-         * For an inserted table, a list of key-value pairs that specify table formatting options, such as header row, total row, and banded rows. Example: {bandedRows: true,  filterButton: false}
-		 */
-		tableOptions?: object
-		/**
-		* This option is applicable for inserting images. Indicates the insert location in relation to the top of the slide for PowerPoint, and its relation to the currently selected cell in Excel. This value is ignored for Word. This value is in points.
-		*/
-		imageTop?: number
-        /**
-		* This option is applicable for inserting images. Indicates the image width. If this option is provided without the imageHeight, the image will scale to match the value of the image width. If both image width and image height are provided, the image will be resized accordingly. If neither the image height or width is provided, the default image size and aspect ratio will be used. This value is in points.
-		*/
-		imageWidth?: number
-        /**
-		* This option is applicable for inserting images. Indicates the insert location in relation to the left side of the slide for PowerPoint, and its relation to the currently selected cell in Excel. This value is ignored for Word. This value is in points.
-		*/
-		imageLeft?: number
-        /**
-		* This option is applicable for inserting images. Indicates the image height. If this option is provided without the imageWidth, the image will scale to match the value of the image height. If both image width and image height are provided, the image will be resized accordingly. If neither the image height or width is provided, the default image size and aspect ratio will be used. This value is in points.
-		*/
-		imageHeight?: number
         /**
          * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
     /**
-	 * Provides options for saving settings.
-	 */
-	export interface SaveSettingsOptions {
-		/**
+     * Provides options for whether to select the location that is navigated to.
+     *
+     * @remarks
+     * The behavior caused by the options.selectionMode option varies by host:
+     *
+     * In Excel: Office.SelectionMode.Selected selects all content in the binding, or named item. Office.SelectionMode.None for text bindings, selects the cell; for matrix bindings, table bindings, and named items, selects the first data cell (not first cell in header row for tables).
+     *
+     * In PowerPoint: Office.SelectionMode.Selected selects the slide title or first textbox on the slide. Office.SelectionMode.None Doesn't select anything.
+     *
+     * In Word: Office.SelectionMode.Selected selects all content in the binding. Office.SelectionMode.None for text bindings, moves the cursor to the beginning of the text; for matrix bindings and table bindings, selects the first data cell (not first cell in header row for tables).
+     */
+    interface GoToByIdOptions {
+        /**
+         * Specifies whether the location specified by the id parameter is selected (highlighted). Use Office.SelectionMode or string equivalent. See the Remarks for more information.
+         */
+        selectionMode?: Office.SelectionMode | string
+        /**
+         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         */
+        asyncContext?: any
+    }
+    /**
+     * Provides options for how to insert data to the selection.
+     */
+    interface SetSelectedDataOptions {
+        /**
+         * Use only with binding type table and when a TableData object is passed for the data parameter. An array of objects that specify a range of columns, rows, or cells and specify, as key-value pairs, the cell formatting to apply to that range. Example: [{cells: Office.Table.Data, format: {fontColor: "yellow"}},
+        {cells: {row: 3, column: 4}, format: {borderColor: "white", fontStyle: "bold"}}]
+         */
+        cellFormat?: Array<RangeFormatConfiguration>
+        /**
+         * Explicitly sets the shape of the data object. If not supplied is inferred from the data type.
+         */
+        coercionType?: Office.CoercionType | string
+        /**
+         * For an inserted table, a list of key-value pairs that specify table formatting options, such as header row, total row, and banded rows. Example: {bandedRows: true,  filterButton: false}
+         */
+        tableOptions?: object
+        /**
+        * This option is applicable for inserting images. Indicates the insert location in relation to the top of the slide for PowerPoint, and its relation to the currently selected cell in Excel. This value is ignored for Word. This value is in points.
+        */
+        imageTop?: number
+        /**
+        * This option is applicable for inserting images. Indicates the image width. If this option is provided without the imageHeight, the image will scale to match the value of the image width. If both image width and image height are provided, the image will be resized accordingly. If neither the image height or width is provided, the default image size and aspect ratio will be used. This value is in points.
+        */
+        imageWidth?: number
+        /**
+        * This option is applicable for inserting images. Indicates the insert location in relation to the left side of the slide for PowerPoint, and its relation to the currently selected cell in Excel. This value is ignored for Word. This value is in points.
+        */
+        imageLeft?: number
+        /**
+        * This option is applicable for inserting images. Indicates the image height. If this option is provided without the imageWidth, the image will scale to match the value of the image height. If both image width and image height are provided, the image will be resized accordingly. If neither the image height or width is provided, the default image size and aspect ratio will be used. This value is in points.
+        */
+        imageHeight?: number
+        /**
+         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         */
+        asyncContext?: any
+    }
+    /**
+     * Provides options for saving settings.
+     */
+    interface SaveSettingsOptions {
+        /**
          * Indicates whether the setting will be replaced if stale.
          */
         overwriteIfStale?: boolean
@@ -691,13 +900,13 @@ declare namespace Office {
     }
     /**
      * Provides access to the properties for Office theme colors.
-     * 
+     *
      * Using Office theme colors lets you coordinate the color scheme of your add-in with the current Office theme selected by the user with File > Office Account > Office Theme UI, which is applied across all Office host applications. Using Office theme colors is appropriate for mail and task pane add-ins.
-     *  
+     *
      * @remarks
      * Hosts: Excel, Outlook, Powerpoint, Project, Word
      */
-    export interface OfficeTheme {
+    interface OfficeTheme {
         /**
          * Gets the Office theme body background color as a hexadecimal color triplet (e.g. "FFA500").
          */
@@ -718,16 +927,16 @@ declare namespace Office {
     /**
      * Dialog object returned as part of the displayDialogAsync callback. The object exposes methods for registering event handlers and closing the dialog
      */
-    export interface DialogHandler {
+    interface DialogHandler {
         /**
          * When called from an active add-in dialog, asynchronously closes the dialog.
          */
         close(): void;
         /**
-         * Registers an event handler. The two supported events are: 
-         * 
+         * Registers an event handler. The two supported events are:
+         *
          * - DialogMessageReceived. Triggered when the dialog box sends a message to its parent.
-         * 
+         *
          * - DialogEventReceived. Triggered when the dialog box has been closed or otherwise unloaded.
          */
         addEventHandler(eventType: Office.EventType, handler: Function): void;
@@ -741,14 +950,14 @@ declare namespace Office {
      * @param expression The object to be retrieved. Example "bindings#BindingName", retrieves a binding promise for a binding named 'BindingName'
      * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
      */
-    export function select(expression: string, callback?: (result: AsyncResult) => void): Binding;
+    function select(expression: string, callback?: (result: AsyncResult) => void): Binding;
     // Enumerations
     /**
      * Specifies the state of the active view of the document, for example, whether the user can edit the document.
      * @remarks
      * Hosts: PowerPoint
      */
-    export enum ActiveView {
+    enum ActiveView {
         /**
          * The active view of the host application only lets the user read the content in the document.
          */
@@ -763,7 +972,7 @@ declare namespace Office {
      * @remarks
      * Hosts: Access, Excel, Word
      */
-    export enum BindingType {
+    enum BindingType {
         /**
          * Plain text. Data is returned as a run of characters.
          */
@@ -779,13 +988,13 @@ declare namespace Office {
     }
     /**
      * Specifies how to coerce data returned or set by the invoked method.
-     * 
+     *
      * @remarks
      * PowerPoint supports only Office.CoercionType.Text, Office.CoercionType.Image, and Office.CoercionType.SlideRange. Project supports only Office.CoercionType.Text.
-     * 
+     *
      * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
      */
-    export enum CoercionType {
+    enum CoercionType {
         /**
          * Return or set data as text (string).Data is returned or set as a one-dimensional run of characters.
          */
@@ -828,13 +1037,13 @@ declare namespace Office {
         Image
     }
     /**
-     * Specifies whether the document in the associated application is read-only or read-write. 
+     * Specifies whether the document in the associated application is read-only or read-write.
      * @remarks
      * Returned by the mode property of the Document object.
-     * 
+     *
      * Hosts: Excel, PowerPoint, Project, Word
      */
-    export enum DocumentMode {
+    enum DocumentMode {
         /**
          * The document is read-only.
          */
@@ -846,34 +1055,34 @@ declare namespace Office {
     }
     /**
      * Specifies the kind of event that was raised. Returned by the type property of an EventNameEventArgs object.
-     * 
+     *
      * @remarks
      * Add-ins for Project support the Office.EventType.ResourceSelectionChanged, Office.EventType.TaskSelectionChanged, and Office.EventType.ViewSelectionChanged event types.
-     * 
+     *
      * Hosts: Access, Excel, PowerPoint, Project, Word
      */
-    export enum EventType {
+    enum EventType {
         /**
          * A Document.ActiveViewChanged event was raised.
          */
         ActiveViewChanged,
         /**
          * Occurs when data within the binding is changed.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, Word
-         * 
+         *
          * To add an event handler for the BindingDataChanged event of a binding, use the addHandlerAsync method of the Binding object. The event handler receives an argument of type BindingDataChangedEventArgs.
          */
         BindingDataChanged,
         /**
          * Occurs when the selection is changed within the binding.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, Word
-         * 
+         *
          * Available in Requirement set: BindingEvents
-         * 
+         *
          * To add an event handler for the BindingSelectionChanged event of a binding, use the addHandlerAsync method of the Binding object. The event handler receives an argument of type BindingSelectionChangedEventArgs.
          */
         BindingSelectionChanged,
@@ -924,11 +1133,11 @@ declare namespace Office {
     }
     /**
      * Specifies the format in which to return the document.
-     * 
+     *
      * @remarks
      * Hosts: PowerPoint, Word
      */
-    export enum FileType {
+    enum FileType {
         /**
          * Returns only the text of the document as a string. (Word only)
          */
@@ -944,11 +1153,11 @@ declare namespace Office {
     }
     /**
      * Specifies whether filtering from the host application is applied when the data is retrieved.
-     * 
+     *
      * @remarks
      * Hosts: Excel, Project, Word
      */
-    export enum FilterType {
+    enum FilterType {
         /**
          * Return all data (not filtered by the host application).
          */
@@ -960,11 +1169,11 @@ declare namespace Office {
     }
     /**
      * Specifies the type of place or object to navigate to.
-     * 
+     *
      * @remarks
      * Hosts: Excel, PowerPoint, Word
      */
-    export enum GoToType {
+    enum GoToType {
         /**
          * Goes to a binding object using the specified binding id.
          */
@@ -983,7 +1192,7 @@ declare namespace Office {
          */
         Index
     }
-    export enum Index {
+    enum Index {
         First,
         Last,
         Next,
@@ -991,11 +1200,11 @@ declare namespace Office {
     }
     /**
      * Specifies whether to select (highlight) the location to navigate to (when using the Document.goToByIdAsync method).
-     * 
+     *
      * @remarks
      * Hosts: Excel, PowerPoint, Word
      */
-    export enum SelectionMode {
+    enum SelectionMode {
         Default,
         /**
          * The location will be selected (highlighted).
@@ -1008,13 +1217,13 @@ declare namespace Office {
     }
     /**
      * Specifies whether values, such as numbers and dates, returned by the invoked method are returned with their formatting applied.
-     * 
+     *
      * @remarks
      * For example, if the valueFormat parameter is specified as "formatted", a number formatted as currency, or a date formatted as mm/dd/yy in the host application will have its formatting preserved. If the valueFormat parameter is specified as "unformatted", a date will be returned in its underlying sequential serial number form.
-     * 
+     *
      * Hosts: Excel, Project, Word
      */
-    export enum ValueFormat {
+    enum ValueFormat {
         /**
          * Return unformatted data.
          */
@@ -1027,44 +1236,44 @@ declare namespace Office {
     // Objects
     /**
     * Represents a binding to a section of the document.
-    * 
+    *
     * @remarks
     * Hosts: Access, Excel, Word
-    * 
+    *
     * Available in Requirement sets: MatrixBinding, TableBinding, TextBinding
-    * 
+    *
     * The Binding object exposes the functionality possessed by all bindings regardless of type.
-    * 
+    *
     * The Binding object is never called directly. It is the abstract parent class of the objects that represent each type of binding: MatrixBinding, TableBinding, or TextBinding. All three of these objects inherit the getDataAsync and setDataAsync methods from the Binding object that enable to you interact with the data in the binding. They also inherit the id and type properties for querying those property values. Additionally, the MatrixBinding and TableBinding objects expose additional methods for matrix- and table-specific features, such as counting the number of rows and columns.
     */
-    export interface Binding {
+    interface Binding {
         /**
         * Get the Document object associated with the binding.
-        * 
+        *
         * @remarks
         * Hosts: Access, Excel, Word
         */
         document: Document;
         /**
          * A string that uniquely identifies this binding among the bindings in the same Document object.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, Word
          */
         id: string;
         /**
         * Gets the type of the binding.
-        * 
+        *
         * @remarks
         * Hosts: Access, Excel, Word
         */
         type: BindingType;
         /**
          * Adds an event handler to the object for the specified event type.
-         * 
+         *
          * @remarks
          * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
-         * 
+         *
          * @param eventType The event type. For example, for bindings, it can be **Office.EventType.BindingSelectionChanged**, **Office.EventType.BindingDataChanged**, or the corresponding text values of these enumerations.
          * @param handler The event handler function to add.
          * @param options Syntax example: {asyncContext:context}
@@ -1074,14 +1283,14 @@ declare namespace Office {
         addHandlerAsync(eventType: EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Returns the data contained within the binding.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, Word
-         * 
+         *
          * Available in Requirement sets: MatrixBindings, TableBindings, TextBindings
-         * 
+         *
          * When called from a MatrixBinding or TableBinding, the getDataAsync method will return a subset of the bound values if the optional startRow, startColumn, rowCount, and columnCount parameters are specified (and they specify a contiguous and valid range).
-         * 
+         *
          * @param options Provides options for how to get the data in a binding.
 
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1089,93 +1298,93 @@ declare namespace Office {
         getDataAsync(options?: GetBindingDataOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes the specified handler from the binding for the specified event type.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, Word
-         * 
+         *
          * Available in Requirement set: BindingEvents
-         * 
+         *
          * @param eventType The event type. For binding can be 'bindingDataChanged' and 'bindingSelectionChanged'
-         * @param options Provides options to determine which event handler or handlers are removed. 
+         * @param options Provides options to determine which event handler or handlers are removed.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         removeHandlerAsync(eventType: EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Writes data to the bound section of the document represented by the specified binding object.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, Word
-         * 
+         *
          * Available in Requirement sets: MatrixBindings, TableBindings, TextBindings
-         * 
+         *
          * @param data The data to be set in the current selection. Possible data types by host:
-         * 
+         *
          *        string: Excel, Excel Online, Word, and Word Online only
-         * 
+         *
          *        array of arrays: Excel and Word only
-         * 
+         *
          *        [TableData](office.tabledata.md): Access, Excel, and Word only
-         * 
+         *
          *        HTML: Word and Word Online only
-         * 
+         *
          *        Office Open XML: Word only
-         * 
+         *
          * @param options Provides options for how to set the data in a binding.
-         * 
+         *
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         setDataAsync(data: TableData | any, options?: SetBindingDataOptions, callback?: (result: AsyncResult) => void): void;
     }
     /**
     * Represents the bindings the add-in has within the document.
-    * 
+    *
     * @remarks
-    * Hosts: 
+    * Hosts:
     */
-    export interface Bindings {
+    interface Bindings {
         /**
         * Gets a Document object that represents the document associated with this set of bindings.
-        * 
+        *
         *remarks
         * Hosts: Access, Excel, Word
         */
         document: Document;
         /**
          * Creates a binding against a named object in the document.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, Word
-         * 
+         *
          * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
-         * 
+         *
          * For Excel, the itemName parameter can refer to a named range or a table.
-         * 
+         *
          * By default, adding a table in Excel assigns the name "Table1" for the first table you add, "Table2" for the second table you add, and so on. To assign a meaningful name for a table in the Excel UI, use the Table Name property on the Table Tools | Design tab of the ribbon.
-         * 
+         *
          *     Note: In Excel, when specifying a table as a named item, you must fully qualify the name to include the worksheet name in the name of the table in this format: "Sheet1!Table1"
-         * 
+         *
          * For Word, the itemName parameter refers to the Title property of a Rich Text content control. (You can't bind to content controls other than the Rich Text content control.)
-         * 
+         *
          * By default, a content control has no Title value assigned. To assign a meaningful name in the Word UI, after inserting a Rich Text content control from the Controls group on the Developer tab of the ribbon, use the Properties command in the Controls group to display the Content Control Properties dialog box. Then set the Title property of the content control to the name you want to reference from your code.
-         * 
+         *
          *     Note: In Word, if there are multiple Rich Text content controls with the same Title property value (name), and you try to bind to one these content controls with this method (by specifying its name as the itemName parameter), the operation will fail.
-         * 
+         *
          * @param itemName Name of the bindable object in the document. For Example 'MyExpenses' table in Excel."
          * @param bindingType The Office BindingType for the data. The method returns null if the selected object cannot be coerced into the specified type.
-         * @param options Provides options for configuring the binding that is created. 
+         * @param options Provides options for configuring the binding that is created.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         addFromNamedItemAsync(itemName: string, bindingType: BindingType, options?: AddBindingFromNamedItemOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Create a binding by prompting the user to make a selection on the document.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel
-         * 
+         *
          * Available in Requirement set: Not in a set
-         * 
+         *
          * Adds a binding object of the specified type to the Bindings collection, which will be identified with the supplied id. The method fails if the specified selection cannot be bound.
-         * 
+         *
          * @param bindingType Specifies the type of the binding object to create. Required. Returns null if the selected object cannot be coerced into the specified type.
          * @param options Provides options for configuring the prompt and identifying the binding that is created.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1183,16 +1392,16 @@ declare namespace Office {
         addFromPromptAsync(bindingType: BindingType, options?: AddBindingFromPromptOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Create a binding based on the user's current selection.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, Word
-         * 
+         *
          * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
-         * 
+         *
          * Adds the specified type of binding object to the Bindings collection, which will be identified with the supplied id.
-         * 
+         *
          * Note In Excel, if you call the addFromSelectionAsync method passing in the Binding.id of an existing binding, the Binding.type of that binding is used, and its type cannot be changed by specifying a different value for the bindingType parameter.If you need to use an existing id and change the bindingType, call the Bindings.releaseByIdAsync method first to release the binding, and then call the addFromSelectionAsync method to reestablish the binding with a new type.
-         * 
+         *
          * @param bindingType Specifies the type of the binding object to create. Required. Returns null if the selected object cannot be coerced into the specified type.
          * @param options Provides options for configuring the prompt and identifying the binding that is created.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1200,12 +1409,12 @@ declare namespace Office {
         addFromSelectionAsync(bindingType: BindingType, options?: AddBindingFromSelectionOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets all bindings that were previously created.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, Word
-         * 
+         *
          * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
-         * 
+         *
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1213,14 +1422,14 @@ declare namespace Office {
         getAllAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Retrieves a binding based on its Name
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts, MatrixBindings, TableBindings, TextBindings
-         * 
+         *
          * Fails if the specified id does not exist.
-         * 
+         *
          * @param id Specifies the unique name of the binding object. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1229,14 +1438,14 @@ declare namespace Office {
         getByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes the binding from the document
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, Word
-         * 
+         *
          * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
-         * 
+         *
          * Fails if the specified id does not exist.
-         * 
+         *
          * @param id Specifies the unique name to be used to identify the binding object. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1246,11 +1455,11 @@ declare namespace Office {
     }
     /**
     * Represents the runtime environment of the add-in and provides access to key objects of the API.
-    * 
+    *
     * @remarks
     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
     */
-    export interface Context {
+    interface Context {
         /**
          * Gets an object that represents the document the content or task pane add-in is interacting with.
          */
@@ -1258,48 +1467,48 @@ declare namespace Office {
     }
     /**
      * Represents an XML node in a tree in a document.
-     * 
+     *
      * @remarks
      * Hosts: Word
-     * 
+     *
      * Available in Requirement set: CustomXmlParts
      */
-    export interface CustomXmlNode {
+    interface CustomXmlNode {
         /**
          * Gets the base name of the node without the namespace prefix, if one exists.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
          */
         baseName: string;
         /**
          * Retrieves the string GUID of the CustomXMLPart.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
          */
         namespaceUri: string;
         /**
          * Gets the type of the CustomXMLNode.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
          */
         nodeType: string;
         /**
          * Gets the nodes associated with the XPath expression.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
-         * 
+         *
          * @param xPath The XPath expression that specifies the nodes to get. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1308,12 +1517,12 @@ declare namespace Office {
         getNodesAsync(xPath: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the node value.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
-         * 
+         *
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1321,12 +1530,12 @@ declare namespace Office {
         getNodeValueAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the text of an XML node in a custom XML part.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
-         * 
+         *
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1334,12 +1543,12 @@ declare namespace Office {
         getTextAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the node's XML.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
-         * 
+         *
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1347,12 +1556,12 @@ declare namespace Office {
         getXmlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets the node value.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
-         * 
+         *
          * @param value The value to be set on the node
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1361,12 +1570,12 @@ declare namespace Office {
         setNodeValueAsync(value: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously sets the text of an XML node in a custom XML part.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
-         * 
+         *
          * @param text Required. The text value of the XML node.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1375,12 +1584,12 @@ declare namespace Office {
         setTextAsync(text: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets the node XML.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
-         * 
+         *
          * @param xml The XML to be set on the node
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1390,48 +1599,48 @@ declare namespace Office {
     }
     /**
      * Represents a single CustomXMLPart in a CustomXMLParts collection.
-     * 
+     *
      * @remarks
      * Hosts: Word
-     * 
+     *
      * Available in Requirement set: CustomXmlParts
      */
-    export interface CustomXmlPart {
+    interface CustomXmlPart {
         /**
          * True, if the custom XML part is built in; otherwise false.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
          */
         builtIn: boolean;
         /**
          * Gets the GUID of the CustomXMLPart.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
          */
         id: string;
         /**
          * Gets the set of namespace prefix mappings (CustomXMLPrefixMappings) used against the current CustomXMLPart.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
          */
         namespaceManager: CustomXmlPrefixMappings;
         /**
          * Adds an event handler to the object using the specified event type.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
-         * 
+         *
          * @param eventType Specifies the type of event to add. Required. For a CustomXmlPart object event, the eventType parameter can be specified as Office.EventType.DataNodeDeleted, Office.EventType.DataNodeInserted, Office.EventType.DataNodeReplaced, or the corresponding text values of these enumerations.
          * @param handler The event handler function to add, whose only parameter is of type NodeDeletedEventArgs, NodeInsertedEventArgs, or NodeReplaceEventArgs. Required.
          * @param options Syntax example: {asyncContext:context}
@@ -1441,12 +1650,12 @@ declare namespace Office {
         addHandlerAsync(eventType: EventType, handler: (result: any) => void, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Deletes the Custom XML Part.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
-         * 
+         *
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1454,12 +1663,12 @@ declare namespace Office {
         deleteAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets any CustomXmlNodes in this custom XML part which match the specified XPath.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
-         * 
+         *
          * @param xPath An XPath expression that specifies the nodes you want returned. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1468,12 +1677,12 @@ declare namespace Office {
         getNodesAsync(xPath: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the XML inside this custom XML part.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
-         * 
+         *
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1481,12 +1690,12 @@ declare namespace Office {
         getXmlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes an event handler for the specified event type.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
-         * 
+         *
          * @param eventType Specifies the type of event to remove. Required.For a CustomXmlPart object event, the eventType parameter can be specified as Office.EventType.DataNodeDeleted, Office.EventType.DataNodeInserted, Office.EventType.DataNodeReplaced, or the corresponding text values of these enumerations.
          * @param options Provides options to determine which event handler or handlers are removed.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1495,21 +1704,21 @@ declare namespace Office {
     }
     /**
      * Represents a collection of CustomXmlPart objects.
-     * 
+     *
      * @remarks
      * Hosts: Word
-     * 
+     *
      * Available in Requirement set: CustomXmlParts
      */
-    export interface CustomXmlParts {
+    interface CustomXmlParts {
         /**
          * Asynchronously adds a new custom XML part to a file.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
-         * 
+         *
          * @param xml The XML to add to the newly created custom XML part.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1518,13 +1727,13 @@ declare namespace Office {
         addAsync(xml: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the specified custom XML part by its id.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
-         * 
-         * @param id The GUID of the custom XML part, including opening and closing braces. 
+         *
+         * @param id The GUID of the custom XML part, including opening and closing braces.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1532,12 +1741,12 @@ declare namespace Office {
         getByIdAsync(id: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the specified custom XML part(s) by its namespace.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
-         * 
+         *
          * @param ns  The namespace URI.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1547,21 +1756,21 @@ declare namespace Office {
     }
     /**
      * Represents a collection of CustomXmlPart objects.
-     * 
+     *
      * @remarks
      * Hosts: Word
      */
-    export interface CustomXmlPrefixMappings {
+    interface CustomXmlPrefixMappings {
         /**
          * Asynchronously adds a prefix to namespace mapping to use when querying an item.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
-         * 
+         *
          * If no namespace is assigned to the requested prefix, the method returns an empty string ("").
-         * 
+         *
          * @param prefix Specifies the prefix to add to the prefix mapping list. Required.
          * @param ns Specifies the namespace URI to assign to the newly added prefix. Required.
          * @param options Syntax example: {asyncContext:context}
@@ -1571,14 +1780,14 @@ declare namespace Office {
         addNamespaceAsync(prefix: string, ns: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the namespace mapped to the specified prefix.
-         * 
+         *
          * @remarks
          * Hosts: Word
          *
          * Available in Requirement set: CustomXmlParts
-         * 
+         *
          * If the prefix already exists in the namespace manager, this method will overwrite the mapping of that prefix except when the prefix is one added or used by the data store internally, in which case it will return an error.
-         * 
+         *
          * @param prefix TSpecifies the prefix to get the namespace for. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1587,14 +1796,14 @@ declare namespace Office {
         getNamespaceAsync(prefix: string, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously gets the prefix for the specified namespace.
-         * 
+         *
          * @remarks
          * Hosts: Word
-         * 
+         *
          * Available in Requirement set: CustomXmlParts
-         * 
+         *
          * If no prefix is assigned to the requested namespace, the method returns an empty string (""). If there are multiple prefixes specified in the namespace manager, the method returns the first prefix that matches the supplied namespace.
-         * 
+         *
          * @param ns Specifies the namespace to get the prefix for. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1604,58 +1813,58 @@ declare namespace Office {
     }
     /**
      * An abstract class that represents the document the add-in is interacting with.
-     * 
+     *
      * @remarks
      * Hosts: Access, Excel, PowerPoint, Project, Word
      */
-    export interface Document {
+    interface Document {
         /**
          * Gets an object that provides access to the bindings defined in the document.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, Word
-         * 
+         *
          * You don't instantiate the Document object directly in your script. To call members of the Document object to interact with the current document or worksheet, use Office.context.document in your script.
          */
         bindings: Bindings;
         /**
          * Gets an object that represents the custom XML parts in the document.
-         * 
+         *
          * @remarks
          * Hosts: Word
          */
         customXmlParts: CustomXmlParts;
         /**
          * Gets the mode the document is in.
-         * 
+         *
          * @remarks
          * Hosts: Word
          */
         mode: DocumentMode;
         /**
          * Gets an object that represents the saved custom settings of the content or task pane add-in for the current document.
-         * 
+         *
          * @remarks
          * Hosts: Word
          */
         settings: Settings;
         /**
          * Gets the URL of the document that the host application currently has open. Returns null if the URL is unavailable.
-         * 
+         *
          * @remarks
          * Hosts: Word
          */
         url: string;
         /**
          * Adds an event handler for a Document object event.
-         * 
+         *
          * @remarks
          * Hosts: Excel, PowerPoint, Project, Word
-         * 
+         *
          * Available in Requirement set: DocumentEvents
-         * 
+         *
          * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
-         * 
+         *
          * @param eventType For a Document object event, the eventType parameter can be specified as Office.EventType.Document.SelectionChanged or Office.EventType.Document.ActiveViewChanged, or the corresponding text value of this enumeration.
          * @param handler The event handler function to add, whose only parameter is of type DocumentSelectionChangedEventArgs. Required.
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -1667,35 +1876,35 @@ declare namespace Office {
          *
          * @remarks
          * Hosts: Excel, PowerPoint, Word
-         * 
+         *
          * Available in Requirement set: ActiveView
-         * 
+         *
          * Can trigger an event when the view changes.
-         * 
+         *
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
         */
         getActiveViewAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Returns the entire document file in slices of up to 4194304 bytes (4 MB). For add-ins for iOS, file slice is supported up to 65536 (64 KB). Note that specifying file slice size of above permitted limit will result in an "Internal Error" failure.
-         * 
+         *
          * @remarks
          * Hosts: Excel, PowerPoint, Word
          *
          * Available in Requirement set: File
-         * 
+         *
          * For add-ins running in Office host applications other than Office for iOS, the getFileAsync method supports getting files in slices of up to 4194304 bytes (4 MB). For add-ins running in Office for iOS apps, the getFileAsync method supports getting files in slices of up to 65536 (64 KB).
-         * 
-         * The fileType parameter can be specified by using the FileType enumeration or text values. But the possible values vary with the host: 
-         * 
+         *
+         * The fileType parameter can be specified by using the FileType enumeration or text values. But the possible values vary with the host:
+         *
          * Excel Online, Win32, Mac, and iOS: Office.FileType.Compressed
-         * 
+         *
          * PowerPoint on Windows desktop, Mac, and iPad, and PowerPoint Online: Office.FileType.Compressed, Office.FileType.Pdf
-         * 
+         *
          * Word on Windows desktop, Word on Mac, and Word Online: Office.FileType.Compressed, Office.FileType.Pdf, Office.FileType.Text
          *
          * Word on iPad: Office.FileType.Compressed, Office.FileType.Text
-         * 
+         *
          * @param fileType The format in which the file will be returned
          * @param options Provides options for setting the size of slices that the document will be divided into.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -1703,104 +1912,104 @@ declare namespace Office {
         getFileAsync(fileType: FileType, options?: GetFileOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets file properties of the current document.
-         * 
+         *
          * @remarks
          * Hosts: Excel, PowerPoint, Word
-         * 
+         *
          * Available in Requirement set: not in a set
-         * 
+         *
          * You get the file's URL with the url property ( asyncResult.value.url).
-         * 
+         *
          * @param options An object like {asyncContext:context} where `context` is a user-defined item of any type that is returned in the AsyncResult object without being altered.
          * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
         */
         getFilePropertiesAsync(options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Reads the data contained in the current selection in the document.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, PowerPoint, Project, Word
-         * 
+         *
          * Available in Requirement set: Selection
-         * 
+         *
          * The possible values for the coercionType parameter vary by the host:
-         * 
+         *
          * Excel, Excel Online, PowerPoint, PowerPoint Online, Word, and Word Online only: Office.CoercionType.Text (string)
-         * 
+         *
          * Excel, Word, and Word Online only: Office.CoercionType.Matrix (array of arrays)
-         * 
+         *
          * Access, Excel, Word, and Word Online only: Office.CoercionType.Table (TableData object)
-         * 
+         *
          * Word only: Office.CoercionType.Html
-         * 
+         *
          * Word and Word Online only: Office.CoercionType.Ooxml (Office Open XML)
-         * 
+         *
          * PowerPoint and PowerPoint Online only: Office.CoercionType.SlideRange
-         * 
-         * @param coercionType The type of data structure to return. 
-         * @param options Provides options for customizing what data is returned and how it is formatted. 
+         *
+         * @param coercionType The type of data structure to return.
+         * @param options Provides options for customizing what data is returned and how it is formatted.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         getSelectedDataAsync(coercionType: CoercionType, options?: GetSelectedDataOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Goes to the specified object or location in the document.
-         * 
+         *
          * @remarks
          * Hosts: Excel, PowerPoint, Word
-         * 
+         *
          * Available in Requirement set: not in a set
-         * 
+         *
          * PowerPoint doesn't support the goToByIdAsync method in Master Views.
-         * 
+         *
          * The behavior caused by the selectionMode option varies by host:
-         * 
+         *
          * In Excel: Office.SelectionMode.Selected selects all content in the binding, or named item. Office.SelectionMode.None for text bindings, selects the cell; for matrix bindings, table bindings, and named items, selects the first data cell (not first cell in header row for tables).
-         * 
+         *
          * In PowerPoint: Office.SelectionMode.Selected selects the slide title or first textbox on the slide. Office.SelectionMode.None Doesn't select anything.
-         * 
+         *
          * In Word: Office.SelectionMode.Selected selects all content in the binding. Office.SelectionMode.None for text bindings, moves the cursor to the beginning of the text; for matrix bindings and table bindings, selects the first data cell (not first cell in header row for tables).
-         * 
+         *
          * @param id The identifier of the object or location to go to.
          * @param goToType The type of the location to go to.
-         * @param options Provides options for whether to select the location that is navigated to. 
+         * @param options Provides options for whether to select the location that is navigated to.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         goToByIdAsync(id: string | number, goToType: GoToType, options?: GoToByIdOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes an event handler for the specified event type.
-         * 
+         *
          * @remarks
          * Hosts: Excel, PowerPoint, Project, Word
-         * 
+         *
          * Available in Requirement set: DocumentEvents
-         * 
+         *
          * @param eventType The event type. For document can be 'Document.SelectionChanged' or 'Document.ActiveViewChanged'.
-         * @param options Provides options to determine which event handler or handlers are removed.         * 
+         * @param options Provides options to determine which event handler or handlers are removed.         *
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
         removeHandlerAsync(eventType: EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Writes the specified data into the current selection.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, PowerPoint, Project, Word, Word Online
-         * 
+         *
          * Available in Requirement set: Selection
-         * 
+         *
          * The possible CoercionTypes that can be used for the data parameter, or for the coercionType option, vary by host:
-         * 
+         *
          * Office.CoercionType.Text: Excel, Word, PowerPoint
-         * 
+         *
          * Office.CoercionType.Matrix: Excel, Word
-         * 
+         *
          * Office.CoercionType.Table: Access, Excel, Word
-         * 
+         *
          * Office.CoercionType.Html: Word
-         * 
+         *
          * Office.CoercionType.Ooxml: Word
-         * 
+         *
          * Office.CoercionType.Image: Excel, Word, PowerPoint
-         * 
+         *
          * @param data The data to be set. Either a string or CoercionType value, 2d array or TableData object.
          * @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 AsyncResult.
@@ -1810,7 +2019,7 @@ declare namespace Office {
     /**
      * Provides information about the document that raised the SelectionChanged event.
      */
-    export interface DocumentSelectionChangedEventArgs {
+    interface DocumentSelectionChangedEventArgs {
         /**
          * Gets a Document object that represents the document that raised the SelectionChanged event.
          */
@@ -1822,25 +2031,25 @@ declare namespace Office {
     }
     /**
      * Represents the document file associated with an Office Add-in.
-     * 
+     *
      * @remarks
      * Access the File object with the AsyncResult.value property in the callback function passed to the Document.getFileAsync method.
-     * 
+     *
      * Hosts: PowerPoint, Word
      */
-    export interface File {
+    interface File {
         /**
          * Gets the document file size in bytes.
-         * 
+         *
          * @remarks
          * Hosts: PowerPoint, Word
-         * 
+         *
          * Available in Requirement set: File
          */
         size: number;
         /**
          * Gets the number of slices into which the file is divided.
-         * @remarks 
+         * @remarks
          * Hosts: PowerPoint, Word
          */
         sliceCount: number;
@@ -1848,7 +2057,7 @@ declare namespace Office {
          * Closes the document file.
          * @remarks
          * No more than two documents are allowed to be in memory; otherwise the Document.getFileAsync operation will fail. Use the File.closeAsync method to close the file when you are finished working with it.
-         * 
+         *
          * Hosts: PowerPoint, Word
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          * @remarks
@@ -1860,7 +2069,7 @@ declare namespace Office {
          * |AsyncResult.status|Determine the success or failure of the operation.|
          * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
          * |AsyncResult.asyncContext|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
-         * 
+         *
          * Available in Requirement set: File
          */
         closeAsync(callback?: (result: AsyncResult) => void): void;
@@ -1879,12 +2088,12 @@ declare namespace Office {
          * |AsyncResult.status|Determine the success or failure of the operation.|
          * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
          * |AsyncResult.asyncContext|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
-         * 
+         *
          * Available in Requirement set: File
          */
         getSliceAsync(sliceIndex: number, callback?: (result: AsyncResult) => void): void;
     }
-    export interface FileProperties {
+    interface FileProperties {
         /**
          * File's URL
          */
@@ -1892,61 +2101,61 @@ declare namespace Office {
     }
     /**
     * Represents a binding in two dimensions of rows and columns.
-    * 
+    *
     * @remarks
          * Hosts: Excel, Word
-    * 
+    *
     * Available in Requirement set: MatrixBindings
-    * 
+    *
     * The MatrixBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object.
     */
-    export interface MatrixBinding extends Binding {
+    interface MatrixBinding extends Binding {
         /**
         * Gets the number of columns in the matrix data structure, as an integer value.
-        * 
+        *
         * @remarks
         * Hosts: Access, Excel, PowerPoint, Project, Word
-        * 
+        *
         * Available in Requirement set: MatrixBindings
         */
         columnCount: number;
         /**
         * Gets the number of rows in the matrix data structure, as an integer value.
-        * 
+        *
         * @remarks
         * Hosts: Access, Excel, PowerPoint, Project, Word
-        * 
+        *
         * Available in Requirement set: MatrixBindings
         */
         rowCount: number;
     }
     /**
      * Represents custom settings for a task pane or content add-in that are stored in the host document as name/value pairs.
-     * 
+     *
      * @remarks
      * The settings created by using the methods of the Settings object are saved per add-in and per document. That is, they are available only to the add-in that created them, and only from the document in which they are saved.
-     * 
+     *
      * The name of a setting is a string, while the value can be a string, number, boolean, null, object, or array.
-     * 
+     *
      * The Settings object is automatically loaded as part of the Document object, and is available by calling the settings property of that object when the add-in is activated. The developer is responsible for calling the saveAsync method after adding or deleting settings to save the settings in the document.
-     * 
+     *
      * Hosts: Access, Excel, PowerPoint, Word
-     * 
+     *
      * Available in Requirement set: Settings
      */
-    export interface Settings {
+    interface Settings {
         /**
          * Adds an event handler for the settingsChanged event.
-         * 
+         *
          * Important: Your add-in's code can register a handler for the settingsChanged event when the add-in is running with any Excel client, but the event will fire only when the add-in is loaded with a spreadsheet that is opened in Excel Online, and more than one user is editing the spreadsheet (co-authoring). Therefore, effectively the settingsChanged event is supported only in Excel Online in co-authoring scenarios.
          *
          * @remarks
          * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
-         * 
+         *
          * Hosts: Excel
-         * 
+         *
          * Available in Requirement set: Settings
-         * 
+         *
          * @param eventType Specifies the type of event to add. Required.
          * @param handler The event handler function to add. Required.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
@@ -1964,27 +2173,27 @@ declare namespace Office {
         addHandlerAsync(eventType: EventType, handler: any, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Retrieves the specified setting.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, PowerPoint, Word
-         * 
+         *
          * Available in Requirement set: Settings
-         * 
+         *
          * @param settingName The case-sensitive name of the setting to retrieve.
          * @returns An object that has property names mapped to JSON serialized values.
          */
         get(name: string): any;
         /**
          * Reads all settings persisted in the document and refreshes the content or task pane add-in's copy of those settings held in memory.
-         * 
+         *
          * @remarks
          * This method is useful in Word and PowerPoint coauthoring scenarios when multiple instances of the same add-in are working against the same document. Because each add-in is working against an in-memory copy of the settings loaded from the document at the time the user opened it, the settings values used by each user can get out of sync. This can happen whenever an instance of the add-in calls the Settings.saveAsync method to persist all of that user's settings to the document. Calling the refreshAsync method from the event handler for the settingsChanged event of the add-in will refresh the settings values for all users.
          * The refreshAsync method can be called from add-ins created for Excel, but since it doesn't support coauthoring there is no reason to do so.
-         * 
+         *
          * Hosts: Access, Excel, PowerPoint, Word
-         * 
+         *
          * Available in Requirement set: Settings
-         * 
+         *
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          * @remarks
          * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
@@ -1999,29 +2208,29 @@ declare namespace Office {
         refreshAsync(callback?: (result: AsyncResult) => void): void;
         /**
          * Removes the specified setting.
-         * 
+         *
          * Important: Be aware that the Settings.remove method affects only the in-memory copy of the settings property bag. To persist the removal of the specified setting in the document, at some point after calling the Settings.remove method and before the add-in is closed, you must call the Settings.saveAsync method.
-         * 
+         *
          * @remarks
          * null is a valid value for a setting. Therefore, assigning null to the setting will not remove it from the settings property bag.
-         * 
+         *
          * Hosts: Access, Excel, PowerPoint, Word
-         * 
+         *
          * Available in Requirement set: Settings
-         * 
+         *
          * @param settingName The case-sensitive name of the setting to remove.
          */
         remove(name: string): void;
         /**
          * Removes an event handler for the settingsChanged event.
-         * 
+         *
          * @remarks
          * If the optional handler parameter is omitted when calling the removeHandlerAsync method, all event handlers for the specified eventType will be removed.
-         * 
+         *
          * Hosts: Access, Excel, PowerPoint
-         * 
+         *
          * Available in Requirement set: Settings
-         * 
+         *
          * @param eventType Specifies the type of event to remove. Required.
          * @param options Provides options to determine which event handler or handlers are removed.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -2034,11 +2243,11 @@ declare namespace Office {
          * Persists the in-memory copy of the settings property bag in the document.
          * @remarks
          * Any settings previously saved by an add-in are loaded when it is initialized, so during the lifetime of the session you can just use the set and get methods to work with the in-memory copy of the settings property bag. When you want to persist the settings so that they are available the next time the add-in is used, use the saveAsync method.
-         * 
+         *
          * Note:
          * The saveAsync method persists the in-memory settings property bag into the document file; however, the changes to the document file itself are saved only when the user (or AutoRecover setting) saves the document to the file system.
          * The refreshAsync method is only useful in coauthoring scenarios (which are only supported in Word) when other instances of the same add-in might change the settings and those changes should be made available to all instances.
-         * 
+         *
          * Hosts: Access, Excel, PowerPoint, Word
          * @param options Provides options for saving settings.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. Optional.
@@ -2054,17 +2263,17 @@ declare namespace Office {
          */
         saveAsync(options?: SaveSettingsOptions, callback?: (result: AsyncResult) => void): void;
         /**
-         * Sets or creates the specified setting. 
-         * 
+         * Sets or creates the specified setting.
+         *
          * Important: Be aware that the Settings.set method affects only the in-memory copy of the settings property bag. To make sure that additions or changes to settings will be available to your add-in the next time the document is opened, at some point after calling the Settings.set method and before the add-in is closed, you must call the Settings.saveAsync method to persist settings in the document.
-         * 
+         *
          * @remarks
          * The set method creates a new setting of the specified name if it does not already exist, or sets an existing setting of the specified name in the in-memory copy of the settings property bag. After you call the Settings.saveAsync method, the value is stored in the document as the serialized JSON representation of its data type. A maximum of 2MB is available for the settings of each add-in.
-         * 
+         *
          * Hosts: Access, Excel, PowerPoint, Word
-         * 
+         *
          * Available in Requirement set: Settings
-         * 
+         *
          * @param settingName The case-sensitive name of the setting to set or create.
          * @param value Specifies the value to be stored.
          */
@@ -2072,115 +2281,115 @@ declare namespace Office {
     }
     /**
      * Represents a slice of a document file.
-     * 
+     *
      * @remarks
      * The Slice object is accessed with the File.getSliceAsync method.
-     * 
+     *
      * Hosts: PowerPoint, Word
-     * 
+     *
      * Available in Requirement set: File
      */
-    export interface Slice {
+    interface Slice {
         /**
          * Gets the raw data of the file slice in Office.FileType.Text ("text") or Office.FileType.Compressed ("compressed") format as specified by the fileType parameter of the call to the Document.getFileAsync method.
-         * 
+         *
          * @remarks
          * Files in the "compressed" format will return a byte array that can be transformed to a base64-encoded string if required.
-         * 
+         *
          * Hosts: PowerPoint, Word
-         * 
+         *
          * Available in Requirement set: File
          */
         data: any;
         /**
          * Gets the zero-based index of the file slice.
-         * 
+         *
          * @remarks
          * Hosts: PowerPoint, Word
-         * 
+         *
          * Available in Requirement set: File
          */
         index: number;
         /**
          * Gets the size of the slice in bytes.
-         * 
+         *
          * @remarks
          * Hosts: PowerPoint, Word
-         * 
+         *
          * Available in Requirement set: File
          */
         size: number;
     }
     /**
     * Represents a binding in two dimensions of rows and columns, optionally with headers.
-    * 
+    *
     * @remarks
     * Hosts: Access, Excel, PowerPoint, Project, Word
-    * 
+    *
     * Available in Requirement set: TableBindings
-    * 
+    *
     * The TableBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object.
-    * 
+    *
     * For Excel, note that after you establish a table binding in Excel, each new row a user adds to the table is automatically included in the binding and rowCount increases.
     */
-    export interface TableBinding extends Binding {
+    interface TableBinding extends Binding {
         /**
         * Gets the number of columns in the TableBinding, as an integer value.
-        * 
+        *
         * @remarks
         * Hosts: Access, Excel,Word
-        * 
+        *
         * Available in Requirement set: TableBindings
         */
         columnCount: number;
         /**
         * True, if the table has headers; otherwise false.
-        * 
+        *
         * @remarks
         * Hosts: Access, Excel, PowerPoint, Project, Word
-        * 
+        *
         * Available in Requirement set: TableBindings
         */
         hasHeaders: boolean;
          /**
         * Gets the number of rows in the TableBinding, as an integer value.
-        * 
+        *
         * @remarks
         * Hosts: Access, Excel,Word
-        * 
+        *
         * Available in Requirement set: TableBindings
         *
         * When you insert an empty table by selecting a single row in Excel 2013 and Excel Online (using Table on the Insert tab), both Office host applications create a single row of headers followed by a single blank row. However, if your add-in's script creates a binding for this newly inserted table (for example, by using the addFromSelectionAsync method), and then checks the value of the rowCount property, the value returned will differ depending whether the spreadsheet is open in Excel 2013 or Excel Online.
 
         * - In Excel on the desktop, rowCount will return 0 (the blank row following the headers is not counted).
-        * 
+        *
         * - In Excel Online, rowCount will return 1 (the blank row following the headers is counted).
-        * 
+        *
         * You can work around this difference in your script by checking if rowCount == 1, and if so, then checking if the row contains all empty strings.
-        * 
+        *
         * In content add-ins for Access, for performance reasons the rowCount property always returns -1.
         */
         rowCount: number;
         /**
          * Adds the specified data to the table as additional columns.
-         * 
+         *
          * @remarks
          * Hosts: Excel, Word
-         * 
+         *
          * Available in Requirement set: TableBindings
-         * 
+         *
          * To add one or more columns specifying the values of the data and headers, pass a TableData object as the data parameter. To add one or more columns specifying only the data, pass an array of arrays ("matrix") as the data parameter.
-         * 
+         *
          * The success or failure of an addColumnsAsync operation is atomic. That is, the entire add columns operation must succeed, or it will be completely rolled back (and the AsyncResult.status property returned to the callback will report failure):
-         * 
+         *
          *  - Each row in the array you pass as the data argument must have the same number of rows as the table being updated. If not, the entire operation will fail.
-         * 
+         *
          *  - Each row and cell in the array must successfully add that row or cell to the table in the newly added column(s). If any row or cell fails to be set for any reason, the entire operation will fail.
-         * 
+         *
          *  - If you pass a TableData object as the data argument, the number of header rows must match that of the table being updated.
-         * 
+         *
          * Additional remark for Excel Online: The total number of cells in the TableData object passed to the data parameter can't exceed 20,000 in a single call to this method.
-         *         
+         *
          * @param tableData An array of arrays ("matrix") or a TableData object that contains one or more columns of data to add to the table. Required.
          * @param options Syntax example: {asyncContext:context}
          *       asyncContext: A user-defined item of any type that is returned in the AsyncResult object without being altered.
@@ -2189,24 +2398,24 @@ declare namespace Office {
         addColumnsAsync(tableData: TableData | any[][], options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Adds the specified data to the table as additional rows.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, Word
-         * 
+         *
          * Available in Requirement set: TableBindings
-         * 
+         *
          * To add one or more columns specifying the values of the data and headers, pass a TableData object as the data parameter. To add one or more columns specifying only the data, pass an array of arrays ("matrix") as the data parameter.
-         * 
+         *
          * The success or failure of an addRowsAsync operation is atomic. That is, the entire add columns operation must succeed, or it will be completely rolled back (and the AsyncResult.status property returned to the callback will report failure):
-         * 
+         *
          *  - Each row in the array you pass as the data argument must have the same number of columns as the table being updated. If not, the entire operation will fail.
-         * 
+         *
          *  - Each column and cell in the array must successfully add that column or cell to the table in the newly added rows(s). If any column or cell fails to be set for any reason, the entire operation will fail.
-         * 
+         *
          *  - If you pass a TableData object as the data argument, the number of header rows must match that of the table being updated.
-         * 
+         *
          * Additional remark for Excel Online: The total number of cells in the TableData object passed to the data parameter can't exceed 20,000 in a single call to this method.
-         *         
+         *
          * @param rows An array of arrays ("matrix") or a TableData object that contains one or more rows of data to add to the table. Required.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -2214,14 +2423,14 @@ declare namespace Office {
         addRowsAsync(rows: TableData | any[][], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Deletes all non-header rows and their values in the table, shifting appropriately for the host application.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, Word
-         * 
+         *
          * Available in Requirement set: TableBindings
-         * 
+         *
          * In Excel, if the table has no header row, this method will delete the table itself.
-         *  
+         *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
@@ -2231,11 +2440,11 @@ declare namespace Office {
          *
          * @remarks
          * Hosts: Excel
-         * 
+         *
          * Available in Requirement set: Not in a set
-         * 
+         *
          * See [Format tables in add-ins for Excel](https://docs.microsoft.com/en-us/office/dev/add-ins/excel/excel-add-ins-tables#format-a-table) for more information.
-         * 
+         *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
          */
@@ -2250,18 +2459,18 @@ declare namespace Office {
         getFormatsAsync(cellReference?: any, formats?: any[], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets formatting on specified items and data in the table.
-         * 
+         *
          * @remarks
          * Hosts: Excel
-         * 
+         *
          * Available in Requirement set: Not in a set
-         * 
+         *
          * @param formatsInfo Array elements are themselves three-element arrays:[target, type, formats]
-         * 
+         *
          *       target: The identifier of the item to format. String.
-         * 
+         *
          *       type: The kind of item to format. String.
-         * 
+         *
          *       formats: An object literal containing a list of property name-value pairs that define the formatting to apply.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -2272,9 +2481,9 @@ declare namespace Office {
          *
          * @remarks
          * Hosts: Excel
-         * 
+         *
          * Available in Requirement set: Not in a set
-         * 
+         *
          * @param tableOptions An object literal containing a list of property name-value pairs that define the table options to apply.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
          * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
@@ -2283,28 +2492,28 @@ declare namespace Office {
     }
     /**
      * Represents the data in a table or a TableBinding.
-     * 
+     *
      * @remarks
      * Hosts: Excel, Word
-     * 
+     *
      * Available in Requirement set: TableBindings
      */
-    export class TableData {
+    class TableData {
         constructor(rows: any[][], headers: any[]);
         constructor();
         /**
          * Gets or sets the headers of the table.
          * @remarks
          * To specify headers, you must specify an array of arrays that corresponds to the structure of the table. For example, to specify headers for a two-column table you would set the header property to [['header1', 'header2']].
-         * 
+         *
          * If you specify null for the headers property (or leaving the property empty when you construct a TableData object), the following results occur when your code executes:
-         * 
+         *
          * - If you insert a new table, the default column headers for the table are created.
-         * 
+         *
          * - If you overwrite or update an existing table, the existing headers are not altered.
-         * 
+         *
          * Hosts: Excel, Word
-         * 
+         *
          * Available in Requirement set: TableBindings
          */
         headers: any[];
@@ -2312,26 +2521,26 @@ declare namespace Office {
          * Gets or sets the rows in the table. Returns an array of arrays that contains the data in the table. Returns an empty array ``, if there are no rows.
          * @remarks
          * To specify rows, you must specify an array of arrays that corresponds to the structure of the table. For example, to specify two rows of string values in a two-column table you would set the rows property to [['a', 'b'], ['c', 'd']].
-         * 
+         *
          * If you specify null for the rows property (or leave the property empty when you construct a TableData object), the following results occur when your code executes:
-         * 
+         *
          * - If you insert a new table, a blank row will be inserted.
-         * 
+         *
          * - If you overwrite or update an existing table, the existing rows are not altered.
-         * 
+         *
          * Hosts: Excel, Word
-         * 
+         *
          * Available in Requirement set: TableBindings
          */
         rows: any[][];
     }
     /**
      * Specifies enumerated values for the cells: property in the cellFormat parameter of [table formatting methods](https://dev.office.com/reference/docs/excel/format-tables-in-add-ins-for-excel.htm).
-     * 
+     *
      * @remarks
      * Hosts: Excel
      */
-    export enum Table {
+    enum Table {
         /**
          * The entire table, including column headers, data, and totals (if any).
          */
@@ -2347,24 +2556,24 @@ declare namespace Office {
     }
     /**
     * Represents a bound text selection in the document.
-    * 
+    *
     * @remarks
     * Hosts: Access, Excel, PowerPoint, Project, Word
-    * 
+    *
     * Available in Requirement set: TextBindings
-    * 
+    *
     * The TextBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object. It does not implement any additional properties or methods of its own.
     */
-    export interface TextBinding extends Binding { }
+    interface TextBinding extends Binding { }
     /**
      * Specifies the project fields that are available as a parameter for the getProjectFieldAsync method.
-     * 
+     *
      * @remarks
      * A ProjectProjectFields constant can be used as a parameter of the getProjectFieldAsync method.
-     * 
+     *
      * Hosts: Project
      */
-    export enum ProjectProjectFields {
+    enum ProjectProjectFields {
         /**
          * The number of digits after the decimal for the currency.
          */
@@ -2417,13 +2626,13 @@ declare namespace Office {
     }
     /**
      * Specifies the resource fields that are available as a parameter for the getResourceFieldAsync method.
-     * 
+     *
      * @remarks
      * A ProjectResourceFields constant can be used as a parameter of the getResourceFieldAsync method.
-     * 
+     *
      * For more information about working with fields in Project, see [Available fields](https://support.office.com/article/Available-fields-reference-615a4563-1cc3-40f4-b66f-1b17e793a460) reference. In Project Help, search for Available fields.
      */
-    export enum ProjectResourceFields {
+    enum ProjectResourceFields {
         /**
          * The accrual method that defines how a task accrues the cost of the resource: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
          */
@@ -3227,15 +3436,15 @@ declare namespace Office {
     }
     /**
      * Specifies the task fields that are available as a parameter for the getTaskFieldAsync method.
-     * 
+     *
      * @remarks
      * A ProjectTaskFields constant can be used as a parameter of the getTaskFieldAsync method.
-     * 
+     *
      * For more information about working with fields in Project, see the [Available fields](https://support.office.com/article/Available-fields-reference-615a4563-1cc3-40f4-b66f-1b17e793a460) reference. In Project Help, search for Available fields.
-     * 
+     *
      * Hosts: Project
      */
-    export enum ProjectTaskFields {
+    enum ProjectTaskFields {
         /**
          * The current actual cost for the task.
          */
@@ -3865,7 +4074,7 @@ declare namespace Office {
          */
         BudgetCost,
         BudgetFixedCost,
-        BudgetFixedWork, 
+        BudgetFixedWork,
         /**
         * The budget work for the task, in hours.
         */
@@ -4365,13 +4574,13 @@ declare namespace Office {
     }
     /**
      * Specifies the types of views that the getSelectedViewAsync method can recognize.
-     * 
+     *
      * @remarks
      * The getSelectedViewAsync method returns the ProjectViewTypes constant value and name that corresponds to the active view.
-     * 
+     *
      * Hosts: Project
      */
-    export enum ProjectViewTypes {
+    enum ProjectViewTypes {
         /**
          * The Gantt chart view.
          */
@@ -4438,7 +4647,7 @@ declare namespace Office {
         Timeline
     }
     // Objects
-    export interface Document {
+    interface Document {
         /**
          * Get Project field (Ex. ProjectWebAccessURL).
          * @param fieldId Project level fields.
@@ -4513,13 +4722,13 @@ declare namespace Office {
     namespace MailboxEnums {
         /**
          * Specifies an attachment's type.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Applicable Outlook mode: Compose or read
          */
-        export enum AttachmentType {
+        enum AttachmentType {
             /**
              * The attachment is a file
              */
@@ -4535,13 +4744,13 @@ declare namespace Office {
         }
         /**
          * Specifies an entity's type.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Applicable Outlook mode: Compose or read
          */
-        export enum EntityType {
+        enum EntityType {
             /**
              * Specifies that the entity is a meeting suggestion.
              */
@@ -4573,13 +4782,13 @@ declare namespace Office {
         }
         /**
          * Specifies the notification message type for an appointment or message.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Applicable Outlook mode: Compose or read
          */
-        export enum ItemNotificationMessageType {
+        enum ItemNotificationMessageType {
             /**
              * The notificationMessage is a progress indicator.
              */
@@ -4595,13 +4804,13 @@ declare namespace Office {
         }
         /**
          * Specifies an item's type.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Applicable Outlook mode: Compose or read
          */
-        export enum ItemType {
+        enum ItemType {
             /**
              * An email, meeting request, meeting response, or meeting cancellation.
              */
@@ -4613,13 +4822,13 @@ declare namespace Office {
         }
         /**
          * Specifies the type of recipient for an appointment.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Applicable Outlook mode: Compose or read
          */
-        export enum RecipientType {
+        enum RecipientType {
             /**
              * Specifies that the recipient is a distribution list containing a list of email addresses.
              */
@@ -4639,13 +4848,13 @@ declare namespace Office {
         }
         /**
          * Specifies the type of response to a meeting invitation.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Applicable Outlook mode: Compose or read
          */
-        export enum ResponseType {
+        enum ResponseType {
             /**
              * There has been no response from the attendee.
              */
@@ -4668,14 +4877,14 @@ declare namespace Office {
             Declined
         }
         /**
-         * Specifies the version of the REST API that corresponds to a REST-formatted item ID. 
-         * 
+         * Specifies the version of the REST API that corresponds to a REST-formatted item ID.
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Applicable Outlook mode: Compose or read
          */
-        export enum RestVersion {
+        enum RestVersion {
             /**
              * Version 1.0.
              */
@@ -4690,13 +4899,13 @@ declare namespace Office {
             Beta
         }
     }
-    export interface AsyncContextOptions {
+    interface AsyncContextOptions {
         asyncContext?: any;
     }
-    export interface CoercionTypeOptions {
+    interface CoercionTypeOptions {
         coercionType?: CoercionType;
     }
-    export enum SourceProperty {
+    enum SourceProperty {
         /**
          * The source of the data is from the body of the message.
          */
@@ -4708,17 +4917,17 @@ declare namespace Office {
     }
     /**
      * Represents an attachment on an item from the server. Read mode only.
-     * 
+     *
      * An array of AttachmentDetail objects is returned as the attachments property of an Appointment or Message object.
-     * 
+     *
      * [Api set: Mailbox 1.0]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Read
      */
-    export interface AttachmentDetails {
+    interface AttachmentDetails {
         /**
          * Gets a value that indicates the type of an attachment.
          */
@@ -4746,29 +4955,29 @@ declare namespace Office {
     }
     /**
      * The body object provides methods for adding and updating the content of the message or appointment. It is returned in the body property of the selected item.
-     * 
+     *
      * [Api set: Mailbox 1.1]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Compose or read
      */
-    export interface Body {
+    interface Body {
         /**
          * Returns the current body in a specified format.
-         * 
+         *
          * This method returns the entire current body in the format specified by coercionType.
-         * 
+         *
          * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param coercionType The format for the returned body.
          * @param options Optional. An object literal that contains one or more of the following properties:
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -4777,18 +4986,18 @@ declare namespace Office {
         getAsync(coercionType: CoercionType, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Returns the current body in a specified format.
-         * 
+         *
          * This method returns the entire current body in the format specified by coercionType.
-         * 
+         *
          * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param coercionType The format for the returned body.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The body is provided in the requested format in the asyncResult.value property.
          */
@@ -4796,14 +5005,14 @@ declare namespace Office {
 
         /**
          * Gets a value that indicates whether the content is in HTML or text format.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The content type is returned as one of the CoercionType values in the asyncResult.value property.
@@ -4811,18 +5020,18 @@ declare namespace Office {
         getTypeAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Adds the specified content to the beginning of the item body.
-         * 
+         *
          * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
-         * 
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
-         * 
+         *
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
          * Applicable Outlook mode: Compose
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         * 
+         *
          * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -4832,18 +5041,18 @@ declare namespace Office {
         prependAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Adds the specified content to the beginning of the item body.
-         * 
+         *
          * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
-         * 
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
-         * 
+         *
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
          * Applicable Outlook mode: Compose
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         * 
+         *
          * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -4852,57 +5061,57 @@ declare namespace Office {
         prependAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
         /**
          * Adds the specified content to the beginning of the item body.
-         * 
+         *
          * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
-         * 
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
-         * 
+         *
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
          * Applicable Outlook mode: Compose
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         * 
+         *
          * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. Any errors encountered will be provided in the asyncResult.error property.
          */
         prependAsync(data: string, callback: (result: AsyncResult) => void): void;
         /**
          * Adds the specified content to the beginning of the item body.
-         * 
+         *
          * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
-         * 
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
-         * 
+         *
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
          * Applicable Outlook mode: Compose
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         * 
+         *
          * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters.
          */
         prependAsync(data: string): void;
         /**
          * Replaces the entire body with the specified text.
-         * 
+         *
          * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
-         * 
+         *
          * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         * 
+         *
          * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
-         * 
+         *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -4912,22 +5121,22 @@ declare namespace Office {
         setAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Replaces the entire body with the specified text.
-         * 
+         *
          * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
-         * 
+         *
          * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         * 
+         *
          * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
-         * 
+         *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -4936,66 +5145,66 @@ declare namespace Office {
         setAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
         /**
          * Replaces the entire body with the specified text.
-         * 
+         *
          * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
-         * 
+         *
          * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         * 
+         *
          * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
-         * 
+         *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  Any errors encountered will be provided in the asyncResult.error property.
          */
         setAsync(data: string, callback: (result: AsyncResult) => void): void;
         /**
          * Replaces the entire body with the specified text.
-         * 
+         *
          * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
-         * 
+         *
          * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         * 
+         *
          * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
-         * 
+         *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
          */
         setAsync(data: string): void;
 
         /**
          * Replaces the selection in the body with the specified text.
-         * 
+         *
          * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
-         * 
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
-         * 
+         *
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         * 
+         *
          * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
-         * 
+         *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -5005,22 +5214,22 @@ declare namespace Office {
         setSelectedDataAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Replaces the selection in the body with the specified text.
-         * 
+         *
          * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
-         * 
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
-         * 
+         *
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         * 
+         *
          * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
-         * 
+         *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -5029,61 +5238,61 @@ declare namespace Office {
         setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
         /**
          * Replaces the selection in the body with the specified text.
-         * 
+         *
          * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
-         * 
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
-         * 
+         *
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         * 
+         *
          * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
-         * 
+         *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  Any errors encountered will be provided in the asyncResult.error property.
          */
         setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
         /**
          * Replaces the selection in the body with the specified text.
-         * 
+         *
          * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
-         * 
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP. 
-         * 
+         *
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to LPNoLP.
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         * 
+         *
          * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
-         * 
+         *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
          */
         setSelectedDataAsync(data: string): void;
     }
     /**
      * Represents a contact stored on the server. Read mode only.
-     * 
+     *
      * The list of contacts associated with an email message or appointment is returned in the contacts property of the Entities object that is returned by the getEntities or getEntitiesByType method of the active item.
-     * 
+     *
      * [Api set: Mailbox 1.0]
-     * 
+     *
      * @remarks
      * Minimum permission level: Restricted
-     * 
+     *
      * Applicable Outlook mode: Read
      */
-    export interface Contact {
+    interface Contact {
         /**
          * An array of strings containing the mailing and street addresses associated with the contact. Nullable.
          */
@@ -5111,208 +5320,208 @@ declare namespace Office {
     }
     /**
      * The Office.context namespace provides shared interfaces that are used by add-ins in all of the Office apps. This listing documents only those interfaces that are used by Outlook add-ins.
-     * 
+     *
      * [Api set: Mailbox 1.0]
-     * 
+     *
      * @remarks
      * For a full listing of the Office.context namespace, see the [Office.context reference in the Shared API]<https://dev.office.com/reference/add-ins/shared/office.context.htm>.
-     * 
+     *
      * Applicable Outlook mode: Compose or read
      */
-    export interface Context {
+    interface Context {
         /**
          * Gets the locale (language) in RFC 1766 Language tag format specified by the user for the UI of the Office host application.
-         * 
+         *
          * The displayLanguage value reflects the current Display Language setting specified with File > Options > Language in the Office host application.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Applicable Outlook mode: Compose or read
          */
-        displayLanguage: string; 
+        displayLanguage: string;
         /**
          * Provides access to the Outlook Add-in object model for Microsoft Outlook and Microsoft Outlook on the web.
-         * 
+         *
          * Namespaces:
-         * 
+         *
          * - diagnostics: Provides diagnostic information to an Outlook add-in.
-         * 
+         *
          * - item: Provides methods and properties for accessing a message or appointment in an Outlook add-in.
-         * 
+         *
          * - userProfile: Provides information about the user in an Outlook add-in.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: Restricted
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         mailbox: Mailbox;
         /**
          * Gets an object that represents the custom settings or state of a mail add-in saved to a user's mailbox.
-         * 
+         *
          * The RoamingSettings object lets you store and access data for a mail add-in that is stored in a user's mailbox, so that is available to that add-in when it is running from any host client application used to access that mailbox.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: Restricted
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         roamingSettings: RoamingSettings;
     }
     /**
      * The CustomProperties object represents custom properties that are specific to a particular item and specific to a mail add-in for Outlook. For example, there might be a need for a mail add-in to save some data that is specific to the current email message that activated the add-in. If the user revisits the same message in the future and activates the mail add-in again, the add-in will be able to retrieve the data that had been saved as custom properties.
-     * 
+     *
      * Because Outlook for Mac doesn't cache custom properties, if the user's network goes down, mail add-ins cannot access their custom properties.
-     * 
+     *
      * [Api set: Mailbox 1.0]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Compose or read
      */
-    export interface CustomProperties {
+    interface CustomProperties {
         /**
          * Returns the value of the specified custom property.
          * @param name The name of the custom property to be returned.
          * @returns The value of the specified custom property.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         get(name: string): any;
         /**
          * Sets the specified property to the specified value.
-         * 
+         *
          * The set method sets the specified property to the specified value. You must use the saveAsync method to save the property to the server.
-         * 
+         *
          * The set method creates a new property if the specified property does not already exist; otherwise, the existing value is replaced with the new value. The value parameter can be of any type; however, it is always passed to the server as a string.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param name The name of the property to be set.
          * @param value The value of the property to be set.
          */
         set(name: string, value: string): void;
         /**
          * Removes the specified property from the custom property collection.
-         * 
+         *
          * To make the removal of the property permanent, you must call the saveAsync method of the CustomProperties object.
          * @param name The name of the property to be removed.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         remove(name: string): void;
         /**
-         * Saves item-specific custom properties to the server. 
-         * 
+         * Saves item-specific custom properties to the server.
+         *
          * You must call the saveAsync method to persist any changes made with the set method or the remove method of the CustomProperties object. The saving action is asynchronous.
-         * 
+         *
          * It's a good practice to have your callback function check for and handle errors from saveAsync. In particular, a read add-in can be activated while the user is in a connected state in a read form, and subsequently the user becomes disconnected. If the add-in calls saveAsync while in the disconnected state, saveAsync would return an error. Your callback method should handle this error accordingly.
-         * 
+         *
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          * @param asyncContext Optional. Any state data that is passed to the callback method.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         saveAsync(callback?: (result: AsyncResult) => void, asyncContext?: any): void;
     }
     /**
      * Provides diagnostic information to an Outlook add-in.
-     * 
+     *
      * [Api set: Mailbox 1.0]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Compose or read
      */
-    export interface Diagnostics {
+    interface Diagnostics {
         /**
          * Gets a string that represents the name of the host application.
-         * 
+         *
          * A string that can be one of the following values: Outlook, Mac Outlook, OutlookIOS, or OutlookWebApp.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         hostName: string;
         /**
          * Gets a string that represents the version of either the host application or the Exchange Server.
-         * 
+         *
          * If the mail add-in is running on the Outlook desktop client or Outlook for iOS, the hostVersion property returns the version of the host application, Outlook. In Outlook Web App, the property returns the version of the Exchange Server. An example is the string 15.0.468.0.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         hostVersion: string;
         /**
          * Gets a string that represents the current view of Outlook Web App.
-         * 
+         *
          * The returned string can be one of the following values: OneColumn, TwoColumns, or ThreeColumns.
-         * 
+         *
          * If the host application is not Outlook Web App, then accessing this property results in undefined.
-         * 
+         *
          * Outlook Web App has three views that correspond to the width of the screen and the window, and the number of columns that can be displayed:
-         * 
+         *
          * - OneColumn, which is displayed when the screen is narrow. Outlook Web App uses this single-column layout on the entire screen of a smartphone.
-         * 
+         *
          * - TwoColumns, which is displayed when the screen is wider. Outlook Web App uses this view on most tablets.
-         * 
+         *
          * - ThreeColumns, which is displayed when the screen is wide. For example, Outlook Web App uses this view in a full screen window on a desktop computer.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         OWAView: "string";
     }
     /**
      * Provides the email properties of the sender or specified recipients of an email message or appointment.
-     * 
+     *
      * [Api set: Mailbox 1.0]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Compose or read
      */
-    export interface EmailAddressDetails {
+    interface EmailAddressDetails {
         /**
          * Gets the SMTP email address.
          */
@@ -5332,15 +5541,15 @@ declare namespace Office {
     }
     /**
      * Represents an email account on an Exchange Server.
-     * 
+     *
      * [Api set: Mailbox 1.0]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Read
      */
-    export interface EmailUser {
+    interface EmailUser {
         /**
          * Gets the display name associated with an email address.
          */
@@ -5352,27 +5561,27 @@ declare namespace Office {
     }
     /**
      * Represents a collection of entities found in an email message or appointment. Read mode only.
-     * 
+     *
      * The Entities object is a container for the entity arrays returned by the getEntities and getEntitiesByType methods when the item (either an email message or an appointment) contains one or more entities that have been found by the server. You can use these entities in your code to provide additional context information to the viewer, such as a map to an address found in the item, or to open a dialer for a phone number found in the item.
-     * 
+     *
      * If no entities of the type specified in the property are present in the item, the property associated with that entity is null. For example, if a message contains a street address and a phone number, the addresses property and phoneNumbers property would contain information, and the other properties would be null.
-     * 
+     *
      * To be recognized as an address, the string must contain a United States postal address that has at least a subset of the elements of a street number, street name, city, state, and zip code.
-     * 
+     *
      * To be recognized as a phone number, the string must contain a North American phone number format.
-     * 
+     *
      * Entity recognition relies on natural language recognition that is based on machine learning of large amounts of data. The recognition of an entity is non-deterministic and success sometimes relies on the particular context in the item.
-     * 
+     *
      * When the property arrays are returned by the getEntitiesByType method, only the property for the specified entity contains data; all other properties are null.
-     * 
+     *
      * [Api set: Mailbox 1.0]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Read
      */
-    export interface Entities {
+    interface Entities {
         /**
          * Gets the physical addresses (street or mailing addresses) found in an email message or appointment.
          */
@@ -5404,502 +5613,502 @@ declare namespace Office {
     }
 
 
-    export interface Appointment extends Item {
+    interface Appointment extends Item {
     }
-    export interface AppointmentCompose extends Appointment, ItemCompose {        
+    interface AppointmentCompose extends Appointment, ItemCompose {
         /**
          * Gets or sets the date and time that the appointment is to end.
-         * 
+         *
          * The end property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the end property value to the client's local date and time.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The end property returns a Date object.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The end property returns a Time object.
-         * 
+         *
          * When you use the Time.setAsync method to set the end time, you should use the convertToUtcClientTime method to convert the local time on the client to UTC for the server.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         end: Time;
         /**
          * Gets or sets the location of an appointment.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The location property returns a string that contains the location of the appointment.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The location property returns a Location object that provides methods that are used to get and set the location of the appointment.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         location: Location;
         /**
          * Provides access to the optional attendees of an event. The type of object and level of access depends on the mode of the current item.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The optionalAttendees property returns an array that contains an EmailAddressDetails object for each optional attendee to the meeting.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The optionalAttendees property returns a Recipients object that provides methods to get or update the optional attendees for a meeting.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         optionalAttendees: Recipients;
         /**
          * Provides access to the required attendees of an event. The type of object and level of access depends on the mode of the current item.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The requiredAttendees property returns an array that contains an EmailAddressDetails object for each required attendee to the meeting.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The requiredAttendees property returns a Recipients object that provides methods to get or update the required attendees for a meeting.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         requiredAttendees: Recipients;
         /**
          * Gets or sets the date and time that the appointment is to begin.
-         * 
+         *
          * The start property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the value to the client's local date and time.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The start property returns a Date object.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The start property returns a Time object.
-         * 
+         *
          * When you use the Time.setAsync method to set the start time, you should use the convertToUtcClientTime method to convert the local time on the client to UTC for the server.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         start: Time;
     }
-    export interface AppointmentRead extends Appointment, ItemRead {
+    interface AppointmentRead extends Appointment, ItemRead {
         end: Date;
         /**
          * Gets or sets the location of an appointment.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The location property returns a string that contains the location of the appointment.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The location property returns a Location object that provides methods that are used to get and set the location of the appointment.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         location: string;
         /**
          * Provides access to the optional attendees of an event. The type of object and level of access depends on the mode of the current item.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The optionalAttendees property returns an array that contains an EmailAddressDetails object for each optional attendee to the meeting.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The optionalAttendees property returns a Recipients object that provides methods to get or update the optional attendees for a meeting.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         optionalAttendees: EmailAddressDetails[];
         /**
          * Gets the email address of the meeting organizer for a specified meeting. Read mode only.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
          */
         organizer: EmailAddressDetails;
         /**
          * Provides access to the required attendees of an event. The type of object and level of access depends on the mode of the current item.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The requiredAttendees property returns an array that contains an EmailAddressDetails object for each required attendee to the meeting.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The requiredAttendees property returns a Recipients object that provides methods to get or update the required attendees for a meeting.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         requiredAttendees: EmailAddressDetails[];
         /**
          * Gets or sets the date and time that the appointment is to begin.
-         * 
+         *
          * The start property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the value to the client's local date and time.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The start property returns a Date object.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The start property returns a Time object.
-         * 
+         *
          * When you use the Time.setAsync method to set the start time, you should use the convertToUtcClientTime method to convert the local time on the client to UTC for the server.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         start: Date;
     }
-    export interface AppointmentForm {
+    interface AppointmentForm {
         /**
          * Gets an object that provides methods for manipulating the body of an item.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         body: string;
         /**
          * Gets or sets the date and time that the appointment is to end.
-         * 
+         *
          * The end property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the end property value to the client's local date and time.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The end property returns a Date object.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The end property returns a Time object.
-         * 
+         *
          * When you use the Time.setAsync method to set the end time, you should use the convertToUtcClientTime method to convert the local time on the client to UTC for the server.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
-        end: Date; 
+        end: Date;
         /**
         * Gets or sets the location of an appointment.
-        * 
+        *
         * *Read mode*
-        * 
+        *
         * The location property returns a string that contains the location of the appointment.
-        * 
+        *
         * *Compose mode*
-        * 
+        *
         * The location property returns a Location object that provides methods that are used to get and set the location of the appointment.
-        * 
+        *
         * [Api set: Mailbox 1.0]
-        * 
+        *
         * @remarks
-        * 
+        *
         * Minimum permission level: ReadItem
         * Applicable Outlook mode: Compose or read
         */
-        location: string;                
+        location: string;
         /**
         * Provides access to the optional attendees of an event. The type of object and level of access depends on the mode of the current item.
-        * 
+        *
         * *Read mode*
-        * 
+        *
         * The optionalAttendees property returns an array that contains an EmailAddressDetails object for each optional attendee to the meeting.
-        * 
+        *
         * *Compose mode*
-        * 
+        *
         * The optionalAttendees property returns a Recipients object that provides methods to get or update the optional attendees for a meeting.
-        * 
+        *
         * [Api set: Mailbox 1.0]
-        * 
+        *
         * @remarks
-        * 
+        *
         * Minimum permission level: ReadItem
-        * 
+        *
         * Applicable Outlook mode: Compose or read
         */
        optionalAttendees: string[] | EmailAddressDetails[];
        resources: string[];
         /**
          * Provides access to the required attendees of an event. The type of object and level of access depends on the mode of the current item.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The requiredAttendees property returns an array that contains an EmailAddressDetails object for each required attendee to the meeting.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The requiredAttendees property returns a Recipients object that provides methods to get or update the required attendees for a meeting.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         requiredAttendees: string[] | EmailAddressDetails[];
         /**
          * Gets or sets the date and time that the appointment is to begin.
-         * 
+         *
          * The start property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the value to the client's local date and time.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The start property returns a Date object.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The start property returns a Time object.
-         * 
+         *
          * When you use the Time.setAsync method to set the start time, you should use the convertToUtcClientTime method to convert the local time on the client to UTC for the server.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
-        start: Date;    
+        start: Date;
         /**
          * Gets or sets the description that appears in the subject field of an item.
-         * 
+         *
          * The subject property gets or sets the entire subject of the item, as sent by the email server.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The subject property returns a string. Use the normalizedSubject property to get the subject minus any leading prefixes such as RE: and FW:.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The subject property returns a Subject object that provides methods to get and set the subject.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         */   
+         */
         subject: string;
     }
 
     /**
      * The item namespace is used to access the currently selected message, meeting request, or appointment. You can determine the type of the item by using the itemType property.
-     * 
+     *
      * [Api set: Mailbox 1.0]
-     * 
+     *
      * @remarks
      * Minimum permission level: Restricted
-     * 
+     *
      * Applicable Outlook mode: Compose or read
      */
-    export interface Item {
+    interface Item {
         /**
          * Gets an object that provides methods for manipulating the body of an item.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         body: Body;
         /**
          * Gets the date and time that an item was created. Read mode only.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
          */
         dateTimeCreated: Date;
         /**
          * Gets the date and time that an item was last modified. Read mode only.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Note: This member is not supported in Outlook for iOS or Outlook for Android.
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
          */
         dateTimeModifed: Date;
         /**
          * Gets the type of item that an instance represents.
-         * 
+         *
          * The itemType property returns one of the ItemType enumeration values, indicating whether the item object instance is a message or an appointment.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         itemType: Office.MailboxEnums.ItemType;
         /**
          * Gets the notification messages for an item.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
-        notificationMessages: NotificationMessages;       
+        notificationMessages: NotificationMessages;
        /**
         * Asynchronously loads custom properties for this add-in on the selected item.
-        * 
+        *
         * Custom properties are stored as key/value pairs on a per-app, per-item basis. This method returns a CustomProperties object in the callback, which provides methods to access the custom properties specific to the current item and the current add-in. Custom properties are not encrypted on the item, so this should not be used as secure storage.
-        * 
+        *
         * The custom properties are provided as a CustomProperties object in the asyncResult.value property. This object can be used to get, set, and remove custom properties from the item and save changes to the custom property set back to the server.
-        * 
+        *
         * [Api set: Mailbox 1.0]
-        * 
+        *
         * @remarks
-        * 
+        *
         * Minimum permission level: ReadItem
-        * 
+        *
         * Applicable Outlook mode: Compose or read
-        * 
+        *
         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
         * @param userContext Optional. Developers can provide any object they wish to access in the callback function. This object can be accessed by the asyncResult.asyncContext property in the callback function.
         */
        loadCustomPropertiesAsync(callback: (result: AsyncResult) => void, userContext?: any): void;
     }
-    export interface ItemCompose extends Item {
+    interface ItemCompose extends Item {
         /**
          * Gets or sets the description that appears in the subject field of an item.
-         * 
+         *
          * The subject property gets or sets the entire subject of the item, as sent by the email server.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The subject property returns a string. Use the normalizedSubject property to get the subject minus any leading prefixes such as RE: and FW:.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The subject property returns a Subject object that provides methods to get and set the subject.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         subject: Subject;
         /**
          * Adds a file to a message or appointment as an attachment.
-         * 
+         *
          * The addFileAttachmentAsync method uploads the file at the specified URI and attaches it to the item in the compose form.
-         * 
+         *
          * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
-         * Errors: 
-         * 
+         *
+         * Errors:
+         *
          * AttachmentSizeExceeded - The attachment is larger than allowed.
-         * 
+         *
          * FileTypeNotSupported - The attachment has an extension that is not allowed.
-         * 
+         *
          * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
-         * 
+         *
          * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -5910,52 +6119,52 @@ declare namespace Office {
         addFileAttachmentAsync(uri: string, attachmentName: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Adds a file to a message or appointment as an attachment.
-         * 
+         *
          * The addFileAttachmentAsync method uploads the file at the specified URI and attaches it to the item in the compose form.
-         * 
+         *
          * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
-         * Errors: 
-         * 
+         *
+         * Errors:
+         *
          * AttachmentSizeExceeded - The attachment is larger than allowed.
-         * 
+         *
          * FileTypeNotSupported - The attachment has an extension that is not allowed.
-         * 
+         *
          * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
-         * 
+         *
          * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
          */
         addFileAttachmentAsync(uri: string, attachmentName: string): void;
         /**
          * Adds a file to a message or appointment as an attachment.
-         * 
+         *
          * The addFileAttachmentAsync method uploads the file at the specified URI and attaches it to the item in the compose form.
-         * 
+         *
          * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
-         * Errors: 
-         * 
+         *
+         * Errors:
+         *
          * AttachmentSizeExceeded - The attachment is larger than allowed.
-         * 
+         *
          * FileTypeNotSupported - The attachment has an extension that is not allowed.
-         * 
+         *
          * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
-         * 
+         *
          * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -5965,26 +6174,26 @@ declare namespace Office {
         addFileAttachmentAsync(uri: string, attachmentName: string, options: AsyncContextOptions): void;
         /**
          * Adds a file to a message or appointment as an attachment.
-         * 
+         *
          * The addFileAttachmentAsync method uploads the file at the specified URI and attaches it to the item in the compose form.
-         * 
+         *
          * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
-         * Errors: 
-         * 
+         *
+         * Errors:
+         *
          * AttachmentSizeExceeded - The attachment is larger than allowed.
-         * 
+         *
          * FileTypeNotSupported - The attachment has an extension that is not allowed.
-         * 
+         *
          * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
-         * 
+         *
          * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type asyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
@@ -5993,24 +6202,24 @@ declare namespace Office {
 
         /**
          * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
-         * 
+         *
          * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the callback method, if needed.
-         * 
+         *
          * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
-         * 
+         *
          * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that you are editing; however, this is not supported and is not recommended.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors:
-         * 
+         *
          * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
-         * 
+         *
          * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
          * @param options An object literal that contains one or more of the following properties.
@@ -6020,74 +6229,74 @@ declare namespace Office {
         addItemAttachmentAsync(itemId: any, attachmentName: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
-         * 
+         *
          * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the callback method, if needed.
-         * 
+         *
          * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
-         * 
+         *
          * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that you are editing; however, this is not supported and is not recommended.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors:
-         * 
+         *
          * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
-         * 
+         *
          * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
          */
         addItemAttachmentAsync(itemId: any, attachmentName: string): void;
         /**
          * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
-         * 
+         *
          * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the callback method, if needed.
-         * 
+         *
          * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
-         * 
+         *
          * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that you are editing; however, this is not supported and is not recommended.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors:
-         * 
+         *
          * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
-         * 
+         *
          * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          */
-        addItemAttachmentAsync(itemId: any, attachmentName: string, options: AsyncContextOptions): void;     
+        addItemAttachmentAsync(itemId: any, attachmentName: string, options: AsyncContextOptions): void;
         /**
          * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
-         * 
+         *
          * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the callback method, if needed.
-         * 
+         *
          * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
-         * 
+         *
          * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that you are editing; however, this is not supported and is not recommended.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors:
-         * 
+         *
          * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
-         * 
+         *
          * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. If adding the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
@@ -6100,33 +6309,33 @@ declare namespace Office {
          * The behaviors of the close method depends on the current state of the item being composed. If the item has unsaved changes, the client prompts the user to save, discard, or close the action.
          *
          * In the Outlook desktop client, if the message is an inline reply, the close method has no effect.
-         * 
+         *
          * Note: In Outlook on the web, if the item is an appointment and it has previously been saved using saveAsync, the user is prompted to save, discard, or cancel even if no changes have occurred since the item was last saved.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: Restricted
-         * 
+         *
          * Applicable Outlook mode: Compose
          */
         close(): void;
         /**
          * Gets initialization data passed when the add-in is activated by an actionable message.
-         * 
+         *
          * Note: This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the web for Office 365.
          *
          * [Api set: Mailbox Preview]
-         * 
+         *
          * @remarks
-         * 
+         *
          * More information on [actionable messages]<https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message>.
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
-         * 
+         *
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. On success, the initialization data is provided in the asyncResult.value property as a string. If there is no initialization context, the asyncResult object will contain an Error object with its code property set to 9020 and its name property set to GenericResponseError.
@@ -6134,44 +6343,44 @@ declare namespace Office {
         getInitializationContextAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously returns selected data from the subject or body of a message.
-         * 
+         *
          * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. If a field other than the body or subject is selected, the method returns the InvalidSelection error.
-         * 
+         *
          * To access the selected data from the callback method, call asyncResult.value.data. To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @returns
          * The selected data as a string with format determined by coercionType.
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string , removing any HTML tags present. If HTML, the method returns the selected text, whether it is plaintext or HTML.
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getSelectedDataAsync(coercionType: CoercionType, callback: (result: AsyncResult) => void): void;
         /**
          * Asynchronously returns selected data from the subject or body of a message.
-         * 
+         *
          * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. If a field other than the body or subject is selected, the method returns the InvalidSelection error.
-         * 
+         *
          * To access the selected data from the callback method, call asyncResult.value.data. To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @returns
          * The selected data as a string with format determined by coercionType.
          *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string , removing any HTML tags present. If HTML, the method returns the selected text, whether it is plaintext or HTML.
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -6180,19 +6389,19 @@ declare namespace Office {
         getSelectedDataAsync(coercionType: CoercionType, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
         /**
          * Removes an attachment from a message or appointment.
-         * 
+         *
          * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form to continue in a separate window.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
-         * 
+         *
          * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -6201,37 +6410,37 @@ declare namespace Office {
         removeAttachmentAsync(attachmentIndex: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes an attachment from a message or appointment.
-         * 
+         *
          * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form to continue in a separate window.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
-         * 
+         *
          * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
          */
         removeAttachmentAsync(attachmentIndex: string): void;
         /**
          * Removes an attachment from a message or appointment.
-         * 
+         *
          * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form to continue in a separate window.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
-         * 
+         *
          * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -6239,19 +6448,19 @@ declare namespace Office {
         removeAttachmentAsync(attachmentIndex: string, options: AsyncContextOptions): void;
         /**
          * Removes an attachment from a message or appointment.
-         * 
+         *
          * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form to continue in a separate window.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
-         * 
+         *
          * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
@@ -6259,29 +6468,29 @@ declare namespace Office {
 
         /**
          * Asynchronously saves an item.
-         * 
+         *
          * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
-         * 
+         *
          * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. Saving an existing appointment will send an update to added or removed attendees.
-         * 
+         *
          * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that when Outlook is in cached mode, it may take some time before the item is actually synced to the server. Until the item is synced, using the itemId will return an error.
-         * 
+         *
          * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
-         * 
+         *
          * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
-         * 
+         *
          * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
-         * 
+         *
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
@@ -6289,103 +6498,103 @@ declare namespace Office {
         saveAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously saves an item.
-         * 
+         *
          * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
-         * 
+         *
          * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. Saving an existing appointment will send an update to added or removed attendees.
-         * 
+         *
          * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that when Outlook is in cached mode, it may take some time before the item is actually synced to the server. Until the item is synced, using the itemId will return an error.
-         * 
+         *
          * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
-         * 
+         *
          * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
-         * 
+         *
          * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
-         * 
+         *
          */
         saveAsync(): void;
         /**
          * Asynchronously saves an item.
-         * 
+         *
          * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
-         * 
+         *
          * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. Saving an existing appointment will send an update to added or removed attendees.
-         * 
+         *
          * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that when Outlook is in cached mode, it may take some time before the item is actually synced to the server. Until the item is synced, using the itemId will return an error.
-         * 
+         *
          * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
-         * 
+         *
          * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
-         * 
+         *
          * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
-         * 
+         *
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          */
         saveAsync(options: AsyncContextOptions): void;
         /**
          * Asynchronously saves an item.
-         * 
+         *
          * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
-         * 
+         *
          * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. Saving an existing appointment will send an update to added or removed attendees.
-         * 
+         *
          * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that when Outlook is in cached mode, it may take some time before the item is actually synced to the server. Until the item is synced, using the itemId will return an error.
-         * 
+         *
          * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
-         * 
+         *
          * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
-         * 
+         *
          * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
-         * 
+         *
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
         saveAsync(callback: (result: AsyncResult) => void): void;
         /**
          * Asynchronously inserts data into the body or subject of a message.
-         * 
+         *
          * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. After insertion, the cursor is placed at the end of the inserted content.
-         * 
+         *
          * [Api set: Mailbox 1.2]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
-         * 
+         *
          * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -6395,37 +6604,37 @@ declare namespace Office {
         setSelectedDataAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Asynchronously inserts data into the body or subject of a message.
-         * 
+         *
          * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. After insertion, the cursor is placed at the end of the inserted content.
-         * 
+         *
          * [Api set: Mailbox 1.2]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
-         * 
+         *
          * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
          */
         setSelectedDataAsync(data: string): void;
         /**
          * Asynchronously inserts data into the body or subject of a message.
-         * 
+         *
          * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. After insertion, the cursor is placed at the end of the inserted content.
-         * 
+         *
          * [Api set: Mailbox 1.2]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
-         * 
+         *
          * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -6434,131 +6643,131 @@ declare namespace Office {
         setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
         /**
          * Asynchronously inserts data into the body or subject of a message.
-         * 
+         *
          * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. After insertion, the cursor is placed at the end of the inserted content.
-         * 
+         *
          * [Api set: Mailbox 1.2]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: InvalidAttachmentId - The attachment identifier does not exist.
-         * 
+         *
          * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
         setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
     }
-    export interface ItemRead extends Item {
+    interface ItemRead extends Item {
         /**
          * Gets an array of attachments for the item. Read mode only.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Note: Certain types of files are blocked by Outlook due to potential security issues and are therefore not returned. For more information, see [Blocked attachments in Outlook]<https://support.office.com/article/Blocked-attachments-in-Outlook-434752E1-02D3-4E90-9124-8B81E49A8519>.
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
-         * 
+         *
          */
         attachments: AttachmentDetails[];
         /**
          * Gets the Exchange Web Services item class of the selected item. Read mode only.
-         * 
+         *
          * The itemClass property specifies the message class of the selected item. The following are the default message classes for the message or appointment item.
-         * 
+         *
          * [div class="mx-tdBreakAll"|Type|Description|item class|
          * |-----------|------------|------------|
          * |Appointment items|These are calendar items of the item class IPM.Appointment or IPM.Appointment.Occurence.|IPM.Appointment,IPM.Appointment.Occurence|
          * |Message items|These include email messages that have the default message class IPM.Note, and meeting requests, responses, and cancellations, that use IPM.Schedule.Meeting as the base message class.|IPM.Note,IPM.Schedule.Meeting.Request,IPM.Schedule.Meeting.Neg,IPM.Schedule.Meeting.Pos,IPM.Schedule.Meeting.Tent,IPM.Schedule.Meeting.Canceled|
-         * 
+         *
          * You can create custom message classes that extends a default message class, for example, a custom appointment message class IPM.Appointment.Contoso.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
          */
         itemClass: string;
         /**
          * Gets the Exchange Web Services item identifier for the current item. Read mode only.
-         * 
+         *
          * The itemId property is not available in compose mode. If an item identifier is required, the saveAsync method can be used to save the item to the store, which will return the item identifier in the AsyncResult.value parameter in the callback function.
-         *  
+         *
          * Note: The identifier returned by the itemId property is the same as the Exchange Web Services item identifier. The itemId property is not identical to the Outlook Entry ID or the ID used by the Outlook REST API. Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. For more details, see Use the Outlook REST APIs from an Outlook add-in.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
          */
         itemId: string;
         /**
          * Gets the subject of an item, with all prefixes removed (including RE: and FWD:). Read mode only.
-         * 
+         *
          * The normalizedSubject property gets the subject of the item, with any standard prefixes (such as RE: and FW:) that are added by email programs. To get the subject of the item with the prefixes intact, use the subject property.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
          */
         normalizedSubject: string;
         /**
          * Gets or sets the description that appears in the subject field of an item.
-         * 
+         *
          * The subject property gets or sets the entire subject of the item, as sent by the email server.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The subject property returns a string. Use the normalizedSubject property to get the subject minus any leading prefixes such as RE: and FW:.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The subject property returns a Subject object that provides methods to get and set the subject.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         subject: string;
         /**
          * Displays a reply form that includes the sender and all recipients of the selected message or the organizer and all attendees of the selected appointment.
-         * 
+         *
          * In Outlook Web App, the reply form is displayed as a pop-out form in the 3-column view and a pop-up form in the 2- or 1-column view.
-         * 
+         *
          * If any of the string parameters exceed their limits, displayReplyAllForm throws an exception.
-         * 
+         *
          * When attachments are specified in the formData.attachments parameter, Outlook and Outlook Web App attempt to download all attachments and attach them to the reply form. If any attachments fail to be added, an error is shown in the form UI. If this isn't possible, then no error message is thrown.
-         * 
+         *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
-         * 
+         *
          * @param formData A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
          *  OR
          * An object that contains body or attachment data and a callback function
@@ -6573,23 +6782,23 @@ declare namespace Office {
         displayReplyAllForm(formData: string | ReplyFormData): void;
         /**
          * Displays a reply form that includes only the sender of the selected message or the organizer of the selected appointment.
-         * 
+         *
          * In Outlook Web App, the reply form is displayed as a pop-out form in the 3-column view and a pop-up form in the 2- or 1-column view.
-         * 
+         *
          * If any of the string parameters exceed their limits, displayReplyForm throws an exception.
-         * 
+         *
          * When attachments are specified in the formData.attachments parameter, Outlook and Outlook Web App attempt to download all attachments and attach them to the reply form. If any attachments fail to be added, an error is shown in the form UI. If this isn't possible, then no error message is thrown.
-         * 
+         *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
-         * 
+         *
          * @param formData A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB.
          * OR
          * An object that contains body or attachment data and a callback function. The object is defined as follows.
@@ -6604,28 +6813,28 @@ declare namespace Office {
         displayReplyForm(formData: string | ReplyFormData): void;
         /**
          * Gets the entities found in the selected item.
-         * 
+         *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
          */
         getEntities(): Entities;
         /**
          * Gets an array of all the entities of the specified entity type found in the selected item.
-         * 
+         *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @returns
          * If the value passed in entityType is not a valid member of the EntityType enumeration, the method returns null. If no entities of the specified type are present on the item, the method returns an empty array. Otherwise, the type of the objects in the returned array depends on the type of entity requested in the entityType parameter.
-         * 
+         *
          * While the minimum permission level to use this method is Restricted, some entity types require ReadItem to access, as specified in the following table.
          * |Value of entityType|Type of objects in returned array|Required Permission Level|
          * |-------|-----------|----------|
@@ -6636,270 +6845,270 @@ declare namespace Office {
          * |PhoneNumber|PhoneNumber|Restricted|
          * |TaskSuggestion|TaskSuggestion|ReadItem|
          * |URL|String|Restricted|
-         * 
+         *
          * @remarks
          * Minimum permission level: Restricted
-         * 
+         *
          * Applicable Outlook mode: Read
-         * 
+         *
          * @param entityType One of the EntityType enumeration values.
          */
         getEntitiesByType(entityType: Office.MailboxEnums.EntityType): (string | Contact | MeetingSuggestion | PhoneNumber | TaskSuggestion)[];
         /**
          * Returns well-known entities in the selected item that pass the named filter defined in the manifest XML file.
-         * 
+         *
          * The getFilteredEntitiesByName method returns the entities that match the regular expression defined in the ItemHasKnownEntity rule element in the manifest XML file with the specified FilterName element value.
-         * 
+         *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
-         * 
-         * @remarks 
-         * 
+         *
+         * @remarks
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
-         * 
+         *
          * @param name The name of the ItemHasKnownEntity rule element that defines the filter to match.
          * @returns If there is no ItemHasKnownEntity element in the manifest with a FilterName element value that matches the name parameter, the method returns null. If the name parameter does match an ItemHasKnownEntity element in the manifest, but there are no entities in the current item that match, the method return an empty array.
          */
         getFilteredEntitiesByName(name: string): (string | Contact | MeetingSuggestion | PhoneNumber | TaskSuggestion)[];
         /**
          * Returns string values in the selected item that match the regular expressions defined in the manifest XML file.
-         * 
+         *
          * The getRegExMatches method returns the strings that match the regular expression defined in each ItemHasRegularExpressionMatch or ItemHasKnownEntity rule element in the manifest XML file. For an ItemHasRegularExpressionMatch rule, a matching string has to occur in the property of the item that is specified by that rule. The PropertyName simple type defines the supported properties.
-         * 
-         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body and should not attempt to return the entire body of the item. Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results. Instead, use the Body.getAsync method to retrieve the entire body. 
-         * 
+         *
+         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body and should not attempt to return the entire body of the item. Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results. Instead, use the Body.getAsync method to retrieve the entire body.
+         *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @returns
          * An object that contains arrays of strings that match the regular expressions defined in the manifest XML file. The name of each array is equal to the corresponding value of the RegExName attribute of the matching ItemHasRegularExpressionMatch rule or the FilterName attribute of the matching ItemHasKnownEntity rule.
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
          */
         getRegExMatches(): any;
         /**
          * Returns string values in the selected item that match the named regular expression defined in the manifest XML file.
-         * 
+         *
          * The getRegExMatchesByName method returns the strings that match the regular expression defined in the ItemHasRegularExpressionMatch rule element in the manifest XML file with the specified RegExName element value.
-         * 
+         *
          * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body and should not attempt to return the entire body of the item. Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results.
-         * 
+         *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @returns
          * An array that contains the strings that match the regular expression defined in the manifest XML file.
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
-         * 
+         *
          * @param name The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
          */
         getRegExMatchesByName(name: string): string[];
         /**
          * Gets the entities found in a highlighted match a user has selected. Highlighted matches apply to contextual add-ins.
-         * 
+         *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
+         *
          * [Api set: Mailbox 1.6]
-         *  
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
-         * 
+         *
          * @param name The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
          */
         getSelectedEntities(): Entities;
         /**
          * Returns string values in a highlighted match that match the regular expressions defined in the manifest XML file. Highlighted matches apply to contextual add-ins.
-         * 
+         *
          * The getSelectedRegExMatches method returns the strings that match the regular expression defined in each ItemHasRegularExpressionMatch or ItemHasKnownEntity rule element in the manifest XML file. For an ItemHasRegularExpressionMatch rule, a matching string has to occur in the property of the item that is specified by that rule. The PropertyName simple type defines the supported properties.
-         * 
+         *
          * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body and should not attempt to return the entire body of the item. Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results. Instead, use the Body.getAsync method to retrieve the entire body.
-         * 
+         *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
+         *
          * [Api set: Mailbox 1.6]
-         * 
+         *
          * @returns
          * An object that contains arrays of strings that match the regular expressions defined in the manifest XML file. The name of each array is equal to the corresponding value of the RegExName attribute of the matching ItemHasRegularExpressionMatch rule or the FilterName attribute of the matching ItemHasKnownEntity rule.
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
          */
         getSelectedRegExMatches(): any;
     }
-    export interface Message extends Item {
+    interface Message extends Item {
         /**
          * Gets an identifier for the email conversation that contains a particular message.
-         * 
+         *
          * You can get an integer for this property if your mail app is activated in read forms or responses in compose forms. If subsequently the user changes the subject of the reply message, upon sending the reply, the conversation ID for that message will change and that value you obtained earlier will no longer apply.
-         * 
+         *
          * You get null for this property for a new item in a compose form. If the user sets a subject and saves the item, the conversationId property will return a value.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         conversationId: string;
     }
-    export interface MessageCompose extends Message, ItemCompose {
+    interface MessageCompose extends Message, ItemCompose {
         /**
          * Gets an object that provides methods to get or update the recipients on the Bcc (blind carbon copy) line of a message. Compose mode only.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
          */
         bcc: Recipients;
         /**
          * Provides access to the Cc (carbon copy) recipients of a message. The type of object and level of access depends on the mode of the current item.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The cc property returns an array that contains an EmailAddressDetails object for each recipient listed on the Cc line of the message. The collection is limited to a maximum of 100 members.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The cc property returns a Recipients object that provides methods to get or update the recipients on the Cc line of the message.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         cc: Recipients;
         /**
          * Provides access to the recipients on the To line of a message. The type of object and level of access depends on the mode of the current item.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The to property returns an array that contains an EmailAddressDetails object for each recipient listed on the To line of the message. The collection is limited to a maximum of 100 members.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The to property returns a Recipients object that provides methods to get or update the recipients on the To line of the message.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         to: Recipients;
     }
-    export interface MessageRead extends Message, ItemRead {
+    interface MessageRead extends Message, ItemRead {
         /**
          * Provides access to the Cc (carbon copy) recipients of a message. The type of object and level of access depends on the mode of the current item.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The cc property returns an array that contains an EmailAddressDetails object for each recipient listed on the Cc line of the message. The collection is limited to a maximum of 100 members.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The cc property returns a Recipients object that provides methods to get or update the recipients on the Cc line of the message.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         cc: EmailAddressDetails[];
         /**
          * Gets the email address of the sender of a message. Read mode only.
-         * 
+         *
          * The from and sender properties represent the same person unless the message is sent by a delegate. In that case, the from property represents the delegator, and the sender property represents the delegate.
-         * 
+         *
          * Note: The recipientType property of the EmailAddressDetails object in the from property is undefined.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
          */
         from: EmailAddressDetails;
         /**
          * Gets the Internet message identifier for an email message. Read mode only.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
          */
         internetMessageId: string;
         /**
          * Gets the email address of the sender of an email message. Read mode only.
-         * 
+         *
          * The from and sender properties represent the same person unless the message is sent by a delegate. In that case, the from property represents the delegator, and the sender property represents the delegate.
-         * 
+         *
          * Note: The recipientType property of the EmailAddressDetails object in the sender property is undefined.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
          */
         sender: EmailAddressDetails;
         /**
          * Provides access to the recipients on the To line of a message. The type of object and level of access depends on the mode of the current item.
-         * 
+         *
          * *Read mode*
-         * 
+         *
          * The to property returns an array that contains an EmailAddressDetails object for each recipient listed on the To line of the message. The collection is limited to a maximum of 100 members.
-         * 
+         *
          * *Compose mode*
-         * 
+         *
          * The to property returns a Recipients object that provides methods to get or update the recipients on the To line of the message.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         to: EmailAddressDetails[];
@@ -6907,16 +7116,16 @@ declare namespace Office {
 
     /**
      * Represents a date and time in the local client's time zone. Read mode only.
-     * 
+     *
      * [Api set: Mailbox 1.0]
-     * 
+     *
      * @remarks
-     * 
+     *
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Read
      */
-    export interface LocalClientTime {
+    interface LocalClientTime {
         /**
          * Integer value representing the month, beginning with 0 for January to 11 for December.
          */
@@ -6952,118 +7161,118 @@ declare namespace Office {
     }
     /**
      * Provides methods to get and set the location of a meeting in an Outlook add-in.
-     * 
+     *
      * [Api set: Mailbox 1.1]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Compose
      */
-    export interface Location {
+    interface Location {
         /**
          * Gets the location of an appointment.
-         * 
+         *
          * The getAsync method starts an asynchronous call to the Exchange server to get the location of an appointment. The location of the appointment is provided as a string in the asyncResult.value property.
-         * 
+         *
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
          */
         getAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Gets the location of an appointment.
-         * 
+         *
          * The getAsync method starts an asynchronous call to the Exchange server to get the location of an appointment. The location of the appointment is provided as a string in the asyncResult.value property.
-         * 
+         *
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
          */
         getAsync(callback: (result: AsyncResult) => void): void;
         /**
          * Sets the location of an appointment.
-         * 
+         *
          * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. Setting the location of an appointment overwrites the current location.
-         * 
+         *
          * @param location The location of the appointment. The string is limited to 255 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  If setting the location fails, the asyncResult.error property will contain an error code.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
          */
         setAsync(location: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets the location of an appointment.
-         * 
+         *
          * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. Setting the location of an appointment overwrites the current location.
-         * 
+         *
          * @param location The location of the appointment. The string is limited to 255 characters.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
          */
         setAsync(location: string): void;
         /**
          * Sets the location of an appointment.
-         * 
+         *
          * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. Setting the location of an appointment overwrites the current location.
-         * 
+         *
          * @param location The location of the appointment. The string is limited to 255 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
          */
         setAsync(location: string, options: AsyncContextOptions): void;
         /**
          * Sets the location of an appointment.
-         * 
+         *
          * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. Setting the location of an appointment overwrites the current location.
-         * 
+         *
          * @param location The location of the appointment. The string is limited to 255 characters.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  If setting the location fails, the asyncResult.error property will contain an error code.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
          */
         setAsync(location: string, callback: (result: AsyncResult) => void): void;
@@ -7071,80 +7280,80 @@ declare namespace Office {
     }
     /**
      * Provides access to the Outlook Add-in object model for Microsoft Outlook and Microsoft Outlook on the web.
-     * 
+     *
      * Namespaces:
-     * 
+     *
      * - diagnostics: Provides diagnostic information to an Outlook add-in.
-     * 
+     *
      * - item: Provides methods and properties for accessing a message or appointment in an Outlook add-in.
-     * 
+     *
      * - userProfile: Provides information about the user in an Outlook add-in.
-     * 
+     *
      * [Api set: Mailbox 1.0]
-     * 
+     *
      * @remarks
      * Minimum permission level: Restricted
-     * 
+     *
      * Applicable Outlook mode: Compose or read
      */
-    export interface Mailbox {
+    interface Mailbox {
         /**
          * Gets the URL of the Exchange Web Services (EWS) endpoint for this email account. Read mode only.
-         * 
+         *
          * Your app must have the ReadItem permission specified in its manifest to call the ewsUrl member in read mode.
-         * 
+         *
          * In compose mode you must call the saveAsync method before you can use the ewsUrl member. Your app must have ReadWriteItem permissions to call the saveAsync method.
-         * 
+         *
          * Note: This member is not supported in Outlook for iOS or Outlook for Android.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * The ewsUrl value can be used by a remote service to make EWS calls to the user's mailbox. For example, you can create a remote service to [get attachments from the selected item]<https://msdn.microsoft.com/library/office/dn148008.aspx>.
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         ewsUrl: string;
-        /** 
+        /**
          * The mailbox item.  Depending on the context in which the add-in opened, the item may be of any number of types.
          * If you want to see IntelliSense for only a specific type, you should cast this item to one of the following:
          * `ItemCompose`, `ItemRead`, `MessageCompose`, `MessageRead`, `AppointmentCompose`, `AppointmentRead`
-         */ 
-        item: Item & MessageRead & MessageCompose & AppointmentRead & AppointmentCompose; 
+         */
+        item: Item & MessageRead & MessageCompose & AppointmentRead & AppointmentCompose;
         /**
          * Gets the URL of the REST endpoint for this email account.
-         * 
+         *
          * Your app must have the ReadItem permission specified in its manifest to call the restUrl member in read mode.
-         * 
+         *
          * In compose mode you must call the saveAsync method before you can use the restUrl member. Your app must have ReadWriteItem permissions to call the saveAsync method.
-         * 
+         *
          * [Api set: Mailbox 1.5]
-         * 
+         *
          * @remarks
-         * 
+         *
          * The restUrl value can be used to make [REST API]<https://docs.microsoft.com/outlook/rest/> calls to the user's mailbox.
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         */        
+         */
         restUrl: string;
         /**
          * Adds an event handler for a supported event.
-         * 
+         *
          * Currently the only supported event type is Office.EventType.ItemChanged, which is invoked when the user selects a new item. This event is used by add-ins that implement a pinnable taskpane, and allows the add-in to refresh the taskpane UI based on the currently selected item.
-         * 
+         *
          * [Api set: Mailbox 1.5]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param eventType The event that should invoke the handler.
          * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -7154,164 +7363,164 @@ declare namespace Office {
         addHandlerAsync(eventType: Office.EventType, handler: (type: Office.EventType) => void, options?: any, callback?: (result: AsyncResult) => void): void;
         /**
          * Converts an item ID formatted for REST into EWS format.
-         * 
+         *
          * Item IDs retrieved via a REST API (such as the Outlook Mail API or the Microsoft Graph) use a different format than the format used by Exchange Web Services (EWS). The convertToEwsId method converts a REST-formatted ID into the proper format for EWS.
-         * 
+         *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: Restricted
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param itemId An item ID formatted for the Outlook REST APIs.
          * @param restVersion A value indicating the version of the Outlook REST API used to retrieve the item ID.
          */
         convertToEwsId(itemId: string, restVersion: Office.MailboxEnums.RestVersion): string;
         /**
          * Gets a dictionary containing time information in local client time.
-         * 
+         *
          * The dates and times used by a mail app for Outlook or Outlook Web App can use different time zones. Outlook uses the client computer time zone; Outlook Web App uses the time zone set on the Exchange Admin Center (EAC). You should handle date and time values so that the values you display on the user interface are always consistent with the time zone that the user expects.
-         * 
+         *
          * If the mail app is running in Outlook, the convertToLocalClientTime method will return a dictionary object with the values set to the client computer time zone. If the mail app is running in Outlook Web App, the convertToLocalClientTime method will return a dictionary object with the values set to the time zone specified in the EAC.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param timeValue A Date object.
          */
         convertToLocalClientTime(timeValue: Date): LocalClientTime;
         /**
          * Converts an item ID formatted for EWS into REST format.
-         * 
+         *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Item IDs retrieved via EWS or via the itemId property use a different format than the format used by REST APIs (such as the [Outlook Mail API]<https://msdn.microsoft.com/office/office365/APi/mail-rest-operations> or the [Microsoft Graph]<http://graph.microsoft.io/>). The convertToRestId method converts an EWS-formatted ID into the proper format for REST.
-         * 
+         *
          * Minimum permission level: Restricted
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param itemId An item ID formatted for Exchange Web Services (EWS)
          * @param restVersion A value indicating the version of the Outlook REST API that the converted ID will be used with.
          */
         convertToRestId(itemId: string, restVersion: Office.MailboxEnums.RestVersion): string;
         /**
          * Gets a Date object from a dictionary containing time information.
-         * 
+         *
          * The convertToUtcClientTime method converts a dictionary containing a local date and time to a Date object with the correct values for the local date and time.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param input The local time value to convert.
          * @returns A Date object with the time expressed in UTC.
          */
         convertToUtcClientTime(input: LocalClientTime): Date;
         /**
          * Displays an existing calendar appointment.
-         * 
+         *
          * The displayAppointmentForm method opens an existing calendar appointment in a new window on the desktop or in a dialog box on mobile devices.
-         * 
+         *
          * In Outlook for Mac, you can use this method to display a single appointment that is not part of a recurring series, or the master appointment of a recurring series, but you cannot display an instance of the series. This is because in Outlook for Mac, you cannot access the properties (including the item ID) of instances of a recurring series.
-         * 
+         *
          * In Outlook Web App, this method opens the specified form only if the body of the form is less than or equal to 32KB number of characters.
-         * 
+         *
          * If the specified item identifier does not identify an existing appointment, a blank pane opens on the client computer or device, and no error message will be returned.
-         * 
+         *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param itemId The Exchange Web Services (EWS) identifier for an existing calendar appointment.
          */
         displayAppointmentForm(itemId: string): void;
         /**
          * Displays an existing message.
-         * 
+         *
          * The displayMessageForm method opens an existing message in a new window on the desktop or in a dialog box on mobile devices.
-         * 
+         *
          * In Outlook Web App, this method opens the specified form only if the body of the form is less than or equal to 32 KB number of characters.
-         * 
+         *
          * If the specified item identifier does not identify an existing message, no message will be displayed on the client computer, and no error message will be returned.
-         * 
+         *
          * Do not use the displayMessageForm with an itemId that represents an appointment. Use the displayAppointmentForm method to display an existing appointment, and displayNewAppointmentForm to display a form to create a new appointment.
-         * 
+         *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param itemId The Exchange Web Services (EWS) identifier for an existing message.
          */
         displayMessageForm(itemId: string): void;
         /**
          * Displays a form for creating a new calendar appointment.
-         * 
+         *
          * The displayNewAppointmentForm method opens a form that enables the user to create a new appointment or meeting. If parameters are specified, the appointment form fields are automatically populated with the contents of the parameters.
-         * 
+         *
          * In Outlook Web App and OWA for Devices, this method always displays a form with an attendees field. If you do not specify any attendees as input arguments, the method displays a form with a Save button. If you have specified attendees, the form would include the attendees and a Send button.
-         * 
+         *
          * In the Outlook rich client and Outlook RT, if you specify any attendees or resources in the requiredAttendees, optionalAttendees, or resources parameter, this method displays a meeting form with a Send button. If you don't specify any recipients, this method displays an appointment form with a Save & Close button.
-         * 
+         *
          * If any of the parameters exceed the specified size limits, or if an unknown parameter name is specified, an exception is thrown.
-         * 
+         *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
-         * 
+         *
          * @param parameters An AppointmentForm describing the new appointment. All properties are optional.
          */
         displayNewAppointmentForm(parameters: AppointmentForm): void;
         /**
          * Displays a form for creating a new message.
-         * 
+         *
          * The displayNewMessageForm method opens a form that enables the user to create a new message. If parameters are specified, the message form fields are automatically populated with the contents of the parameters.
-         * 
+         *
          * If any of the parameters exceed the specified size limits, or if an unknown parameter name is specified, an exception is thrown.
-         * 
+         *
          * [Api set: Mailbox 1.6]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Read
-         * 
+         *
          * @param parameters A dictionary containing all values to be filled in for the user in the new form. All parameters are optional.
          *        toRecipients: An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the recipients on the To line. The array is limited to a maximum of 100 entries.
          *        ccRecipients: An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the recipients on the Cc line. The array is limited to a maximum of 100 entries.
@@ -7328,31 +7537,31 @@ declare namespace Office {
         displayNewMessageForm(parameters: any): void;
         /**
          * Gets a string that contains a token used to call REST APIs or Exchange Web Services.
-         * 
+         *
          * The getCallbackTokenAsync method makes an asynchronous call to get an opaque token from the Exchange Server that hosts the user's mailbox. The lifetime of the callback token is 5 minutes.
-         * 
+         *
          * *REST Tokens*
-         * 
+         *
          * When a REST token is requested (options.isRest = true), the resulting token will not work to authenticate Exchange Web Services calls. The token will be limited in scope to read-only access to the current item and its attachments, unless the add-in has specified the ReadWriteMailbox permission in its manifest. If the ReadWriteMailbox permission is specified, the resulting token will grant read/write access to mail, calendar, and contacts, including the ability to send mail.
-         * 
+         *
          * The add-in should use the restUrl property to determine the correct URL to use when making REST API calls.
-         * 
+         *
          * *EWS Tokens*
-         * 
+         *
          * When an EWS token is requested (options.isRest = false), the resulting token will not work to authenticate REST API calls. The token will be limited in scope to accessing the current item.
-         * 
+         *
          * The add-in should use the ewsUrl property to determine the correct URL to use when making EWS calls.
-         * 
-         * Note: It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible. 
-         * 
+         *
+         * Note: It is recommended that add-ins use the REST APIs instead of Exchange Web Services whenever possible.
+         *
          * [Api set: Mailbox 1.5]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose and read
-         * 
+         *
          * @param options An object literal that contains one or more of the following properties.
          *        isRest: Determines if the token provided will be used for the Outlook REST APIs or Exchange Web Services. Default value is false.
          *        asyncContext: Any state data that is passed to the asynchronous method.
@@ -7361,125 +7570,125 @@ declare namespace Office {
         getCallbackTokenAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
         /**
          * Gets a string that contains a token used to get an attachment or item from an Exchange Server.
-         * 
+         *
          * The getCallbackTokenAsync method makes an asynchronous call to get an opaque token from the Exchange Server that hosts the user's mailbox. The lifetime of the callback token is 5 minutes.
-         * 
+         *
          * You can pass the token and an attachment identifier or item identifier to a third-party system. The third-party system uses the token as a bearer authorization token to call the Exchange Web Services (EWS) GetAttachment or GetItem operation to return an attachment or item. For example, you can create a remote service to get attachments from the selected item.
-         * 
+         *
          * Your app must have the ReadItem permission specified in its manifest to call the getCallbackTokenAsync method in read mode.
-         * 
+         *
          * In compose mode you must call the saveAsync method to get an item identifier to pass to the getCallbackTokenAsync method. Your app must have ReadWriteItem permissions to call the saveAsync method.
-         * 
+         *
          * [Api set: Mailbox 1.5]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose and read
-         * 
+         *
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The token is provided as a string in the asyncResult.value property.
          */
         getCallbackTokenAsync(callback: (result: AsyncResult) => void): void;
         /**
          * Gets a string that contains a token used to get an attachment or item from an Exchange Server.
-         * 
+         *
          * The getCallbackTokenAsync method makes an asynchronous call to get an opaque token from the Exchange Server that hosts the user's mailbox. The lifetime of the callback token is 5 minutes.
-         * 
+         *
          * You can pass the token and an attachment identifier or item identifier to a third-party system. The third-party system uses the token as a bearer authorization token to call the Exchange Web Services (EWS) GetAttachment or GetItem operation to return an attachment or item. For example, you can create a remote service to get attachments from the selected item.
-         * 
+         *
          * Your app must have the ReadItem permission specified in its manifest to call the getCallbackTokenAsync method in read mode.
-         * 
+         *
          * In compose mode you must call the saveAsync method to get an item identifier to pass to the getCallbackTokenAsync method. Your app must have ReadWriteItem permissions to call the saveAsync method.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose and read
-         * 
+         *
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The token is provided as a string in the asyncResult.value property.
          * @param userContext Optional. Any state data that is passed to the asynchronous method.
          */
         getCallbackTokenAsync(callback: (result: AsyncResult) => void, userContext?: any): void;
         /**
          * Gets a token identifying the user and the Office Add-in.
-         * 
+         *
          * The token is provided as a string in the asyncResult.value property.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * The getUserIdentityTokenAsync method returns a token that you can use to identify and [authenticate the add-in and user with a third-party system]<https://msdn.microsoft.com/library/office/fp179828.aspx>.
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose and read
-         * 
+         *
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          * @param userContext Optional. Any state data that is passed to the asynchronous method.|
          */
         getUserIdentityTokenAsync(callback: (result: AsyncResult) => void, userContext?: any): void;
         /**
          * Makes an asynchronous request to an Exchange Web Services (EWS) service on the Exchange server that hosts the user's mailbox.
-         * 
+         *
          * In these cases, add-ins should use REST APIs to access the user's mailbox instead.
-         * 
+         *
          * The makeEwsRequestAsync method sends an EWS request on behalf of the add-in to Exchange.
-         * 
+         *
          * You cannot request Folder Associated Items with the makeEwsRequestAsync method.
-         * 
+         *
          * The XML request must specify UTF-8 encoding. <?xml version="1.0" encoding="utf-8"?>
-         * 
+         *
          * Your add-in must have the ReadWriteMailbox permission to use the makeEwsRequestAsync method. For information about using the ReadWriteMailbox permission and the EWS operations that you can call with the makeEwsRequestAsync method, see Specify permissions for mail add-in access to the user's mailbox.
-         * 
+         *
          * The XML result of the EWS call is provided as a string in the asyncResult.value property. If the result exceeds 1 MB in size, an error message is returned instead.
-         * 
+         *
          * Note: This method is not supported in the following scenarios. - In Outlook for iOS or Outlook for Android - When the add-in is loaded in a Gmail mailbox
-         * 
+         *
          * Note: The server administrator must set OAuthAuthentication to true on the Client Access Server EWS directory to enable the makeEwsRequestAsync method to make EWS requests.
-         * 
+         *
          * *Version differences*
-         * 
+         *
          * When you use the makeEwsRequestAsync method in mail apps running in Outlook versions earlier than version 15.0.4535.1004, you should set the encoding value to ISO-8859-1.
-         * 
+         *
          * <?xml version="1.0" encoding="iso-8859-1"?>
-         * 
-         * You do not need to set the encoding value when your mail app is running in Outlook on the web. You can determine whether your mail app is running in Outlook or Outlook on the web by using the mailbox.diagnostics.hostName property. You can determine what version of Outlook is running by using the mailbox.diagnostics.hostVersion property. 
-         * 
+         *
+         * You do not need to set the encoding value when your mail app is running in Outlook on the web. You can determine whether your mail app is running in Outlook or Outlook on the web by using the mailbox.diagnostics.hostName property. You can determine what version of Outlook is running by using the mailbox.diagnostics.hostVersion property.
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
-         * 
+         *
          * Minimum permission level: ReadWriteMailbox
-         * 
+         *
          * Applicable Outlook mode: Compose and read
-         * 
+         *
          * @param data The EWS request.
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          * @param userContext Optional. Any state data that is passed to the asynchronous method.
          */
         makeEwsRequestAsync(data: any, callback: (result: AsyncResult) => void, userContext?: any): void;
     }
-    
+
     /**
      * Represents a suggested meeting found in an item. Read mode only.
-     * 
+     *
      * The list of meetings suggested in an email message is returned in the meetingSuggestions property of the Entities object that is returned when the getEntities or getEntitiesByType method is called on the active item.
-     * 
+     *
      * The start and end values are string representations of a Date object that contains the date and time at which the suggested meeting is to begin and end. The values are in the default time zone specified for the current user.
-     * 
+     *
      * [Api set: Mailbox 1.0]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Read
      */
-    export interface MeetingSuggestion {
+    interface MeetingSuggestion {
         /**
          * Gets the attendees for a suggested meeting.
          */
@@ -7507,15 +7716,15 @@ declare namespace Office {
     }
     /**
      * An array of NotificationMessageDetails objects are returned by the NotificationMessages.getAllAsync method.
-     * 
+     *
      * [Api set: Mailbox 1.3]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Compose or read
      */
-    export interface NotificationMessageDetails {
+    interface NotificationMessageDetails {
         /**
          * The identifier for the notification message.
          */
@@ -7539,95 +7748,95 @@ declare namespace Office {
     }
     /**
      * The NotificationMessages object is returned as the notificationMessages property of an item.
-     * 
+     *
      * [Api set: Mailbox 1.3]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Compose or read
      */
-    export interface NotificationMessages {
+    interface NotificationMessages {
         /**
          * Adds a notification to an item.
-         * 
+         *
          * There are a maximum of 5 notifications per message. Setting more will return a NumberOfNotificationMessagesExceeded error.
-         * 
+         *
          * @param key  A developer-specified key used to reference this notification message. Developers can use it to modify this message later. It can't be longer than 32 characters.
          * @param JSONmessage A JSON object that contains the notification message to be added to the item. It contains a NotificationMessageDetails object.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         addAsync(key: string, JSONmessage: NotificationMessageDetails, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Adds a notification to an item.
-         * 
+         *
          * There are a maximum of 5 notifications per message. Setting more will return a NumberOfNotificationMessagesExceeded error.
-         * 
+         *
          * @param key  A developer-specified key used to reference this notification message. Developers can use it to modify this message later. It can't be longer than 32 characters.
          * @param JSONmessage A JSON object that contains the notification message to be added to the item. It contains a NotificationMessageDetails object.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         addAsync(key: string, JSONmessage: NotificationMessageDetails): void;
         /**
          * Adds a notification to an item.
-         * 
+         *
          * There are a maximum of 5 notifications per message. Setting more will return a NumberOfNotificationMessagesExceeded error.
-         * 
+         *
          * @param key  A developer-specified key used to reference this notification message. Developers can use it to modify this message later. It can't be longer than 32 characters.
          * @param JSONmessage A JSON object that contains the notification message to be added to the item. It contains a NotificationMessageDetails object.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         addAsync(key: string, JSONmessage: NotificationMessageDetails, options: AsyncContextOptions): void;
         /**
          * Adds a notification to an item.
-         * 
+         *
          * There are a maximum of 5 notifications per message. Setting more will return a NumberOfNotificationMessagesExceeded error.
-         * 
+         *
          * @param key  A developer-specified key used to reference this notification message. Developers can use it to modify this message later. It can't be longer than 32 characters.
          * @param JSONmessage A JSON object that contains the notification message to be added to the item. It contains a NotificationMessageDetails object.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         addAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult) => void): void;
         /**
          * Returns all keys and messages for an item.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
@@ -7635,27 +7844,27 @@ declare namespace Office {
         getAllAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Returns all keys and messages for an item.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAllAsync(callback: (result: AsyncResult) => void): void;
         /**
          * Removes a notification message for an item.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param key The key for the notification message to remove.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -7664,27 +7873,27 @@ declare namespace Office {
         removeAsync(key: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Removes a notification message for an item.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param key The key for the notification message to remove.
          */
         removeAsync(key: string): void;
         /**
          * Removes a notification message for an item.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param key The key for the notification message to remove.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -7692,30 +7901,30 @@ declare namespace Office {
         removeAsync(key: string, options: AsyncContextOptions): void;
         /**
          * Removes a notification message for an item.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param key The key for the notification message to remove.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         removeAsync(key: string, callback: (result: AsyncResult) => void): void;
         /**
-         * Replaces a notification message that has a given key with another message. 
-         * 
+         * Replaces a notification message that has a given key with another message.
+         *
          * If a notification message with the specified key doesn't exist, replaceAsync will add the notification.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param key The key for the notification message to replace. It can't be longer than 32 characters.
          * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. It contains a NotificationMessageDetails object.
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -7724,33 +7933,33 @@ declare namespace Office {
          */
         replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
-         * Replaces a notification message that has a given key with another message. 
-         * 
+         * Replaces a notification message that has a given key with another message.
+         *
          * If a notification message with the specified key doesn't exist, replaceAsync will add the notification.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param key The key for the notification message to replace. It can't be longer than 32 characters.
          * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. It contains a NotificationMessageDetails object.
          */
         replaceAsync(key: string, JSONmessage: NotificationMessageDetails): void;
         /**
-         * Replaces a notification message that has a given key with another message. 
-         * 
+         * Replaces a notification message that has a given key with another message.
+         *
          * If a notification message with the specified key doesn't exist, replaceAsync will add the notification.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param key The key for the notification message to replace. It can't be longer than 32 characters.
          * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. It contains a NotificationMessageDetails object.
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -7758,17 +7967,17 @@ declare namespace Office {
          */
         replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options: AsyncContextOptions): void;
         /**
-         * Replaces a notification message that has a given key with another message. 
-         * 
+         * Replaces a notification message that has a given key with another message.
+         *
          * If a notification message with the specified key doesn't exist, replaceAsync will add the notification.
-         * 
+         *
          * [Api set: Mailbox 1.3]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param key The key for the notification message to replace. It can't be longer than 32 characters.
          * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. It contains a NotificationMessageDetails object.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
@@ -7777,17 +7986,17 @@ declare namespace Office {
     }
     /**
      * Represents a phone number identified in an item. Read mode only.
-     * 
+     *
      * An array of PhoneNumber objects containing the phone numbers found in an email message is returned in the phoneNumbers property of the Entities object that is returned when you call the getEntities method on the selected item.
-     * 
+     *
      * [Api set: Mailbox 1.0]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Read
      */
-    export interface PhoneNumber {
+    interface PhoneNumber {
         /**
          * Gets a string containing a phone number. This string contains only the digits of the telephone number and excludes characters like parentheses and hyphens, if they exist in the original item.
          */
@@ -7803,33 +8012,33 @@ declare namespace Office {
     }
     /**
      * [Api set: Mailbox 1.1]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Compose
      */
-    export interface Recipients {
+    interface Recipients {
         /**
          * Adds a recipient list to the existing recipients for an appointment or message.
-         * 
+         *
          * The recipients parameter can be an array of one of the following:
-         * 
+         *
          * - Strings containing SMTP email addresses
-         * 
+         *
          * - EmailUser objects
-         * 
+         *
          * - EmailAddressDetails objects
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
-         * 
+         *
          * @param recipients The recipients to add to the recipients list.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -7838,47 +8047,47 @@ declare namespace Office {
         addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Adds a recipient list to the existing recipients for an appointment or message.
-         * 
+         *
          * The recipients parameter can be an array of one of the following:
-         * 
+         *
          * - Strings containing SMTP email addresses
-         * 
+         *
          * - EmailUser objects
-         * 
+         *
          * - EmailAddressDetails objects
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
-         * 
+         *
          * @param recipients The recipients to add to the recipients list.
          */
         addAsync(recipients: (string | EmailUser | EmailAddressDetails)[]): void;
         /**
          * Adds a recipient list to the existing recipients for an appointment or message.
-         * 
+         *
          * The recipients parameter can be an array of one of the following:
-         * 
+         *
          * - Strings containing SMTP email addresses
-         * 
+         *
          * - EmailUser objects
-         * 
+         *
          * - EmailAddressDetails objects
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
-         * 
+         *
          * @param recipients The recipients to add to the recipients list.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -7886,56 +8095,56 @@ declare namespace Office {
         addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: AsyncContextOptions): void;
         /**
          * Adds a recipient list to the existing recipients for an appointment or message.
-         * 
+         *
          * The recipients parameter can be an array of one of the following:
-         * 
+         *
          * - Strings containing SMTP email addresses
-         * 
+         *
          * - EmailUser objects
-         * 
+         *
          * - EmailAddressDetails objects
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
-         * 
+         *
          * @param recipients The recipients to add to the recipients list.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If adding the recipients fails, the asyncResult.error property will contain an error code.
          */
         addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult) => void): void;
-        
+
         /**
          * Gets a recipient list for an appointment or message.
-         * 
+         *
          * When the call completes, the asyncResult.value property will contain an array of EmailAddressDetails objects.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAsync(callback: (result: AsyncResult) => void): void;
         /**
          * Gets a recipient list for an appointment or message.
-         * 
+         *
          * When the call completes, the asyncResult.value property will contain an array of EmailAddressDetails objects.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
@@ -7943,26 +8152,26 @@ declare namespace Office {
         getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
         /**
          * Sets a recipient list for an appointment or message.
-         * 
+         *
          * The setAsync method overwrites the current recipient list.
-         * 
+         *
          * The recipients parameter can be an array of one of the following:
-         * 
+         *
          * - Strings containing SMTP email addresses
-         * 
+         *
          * - EmailUser objects
-         * 
+         *
          * - EmailAddressDetails objects
-         *   
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
-         * 
+         *
          * @param recipients The recipients to add to the recipients list.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -7971,51 +8180,51 @@ declare namespace Office {
         setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets a recipient list for an appointment or message.
-         * 
+         *
          * The setAsync method overwrites the current recipient list.
-         * 
+         *
          * The recipients parameter can be an array of one of the following:
-         * 
+         *
          * - Strings containing SMTP email addresses
-         * 
+         *
          * - EmailUser objects
-         * 
+         *
          * - EmailAddressDetails objects
-         *   
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
-         * 
+         *
          * @param recipients The recipients to add to the recipients list.
          */
         setAsync(recipients: (string | EmailUser | EmailAddressDetails)[]): void;
         /**
          * Sets a recipient list for an appointment or message.
-         * 
+         *
          * The setAsync method overwrites the current recipient list.
-         * 
+         *
          * The recipients parameter can be an array of one of the following:
-         * 
+         *
          * - Strings containing SMTP email addresses
-         * 
+         *
          * - EmailUser objects
-         * 
+         *
          * - EmailAddressDetails objects
-         *   
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
-         * 
+         *
          * @param recipients The recipients to add to the recipients list.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -8023,120 +8232,120 @@ declare namespace Office {
         setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: AsyncContextOptions): void;
         /**
          * Sets a recipient list for an appointment or message.
-         * 
+         *
          * The setAsync method overwrites the current recipient list.
-         * 
+         *
          * The recipients parameter can be an array of one of the following:
-         * 
+         *
          * - Strings containing SMTP email addresses
-         * 
+         *
          * - EmailUser objects
-         * 
+         *
          * - EmailAddressDetails objects
-         *   
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
-         * 
+         *
          * @param recipients The recipients to add to the recipients list.
          * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  If setting the recipients fails the asyncResult.error property will contain a code that indicates any error that occurred while adding the data.
          */
         setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult) => void): void;
 
     }
-    export interface ReplyFormAttachment {
+    interface ReplyFormAttachment {
         type: string;
         name: string;
         url?: string;
         itemId?: string;
     }
-    export interface ReplyFormData {
+    interface ReplyFormData {
         htmlBody?: string;
         attachments?: ReplyFormAttachment[];
         callback?: (result: AsyncResult) => void;
     }
     /**
      * The settings created by using the methods of the RoamingSettings object are saved per add-in and per user. That is, they are available only to the add-in that created them, and only from the user's mail box in which they are saved.
-     * 
+     *
      * While the Outlook Add-in API limits access to these settings to only the add-in that created them, these settings should not be considered secure storage. They can be accessed by Exchange Web Services or Extended MAPI. They should not be used to store sensitive information such as user credentials or security tokens.
-     * 
+     *
      * The name of a setting is a String, while the value can be a String, Number, Boolean, null, Object, or Array.
-     * 
+     *
      * The RoamingSettings object is accessible via the roamingSettings property in the Office.context namespace.
-     * 
+     *
      * Important: The RoamingSettings object is initialized from the persisted storage only when the add-in is first loaded. For task panes, this means that it is only initialized when the task pane first opens. If the task pane navigates to another page or reloads the current page, the in-memory object is reset to its initial values, even if your add-in has persisted changes. The persisted changes will not be available until the task pane is closed and reopened.
      *
      * [Api set: Mailbox 1.0]
-     * 
+     *
      * @remarks
      * Minimum permission level: Restricted
-     * 
+     *
      * Applicable Outlook mode: Compose or read
      */
-    export interface RoamingSettings {
+    interface RoamingSettings {
         /**
          * Retrieves the specified setting.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: Restricted
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param name The case-sensitive name of the setting to retrieve.
          * @returns Type: String | Number | Boolean | Object | Array
          */
         get(name: string): any;
         /**
          * Removes the specified setting
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: Restricted
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param name The case-sensitive name of the setting to remove.
          */
         remove(name: string): void;
         /**
          * Saves the settings.
-         * 
+         *
          * Any settings previously saved by an add-in are loaded when it is initialized, so during the lifetime of the session you can just use the set and get methods to work with the in-memory copy of the settings property bag. When you want to persist the settings so that they are available the next time the add-in is used, use the saveAsync method.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: Restricted
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param callback Optional? When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         saveAsync(callback?: (result: AsyncResult) => void): void;
         /**
          * Sets or creates the specified setting.
-         * 
+         *
          * The set method creates a new setting of the specified name if it does not already exist, or sets an existing setting of the specified name. The value is stored in the document as the serialized JSON representation of its data type.
-         * 
+         *
          * A maximum of 2MB is available for the settings of each add-in, and each individual setting is limited to 32KB.
-         * 
+         *
          * Any changes made to settings using the set function will not be saved to the server until the saveAsync function is called.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: Restricted
-         * 
+         *
          * Applicable Outlook mode: Compose or read
-         * 
+         *
          * @param name The case-sensitive name of the setting to set or create.
          * @param value Specifies the value to be stored.
          */
@@ -8145,41 +8354,41 @@ declare namespace Office {
 
     /**
      * Provides methods to get and set the subject of an appointment or message in an Outlook add-in.
-     * 
+     *
      * [Api set: Mailbox 1.1]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Compose
      */
-    export interface Subject {
+    interface Subject {
         /**
          * Gets the subject of an appointment or message.
          * The getAsync method starts an asynchronous call to the Exchange server to get the subject of an appointment or message.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAsync(callback: (result: AsyncResult) => void): void;
         /**
          * Gets the subject of an appointment or message.
-         * 
+         *
          * The getAsync method starts an asynchronous call to the Exchange server to get the subject of an appointment or message.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
@@ -8187,18 +8396,18 @@ declare namespace Office {
         getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
         /**
          * Sets the subject of an appointment or message.
-         * 
+         *
          * The setAsync method starts an asynchronous call to the Exchange server to set the subject of an appointment or message. Setting the subject overwrites the current subject, but leaves any prefixes, such as "Fwd:" or "Re:" in place.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: DataExceedsMaximumSize - The subject parameter is longer than 255 characters.
-         * 
+         *
          * @param subject The subject of the appointment or message. The string is limited to 255 characters.
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -8207,35 +8416,35 @@ declare namespace Office {
         setAsync(subject: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets the subject of an appointment or message.
-         * 
+         *
          * The setAsync method starts an asynchronous call to the Exchange server to set the subject of an appointment or message. Setting the subject overwrites the current subject, but leaves any prefixes, such as "Fwd:" or "Re:" in place.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: DataExceedsMaximumSize - The subject parameter is longer than 255 characters.
-         * 
+         *
          * @param subject The subject of the appointment or message. The string is limited to 255 characters.
          */
         setAsync(data: string): void;
         /**
          * Sets the subject of an appointment or message.
-         * 
+         *
          * The setAsync method starts an asynchronous call to the Exchange server to set the subject of an appointment or message. Setting the subject overwrites the current subject, but leaves any prefixes, such as "Fwd:" or "Re:" in place.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: DataExceedsMaximumSize - The subject parameter is longer than 255 characters.
-         * 
+         *
          * @param subject The subject of the appointment or message. The string is limited to 255 characters.
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -8243,18 +8452,18 @@ declare namespace Office {
         setAsync(data: string, options: AsyncContextOptions): void;
         /**
          * Sets the subject of an appointment or message.
-         * 
+         *
          * The setAsync method starts an asynchronous call to the Exchange server to set the subject of an appointment or message. Setting the subject overwrites the current subject, but leaves any prefixes, such as "Fwd:" or "Re:" in place.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: DataExceedsMaximumSize - The subject parameter is longer than 255 characters.
-         * 
+         *
          * @param subject The subject of the appointment or message. The string is limited to 255 characters.
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If setting the subject fails, the asyncResult.error property will contain an error code.
          */
@@ -8263,17 +8472,17 @@ declare namespace Office {
     }
     /**
      * Represents a suggested task identified in an item. Read mode only.
-     * 
+     *
      * The list of tasks suggested in an email message is returned in the taskSuggestions property of the [Entities]Entities object that is returned when the getEntities or getEntitiesByType method is called on the active item.
-     * 
+     *
      * [Api set: Mailbox 1.0]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Read
      */
-    export interface TaskSuggestion {
+    interface TaskSuggestion {
         /**
          * Gets the users that should be assigned a suggested task.
          */
@@ -8285,42 +8494,42 @@ declare namespace Office {
     }
     /**
      * The Time object is returned as the start or end property of an appointment in compose mode.
-     * 
+     *
      * [Api set: Mailbox 1.1]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Compose
      */
-    export interface Time {
+    interface Time {
         /**
          * Gets the start or end time of an appointment.
-         * 
+         *
          * The date and time is provided as a Date object in the asyncResult.value property. The value is in Coordinated Universal Time (UTC). You can convert the UTC time to the local client time by using the convertToLocalClientTime method.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
         getAsync(callback: (result: AsyncResult) => void): void;
         /**
          * Gets the start or end time of an appointment.
-         * 
+         *
          * The date and time is provided as a Date object in the asyncResult.value property. The value is in Coordinated Universal Time (UTC). You can convert the UTC time to the local client time by using the convertToLocalClientTime method.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
@@ -8328,20 +8537,20 @@ declare namespace Office {
         getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
         /**
          * Sets the start or end time of an appointment.
-         * 
+         *
          * If the setAsync method is called on the start property, the end property will be adjusted to maintain the duration of the appointment as previously set. If the setAsync method is called on the end property, the duration of the appointment will be extended to the new end time.
-         * 
+         *
          * The time must be in UTC; you can get the correct UTC time by using the convertToUtcClientTime method.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: InvalidEndTime - The appointment end time is before the appointment start time.
-         * 
+         *
          * @param dateTime A date-time object in Coordinated Universal Time (UTC).
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -8350,39 +8559,39 @@ declare namespace Office {
         setAsync(dateTime: Date, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
         /**
          * Sets the start or end time of an appointment.
-         * 
+         *
          * If the setAsync method is called on the start property, the end property will be adjusted to maintain the duration of the appointment as previously set. If the setAsync method is called on the end property, the duration of the appointment will be extended to the new end time.
-         * 
+         *
          * The time must be in UTC; you can get the correct UTC time by using the convertToUtcClientTime method.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: InvalidEndTime - The appointment end time is before the appointment start time.
-         * 
+         *
          * @param dateTime A date-time object in Coordinated Universal Time (UTC).
          */
         setAsync(dateTime: Date): void;
         /**
          * Sets the start or end time of an appointment.
-         * 
+         *
          * If the setAsync method is called on the start property, the end property will be adjusted to maintain the duration of the appointment as previously set. If the setAsync method is called on the end property, the duration of the appointment will be extended to the new end time.
-         * 
+         *
          * The time must be in UTC; you can get the correct UTC time by using the convertToUtcClientTime method.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: InvalidEndTime - The appointment end time is before the appointment start time.
-         * 
+         *
          * @param dateTime A date-time object in Coordinated Universal Time (UTC).
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
@@ -8390,20 +8599,20 @@ declare namespace Office {
         setAsync(dateTime: Date, options: AsyncContextOptions): void;
         /**
          * Sets the start or end time of an appointment.
-         * 
+         *
          * If the setAsync method is called on the start property, the end property will be adjusted to maintain the duration of the appointment as previously set. If the setAsync method is called on the end property, the duration of the appointment will be extended to the new end time.
-         * 
+         *
          * The time must be in UTC; you can get the correct UTC time by using the convertToUtcClientTime method.
-         * 
+         *
          * [Api set: Mailbox 1.1]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadWriteItem
-         * 
+         *
          * Applicable Outlook mode: Compose
-         * 
+         *
          * Errors: InvalidEndTime - The appointment end time is before the appointment start time.
-         * 
+         *
          * @param dateTime A date-time object in Coordinated Universal Time (UTC).
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If setting the date and time fails, the asyncResult.error property will contain an error code.
          */
@@ -8412,64 +8621,64 @@ declare namespace Office {
     }
     /**
      * [Api set: Mailbox 1.0]
-     * 
+     *
      * @remarks
      * Minimum permission level: ReadItem
-     * 
+     *
      * Applicable Outlook mode: Compose or read
      */
-    export interface UserProfile {
+    interface UserProfile {
         /**
          * Gets the account type of the user associated with the mailbox. The possible values are listed in the following table.
-         * 
+         *
          * Note: This member is currently only supported in Outlook 2016 for Mac, build 16.9.1212 and greater.
-         * 
+         *
          * [Api set: Mailbox 1.6]
-         * 
+         *
          * @remarks
-         * 
+         *
          * |Value    |Description   |
          * |---------|--------------|
          * |enterprise |The mailbox is on an on-premises Exchange server.|
          * |gmail |The mailbox is associated with a Gmail account.|
          * |office365 |The mailbox is associated with an Office 365 work or school account.|
          * |outlookCom |The mailbox is associated with a personal Outlook.com account.|
-         * 
+         *
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         accountType: string;
         /**
          * Gets the user's display name.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         displayName: string;
         /**
          * Gets the user's display name.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         emailAddress: string;
         /**
          * Gets the user's SMTP email address.
-         * 
+         *
          * [Api set: Mailbox 1.0]
-         * 
+         *
          * @remarks
          * Minimum permission level: ReadItem
-         * 
+         *
          * Applicable Outlook mode: Compose or read
          */
         timeZone: string;
@@ -8500,6 +8709,7 @@ declare namespace OfficeExtension {
         isNullObject: boolean;
     }
 }
+
 declare namespace OfficeExtension {
     interface LoadOption {
         select?: string | string[];
@@ -8507,7 +8717,7 @@ declare namespace OfficeExtension {
         top?: number;
         skip?: number;
     }
-    export interface UpdateOptions {
+    interface UpdateOptions {
         /**
          * Throw an error if the passed-in property list includes read-only properties (default = true).
          */
@@ -8515,7 +8725,7 @@ declare namespace OfficeExtension {
     }
 
     /** Contains debug information about the request context. */
-    export interface RequestContextDebugInfo {
+    interface RequestContextDebugInfo {
         /**
          * The statements to be executed in the host.
          *
@@ -8557,7 +8767,7 @@ declare namespace OfficeExtension {
         readonly debugInfo: RequestContextDebugInfo;
     }
 
-    export interface EmbeddedOptions {
+    interface EmbeddedOptions {
         sessionKey?: string,
         container?: HTMLElement,
         id?: string;
@@ -8571,6 +8781,7 @@ declare namespace OfficeExtension {
         public init(): Promise<any>;
     }
 }
+
 declare namespace OfficeExtension {
     /** Contains the result for methods that return primitive types. The object's value property is retrieved from the document after "context.sync()" is invoked. */
     class ClientResult<T> {
@@ -8581,7 +8792,7 @@ declare namespace OfficeExtension {
 
 declare namespace OfficeExtension {
     /** Configuration */
-    export var config: {
+    var config: {
         /**
          * Determines whether to log additional error information upon failure.
          *
@@ -8593,7 +8804,7 @@ declare namespace OfficeExtension {
         extendedErrorLogging: boolean;
     };
 
-    export interface DebugInfo {
+    interface DebugInfo {
         /** Error code string, such as "InvalidArgument". */
         code: string;
         /** The error message passed through from the host Office application. */
@@ -8644,6 +8855,7 @@ declare namespace OfficeExtension {
         innerError: Error;
     }
 }
+
 declare namespace OfficeExtension {
     class ErrorCodes {
         public static accessDenied: string;
@@ -8660,11 +8872,11 @@ declare namespace OfficeExtension {
         public static connectionFailure: string;
     }
 }
-declare namespace OfficeExtension {
-    /** An Promise object that represents a deferred interaction with the host Office application. The publically-consumable OfficeExtension.Promise is available starting in ExcelApi 1.2 and WordApi 1.2. Promises can be chained via ".then", and errors can be caught via ".catch". Remember to always use a ".catch" on the outer promise, and to return intermediary promises so as not to break the promise chain. When a "native" Promise implementation is available, OfficeExtension.Promise will switch to use the native Promise instead. */
-    export const Promise: PromiseConstructor;
 
-    export type IPromise<T> = Promise<T>;
+declare namespace OfficeExtension {
+    /** A Promise object that represents a deferred interaction with the host Office application. The publicly-consumable OfficeExtension.Promise is available starting in ExcelApi 1.2 and WordApi 1.2. Promises can be chained via ".then", and errors can be caught via ".catch". Remember to always use a ".catch" on the outer promise, and to return intermediary promises so as not to break the promise chain. When a browser-provided native Promise implementation is available, OfficeExtension.Promise will switch to use the native Promise instead. */
+    const Promise: Office.IPromiseConstructor;
+    type IPromise<T> = Promise<T>;
 }
 
 declare namespace OfficeExtension {
@@ -8682,20 +8894,20 @@ declare namespace OfficeExtension {
 }
 
 declare namespace OfficeExtension {
-    export class EventHandlers<T> {
+    class EventHandlers<T> {
         constructor(context: ClientRequestContext, parentObject: ClientObject, name: string, eventInfo: EventInfo<T>);
         add(handler: (args: T) => Promise<any>): EventHandlerResult<T>;
         remove(handler: (args: T) => Promise<any>): void;
     }
 
-    export class EventHandlerResult<T> {
+    class EventHandlerResult<T> {
         constructor(context: ClientRequestContext, handlers: EventHandlers<T>, handler: (args: T) => Promise<any>);
         /** The request context associated with the object */
         context: ClientRequestContext;
         remove(): void;
     }
 
-    export interface EventInfo<T> {
+    interface EventInfo<T> {
         registerFunc: (callback: (args: any) => void) => Promise<any>;
         unregisterFunc: (callback: (args: any) => void) => Promise<any>;
         eventArgsTransformFunc: (args: any) => Promise<T>;
@@ -8985,7 +9197,7 @@ declare namespace Excel {
         /**
          *
          * Gets the Binding object that represents the binding that raised the SelectionChanged event.
-         * 
+         *
          * @remarks
          * Hosts: Access, Excel, Word
          *
@@ -8997,10 +9209,10 @@ declare namespace Excel {
          * Gets the number of columns selected. The number of columns selected. If a single cell is selected returns 1.
          *
          * [Api set: ExcelApi 1.2]
-         * 
+         *
          * @remarks
          * If the user makes a non-contiguous selection, the count for the last contiguous selection within the binding is returned.
-         * 
+         *
          * For Word, this property will work only for bindings of BindingType "table". If the binding is of type "matrix", null is returned. Also, the call will fail if the table contains merged cells, because the structure of the table must be uniform for this property to work correctly.
          */
         columnCount: number;
@@ -9008,10 +9220,10 @@ declare namespace Excel {
          * Gets the number of columns selected. The number of columns selected. If a single cell is selected returns 1.
          *
          * [Api set: ExcelApi 1.2]
-         * 
+         *
          * @remarks
          * If the user makes a non-contiguous selection, the count for the last contiguous selection within the binding is returned.
-         * 
+         *
          * For Word, this property will work only for bindings of BindingType "table". If the binding is of type "matrix", null is returned. Also, the call will fail if the table contains merged cells, because the structure of the table must be uniform for this property to work correctly.
          */
         rowCount: number;

From c99b6ef3982480df1b389c709bfbbe28e22edc4e Mon Sep 17 00:00:00 2001
From: Michael Zlatkovsky <michael.zlatkovsky@microsoft.com>
Date: Thu, 31 May 2018 17:01:25 -0700
Subject: [PATCH 573/575] Fix link syntax

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

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 6ee6338c6f..93a556840a 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -5324,7 +5324,7 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * For a full listing of the Office.context namespace, see the [Office.context reference in the Shared API]<https://dev.office.com/reference/add-ins/shared/office.context.htm>.
+     * For a full listing of the Office.context namespace, see the [Office.context reference in the Shared API](https://dev.office.com/reference/add-ins/shared/office.context.htm).
      *
      * Applicable Outlook mode: Compose or read
      */
@@ -6330,7 +6330,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * More information on [actionable messages]<https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message>.
+         * More information on [actionable messages](https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message).
          *
          * Minimum permission level: ReadItem
          *
@@ -6669,7 +6669,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Note: Certain types of files are blocked by Outlook due to potential security issues and are therefore not returned. For more information, see [Blocked attachments in Outlook]<https://support.office.com/article/Blocked-attachments-in-Outlook-434752E1-02D3-4E90-9124-8B81E49A8519>.
+         * Note: Certain types of files are blocked by Outlook due to potential security issues and are therefore not returned. For more information, see [Blocked attachments in Outlook](https://support.office.com/article/Blocked-attachments-in-Outlook-434752E1-02D3-4E90-9124-8B81E49A8519).
          *
          * Minimum permission level: ReadItem
          *
@@ -7310,7 +7310,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * The ewsUrl value can be used by a remote service to make EWS calls to the user's mailbox. For example, you can create a remote service to [get attachments from the selected item]<https://msdn.microsoft.com/library/office/dn148008.aspx>.
+         * The ewsUrl value can be used by a remote service to make EWS calls to the user's mailbox. For example, you can create a remote service to [get attachments from the selected item](https://msdn.microsoft.com/library/office/dn148008.aspx).
          *
          * Minimum permission level: ReadItem
          *
@@ -7334,7 +7334,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * The restUrl value can be used to make [REST API]<https://docs.microsoft.com/outlook/rest/> calls to the user's mailbox.
+         * The restUrl value can be used to make [REST API](https://docs.microsoft.com/outlook/rest/) calls to the user's mailbox.
          *
          * Minimum permission level: ReadItem
          *
@@ -7407,7 +7407,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * Item IDs retrieved via EWS or via the itemId property use a different format than the format used by REST APIs (such as the [Outlook Mail API]<https://msdn.microsoft.com/office/office365/APi/mail-rest-operations> or the [Microsoft Graph]<http://graph.microsoft.io/>). The convertToRestId method converts an EWS-formatted ID into the proper format for REST.
+         * Item IDs retrieved via EWS or via the itemId property use a different format than the format used by REST APIs (such as the [Outlook Mail API](https://msdn.microsoft.com/office/office365/APi/mail-rest-operations) or the [Microsoft Graph](http://graph.microsoft.io/)). The convertToRestId method converts an EWS-formatted ID into the proper format for REST.
          *
          * Minimum permission level: Restricted
          *
@@ -7622,7 +7622,7 @@ declare namespace Office {
          *
          * @remarks
          *
-         * The getUserIdentityTokenAsync method returns a token that you can use to identify and [authenticate the add-in and user with a third-party system]<https://msdn.microsoft.com/library/office/fp179828.aspx>.
+         * The getUserIdentityTokenAsync method returns a token that you can use to identify and [authenticate the add-in and user with a third-party system](https://msdn.microsoft.com/library/office/fp179828.aspx).
          *
          * Minimum permission level: ReadItem
          *

From 4cce589580576b275938c3888fb1ac6eac04501f Mon Sep 17 00:00:00 2001
From: Zhang Yijiang <mediumdeviation@gmail.com>
Date: Fri, 1 Jun 2018 11:06:16 +0800
Subject: [PATCH 574/575] Revert "Add missing properties in InitializeOptions"

This reverts commit 6345e48b3521d5858a9417becd09324e47d61318.
---
 types/redux-form/v6/lib/actionTypes.d.ts |  1 -
 types/redux-form/v6/lib/actions.d.ts     | 21 ++++-----------------
 types/redux-form/v6/lib/reduxForm.d.ts   |  5 -----
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/types/redux-form/v6/lib/actionTypes.d.ts b/types/redux-form/v6/lib/actionTypes.d.ts
index 02b47849d3..ce1ba5d208 100644
--- a/types/redux-form/v6/lib/actionTypes.d.ts
+++ b/types/redux-form/v6/lib/actionTypes.d.ts
@@ -20,7 +20,6 @@ export interface ActionTypes {
     INITIALIZE: string;
     REGISTER_FIELD: string;
     RESET: string;
-    RESET_SECTION: string;
     SET_SUBMIT_FAILED: string;
     SET_SUBMIT_SUCCEEDED: string;
     START_ASYNC_VALIDATION: string;
diff --git a/types/redux-form/v6/lib/actions.d.ts b/types/redux-form/v6/lib/actions.d.ts
index 67638a2784..7e7ea5762a 100644
--- a/types/redux-form/v6/lib/actions.d.ts
+++ b/types/redux-form/v6/lib/actions.d.ts
@@ -84,22 +84,14 @@ export function destroy(...form: string[]): FormAction;
 export function focus(form: string, field: string): FormAction;
 
 /**
- * Sets the initial values in the form with which future data values will be compared to calculate dirty and pristine. 
- * 
- * If the keepDirty parameter is true, the values of currently dirty fields will be retained to avoid overwriting user edits.
- * 
- * If the keepSubmitSucceeded parameter is true, it will not clear the submitSucceeded flag if it is set.
- * 
- * If the updateUnregisteredFields parameter is true, it will update every initialValue if still pristine instead of only 
- * registered fields. Highly recommended, defaults to false because of non-breaking backwards compatibility.
- * 
- * If the keepValues parameter is true, it will keep the old values and initial values.
+ * Sets the initial values in the form with which future data values will be compared to calculate dirty and pristine.
+ * The data parameter may contain deep nested array and object values that match the shape of your form fields.
+ * If the keepDirty parameter is true, the values of the currently dirty fields will be retained to avoid overwriting
+ * user edits.
  */
 interface InitializeOptions {
     keepDirty: boolean;
     keepSubmitSucceeded: boolean;
-    updateUnregisteredFields: boolean;
-    keepValues: boolean;
 }
 
 export function initialize(form: string, data: any, keepDirty?: boolean | InitializeOptions, options?: InitializeOptions): FormAction;
@@ -114,11 +106,6 @@ export function registerField(form: string, name: string, type: FieldType): Form
  */
 export function reset(form: string): FormAction;
 
-/**
- * Resets the values in the form sections back to the values past in with the most recent initialize action. 
- */
-export function resetSection(form: string, ...sections: string[]): FormAction;
-
 /**
  * Flips the asyncValidating flag true
  */
diff --git a/types/redux-form/v6/lib/reduxForm.d.ts b/types/redux-form/v6/lib/reduxForm.d.ts
index 2900137019..53ad871c0c 100644
--- a/types/redux-form/v6/lib/reduxForm.d.ts
+++ b/types/redux-form/v6/lib/reduxForm.d.ts
@@ -518,11 +518,6 @@ export interface StrictFormProps<FormData extends DataShape, P, S> {
      */
     reset(): void;
 
-    /**
-     * Resets the form sections to the initialValues. It will be pristine after reset.
-     */
-    resetSection(...sections: string[]) : void;
-
     /**
      * Whether or not your form is currently submitting. This prop will only
      * work if you have passed an onSubmit function that returns a promise. It

From eac6ce3cabc0be6d539f9d3d8b9e7c85a44bbf3c Mon Sep 17 00:00:00 2001
From: Zhang Yijiang <mediumdeviation@gmail.com>
Date: Fri, 1 Jun 2018 11:10:17 +0800
Subject: [PATCH 575/575] Add resetSection action, initialize props

---
 types/redux-form/lib/actionTypes.d.ts | 1 +
 types/redux-form/lib/actions.d.ts     | 3 +++
 types/redux-form/lib/reduxForm.d.ts   | 1 +
 3 files changed, 5 insertions(+)

diff --git a/types/redux-form/lib/actionTypes.d.ts b/types/redux-form/lib/actionTypes.d.ts
index ac0256456c..7718ba74ab 100644
--- a/types/redux-form/lib/actionTypes.d.ts
+++ b/types/redux-form/lib/actionTypes.d.ts
@@ -21,6 +21,7 @@ export interface ActionTypes {
     INITIALIZE: string;
     REGISTER_FIELD: string;
     RESET: string;
+    RESET_SECTION: string;
     SET_SUBMIT_FAILED: string;
     SET_SUBMIT_SUCCEEDED: string;
     START_ASYNC_VALIDATION: string;
diff --git a/types/redux-form/lib/actions.d.ts b/types/redux-form/lib/actions.d.ts
index 80fbc3a234..adc6e9842b 100644
--- a/types/redux-form/lib/actions.d.ts
+++ b/types/redux-form/lib/actions.d.ts
@@ -26,11 +26,14 @@ 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 | InitializeOptions, options?: 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?: any): FormAction;
 export declare function setSubmitFailed(form: string, ...fields: string[]): FormAction;
diff --git a/types/redux-form/lib/reduxForm.d.ts b/types/redux-form/lib/reduxForm.d.ts
index 29b6ca24ae..128845f08f 100644
--- a/types/redux-form/lib/reduxForm.d.ts
+++ b/types/redux-form/lib/reduxForm.d.ts
@@ -133,6 +133,7 @@ export interface FormInstance<FormData, P> extends Component<P> {
     pristine: boolean;
     registeredFields: RegisteredFieldState[];
     reset(): void;
+    resetSection(...sections: string[]): void;
     submit(): Promise<any>;
     valid: boolean;
     values: Partial<FormData>;